EntityManager: Promote FoundDeviceT to a struct and rename
Using tuples is a readability headache. Use names provided by a struct
rather than opaque indices.
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Change-Id: Ifd5225ee28e0898d35193165ae379e6e7c6026da
diff --git a/include/EntityManager.hpp b/include/EntityManager.hpp
index 2b4565b..22a8042 100644
--- a/include/EntityManager.hpp
+++ b/include/EntityManager.hpp
@@ -30,8 +30,13 @@
#include <optional>
#include <string>
-// The string is the path to the object hosting the interface
-using FoundDeviceT = std::vector<std::tuple<DBusInterface, std::string>>;
+struct DBusDeviceDescriptor
+{
+ DBusInterface interface;
+ std::string path;
+};
+
+using FoundDevices = std::vector<DBusDeviceDescriptor>;
struct CmpStr
{
@@ -83,13 +88,13 @@
PerformProbe(
const std::vector<std::string>& probeCommand,
std::shared_ptr<PerformScan>& scanPtr,
- std::function<void(FoundDeviceT&, const MapperGetSubTreeResponse&)>&&
+ std::function<void(FoundDevices&, const MapperGetSubTreeResponse&)>&&
callback);
virtual ~PerformProbe();
std::vector<std::string> _probeCommand;
std::shared_ptr<PerformScan> scan;
- std::function<void(FoundDeviceT&, const MapperGetSubTreeResponse&)>
+ std::function<void(FoundDevices&, const MapperGetSubTreeResponse&)>
_callback;
};