commit ff3d538b81043adf0bc8a57ec28255b2595e08bb
author Patrick Williams <patrick@stwcx.xyz> Fri Jul 22 19:26:55 2022 -0500
committer Andrew Jeffery <andrew@aj.id.au> Mon Jul 25 00:33:58 2022 +0000
tree 13e92284520fe0cb9279920a73f9d7560d83ba0a
parent ff8cd97653139eeaa19547952969adb92779f806

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

controller.cpp

diff --git a/controller.cpp b/controller.cpp
index 78fd316..a694b3d 100644
--- a/controller.cpp
+++ b/controller.cpp
@@ -135,7 +135,7 @@
     auto bus = sdbusplus::bus::new_default();
 
     // Add systemd object manager.
-    sdbusplus::server::manager::manager(bus, objPath.c_str());
+    sdbusplus::server::manager_t(bus, objPath.c_str());
 
     // Create the Physical LED objects for directing actions.
     // Need to save this else sdbusplus destructor will wipe this off.

physical.hpp

diff --git a/physical.hpp b/physical.hpp
index 7a3c912..3592494 100644
--- a/physical.hpp
+++ b/physical.hpp
@@ -45,8 +45,8 @@
      * @param[in] ledPath   - sysfs path where this LED is exported
      * @param[in] color     - led color name
      */
-    Physical(sdbusplus::bus::bus& bus, const std::string& objPath,
-             SysfsLed& led, const std::string& color = "") :
+    Physical(sdbusplus::bus_t& bus, const std::string& objPath, SysfsLed& led,
+             const std::string& color = "") :
         PhysicalIfaces(bus, objPath.c_str(),
                        PhysicalIfaces::action::defer_emit),
         led(led)

test/physical.cpp

diff --git a/test/physical.cpp b/test/physical.cpp
index ae831a3..000b321 100644
--- a/test/physical.cpp
+++ b/test/physical.cpp
@@ -72,7 +72,7 @@
 
 TEST(Physical, ctor_none_trigger)
 {
-    sdbusplus::bus::bus bus = sdbusplus::bus::new_default();
+    sdbusplus::bus_t bus = sdbusplus::bus::new_default();
     /* NiceMock ignores calls to methods with no expectations defined */
     NiceMock<MockLed> led;
     ON_CALL(led, getTrigger()).WillByDefault(Return("none"));
@@ -82,7 +82,7 @@
 
 TEST(Physical, ctor_maxbrightness_and_brightness_read_127)
 {
-    sdbusplus::bus::bus bus = sdbusplus::bus::new_default();
+    sdbusplus::bus_t bus = sdbusplus::bus::new_default();
     /* NiceMock ignores calls to methods with no expectations defined */
     NiceMock<MockLed> led;
     EXPECT_CALL(led, getTrigger()).WillRepeatedly(Return("none"));
@@ -94,7 +94,7 @@
 
 TEST(Physical, ctor_maxbrightness_and_brightness_read_0)
 {
-    sdbusplus::bus::bus bus = sdbusplus::bus::new_default();
+    sdbusplus::bus_t bus = sdbusplus::bus::new_default();
     /* NiceMock ignores calls to methods with no expectations defined */
     NiceMock<MockLed> led;
     EXPECT_CALL(led, getTrigger()).WillRepeatedly(Return("none"));
@@ -106,7 +106,7 @@
 
 TEST(Physical, ctor_only_maxbrightness_read_127)
 {
-    sdbusplus::bus::bus bus = sdbusplus::bus::new_default();
+    sdbusplus::bus_t bus = sdbusplus::bus::new_default();
     /* NiceMock ignores calls to methods with no expectations defined */
     NiceMock<MockLed> led;
     EXPECT_CALL(led, getTrigger()).WillRepeatedly(Return("none"));
@@ -118,7 +118,7 @@
 
 TEST(Physical, ctor_only_brightness_read_127)
 {
-    sdbusplus::bus::bus bus = sdbusplus::bus::new_default();
+    sdbusplus::bus_t bus = sdbusplus::bus::new_default();
     /* NiceMock ignores calls to methods with no expectations defined */
     NiceMock<MockLed> led;
     EXPECT_CALL(led, getTrigger()).WillRepeatedly(Return("none"));
@@ -130,7 +130,7 @@
 
 TEST(Physical, ctor_timer_trigger)
 {
-    sdbusplus::bus::bus bus = sdbusplus::bus::new_default();
+    sdbusplus::bus_t bus = sdbusplus::bus::new_default();
     NiceMock<MockLed> led;
     EXPECT_CALL(led, getTrigger()).WillOnce(Return("timer"));
     EXPECT_CALL(led, getDelayOn()).WillOnce(Return(500));
@@ -141,7 +141,7 @@
 
 TEST(Physical, off)
 {
-    sdbusplus::bus::bus bus = sdbusplus::bus::new_default();
+    sdbusplus::bus_t bus = sdbusplus::bus::new_default();
     NiceMock<MockLed> led;
     ON_CALL(led, getMaxBrightness()).WillByDefault(Return(127));
     EXPECT_CALL(led, getTrigger()).WillOnce(Return("none"));
@@ -156,7 +156,7 @@
 {
     constexpr unsigned long asserted = 127;
 
-    sdbusplus::bus::bus bus = sdbusplus::bus::new_default();
+    sdbusplus::bus_t bus = sdbusplus::bus::new_default();
     NiceMock<MockLed> led;
     ON_CALL(led, getMaxBrightness()).WillByDefault(Return(asserted));
     EXPECT_CALL(led, getTrigger()).WillOnce(Return("none"));
@@ -169,7 +169,7 @@
 
 TEST(Physical, blink)
 {
-    sdbusplus::bus::bus bus = sdbusplus::bus::new_default();
+    sdbusplus::bus_t bus = sdbusplus::bus::new_default();
     NiceMock<MockLed> led;
     EXPECT_CALL(led, getTrigger()).WillOnce(Return("none"));
     EXPECT_CALL(led, setTrigger("timer"));
@@ -182,7 +182,7 @@
 
 TEST(Physical, ctor_none_trigger_asserted_brightness)
 {
-    sdbusplus::bus::bus bus = sdbusplus::bus::new_default();
+    sdbusplus::bus_t bus = sdbusplus::bus::new_default();
     NiceMock<MockLed> led;
     EXPECT_CALL(led, getTrigger()).WillRepeatedly(Return("none"));
     EXPECT_CALL(led, getBrightness()).WillRepeatedly(Return(127));