All public inline functions arn't anymore inline

 - methods with templates excluded

20 files changed, 179 insertions, 180 deletions

diff --git a/src/CommonAPI/DBus/DBusConfiguration.cpp b/src/CommonAPI/DBus/DBusConfiguration.cpp
index 1fa9ae7..9b23a9c 100644
--- a/src/CommonAPI/DBus/DBusConfiguration.cpp
+++ b/src/CommonAPI/DBus/DBusConfiguration.cpp
@@ -95,19 +95,19 @@ const DBusFactoryConfig* DBusConfiguration::getFactoryConfiguration(const std::s
     return NULL;
 }
 
-inline void reset(DBusServiceAddress& dbusServiceAddress) {
+void reset(DBusServiceAddress& dbusServiceAddress) {
     std::get<0>(dbusServiceAddress) = "";
     std::get<1>(dbusServiceAddress) = "";
     std::get<2>(dbusServiceAddress) = "";
 }
 
-inline void reset(CommonApiServiceDetails& serviceDetails) {
+void reset(CommonApiServiceDetails& serviceDetails) {
     reset(std::get<0>(serviceDetails));
     std::get<1>(serviceDetails) = false;
 }
 
 
-inline void reset(DBusFactoryConfig& dbusFactoryconfiguration) {
+void reset(DBusFactoryConfig& dbusFactoryconfiguration) {
     dbusFactoryconfiguration.factoryName_ = "";
     dbusFactoryconfiguration.busType_ = BusType::SESSION;
 }
diff --git a/src/CommonAPI/DBus/DBusConnection.cpp b/src/CommonAPI/DBus/DBusConnection.cpp
index 61b31d7..1d8fd38 100644
--- a/src/CommonAPI/DBus/DBusConnection.cpp
+++ b/src/CommonAPI/DBus/DBusConnection.cpp
@@ -1207,5 +1207,26 @@ void notifyDBusSignalHandlers(DBusSignalHandlersTable& dbusSignalHandlerstable,
     return dbusConnection->onLibdbusObjectPathMessage(libdbusMessage);
 }
 
+
+std::shared_ptr<DBusConnection> DBusConnection::getBus(const BusType& busType) {
+    return std::make_shared<DBusConnection>(busType);
+}
+
+std::shared_ptr<DBusConnection> DBusConnection::wrapLibDBus(::DBusConnection* libDbusConnection) {
+    return std::make_shared<DBusConnection>(libDbusConnection);
+}
+
+std::shared_ptr<DBusConnection> DBusConnection::getSessionBus() {
+    return getBus(BusType::SESSION);
+}
+
+std::shared_ptr<DBusConnection> DBusConnection::getSystemBus() {
+    return getBus(BusType::SYSTEM);
+}
+
+std::shared_ptr<DBusConnection> DBusConnection::getStarterBus() {
+    return getBus(BusType::STARTER);
+}
+
 } // namespace DBus
 } // namespace CommonAPI
diff --git a/src/CommonAPI/DBus/DBusConnection.h b/src/CommonAPI/DBus/DBusConnection.h
index 54b94d1..7550c10 100644
--- a/src/CommonAPI/DBus/DBusConnection.h
+++ b/src/CommonAPI/DBus/DBusConnection.h
@@ -54,11 +54,11 @@ class DBusConnection: public DBusProxyConnection, public std::enable_shared_from
  public:
     DBusConnection(BusType busType);
 
-    inline static std::shared_ptr<DBusConnection> getBus(const BusType& dbusBusType);
-    inline static std::shared_ptr<DBusConnection> wrapLibDBus(::DBusConnection* libDbusConnection);
-    inline static std::shared_ptr<DBusConnection> getSessionBus();
-    inline static std::shared_ptr<DBusConnection> getSystemBus();
-    inline static std::shared_ptr<DBusConnection> getStarterBus();
+    static std::shared_ptr<DBusConnection> getBus(const BusType& dbusBusType);
+    static std::shared_ptr<DBusConnection> wrapLibDBus(::DBusConnection* libDbusConnection);
+    static std::shared_ptr<DBusConnection> getSessionBus();
+    static std::shared_ptr<DBusConnection> getSystemBus();
+    static std::shared_ptr<DBusConnection> getStarterBus();
 
     DBusConnection(const DBusConnection&) = delete;
     DBusConnection(::DBusConnection* libDbusConnection);
@@ -235,25 +235,6 @@ class DBusConnection: public DBusProxyConnection, public std::enable_shared_from
     mutable std::mutex enforceTimeoutMutex_;
 };
 
