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

src/Utils.cpp

diff --git a/src/Utils.cpp b/src/Utils.cpp
index 31a10bc..48c04fa 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -190,7 +190,7 @@
 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)
 {
@@ -211,7 +211,7 @@
 // ADDRESS field from a object on dbus
 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)
 {
@@ -456,7 +456,7 @@
 /// \brief JSON/DBus matching Callable for std::variant (visitor)
 ///
 /// Default match JSON/DBus match implementation
-/// \tparam T The concrete DBus value type from BasicVariantType
+/// \tparam T The concrete DBus value type from DBusValueVariant
 template <typename T>
 struct MatchProbe
 {
@@ -517,7 +517,7 @@
     }
 };
 
-bool matchProbe(const nlohmann::json& probe, const BasicVariantType& dbusValue)
+bool matchProbe(const nlohmann::json& probe, const DBusValueVariant& dbusValue)
 {
     return std::visit(MatchProbeForwarder(probe), dbusValue);
 }