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 8a4020ada4013929413eae0a964d9d0ed739dfbd..11cf298ec3907f5bdd73df8f5cb52fec717d4e82 100644 (file)
--- 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 dc39e1abe9086f2a67c6871867fbe0382ab5b7a8..5fee557e03aac8f2dbc5d5663d80b13c9decc3ee 100644 (file)
--- 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;