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: Ief1b330c4f623ecc1be771f36083780a12260834
diff --git a/src/ibm/hypervisor-network-mgr-src/hyp_network_manager.hpp b/src/ibm/hypervisor-network-mgr-src/hyp_network_manager.hpp
index 5616c66..ca21ece 100644
--- a/src/ibm/hypervisor-network-mgr-src/hyp_network_manager.hpp
+++ b/src/ibm/hypervisor-network-mgr-src/hyp_network_manager.hpp
@@ -68,7 +68,7 @@
* @param[in] event - event.
* @param[in] path - Path to attach at.
*/
- HypNetworkMgr(sdbusplus::bus::bus& bus, sdeventplus::Event& event,
+ HypNetworkMgr(sdbusplus::bus_t& bus, sdeventplus::Event& event,
const char* path) :
bus(bus),
event(event), objectPath(path){};
@@ -141,7 +141,7 @@
void setBIOSTableAttrs();
/** @brief sdbusplus DBus bus connection. */
- sdbusplus::bus::bus& bus;
+ sdbusplus::bus_t& bus;
/** sdevent Event handle. */
sdeventplus::Event& event;
diff --git a/src/ibm/hypervisor-network-mgr-src/hyp_network_manager_main.cpp b/src/ibm/hypervisor-network-mgr-src/hyp_network_manager_main.cpp
index eed841a..d28ca11 100644
--- a/src/ibm/hypervisor-network-mgr-src/hyp_network_manager_main.cpp
+++ b/src/ibm/hypervisor-network-mgr-src/hyp_network_manager_main.cpp
@@ -12,7 +12,7 @@
auto bus = sdbusplus::bus::new_default();
// Add sdbusplus ObjectManager
- sdbusplus::server::manager::manager objManager(bus, DEFAULT_HYP_NW_OBJPATH);
+ sdbusplus::server::manager_t objManager(bus, DEFAULT_HYP_NW_OBJPATH);
// Get default event loop
auto event = sdeventplus::Event::get_default();
diff --git a/src/ibm/hypervisor-network-mgr-src/hyp_sys_config.hpp b/src/ibm/hypervisor-network-mgr-src/hyp_sys_config.hpp
index 7d89d82..f9f7d74 100644
--- a/src/ibm/hypervisor-network-mgr-src/hyp_sys_config.hpp
+++ b/src/ibm/hypervisor-network-mgr-src/hyp_sys_config.hpp
@@ -16,7 +16,7 @@
using SysConfigIntf =
sdbusplus::xyz::openbmc_project::Network::server::SystemConfiguration;
-using Iface = sdbusplus::server::object::object<SysConfigIntf>;
+using Iface = sdbusplus::server::object_t<SysConfigIntf>;
class HypNetworkMgr; // forward declaration of network manager.
@@ -40,7 +40,7 @@
* @param[in] objPath - Path to attach at.
* @param[in] parent - Parent object.
*/
- HypSysConfig(sdbusplus::bus::bus& bus, const std::string& objPath,
+ HypSysConfig(sdbusplus::bus_t& bus, const std::string& objPath,
HypNetworkMgr& parent) :
Iface(bus, objPath.c_str(), Iface::action::defer_emit),
bus(bus), manager(parent){};
@@ -66,7 +66,7 @@
void setHostNameInBios(const std::string& name);
/** @brief Persistent sdbusplus DBus bus connection. */
- sdbusplus::bus::bus& bus;
+ sdbusplus::bus_t& bus;
/** @brief Hyp Network Manager object. */
HypNetworkMgr& manager;