commit c5d295b1b8ba79db2fd2b90a4a9266c20a277462
author Patrick Williams <patrick@stwcx.xyz> Sat Nov 26 09:41:58 2022 -0600
committer Patrick Williams <patrick@stwcx.xyz> Sat Nov 26 09:41:58 2022 -0600
tree 19df3436946924ed43a81daaf78f341f5ad75ddd
parent 5c76c6d6a8254301d185e3ffffb08fdb848f29c2

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

Change-Id: Iec773dab30fd27555b9b1d51152fd1901020cc69
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>

ecc_manager.cpp

diff --git a/ecc_manager.cpp b/ecc_manager.cpp
index 3fa1f88..6f19ddd 100644
--- a/ecc_manager.cpp
+++ b/ecc_manager.cpp
@@ -226,7 +226,7 @@
 void ECC::addSELLog(std::string message, std::string path,
                     std::vector<uint8_t> selData, bool assert, uint16_t genId)
 {
-    // sdbusplus::bus::bus bus = sdbusplus::bus::new_default();
+    // sdbusplus::bus_t bus = sdbusplus::bus::new_default();
 
     auto selCall = _bus.new_method_call(
         "xyz.openbmc_project.Logging.IPMI", "/xyz/openbmc_project/Logging/IPMI",

ecc_manager.hpp

diff --git a/ecc_manager.hpp b/ecc_manager.hpp
index bbad72c..d239c56 100644
--- a/ecc_manager.hpp
+++ b/ecc_manager.hpp
@@ -13,14 +13,14 @@
 {
 
 template <typename... T>
-using ServerObject = typename sdbusplus::server::object::object<T...>;
+using ServerObject = typename sdbusplus::server::object_t<T...>;
 
 using EccInterface = sdbusplus::xyz::openbmc_project::Memory::server::MemoryECC;
 using EccObject = ServerObject<EccInterface>;
 /** @class
  *  @brief Manages ECC
  */
-class ECC : sdbusplus::server::object::object<
+class ECC : sdbusplus::server::object_t<
                 sdbusplus::xyz::openbmc_project::Memory::server::MemoryECC>
 {
   public:
@@ -36,8 +36,8 @@
      * @param[in] bus     - Handle to system dbus
      * @param[in] objPath - The Dbus path
      */
-    ECC(sdbusplus::bus::bus& bus, const std::string& objPath) :
-        sdbusplus::server::object::object<
+    ECC(sdbusplus::bus_t& bus, const std::string& objPath) :
+        sdbusplus::server::object_t<
             sdbusplus::xyz::openbmc_project::Memory::server::MemoryECC>(
             bus, objPath.c_str()),
         _bus(bus), _event(sdeventplus::Event::get_default()),
@@ -54,7 +54,7 @@
 
   private:
     /** @brief sdbusplus bus client connection. */
-    sdbusplus::bus::bus& _bus;
+    sdbusplus::bus_t& _bus;
     /** @brief the Event Loop structure */
     sdeventplus::Event _event;
     /** @brief Read Timer */