commit bea36e227470702dc067e00491658109f5073f9f
author Patrick Williams <patrick@stwcx.xyz> Fri Jul 22 19:26:57 2022 -0500
committer Patrick Williams <patrick@stwcx.xyz> Fri Jul 22 19:26:57 2022 -0500
tree f228262a1296ac2b106578a96d0f0551044c4988
parent a3b64fb63eb86e554657168133804db5db271f5e

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

include/dbus/file_notifier.hpp

diff --git a/include/dbus/file_notifier.hpp b/include/dbus/file_notifier.hpp
index 16b61b8..c887ab2 100644
--- a/include/dbus/file_notifier.hpp
+++ b/include/dbus/file_notifier.hpp
@@ -26,7 +26,7 @@
      * @param filePath - full path of the CPER log JSON file.
      * @param entry - index of the DBus file path object.
      */
-    CperFileNotifier(sdbusplus::bus::bus& bus, const std::string& filePath,
+    CperFileNotifier(sdbusplus::bus_t& bus, const std::string& filePath,
                      uint64_t entry) :
         FileNotifierInterface(bus, generatePath(entry).c_str(),
                               action::emit_no_signals),
@@ -46,7 +46,7 @@
      */
     uint64_t entry;
 
-    sdbusplus::bus::bus& bus;
+    sdbusplus::bus_t& bus;
 
     /**
      * @brief Generate a path for the CperFileNotifier DBus object.

include/rde/external_storer_file.hpp

diff --git a/include/rde/external_storer_file.hpp b/include/rde/external_storer_file.hpp
index f6a6281..bb853f4 100644
--- a/include/rde/external_storer_file.hpp
+++ b/include/rde/external_storer_file.hpp
@@ -83,13 +83,13 @@
      * will take the ownership of this object.
      */
     ExternalStorerFileInterface(
-        sdbusplus::bus::bus& bus, std::string_view rootPath,
+        sdbusplus::bus_t& bus, std::string_view rootPath,
         std::unique_ptr<FileHandlerInterface> fileHandler);
 
     bool publishJson(std::string_view jsonStr) override;
 
   private:
-    sdbusplus::bus::bus& bus;
+    sdbusplus::bus_t& bus;
     std::string rootPath;
     std::unique_ptr<FileHandlerInterface> fileHandler;
     std::string logServiceId;

include/rde/notifier_dbus_handler.hpp

diff --git a/include/rde/notifier_dbus_handler.hpp b/include/rde/notifier_dbus_handler.hpp
index efcbd86..e90fa71 100644
--- a/include/rde/notifier_dbus_handler.hpp
+++ b/include/rde/notifier_dbus_handler.hpp
@@ -21,7 +21,7 @@
      *
      * @param bus - bus to attache to.
      */
-    explicit CperFileNotifierHandler(sdbusplus::bus::bus& bus);
+    explicit CperFileNotifierHandler(sdbusplus::bus_t& bus);
 
     /**
      * @brief Create a DBus object with the provided filePath value.
@@ -31,8 +31,8 @@
     void createEntry(const std::string& filePath);
 
   private:
-    sdbusplus::bus::bus& bus;
-    sdbusplus::server::manager::manager objManager;
+    sdbusplus::bus_t& bus;
+    sdbusplus::server::manager_t objManager;
 
     /**
      * @brief A vector to keep track of DBus FilePath objects.