commit b3ef4e1a3de7630c4b4ac5f7447da81c439e88a9
author Patrick Williams <patrick@stwcx.xyz> Fri Jul 22 19:26:55 2022 -0500
committer Patrick Williams <patrick@stwcx.xyz> Fri Jul 22 19:26:55 2022 -0500
tree bf65fe567b33fd56b5b5fcbf4a641d63be2336a3
parent 2f64e4206e2e46a3c2ca4e19a5162f1df6fb97ea

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

test/ldap_config_test.cpp

diff --git a/test/ldap_config_test.cpp b/test/ldap_config_test.cpp
index 35fdaea..6f7d1f7 100644
--- a/test/ldap_config_test.cpp
+++ b/test/ldap_config_test.cpp
@@ -70,15 +70,15 @@
     std::string tlsCacertFile;
     std::string tlsCertFile;
     std::string ldapconfFile;
-    sdbusplus::bus::bus bus;
+    sdbusplus::bus_t bus;
 };
 
 class MockConfigMgr : public phosphor::ldap::ConfigMgr
 {
   public:
-    MockConfigMgr(sdbusplus::bus::bus& bus, const char* path,
-                  const char* filePath, const char* dbusPersistentFile,
-                  const char* caCertFile, const char* certFile) :
+    MockConfigMgr(sdbusplus::bus_t& bus, const char* path, const char* filePath,
+                  const char* dbusPersistentFile, const char* caCertFile,
+                  const char* certFile) :
         phosphor::ldap::ConfigMgr(bus, path, filePath, dbusPersistentFile,
                                   caCertFile, certFile)
     {}

test/mock_user_mgr.hpp

diff --git a/test/mock_user_mgr.hpp b/test/mock_user_mgr.hpp
index 70d696c..9a0ecdd 100644
--- a/test/mock_user_mgr.hpp
+++ b/test/mock_user_mgr.hpp
@@ -12,7 +12,7 @@
 class MockManager : public UserMgr
 {
   public:
-    MockManager(sdbusplus::bus::bus& bus, const char* path) : UserMgr(bus, path)
+    MockManager(sdbusplus::bus_t& bus, const char* path) : UserMgr(bus, path)
     {}
 
     MOCK_METHOD1(getLdapGroupName, std::string(const std::string& userName));

test/user_mgr_test.cpp

diff --git a/test/user_mgr_test.cpp b/test/user_mgr_test.cpp
index 74ae930..3059ea3 100644
--- a/test/user_mgr_test.cpp
+++ b/test/user_mgr_test.cpp
@@ -22,7 +22,7 @@
 {
   public:
     sdbusplus::SdBusMock sdbusMock;
-    sdbusplus::bus::bus bus;
+    sdbusplus::bus_t bus;
     MockManager mockManager;
 
     TestUserMgr() :