commit eab4929d1f8c8b49d104ec6ef58cdb552696d347
author Andrew Jeffery <andrew@aj.id.au> Tue Apr 05 14:42:20 2022 +0930
committer Andrew Jeffery <andrew@aj.id.au> Wed Apr 13 16:18:29 2022 +0930
tree 58d10a28beee0272052165c7b027df2b7c57595c
parent ac20bd9eba6242147aebcd64953766cefe8bca2b

EntityManager: Rename BasicVariantType to DBusValueVariant

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Change-Id: Ifde3020ee286ee6b98951df4bad5c3bd8d0251d2

include/EntityManager.hpp

diff --git a/include/EntityManager.hpp b/include/EntityManager.hpp
index 540d9a6..eb8a86d 100644
--- a/include/EntityManager.hpp
+++ b/include/EntityManager.hpp
@@ -35,11 +35,11 @@
     std::string,
     boost::container::flat_map<
         std::string,
-        boost::container::flat_map<std::string, BasicVariantType>>>;
+        boost::container::flat_map<std::string, DBusValueVariant>>>;
 
 // vector of tuple<map<propertyName, variant>, D-Bus path>>
 using FoundDeviceT = std::vector<std::tuple<
-    boost::container::flat_map<std::string, BasicVariantType>, std::string>>;
+    boost::container::flat_map<std::string, DBusValueVariant>, std::string>>;
 
 struct CmpStr
 {

include/Utils.hpp

diff --git a/include/Utils.hpp b/include/Utils.hpp
index eb8b8f1..fa155f9 100644
--- a/include/Utils.hpp
+++ b/include/Utils.hpp
@@ -32,7 +32,7 @@
 
 extern boost::asio::io_context io;
 
-using BasicVariantType =
+using DBusValueVariant =
     std::variant<std::string, int64_t, uint64_t, double, int32_t, uint32_t,
                  int16_t, uint16_t, uint8_t, bool, std::vector<uint8_t>>;
 
@@ -139,14 +139,14 @@
 std::optional<std::string> templateCharReplace(
     nlohmann::json::iterator& keyPair,
     const boost::container::flat_map<
-        std::string, boost::container::flat_map<std::string, BasicVariantType>>&
+        std::string, boost::container::flat_map<std::string, DBusValueVariant>>&
         allInterfaces,
     const size_t foundDeviceIdx,
     const std::optional<std::string>& replaceStr = std::nullopt);
 
 std::optional<std::string> templateCharReplace(
     nlohmann::json::iterator& keyPair,
-    const boost::container::flat_map<std::string, BasicVariantType>&
+    const boost::container::flat_map<std::string, DBusValueVariant>&
         foundDevice,
     const size_t foundDeviceIdx,
     const std::optional<std::string>& replaceStr = std::nullopt);
@@ -172,4 +172,4 @@
 /// \param probe the probe statement to match against.
 /// \param dbusValue the property value being matched to a probe.
 /// \return true if the dbusValue matched the probe otherwise false.
-bool matchProbe(const nlohmann::json& probe, const BasicVariantType& dbusValue);
+bool matchProbe(const nlohmann::json& probe, const DBusValueVariant& dbusValue);