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: If9a7314dade153dd7dbd149a76352aca8257839d
diff --git a/version.hpp b/version.hpp
index 7cd2be7..9d2fa50 100644
--- a/version.hpp
+++ b/version.hpp
@@ -21,10 +21,10 @@
typedef std::function<void(std::string)> eraseFunc;
-using VersionInherit = sdbusplus::server::object::object<
+using VersionInherit = sdbusplus::server::object_t<
sdbusplus::xyz::openbmc_project::Software::server::Version,
sdbusplus::xyz::openbmc_project::Common::server::FilePath>;
-using DeleteInherit = sdbusplus::server::object::object<
+using DeleteInherit = sdbusplus::server::object_t<
sdbusplus::xyz::openbmc_project::Object::server::Delete>;
namespace sdbusRule = sdbusplus::bus::match::rules;
@@ -46,7 +46,7 @@
* @param[in] path - The D-Bus object path
* @param[in] parent - Parent object.
*/
- Delete(sdbusplus::bus::bus& bus, const std::string& path, Version& parent) :
+ Delete(sdbusplus::bus_t& bus, const std::string& path, Version& parent) :
DeleteInherit(bus, path.c_str(), action::emit_interface_added),
parent(parent)
{}
@@ -82,7 +82,7 @@
* @param[in] filePath - The image filesystem path
* @param[in] callback - The eraseFunc callback
*/
- Version(sdbusplus::bus::bus& bus, const std::string& objPath,
+ Version(sdbusplus::bus_t& bus, const std::string& objPath,
ItemUpdater& parent, const std::string& versionId,
const std::string& versionString, VersionPurpose versionPurpose,
const std::string& filePath, eraseFunc callback) :
@@ -118,7 +118,7 @@
*
* @param[in] msg - Data associated with subscribed signal
*/
- void updateDeleteInterface(sdbusplus::message::message& msg);
+ void updateDeleteInterface(sdbusplus::message_t& msg);
/**
* @brief Read the manifest file to get the value of the key.
@@ -163,7 +163,7 @@
private:
/** @brief Persistent sdbusplus DBus bus connection */
- sdbusplus::bus::bus& bus;
+ sdbusplus::bus_t& bus;
/** @brief Persistent DBus object path */
std::string objPath;