commit 84b790cb97faf592fbcc7d5d080409282442e76f
author Patrick Williams <patrick@stwcx.xyz> Fri Jul 22 19:26:56 2022 -0500
committer Patrick Williams <patrick@stwcx.xyz> Mon Aug 01 14:49:40 2022 +0000
tree 49dfa95c636e13213d9897b1b7a74663a5320a89
parent 5e8aee72dce2aae111ef8bacae902f7e4e228607

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

fw-update/activation.hpp

diff --git a/fw-update/activation.hpp b/fw-update/activation.hpp
index d5c2fc7..3a061b1 100644
--- a/fw-update/activation.hpp
+++ b/fw-update/activation.hpp
@@ -15,11 +15,11 @@
 namespace fw_update
 {
 
-using ActivationIntf = sdbusplus::server::object::object<
+using ActivationIntf = sdbusplus::server::object_t<
     sdbusplus::xyz::openbmc_project::Software::server::Activation>;
-using ActivationProgressIntf = sdbusplus::server::object::object<
+using ActivationProgressIntf = sdbusplus::server::object_t<
     sdbusplus::xyz::openbmc_project::Software::server::ActivationProgress>;
-using DeleteIntf = sdbusplus::server::object::object<
+using DeleteIntf = sdbusplus::server::object_t<
     sdbusplus::xyz::openbmc_project::Object::server::Delete>;
 
 /** @class ActivationProgress
@@ -35,7 +35,7 @@
      * @param[in] bus - Bus to attach to
      * @param[in] objPath - D-Bus object path
      */
-    ActivationProgress(sdbusplus::bus::bus& bus, const std::string& objPath) :
+    ActivationProgress(sdbusplus::bus_t& bus, const std::string& objPath) :
         ActivationProgressIntf(bus, objPath.c_str(),
                                action::emit_interface_added)
     {
@@ -56,7 +56,7 @@
      *  @param[in] objPath - D-Bus object path
      *  @param[in] updateManager - Reference to FW update manager
      */
-    Delete(sdbusplus::bus::bus& bus, const std::string& objPath,
+    Delete(sdbusplus::bus_t& bus, const std::string& objPath,
            UpdateManager* updateManager) :
         DeleteIntf(bus, objPath.c_str(), action::emit_interface_added),
         updateManager(updateManager)
@@ -86,7 +86,7 @@
      *  @param[in] objPath - D-Bus object path
      *  @param[in] updateManager - Reference to FW update manager
      */
-    Activation(sdbusplus::bus::bus& bus, std::string objPath,
+    Activation(sdbusplus::bus_t& bus, std::string objPath,
                Activations activationStatus, UpdateManager* updateManager) :
         ActivationIntf(bus, objPath.c_str(),
                        ActivationIntf::action::defer_emit),
@@ -140,7 +140,7 @@
     }
 
   private:
-    sdbusplus::bus::bus& bus;
+    sdbusplus::bus_t& bus;
     const std::string objPath;
     UpdateManager* updateManager;
     std::unique_ptr<Delete> deleteImpl;