-std::shared_ptr<DBusConnection> DBusConnection::getBus(const BusType& busType) {
-    return std::make_shared<DBusConnection>(busType);
-}
-
-std::shared_ptr<DBusConnection> DBusConnection::wrapLibDBus(::DBusConnection* libDbusConnection) {
-    return std::make_shared<DBusConnection>(libDbusConnection);
-}
-
-std::shared_ptr<DBusConnection> DBusConnection::getSessionBus() {
-    return getBus(BusType::SESSION);
-}
-
-std::shared_ptr<DBusConnection> DBusConnection::getSystemBus() {
-    return getBus(BusType::SYSTEM);
-}
-
-std::shared_ptr<DBusConnection> DBusConnection::getStarterBus() {
-    return getBus(BusType::STARTER);
-}
 
 } // namespace DBus
 } // namespace CommonAPI
diff --git a/src/CommonAPI/DBus/DBusDaemonProxy.cpp b/src/CommonAPI/DBus/DBusDaemonProxy.cpp
index 99ca10d..e6ed98c 100644
--- a/src/CommonAPI/DBus/DBusDaemonProxy.cpp
+++ b/src/CommonAPI/DBus/DBusDaemonProxy.cpp
@@ -199,6 +199,10 @@ std::future<CallStatus> DBusDaemonProxy::getNameOwnerAsync(const std::string& bu
                     2000);
 }
 
+const char* DBusDaemonProxy::getInterfaceId() {
+    static const char interfaceId[] = "org.freedesktop.DBus";
+    return interfaceId;
+}
 
 } // namespace DBus
 } // namespace CommonAPI
diff --git a/src/CommonAPI/DBus/DBusDaemonProxy.h b/src/CommonAPI/DBus/DBusDaemonProxy.h
index 14f7799..5db2932 100644
--- a/src/CommonAPI/DBus/DBusDaemonProxy.h
+++ b/src/CommonAPI/DBus/DBusDaemonProxy.h
@@ -57,7 +57,7 @@ class DBusDaemonProxy: public DBusProxyBase {
 
     void init();
 
-    static inline const char* getInterfaceId();
+    static const char* getInterfaceId();
 
     NameOwnerChangedEvent& getNameOwnerChangedEvent();
 
@@ -95,11 +95,6 @@ class DBusDaemonProxy: public DBusProxyBase {
     StaticInterfaceVersionAttribute interfaceVersionAttribute_;
 };
 
-const char* DBusDaemonProxy::getInterfaceId() {
-    static const char interfaceId[] = "org.freedesktop.DBus";
-    return interfaceId;
-}
-
 } // namespace DBus
 } // namespace CommonAPI
 
diff --git a/src/CommonAPI/DBus/DBusInputStream.cpp b/src/CommonAPI/DBus/DBusInputStream.cpp
index 53ae32d..c1ef4a3 100644
--- a/src/CommonAPI/DBus/DBusInputStream.cpp
+++ b/src/CommonAPI/DBus/DBusInputStream.cpp
@@ -347,5 +347,9 @@ void DBusInputStream::beginReadMapElement() {
 void DBusInputStream::endReadMapElement() {
 }
 
+void DBusInputStream::setError() {
+    exception_ = new CommonAPI::DBus::DBusError();
+}
+
 } // namespace DBus
 } // namespace CommonAPI
diff --git a/src/CommonAPI/DBus/DBusInputStream.h b/src/CommonAPI/DBus/DBusInputStream.h
index 9ee3238..b91583c 100644
--- a/src/CommonAPI/DBus/DBusInputStream.h
+++ b/src/CommonAPI/DBus/DBusInputStream.h
@@ -227,10 +227,6 @@ private:
     std::stack<position_t> savedStreamPositions_;
 };
 
-inline void DBusInputStream::setError() {
-    exception_ = new CommonAPI::DBus::DBusError();
-}
-
 } // namespace DBus
 } // namespace CommonAPI
 
