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: I41103c892db258a85640aa1442acd9a295c8a847
diff --git a/host_state_manager.hpp b/host_state_manager.hpp
index 087b5f0..cd1389c 100644
--- a/host_state_manager.hpp
+++ b/host_state_manager.hpp
@@ -24,7 +24,7 @@
namespace manager
{
-using HostInherit = sdbusplus::server::object::object<
+using HostInherit = sdbusplus::server::object_t<
sdbusplus::xyz::openbmc_project::State::server::Host,
sdbusplus::xyz::openbmc_project::State::Boot::server::Progress,
sdbusplus::xyz::openbmc_project::Control::Boot::server::RebootAttempts,
@@ -53,7 +53,7 @@
* @param[in] objPath - The Dbus object path
* @param[in] id - The Host id
*/
- Host(sdbusplus::bus::bus& bus, const char* objPath, size_t id) :
+ Host(sdbusplus::bus_t& bus, const char* objPath, size_t id) :
HostInherit(bus, objPath, HostInherit::action::defer_emit), bus(bus),
systemdSignalJobRemoved(
bus,
@@ -211,7 +211,7 @@
* @param[in] msg - Data associated with subscribed signal
*
*/
- void sysStateChangeJobRemoved(sdbusplus::message::message& msg);
+ void sysStateChangeJobRemoved(sdbusplus::message_t& msg);
/** @brief Check if JobNew systemd signal is relevant to this object
*
@@ -224,7 +224,7 @@
* @param[in] msg - Data associated with subscribed signal
*
*/
- void sysStateChangeJobNew(sdbusplus::message::message& msg);
+ void sysStateChangeJobNew(sdbusplus::message_t& msg);
/** @brief Decrement reboot count
*
@@ -334,7 +334,7 @@
const std::string& getTarget(Transition tranReq);
/** @brief Persistent sdbusplus DBus bus connection. */
- sdbusplus::bus::bus& bus;
+ sdbusplus::bus_t& bus;
/** @brief Used to subscribe to dbus systemd JobRemoved signal **/
sdbusplus::bus::match_t systemdSignalJobRemoved;