commit cb356d48f0ab00c4f5f774c68760d2c2afd14cd8
author Patrick Williams <patrick@stwcx.xyz> Fri Jul 22 19:26:53 2022 -0500
committer Patrick Williams <patrick@stwcx.xyz> Mon Jul 25 21:46:50 2022 +0000
tree 07e36648b990a070e10e22dbf612fb0b51101cc6
parent 10e5f1e770d31ab8a6a012dd36577ad563bf6c2f

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

monitor/system.hpp

diff --git a/monitor/system.hpp b/monitor/system.hpp
index 8c1bb44..df3e35f 100644
--- a/monitor/system.hpp
+++ b/monitor/system.hpp
@@ -58,8 +58,7 @@
      * @param[in] bus - sdbusplus bus object
      * @param[in] event - event loop reference
      */
-    System(Mode mode, sdbusplus::bus::bus& bus,
-           const sdeventplus::Event& event);
+    System(Mode mode, sdbusplus::bus_t& bus, const sdeventplus::Event& event);
 
     /**
      * @brief Callback function to handle receiving a HUP signal to reload the
@@ -130,7 +129,7 @@
      *
      * @param[in] msg - Service details.
      */
-    void inventoryOnlineCb(sdbusplus::message::message& msg);
+    void inventoryOnlineCb(sdbusplus::message_t& msg);
 
     /**
      * @brief Create a BMC Dump
@@ -141,7 +140,7 @@
     Mode _mode;
 
     /* The sdbusplus bus object */
-    sdbusplus::bus::bus& _bus;
+    sdbusplus::bus_t& _bus;
 
     /* The event loop reference */
     const sdeventplus::Event& _event;
@@ -150,7 +149,7 @@
     std::unique_ptr<phosphor::fan::trust::Manager> _trust;
 
     /* match object to detect Inventory service */
-    std::unique_ptr<sdbusplus::bus::match::match> _inventoryMatch;
+    std::unique_ptr<sdbusplus::bus::match_t> _inventoryMatch;
 
     /* List of fan objects to monitor */
     std::vector<std::unique_ptr<Fan>> _fans;
@@ -192,7 +191,7 @@
     /**
      * @brief The tach sensors D-Bus match objects
      */
-    std::vector<std::unique_ptr<sdbusplus::bus::match::match>> _sensorMatch;
+    std::vector<std::unique_ptr<sdbusplus::bus::match_t>> _sensorMatch;
 
     /**
      * @brief true if config files have been loaded
@@ -260,7 +259,7 @@
      *
      * @param[in] sensorMap - map providing sensor access for each service
      */
-    void tachSignalOffline(sdbusplus::message::message& msg,
+    void tachSignalOffline(sdbusplus::message_t& msg,
                            const SensorMapType& sensorMap);
 
     /**