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
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I46a5eec210002af84239af74a93c830b1d4a13f1
diff --git a/include/dbus_monitor.hpp b/include/dbus_monitor.hpp
index ce0550d..129422e 100644
--- a/include/dbus_monitor.hpp
+++ b/include/dbus_monitor.hpp
@@ -18,7 +18,7 @@
struct DbusWebsocketSession
{
- std::vector<std::unique_ptr<sdbusplus::bus::match::match>> matches;
+ std::vector<std::unique_ptr<sdbusplus::bus::match_t>> matches;
boost::container::flat_set<std::string, std::less<>,
std::vector<std::string>>
interfaces;
@@ -44,7 +44,7 @@
BMCWEB_LOG_ERROR << "Couldn't find dbus connection " << connection;
return 0;
}
- sdbusplus::message::message message(m);
+ sdbusplus::message_t message(m);
nlohmann::json json;
json["event"] = message.get_member();
json["path"] = message.get_path();
@@ -206,7 +206,7 @@
BMCWEB_LOG_DEBUG << "Creating match " << propertiesMatchString;
thisSession.matches.emplace_back(
- std::make_unique<sdbusplus::bus::match::match>(
+ std::make_unique<sdbusplus::bus::match_t>(
*crow::connections::systemBus, propertiesMatchString,
onPropertyUpdate, &conn));
}
@@ -229,7 +229,7 @@
ifaceMatchString += "'";
BMCWEB_LOG_DEBUG << "Creating match " << ifaceMatchString;
thisSession.matches.emplace_back(
- std::make_unique<sdbusplus::bus::match::match>(
+ std::make_unique<sdbusplus::bus::match_t>(
*crow::connections::systemBus, ifaceMatchString,
onPropertyUpdate, &conn));
}
@@ -243,7 +243,7 @@
"member='InterfacesAdded'");
BMCWEB_LOG_DEBUG << "Creating match " << objectManagerMatchString;
thisSession.matches.emplace_back(
- std::make_unique<sdbusplus::bus::match::match>(
+ std::make_unique<sdbusplus::bus::match_t>(
*crow::connections::systemBus, objectManagerMatchString,
onPropertyUpdate, &conn));
}