sdbusplus: use shorter type aliases
The sdbusplus headers provide shortened aliases for many types.
Switch to using them to provide better code clarity and shorter
lines. Possible replacements are for:
* bus_t
* exception_t
* manager_t
* match_t
* message_t
* object_t
* slot_t
Change-Id: I5159082c7ccf1336bb426c790e7d997580c54282
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/vpd-manager/include/types.hpp b/vpd-manager/include/types.hpp
index fa44662..66d7f8d 100644
--- a/vpd-manager/include/types.hpp
+++ b/vpd-manager/include/types.hpp
@@ -205,9 +205,9 @@
/* List of invalid record entries*/
using InvalidRecordList = std::vector<InvalidRecordEntry>;
/* Map of inventory path -> Present property match object */
-using FruPresenceMatchObjectMap = std::map<Path, std::shared_ptr<sdbusplus::bus::match::match>>;
+using FruPresenceMatchObjectMap = std::map<Path, std::shared_ptr<sdbusplus::bus::match_t>>;
/* A map of interface to match object*/
-using MatchObjectInterfaceMap = std::map<std::string,std::shared_ptr<sdbusplus::bus::match::match>>;
+using MatchObjectInterfaceMap = std::map<std::string,std::shared_ptr<sdbusplus::bus::match_t>>;
/* A map of service name to match object interface map*/
using MatchObjectMap = std::map<std::string,MatchObjectInterfaceMap>;
} // namespace types
diff --git a/vpd-manager/src/listener.cpp b/vpd-manager/src/listener.cpp
index 4084e0a..624f743 100644
--- a/vpd-manager/src/listener.cpp
+++ b/vpd-manager/src/listener.cpp
@@ -306,8 +306,8 @@
throw std::runtime_error("Invalid service name or interface name");
}
- std::shared_ptr<sdbusplus::bus::match::match> l_matchObj =
- std::make_unique<sdbusplus::bus::match::match>(
+ std::shared_ptr<sdbusplus::bus::match_t> l_matchObj =
+ std::make_unique<sdbusplus::bus::match_t>(
static_cast<sdbusplus::bus_t&>(*m_asioConnection),
"type='signal',member='PropertiesChanged',"
"interface='org.freedesktop.DBus.Properties',"