diff --git a/src/CommonAPI/DBus/DBusMessage.cpp b/src/CommonAPI/DBus/DBusMessage.cpp
index 0180f58..512ed57 100644
--- a/src/CommonAPI/DBus/DBusMessage.cpp
+++ b/src/CommonAPI/DBus/DBusMessage.cpp
@@ -273,5 +273,29 @@ bool DBusMessage::setDestination(const char* destination)
     return dbus_message_set_destination(libdbusMessage_, destination);
 }
 
+bool DBusMessage::hasObjectPath(const std::string& objectPath) const {
+    return hasObjectPath(objectPath.c_str());
+}
+
+bool DBusMessage::isInvalidType() const {
+    return (getType() == Type::Invalid);
+}
+
+bool DBusMessage::isMethodCallType() const {
+    return (getType() == Type::MethodCall);
+}
+
+bool DBusMessage::isMethodReturnType() const {
+    return (getType() == Type::MethodReturn);
+}
+
+bool DBusMessage::isErrorType() const {
+    return (getType() == Type::Error);
+}
+
+bool DBusMessage::isSignalType() const {
+    return (getType() == Type::Signal);
+}
+
 } // namespace DBus
 } // namespace CommonAPI
diff --git a/src/CommonAPI/DBus/DBusMessage.h b/src/CommonAPI/DBus/DBusMessage.h
index 3b30ad0..66addf3 100644
--- a/src/CommonAPI/DBus/DBusMessage.h
+++ b/src/CommonAPI/DBus/DBusMessage.h
@@ -77,7 +77,7 @@ class DBusMessage {
     const char* getErrorName() const;
     const char* getDestination() const;
 
-    inline bool hasObjectPath(const std::string& objectPath) const;
+    bool hasObjectPath(const std::string& objectPath) const;
 
     bool hasObjectPath(const char* objectPath) const;
     bool hasInterfaceName(const char* interfaceName) const;
@@ -92,11 +92,11 @@ class DBusMessage {
         Signal = DBUS_MESSAGE_TYPE_SIGNAL
     };
     const Type getType() const;
-    inline bool isInvalidType() const;
-    inline bool isMethodCallType() const;
-    inline bool isMethodReturnType() const;
-    inline bool isErrorType() const;
-    inline bool isSignalType() const;
+    bool isInvalidType() const;
+    bool isMethodCallType() const;
+    bool isMethodReturnType() const;
+    bool isErrorType() const;
+    bool isSignalType() const;
 
     char* getBodyData() const;
     int getBodyLength() const;
@@ -111,30 +111,6 @@ class DBusMessage {
     friend class DBusConnection;
 };
 
-bool DBusMessage::hasObjectPath(const std::string& objectPath) const {
-    return hasObjectPath(objectPath.c_str());
-}
-
-bool DBusMessage::isInvalidType() const {
-    return (getType() == Type::Invalid);
-}
-
-bool DBusMessage::isMethodCallType() const {
-    return (getType() == Type::MethodCall);
-}
-
-bool DBusMessage::isMethodReturnType() const {
-    return (getType() == Type::MethodReturn);
-}
-
-bool DBusMessage::isErrorType() const {
-    return (getType() == Type::Error);
-}
-
-bool DBusMessage::isSignalType() const {
-    return (getType() == Type::Signal);
-}
-
 } // namespace DBus
 } // namespace CommonAPI
 
diff --git a/src/CommonAPI/DBus/DBusObjectManager.cpp b/src/CommonAPI/DBus/DBusObjectManager.cpp
index bea40a1..2feff75 100644
--- a/src/CommonAPI/DBus/DBusObjectManager.cpp
+++ b/src/CommonAPI/DBus/DBusObjectManager.cpp
@@ -307,5 +307,10 @@ bool DBusObjectManager::onIntrospectableInterfaceDBusMessage(const DBusMessage&
     return false;
 }
 
+
+std::shared_ptr<DBusObjectManagerStub> DBusObjectManager::getRootDBusObjectManagerStub() {
+    return rootDBusObjectManagerStub_;
+}
+
 } // namespace DBus
 } // namespace CommonAPI
