commit 45e8352180af8992aecad88db62647511c776fef
author Patrick Williams <patrick@stwcx.xyz> Fri Jul 22 19:26:52 2022 -0500
committer Patrick Williams <patrick@stwcx.xyz> Mon Jul 25 15:28:17 2022 +0000
tree 2be6c1b969dd013dd79eb7bd18a31d1efcdc450b
parent c8962bda038446e6d09e3f703ca07669c2403c54

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

extensions/openpower-pels/dbus_watcher.hpp

diff --git a/extensions/openpower-pels/dbus_watcher.hpp b/extensions/openpower-pels/dbus_watcher.hpp
index 54cf6d4..dcf2744 100644
--- a/extensions/openpower-pels/dbus_watcher.hpp
+++ b/extensions/openpower-pels/dbus_watcher.hpp
@@ -97,7 +97,7 @@
      * @param[in] dataIface - The DataInterface object
      * @param[in] func - The callback used any time the property is read
      */
-    PropertyWatcher(sdbusplus::bus::bus& bus, const std::string& path,
+    PropertyWatcher(sdbusplus::bus_t& bus, const std::string& path,
                     const std::string& interface,
                     const std::string& propertyName, const std::string& service,
                     const DataIface& dataIface, PropertySetFunc func) :
@@ -119,7 +119,7 @@
         {
             read(dataIface, service);
         }
-        catch (const sdbusplus::exception::exception& e)
+        catch (const sdbusplus::exception_t& e)
         {
             // Path doesn't exist now
         }
@@ -142,7 +142,7 @@
      * @param[in] dataIface - The DataInterface object
      * @param[in] func - The callback used any time the property is read
      */
-    PropertyWatcher(sdbusplus::bus::bus& bus, const std::string& path,
+    PropertyWatcher(sdbusplus::bus_t& bus, const std::string& path,
                     const std::string& interface,
                     const std::string& propertyName, const DataIface& dataIface,
                     PropertySetFunc func) :
@@ -183,7 +183,7 @@
      *
      * @param[in] msg - The sdbusplus message object
      */
-    void propChanged(sdbusplus::message::message& msg)
+    void propChanged(sdbusplus::message_t& msg)
     {
         DBusInterface interface;
         DBusPropertyMap properties;
@@ -204,7 +204,7 @@
      *
      * @param[in] msg - The sdbusplus message object
      */
-    void interfaceAdded(sdbusplus::message::message& msg)
+    void interfaceAdded(sdbusplus::message_t& msg)
     {
         sdbusplus::message::object_path path;
         DBusInterfaceMap interfaces;
@@ -278,7 +278,7 @@
      * @param[in] dataIface - The DataInterface object
      * @param[in] func - The callback used any time the property is read
      */
-    InterfaceWatcher(sdbusplus::bus::bus& bus, const std::string& path,
+    InterfaceWatcher(sdbusplus::bus_t& bus, const std::string& path,
                      const std::string& interface, const DataIface& dataIface,
                      InterfaceSetFunc func) :
         DBusWatcher(path, interface),
@@ -299,7 +299,7 @@
         {
             read(dataIface);
         }
-        catch (const sdbusplus::exception::exception& e)
+        catch (const sdbusplus::exception_t& e)
         {
             // Path doesn't exist now
         }
@@ -331,7 +331,7 @@
      *
      * @param[in] msg - The sdbusplus message object
      */
-    void propChanged(sdbusplus::message::message& msg)
+    void propChanged(sdbusplus::message_t& msg)
     {
         DBusInterface interface;
         DBusPropertyMap properties;
@@ -348,7 +348,7 @@
      *
      * @param[in] msg - The sdbusplus message object
      */
-    void interfaceAdded(sdbusplus::message::message& msg)
+    void interfaceAdded(sdbusplus::message_t& msg)
     {
         sdbusplus::message::object_path path;
         DBusInterfaceMap interfaces;