commit 374fae562a17a92d717a116343a83449bf9ec741
author Patrick Williams <patrick@stwcx.xyz> Fri Jul 22 19:26:55 2022 -0500
committer Patrick Williams <patrick@stwcx.xyz> Tue Jul 26 03:03:50 2022 +0000
tree 75d397c98e11a9b8e411c09e9e48696bd4f8afe1
parent 467a24047f75096e4184949efa881cb5a4ac17be

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: Ie530f2c63000bbfac7c5fbbc74ebe6bc8c07fb1a

src/item_updater.hpp

diff --git a/src/item_updater.hpp b/src/item_updater.hpp
index 94d97f5..0f998c8 100644
--- a/src/item_updater.hpp
+++ b/src/item_updater.hpp
@@ -25,7 +25,7 @@
 
 class Version;
 
-using ItemUpdaterInherit = sdbusplus::server::object::object<
+using ItemUpdaterInherit = sdbusplus::server::object_t<
     sdbusplus::xyz::openbmc_project::Association::server::Definitions>;
 
 namespace MatchRules = sdbusplus::bus::match::rules;
@@ -47,7 +47,7 @@
      * @param[in] bus    - The D-Bus bus object
      * @param[in] path   - The D-Bus path
      */
-    ItemUpdater(sdbusplus::bus::bus& bus, const std::string& path) :
+    ItemUpdater(sdbusplus::bus_t& bus, const std::string& path) :
         ItemUpdaterInherit(bus, path.c_str()), bus(bus),
         versionMatch(bus,
                      MatchRules::interfacesAdded() +
@@ -107,7 +107,7 @@
      *
      * @param[in]  msg       - Data associated with subscribed signal
      */
-    void createActivation(sdbusplus::message::message& msg);
+    void createActivation(sdbusplus::message_t& msg);
 
     using Properties =
         std::map<std::string, utils::UtilsInterface::PropertyType>;
@@ -117,7 +117,7 @@
      *
      * @param[in]  msg       - Data associated with subscribed signal
      */
-    void onPsuInventoryChangedMsg(sdbusplus::message::message& msg);
+    void onPsuInventoryChangedMsg(sdbusplus::message_t& msg);
 
     /** @brief Callback function for PSU inventory match.
      *  @details Update an Activation D-Bus object for PSU inventory.
@@ -178,7 +178,7 @@
     void invokeActivation(const std::unique_ptr<Activation>& activation);
 
     /** @brief Persistent sdbusplus D-Bus bus connection. */
-    sdbusplus::bus::bus& bus;
+    sdbusplus::bus_t& bus;
 
     /** @brief Persistent map of Activation D-Bus objects and their
      * version id */