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: I6a559082fed34ae62b648345ead793436d2d03f6
diff --git a/mslverify/util.hpp b/mslverify/util.hpp
index d91e5e7..0dfe6e3 100644
--- a/mslverify/util.hpp
+++ b/mslverify/util.hpp
@@ -34,7 +34,7 @@
/** @brief Invoke a method. */
template <typename... Args>
-static auto callMethod(::sdbusplus::bus::bus& bus, const std::string& busName,
+static auto callMethod(::sdbusplus::bus_t& bus, const std::string& busName,
const std::string& path, const std::string& interface,
const std::string& method, Args&&... args)
{
@@ -66,11 +66,11 @@
/** @brief Invoke a method and read the response. */
template <typename Ret, typename... Args>
static auto
- callMethodAndRead(::sdbusplus::bus::bus& bus, const std::string& busName,
+ callMethodAndRead(::sdbusplus::bus_t& bus, const std::string& busName,
const std::string& path, const std::string& interface,
const std::string& method, Args&&... args)
{
- ::sdbusplus::message::message respMsg = callMethod<Args...>(
+ ::sdbusplus::message_t respMsg = callMethod<Args...>(
bus, busName, path, interface, method, std::forward<Args>(args)...);
Ret resp;
respMsg.read(resp);
@@ -89,7 +89,7 @@
}
/** @brief Get service from the mapper. */
-static auto getService(::sdbusplus::bus::bus& bus, const std::string& path,
+static auto getService(::sdbusplus::bus_t& bus, const std::string& path,
const std::string& interface)
{
using namespace std::literals::string_literals;
@@ -112,7 +112,7 @@
/** @brief Get a property without mapper lookup. */
template <typename Property>
-static auto getProperty(::sdbusplus::bus::bus& bus, const std::string& busName,
+static auto getProperty(::sdbusplus::bus_t& bus, const std::string& busName,
const std::string& path, const std::string& interface,
const std::string& property)
{
@@ -137,7 +137,7 @@
/** @brief Get a property with mapper lookup. */
template <typename Property>
-static auto getProperty(::sdbusplus::bus::bus& bus, const std::string& path,
+static auto getProperty(::sdbusplus::bus_t& bus, const std::string& path,
const std::string& interface,
const std::string& property)
{