commit b228bc30ff4ecd8cbb5aef68bdbdecbe83d07176
author Patrick Williams <patrick@stwcx.xyz> Fri Jul 22 19:26:56 2022 -0500
committer Patrick Williams <patrick@stwcx.xyz> Sun Jul 24 01:52:37 2022 +0000
tree 6d6eaca56babf9a1c690087f5dcde8b2de96a841
parent 94a1b6424d08fece2ea5ec2e0cc9ed9dbd720635

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

pid/builder.cpp

diff --git a/pid/builder.cpp b/pid/builder.cpp
index 505ca98..7be7897 100644
--- a/pid/builder.cpp
+++ b/pid/builder.cpp
@@ -47,7 +47,7 @@
 std::unordered_map<int64_t, std::shared_ptr<ZoneInterface>>
     buildZones(const std::map<int64_t, conf::PIDConf>& zonePids,
                std::map<int64_t, conf::ZoneConfig>& zoneConfigs,
-               SensorManager& mgr, sdbusplus::bus::bus& modeControlBus)
+               SensorManager& mgr, sdbusplus::bus_t& modeControlBus)
 {
     std::unordered_map<int64_t, std::shared_ptr<ZoneInterface>> zones;
 

pid/builder.hpp

diff --git a/pid/builder.hpp b/pid/builder.hpp
index 5f03400..dbfc229 100644
--- a/pid/builder.hpp
+++ b/pid/builder.hpp
@@ -15,6 +15,6 @@
 std::unordered_map<int64_t, std::shared_ptr<ZoneInterface>>
     buildZones(const std::map<int64_t, conf::PIDConf>& zonePids,
                std::map<int64_t, conf::ZoneConfig>& zoneConfigs,
-               SensorManager& mgr, sdbusplus::bus::bus& modeControlBus);
+               SensorManager& mgr, sdbusplus::bus_t& modeControlBus);
 
 }

pid/zone.hpp

diff --git a/pid/zone.hpp b/pid/zone.hpp
index c73ad39..12e47a6 100644
--- a/pid/zone.hpp
+++ b/pid/zone.hpp
@@ -20,7 +20,7 @@
 #include <vector>
 
 template <typename... T>
-using ServerObject = typename sdbusplus::server::object::object<T...>;
+using ServerObject = typename sdbusplus::server::object_t<T...>;
 using ModeInterface = sdbusplus::xyz::openbmc_project::Control::server::Mode;
 using ModeObject = ServerObject<ModeInterface>;
 
@@ -36,7 +36,7 @@
 {
   public:
     DbusPidZone(int64_t zone, double minThermalOutput, double failSafePercent,
-                const SensorManager& mgr, sdbusplus::bus::bus& bus,
+                const SensorManager& mgr, sdbusplus::bus_t& bus,
                 const char* objPath, bool defer) :
         ModeObject(bus, objPath,
                    defer ? ModeObject::action::defer_emit