diff --git a/src/CommonAPI/DBus/DBusObjectManager.h b/src/CommonAPI/DBus/DBusObjectManager.h
index c81fea6..db63e3e 100644
--- a/src/CommonAPI/DBus/DBusObjectManager.h
+++ b/src/CommonAPI/DBus/DBusObjectManager.h
@@ -37,7 +37,7 @@ class DBusObjectManager {
 
     bool handleMessage(const DBusMessage&);
 
-    inline std::shared_ptr<DBusObjectManagerStub> getRootDBusObjectManagerStub();
+    std::shared_ptr<DBusObjectManagerStub> getRootDBusObjectManagerStub();
 
  private:
     // objectPath, interfaceName
@@ -64,11 +64,6 @@ class DBusObjectManager {
     std::recursive_mutex objectPathLock_;
 };
 
-
-std::shared_ptr<DBusObjectManagerStub> DBusObjectManager::getRootDBusObjectManagerStub() {
-    return rootDBusObjectManagerStub_;
-}
-
 } // namespace DBus
 } // namespace CommonAPI
 
diff --git a/src/CommonAPI/DBus/DBusObjectManagerStub.cpp b/src/CommonAPI/DBus/DBusObjectManagerStub.cpp
index 6d08f8d..7c2237e 100644
--- a/src/CommonAPI/DBus/DBusObjectManagerStub.cpp
+++ b/src/CommonAPI/DBus/DBusObjectManagerStub.cpp
@@ -279,5 +279,14 @@ bool DBusObjectManagerStub::onInterfaceDBusMessage(const DBusMessage& dbusMessag
     return dbusMessageReplySent;
 }
 
+
+const std::string& DBusObjectManagerStub::getDBusObjectPath() const {
+    return dbusObjectPath_;
+}
+
+const char* DBusObjectManagerStub::getInterfaceName() {
+    return "org.freedesktop.DBus.ObjectManager";
+}
+
 } // namespace DBus
 } // namespace CommonAPI
diff --git a/src/CommonAPI/DBus/DBusObjectManagerStub.h b/src/CommonAPI/DBus/DBusObjectManagerStub.h
index 7335602..8a990ab 100644
--- a/src/CommonAPI/DBus/DBusObjectManagerStub.h
+++ b/src/CommonAPI/DBus/DBusObjectManagerStub.h
@@ -94,8 +94,8 @@ class DBusObjectManagerStub: public DBusInterfaceHandler {
 
     bool isDBusStubAdapterExported(std::shared_ptr<DBusStubAdapter> dbusStubAdapter);
 
-    inline const std::string& getDBusObjectPath() const;
-    inline static const char* getInterfaceName();
+    const std::string& getDBusObjectPath() const;
+    static const char* getInterfaceName();
 
     virtual const char* getMethodsDBusIntrospectionXmlData() const;
     virtual bool onInterfaceDBusMessage(const DBusMessage& dbusMessage);
@@ -120,15 +120,6 @@ class DBusObjectManagerStub: public DBusInterfaceHandler {
     std::mutex dbusObjectManagerStubLock_;
 };
 
-
-inline const std::string& DBusObjectManagerStub::getDBusObjectPath() const {
-    return dbusObjectPath_;
-}
-
-const char* DBusObjectManagerStub::getInterfaceName() {
-    return "org.freedesktop.DBus.ObjectManager";
-}
-
 } // namespace DBus
 } // namespace CommonAPI
 
diff --git a/src/CommonAPI/DBus/DBusProxyAsyncCallbackHandler.h b/src/CommonAPI/DBus/DBusProxyAsyncCallbackHandler.h
index 37c3ba6..66a78f1 100644
--- a/src/CommonAPI/DBus/DBusProxyAsyncCallbackHandler.h
+++ b/src/CommonAPI/DBus/DBusProxyAsyncCallbackHandler.h
@@ -21,16 +21,16 @@
 #include <future>
 #include <memory>
 
