commit 374fae562a17a92d717a116343a83449bf9ec741
author Patrick Williams <patrick@stwcx.xyz> Fri Jul 22 19:26:55 2022 -0500
committer Patrick Williams <patrick@stwcx.xyz> Tue Jul 26 03:03:50 2022 +0000
tree 75d397c98e11a9b8e411c09e9e48696bd4f8afe1
parent 467a24047f75096e4184949efa881cb5a4ac17be

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

src/version.hpp

diff --git a/src/version.hpp b/src/version.hpp
index 4c4dfde..37c7e38 100644
--- a/src/version.hpp
+++ b/src/version.hpp
@@ -15,9 +15,9 @@
 
 using eraseFunc = std::function<void(std::string)>;
 
-using VersionInherit = sdbusplus::server::object::object<
+using VersionInherit = sdbusplus::server::object_t<
     sdbusplus::xyz::openbmc_project::Software::server::Version>;
-using DeleteInherit = sdbusplus::server::object::object<
+using DeleteInherit = sdbusplus::server::object_t<
     sdbusplus::xyz::openbmc_project::Object::server::Delete>;
 
 namespace sdbusRule = sdbusplus::bus::match::rules;
@@ -38,8 +38,7 @@
      *  @param[in] path   - The D-Bus object path
      *  @param[in] version - The Version object.
      */
-    Delete(sdbusplus::bus::bus& bus, const std::string& path,
-           Version& version) :
+    Delete(sdbusplus::bus_t& bus, const std::string& path, Version& version) :
         DeleteInherit(bus, path.c_str(), action::emit_interface_added),
         version(version)
     {
@@ -74,7 +73,7 @@
      * @param[in] versionPurpose - The version purpose
      * @param[in] callback       - The eraseFunc callback
      */
-    Version(sdbusplus::bus::bus& bus, const std::string& objPath,
+    Version(sdbusplus::bus_t& bus, const std::string& objPath,
             const std::string& versionId, const std::string& versionString,
             VersionPurpose versionPurpose, eraseFunc callback) :
         VersionInherit(bus, (objPath).c_str(),
@@ -146,7 +145,7 @@
 
   private:
     /** @brief Persistent sdbusplus DBus bus connection */
-    sdbusplus::bus::bus& bus;
+    sdbusplus::bus_t& bus;
 
     /** @brief Persistent DBus object path */
     std::string objPath;