From e16ace47c9bf750b05ffb32214f15efe1a27bf84 Mon Sep 17 00:00:00 2001 From: Krzysztof Jackiewicz Date: Thu, 18 May 2017 10:20:08 +0200 Subject: [PATCH] Remove const from dbus::Connection::methodcall() const Variant in return value disables the use of Variant's move constructor so the only way to get it is by const Variant& which is not always preferred option. Change-Id: If6ac46e486444f69c946920ee6fa31fed100d134 --- include/klay/dbus/connection.h | 16 ++++++++-------- src/dbus/connection.cpp | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/klay/dbus/connection.h b/include/klay/dbus/connection.h index 8a4020a..11cf298 100644 --- a/include/klay/dbus/connection.h +++ b/include/klay/dbus/connection.h @@ -66,14 +66,14 @@ public: void unsubscribeSignal(SubscriptionId id); - const Variant methodcall(const std::string& busName, - const std::string& object, - const std::string& interface, - const std::string& method, - int timeout, - const std::string& replyType, - const std::string& paramType, - ...); + Variant methodcall(const std::string& busName, + const std::string& object, + const std::string& interface, + const std::string& method, + int timeout, + const std::string& replyType, + const std::string& paramType, + ...); void emitSignal(const std::string& busName, const std::string& object, diff --git a/src/dbus/connection.cpp b/src/dbus/connection.cpp index dc39e1a..5fee557 100644 --- a/src/dbus/connection.cpp +++ b/src/dbus/connection.cpp @@ -98,14 +98,14 @@ void Connection::unsubscribeSignal(Connection::SubscriptionId id) g_dbus_connection_signal_unsubscribe(connection, id); } -const Variant Connection::methodcall(const std::string& busName, - const std::string& object, - const std::string& interface, - const std::string& method, - int timeout, - const std::string& replyType, - const std::string& paramType, - ...) +Variant Connection::methodcall(const std::string& busName, + const std::string& object, + const std::string& interface, + const std::string& method, + int timeout, + const std::string& replyType, + const std::string& paramType, + ...) { Variant result; Error error; -- 2.34.1