-
 namespace CommonAPI {
 namespace DBus {
 
-template <typename ... _ArgTypes>
+template<typename ... _ArgTypes>
 class DBusProxyAsyncCallbackHandler: public DBusProxyConnection::DBusMessageReplyAsyncHandler {
  public:
     typedef std::function<void(CallStatus, _ArgTypes...)> FunctionType;
 
-    static inline std::unique_ptr<DBusProxyConnection::DBusMessageReplyAsyncHandler> create(FunctionType&& callback) {
+    static std::unique_ptr<DBusProxyConnection::DBusMessageReplyAsyncHandler> create(
+            FunctionType&& callback) {
         return std::unique_ptr<DBusProxyConnection::DBusMessageReplyAsyncHandler>(
                 new DBusProxyAsyncCallbackHandler(std::move(callback)));
     }
diff --git a/src/CommonAPI/DBus/DBusProxyBase.cpp b/src/CommonAPI/DBus/DBusProxyBase.cpp
index 5e83875..f796cfb 100644
--- a/src/CommonAPI/DBus/DBusProxyBase.cpp
+++ b/src/CommonAPI/DBus/DBusProxyBase.cpp
@@ -25,5 +25,43 @@ DBusMessage DBusProxyBase::createMethodCall(const char* methodName,
                     methodSignature);
 }
 
+const std::shared_ptr<DBusProxyConnection>& DBusProxyBase::getDBusConnection() const {
+    return dbusConnection_;
+}
+
+DBusProxyConnection::DBusSignalHandlerToken DBusProxyBase::addSignalMemberHandler(
+        const std::string& signalName,
+        const std::string& signalSignature,
+        DBusProxyConnection::DBusSignalHandler* dbusSignalHandler,
+        const bool justAddFilter) {
+    return addSignalMemberHandler(
+            getDBusObjectPath(),
+            getInterfaceName(),
+            signalName,
+            signalSignature,
+            dbusSignalHandler,
+            justAddFilter);
+}
+
+DBusProxyConnection::DBusSignalHandlerToken DBusProxyBase::addSignalMemberHandler(
+                const std::string& objectPath,
+                const std::string& interfaceName,
+                const std::string& signalName,
+                const std::string& signalSignature,
+                DBusProxyConnection::DBusSignalHandler* dbusSignalHandler,
+                const bool justAddFilter) {
+    return dbusConnection_->addSignalMemberHandler(
+                objectPath,
+                interfaceName,
+                signalName,
+                signalSignature,
+                dbusSignalHandler,
+                justAddFilter);
+}
+
+bool DBusProxyBase::removeSignalMemberHandler(const DBusProxyConnection::DBusSignalHandlerToken& dbusSignalHandlerToken) {
+    return dbusConnection_->removeSignalMemberHandler(dbusSignalHandlerToken);
+}
+
 } // namespace DBus
 } // namespace CommonAPI
diff --git a/src/CommonAPI/DBus/DBusProxyBase.h b/src/CommonAPI/DBus/DBusProxyBase.h
index 0911319..2896d83 100644
--- a/src/CommonAPI/DBus/DBusProxyBase.h
+++ b/src/CommonAPI/DBus/DBusProxyBase.h
@@ -36,18 +36,18 @@ class DBusProxyBase: public virtual CommonAPI::Proxy {
     virtual const std::string& getDBusBusName() const = 0;
     virtual const std::string& getDBusObjectPath() const = 0;
     virtual const std::string& getInterfaceName() const = 0;
-    inline const std::shared_ptr<DBusProxyConnection>& getDBusConnection() const;
+    const std::shared_ptr<DBusProxyConnection>& getDBusConnection() const;
 
     DBusMessage createMethodCall(const char* methodName,
                                  const char* methodSignature = NULL) const;
 
-    inline DBusProxyConnection::DBusSignalHandlerToken addSignalMemberHandler(
+    DBusProxyConnection::DBusSignalHandlerToken addSignalMemberHandler(
             const std::string& signalName,
             const std::string& signalSignature,
             DBusProxyConnection::DBusSignalHandler* dbusSignalHandler,
             const bool justAddFilter = false);
 
-    inline DBusProxyConnection::DBusSignalHandlerToken addSignalMemberHandler(
+    DBusProxyConnection::DBusSignalHandlerToken addSignalMemberHandler(
                 const std::string& objectPath,
                 const std::string& interfaceName,
                 const std::string& signalName,
@@ -55,7 +55,7 @@ class DBusProxyBase: public virtual CommonAPI::Proxy {
                 DBusProxyConnection::DBusSignalHandler* dbusSignalHandler,
                 const bool justAddFilter = false);
 
-    inline bool removeSignalMemberHandler(const DBusProxyConnection::DBusSignalHandlerToken& dbusSignalHandlerToken);
+    bool removeSignalMemberHandler(const DBusProxyConnection::DBusSignalHandlerToken& dbusSignalHandlerToken);
 
     virtual void init() = 0;
 
@@ -68,45 +68,6 @@ class DBusProxyBase: public virtual CommonAPI::Proxy {
     std::shared_ptr<DBusProxyConnection> dbusConnection_;
 };
 
-const std::shared_ptr<DBusProxyConnection>& DBusProxyBase::getDBusConnection() const {
-    return dbusConnection_;
-}
-
-DBusProxyConnection::DBusSignalHandlerToken DBusProxyBase::addSignalMemberHandler(
-        const std::string& signalName,
-        const std::string& signalSignature,
-        DBusProxyConnection::DBusSignalHandler* dbusSignalHandler,
-        const bool justAddFilter) {
-    return addSignalMemberHandler(
-            getDBusObjectPath(),
-            getInterfaceName(),
-            signalName,
-            signalSignature,
-            dbusSignalHandler,
-            justAddFilter);
-}
-
-DBusProxyConnection::DBusSignalHandlerToken DBusProxyBase::addSignalMemberHandler(
-                const std::string& objectPath,
-                const std::string& interfaceName,
-                const std::string& signalName,
-                const std::string& signalSignature,
-                DBusProxyConnection::DBusSignalHandler* dbusSignalHandler,
-                const bool justAddFilter) {
-    return dbusConnection_->addSignalMemberHandler(
-                objectPath,
-                interfaceName,
-                signalName,
-                signalSignature,
-                dbusSignalHandler,
-                justAddFilter);
-}
-
-bool DBusProxyBase::removeSignalMemberHandler(const DBusProxyConnection::DBusSignalHandlerToken& dbusSignalHandlerToken) {
-    return dbusConnection_->removeSignalMemberHandler(dbusSignalHandlerToken);
-}
-
-
 } // namespace DBus
 } // namespace CommonAPI
 
diff --git a/src/CommonAPI/DBus/DBusSerializableArguments.h b/src/CommonAPI/DBus/DBusSerializableArguments.h
index bab1a68..e859602 100644
--- a/src/CommonAPI/DBus/DBusSerializableArguments.h
+++ b/src/CommonAPI/DBus/DBusSerializableArguments.h
@@ -23,41 +23,41 @@ struct DBusSerializableArguments;
 
 template <>
 struct DBusSerializableArguments<> {
-	static inline bool serialize(OutputStream& outputStream) {
-		return true;
-	}
+    static bool serialize(OutputStream& outputStream) {
+        return true;
+    }
 
-	static inline bool deserialize(DBusInputStream& inputStream) {
-		return true;
-	}
+    static bool deserialize(DBusInputStream& inputStream) {
+        return true;
+    }
 };
 
 template <typename _ArgumentType>
 struct DBusSerializableArguments<_ArgumentType> {
-	static inline bool serialize(OutputStream& outputStream, const _ArgumentType& argument) {
-		outputStream << argument;
-		return !outputStream.hasError();
-	}
+    static bool serialize(OutputStream& outputStream, const _ArgumentType& argument) {
+        outputStream << argument;
+        return !outputStream.hasError();
+    }
 
-	static inline bool deserialize(DBusInputStream& inputStream, _ArgumentType& argument) {
-		inputStream >> argument;
-		return !inputStream.hasError();
-	}
+    static bool deserialize(DBusInputStream& inputStream, _ArgumentType& argument) {
+        inputStream >> argument;
+        return !inputStream.hasError();
+    }
 };
 
 template <typename _ArgumentType, typename ... _Rest>
 struct DBusSerializableArguments<_ArgumentType, _Rest...> {
-	static inline bool serialize(OutputStream& outputStream, const _ArgumentType& argument, const _Rest&... rest) {
-		outputStream << argument;
-		const bool success = !outputStream.hasError();
-		return success ? DBusSerializableArguments<_Rest...>::serialize(outputStream, rest...) : false;
-	}
+    static bool serialize(OutputStream& outputStream, const _ArgumentType& argument, const _Rest&... rest) {
+        outputStream << argument;
+        const bool success = !outputStream.hasError();
+        return success ? DBusSerializableArguments<_Rest...>::serialize(outputStream, rest...) : false;
+    }
 
-	static inline bool deserialize(DBusInputStream& inputStream, _ArgumentType& argument, _Rest&... rest) {
-		inputStream >> argument;
-		const bool success = !inputStream.hasError();
-		return success ? DBusSerializableArguments<_Rest...>::deserialize(inputStream, rest...) : false;
-	}
+    static bool deserialize(DBusInputStream& inputStream, _ArgumentType& argument, _Rest&... rest) {
+        inputStream >> argument;
+        const bool success = !inputStream.hasError();
+        return success ? DBusSerializableArguments<_Rest...>::deserialize(inputStream, rest...) : false;
+    }
 };
 
 } // namespace DBus
diff --git a/src/CommonAPI/DBus/DBusStubAdapter.cpp b/src/CommonAPI/DBus/DBusStubAdapter.cpp
index f532fed..6b97c0b 100644
--- a/src/CommonAPI/DBus/DBusStubAdapter.cpp
+++ b/src/CommonAPI/DBus/DBusStubAdapter.cpp
@@ -69,5 +69,25 @@ const std::string& DBusStubAdapter::getInstanceId() const {
     return commonApiParticipantId_;
 }
 
+const bool DBusStubAdapter::isManagingInterface() {
+    return isManagingInterface_;
+}
+
+const std::string& DBusStubAdapter::getDBusName() const {
+    return dbusBusName_;
+}
+
+const std::string& DBusStubAdapter::getObjectPath() const {
+    return dbusObjectPath_;
+}
+
+const std::string& DBusStubAdapter::getInterfaceName() const {
+    return dbusInterfaceName_;
+}
+
+const std::shared_ptr<DBusProxyConnection>& DBusStubAdapter::getDBusConnection() const {
+    return dbusConnection_;
+}
+
 } // namespace dbus
 } // namespace CommonAPI
