Apply updated class names

Change-Id: I58d902b49d3be20a17f801bb0689c41342e58181
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>

diff --git a/include/ContextStoreService.h b/include/ContextStoreService.h
index e8a976b..a599af9 100644 (file)
--- a/include/ContextStoreService.h
+++ b/include/ContextStoreService.h
@@ -19,12 +19,12 @@
 
 /* This header SHOULD NOT be included by other headers in this directory. */
 
-#include <DBusService.h>
+#include <ServiceBase.h>
 #include <ContextStoreTypes.h>
 
 namespace ctx {
 
-       class EXPORT_API ContextStoreService : public DBusService {
+       class EXPORT_API ContextStoreService : public ServiceBase {
        public:
                ContextStoreService(GDBusConnection* conn);
                ~ContextStoreService();
@@ -33,7 +33,7 @@ namespace ctx {
                bool prepare();
                void cleanup();
                void onUserActivated(uid_t uid);
-               ClientProxy* createProxy(const std::string& busName);
+               ClientBase* createClient(const std::string& busName);
        };
 
 }

diff --git a/src/client/ContextStore.cpp b/src/client/ContextStore.cpp
index 97f42ab..051a48d 100644 (file)
--- a/src/client/ContextStore.cpp
+++ b/src/client/ContextStore.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <ContextStoreTypesPrivate.h>
-#include <DBusClient.h>
+#include <ServiceProxy.h>
 #include <ContextStore.h>
 
 using namespace ctx;
@@ -23,12 +23,12 @@ using namespace ctx;
 /* TODO: Remove this test code */
 EXPORT_API int context_store_test()
 {
-       // DBusClient object can be maintained as a static object.
-       DBusClient client(CTX_CONTEXT_STORE);
+       // ServiceProxy object can be maintained as a static object.
+       ServiceProxy proxy(CTX_CONTEXT_STORE);
 
        GVariant* output = NULL;
 
-       int err = client.call("test", g_variant_new("(i)", 100), &output);
+       int err = proxy.call("test", g_variant_new("(i)", 100), &output);
 
        _I(YELLOW("Return: %d (%s)"), err, CTX_ERROR_STR(err));
 

diff --git a/src/server-dummy/ContextStoreService.cpp b/src/server-dummy/ContextStoreService.cpp
index c0d8092..3c66f49 100644 (file)
--- a/src/server-dummy/ContextStoreService.cpp
+++ b/src/server-dummy/ContextStoreService.cpp
@@ -20,7 +20,7 @@
 using namespace ctx;
 
 ContextStoreService::ContextStoreService(GDBusConnection* conn) :
-       DBusService(conn, CTX_CONTEXT_STORE, CTX_CONTEXT_STORE_SPEC)
+       ServiceBase(conn, CTX_CONTEXT_STORE, CTX_CONTEXT_STORE_SPEC)
 {
        throw std::runtime_error("Context Store is not supported");
 }
@@ -42,7 +42,7 @@ void ContextStoreService::onUserActivated(uid_t uid)
 {
 }
 
-ClientProxy* ContextStoreService::createProxy(const std::string& busName)
+ClientBase* ContextStoreService::createClient(const std::string& busName)
 {
        return NULL;
 }

diff --git a/src/server/ContextStoreClientProxy.cpp b/src/server/ContextStoreClient.cpp
similarity index 66%
rename from src/server/ContextStoreClientProxy.cpp
rename to src/server/ContextStoreClient.cpp
index d4ea4b1..6f64c7f 100644 (file)
--- a/src/server/ContextStoreClientProxy.cpp
+++ b/src/server/ContextStoreClient.cpp
@@ -14,27 +14,27 @@
  * limitations under the License.
  */
 
-#include <DBusService.h>
+#include <ServiceBase.h>
 #include <MethodCall.h>
-#include "ContextStoreClientProxy.h"
+#include "ContextStoreClient.h"
 
 using namespace ctx;
 
-ContextStoreClientProxy::ContextStoreClientProxy(DBusService* hostService, const std::string& busName) :
-       ClientProxy(hostService, busName)
+ContextStoreClient::ContextStoreClient(ServiceBase* hostService, const std::string& busName) :
+       ClientBase(hostService, busName)
 {
 }
 
-ContextStoreClientProxy::~ContextStoreClientProxy()
+ContextStoreClient::~ContextStoreClient()
 {
 }
 
-void ContextStoreClientProxy::onMethodCalled(MethodCall* methodCall)
+void ContextStoreClient::onMethodCalled(MethodCall* methodCall)
 {
        // 'methodCall' should be deleted.
        delete methodCall;
 }
 
-void ContextStoreClientProxy::onDisconnected()
+void ContextStoreClient::onDisconnected()
 {
 }

diff --git a/src/server/ContextStoreClientProxy.h b/src/server/ContextStoreClient.h
similarity index 69%
rename from src/server/ContextStoreClientProxy.h
rename to src/server/ContextStoreClient.h
index eaff6d6..0f51a77 100644 (file)
--- a/src/server/ContextStoreClientProxy.h
+++ b/src/server/ContextStoreClient.h
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-#ifndef __CONTEXT_STORE_CLIENT_PROXY_H__
-#define __CONTEXT_STORE_CLIENT_PROXY_H__
+#ifndef __CONTEXT_STORE_CLIENT_H__
+#define __CONTEXT_STORE_CLIENT_H__
 
-#include <ClientProxy.h>
+#include <ClientBase.h>
 
 namespace ctx {
 
-       class ContextStoreClientProxy : public ClientProxy {
+       class ContextStoreClient : public ClientBase {
        public:
-               ContextStoreClientProxy(DBusService* hostService, const std::string& busName);
-               ~ContextStoreClientProxy();
+               ContextStoreClient(ServiceBase* hostService, const std::string& busName);
+               ~ContextStoreClient();
 
                void onMethodCalled(MethodCall* methodCall);
                void onDisconnected();
@@ -32,4 +32,4 @@ namespace ctx {
 
 }
 
-#endif /* __CONTEXT_STORE_CLIENT_PROXY_H__ */
+#endif /* __CONTEXT_STORE_CLIENT_H__ */

diff --git a/src/server/ContextStoreService.cpp b/src/server/ContextStoreService.cpp
index 7abe338..e435fd0 100644 (file)
--- a/src/server/ContextStoreService.cpp
+++ b/src/server/ContextStoreService.cpp
@@ -16,12 +16,12 @@
 
 #include <ContextStoreTypesPrivate.h>
 #include <ContextStoreService.h>
-#include "ContextStoreClientProxy.h"
+#include "ContextStoreClient.h"
 
 using namespace ctx;
 
 ContextStoreService::ContextStoreService(GDBusConnection* conn) :
-       DBusService(conn, CTX_CONTEXT_STORE, CTX_CONTEXT_STORE_SPEC)
+       ServiceBase(conn, CTX_CONTEXT_STORE, CTX_CONTEXT_STORE_SPEC)
 {
 }
 
@@ -43,7 +43,7 @@ void ContextStoreService::onUserActivated(uid_t uid)
 {
 }
 
-ClientProxy* ContextStoreService::createProxy(const std::string& busName)
+ClientBase* ContextStoreService::createClient(const std::string& busName)
 {
-       return new(std::nothrow) ContextStoreClientProxy(this, busName);
+       return new(std::nothrow) ContextStoreClient(this, busName);
 }