commit 0dea1992667c63d6840e05f731689a1a6cca9a07
author Patrick Williams <patrick@stwcx.xyz> Fri Jul 22 19:26:52 2022 -0500
committer Adriana Kobylak <anoo@linux.ibm.com> Tue Jul 26 18:38:21 2022 +0000
tree 9f55217e02df76ed0819d369b4a850a1425d1eba
parent 42580a42d5f6ef86a5edf0293d22e7d63f56d6ea

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

item_updater.hpp

diff --git a/item_updater.hpp b/item_updater.hpp
index d104dc4..0b880c7 100644
--- a/item_updater.hpp
+++ b/item_updater.hpp
@@ -18,13 +18,13 @@
 namespace updater
 {
 
-using ItemUpdaterInherit = sdbusplus::server::object::object<
+using ItemUpdaterInherit = sdbusplus::server::object_t<
     sdbusplus::xyz::openbmc_project::Common::server::FactoryReset,
     sdbusplus::xyz::openbmc_project::Association::server::Definitions,
     sdbusplus::xyz::openbmc_project::Collection::server::DeleteAll>;
-using GardResetInherit = sdbusplus::server::object::object<
+using GardResetInherit = sdbusplus::server::object_t<
     sdbusplus::xyz::openbmc_project::Common::server::FactoryReset>;
-using ObjectEnable = sdbusplus::server::object::object<
+using ObjectEnable = sdbusplus::server::object_t<
     sdbusplus::xyz::openbmc_project::Object::server::Enable>;
 namespace MatchRules = sdbusplus::bus::match::rules;
 
@@ -47,7 +47,7 @@
      * @param[in] bus    - The Dbus bus object
      * @param[in] path   - The Dbus object path
      */
-    GardReset(sdbusplus::bus::bus& bus, const std::string& path) :
+    GardReset(sdbusplus::bus_t& bus, const std::string& path) :
         GardResetInherit(bus, path.c_str(),
                          GardResetInherit::action::emit_interface_added),
         bus(bus), path(path)
@@ -59,7 +59,7 @@
   protected:
     // TODO Remove once openbmc/openbmc#1975 is resolved
     static constexpr auto interface = "xyz.openbmc_project.Common.FactoryReset";
-    sdbusplus::bus::bus& bus;
+    sdbusplus::bus_t& bus;
     std::string path;
 
     /**
@@ -79,7 +79,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() +
@@ -178,7 +178,7 @@
      *
      * @param[in]  msg       - Data associated with subscribed signal
      */
-    virtual void createActivation(sdbusplus::message::message& msg);
+    virtual void createActivation(sdbusplus::message_t& msg);
 
     /** @brief Create Activation object */
     virtual std::unique_ptr<Activation> createActivationObject(
@@ -201,7 +201,7 @@
     virtual bool validateImage(const std::string& path) = 0;
 
     /** @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 */