diff --git a/src/CommonAPI/DBus/DBusStubAdapter.h b/src/CommonAPI/DBus/DBusStubAdapter.h
index 129e397..fa7a377 100644
--- a/src/CommonAPI/DBus/DBusStubAdapter.h
+++ b/src/CommonAPI/DBus/DBusStubAdapter.h
@@ -47,13 +47,13 @@ class DBusStubAdapter: virtual public CommonAPI::StubAdapter, public DBusInterfa
     virtual const std::string& getServiceId() const;
     virtual const std::string& getInstanceId() const;
 
-    inline const std::string& getDBusName() const;
-    inline const std::string& getObjectPath() const;
-    inline const std::string& getInterfaceName() const;
+    const std::string& getDBusName() const;
+    const std::string& getObjectPath() const;
+    const std::string& getInterfaceName() const;
 
-    inline const std::shared_ptr<DBusProxyConnection>& getDBusConnection() const;
+    const std::shared_ptr<DBusProxyConnection>& getDBusConnection() const;
 
-    inline const bool isManagingInterface();
+    const bool isManagingInterface();
 
     virtual const char* getMethodsDBusIntrospectionXmlData() const = 0;
     virtual bool onInterfaceDBusMessage(const DBusMessage& dbusMessage) = 0;
@@ -79,26 +79,6 @@ class DBusStubAdapter: virtual public CommonAPI::StubAdapter, public DBusInterfa
 };
 
 
