From: Krzysztof Jackiewicz Date: Thu, 18 May 2017 08:20:08 +0000 (+0200) Subject: Remove const from dbus::Connection::methodcall() X-Git-Tag: submit/tizen/20170818.072322^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F78%2F129878%2F3;p=platform%2Fcore%2Fsecurity%2Fklay.git 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 --- 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;