-const bool DBusStubAdapter::isManagingInterface() {
-    return isManagingInterface_;
-}
-
-const std::string& DBusStubAdapter::getDBusName() const {
-    return dbusBusName_;
-}
-
-const std::string& DBusStubAdapter::getObjectPath() const {
-    return dbusObjectPath_;
-}
-
-const std::string& DBusStubAdapter::getInterfaceName() const {
-    return dbusInterfaceName_;
-}
-
-const std::shared_ptr<DBusProxyConnection>& DBusStubAdapter::getDBusConnection() const {
-    return dbusConnection_;
-}
-
 } // namespace dbus
 } // namespace CommonAPI
 
diff --git a/src/CommonAPI/DBus/DBusStubAdapterHelper.h b/src/CommonAPI/DBus/DBusStubAdapterHelper.h
index a617b15..e2cbd13 100644
--- a/src/CommonAPI/DBus/DBusStubAdapterHelper.h
+++ b/src/CommonAPI/DBus/DBusStubAdapterHelper.h
@@ -48,7 +48,6 @@ class DBusStubAdapterHelper: public virtual DBusStubAdapter {
     typedef std::pair<const char*, const char*> DBusInterfaceMemberPath;
     typedef std::unordered_map<DBusInterfaceMemberPath, StubDispatcherBase*> StubDispatcherTable;
 
- public:
     DBusStubAdapterHelper(const std::shared_ptr<DBusFactory>& factory,
                           const std::string& commonApiAddress,
                           const std::string& dbusInterfaceName,