Replace MethodCallHandler::setCaller() with a parameterized constructor

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

diff --git a/include/private/SensorRecorderService.h b/include/private/SensorRecorderService.h
index 90520f4..0235691 100644 (file)
--- a/include/private/SensorRecorderService.h
+++ b/include/private/SensorRecorderService.h
@@ -21,6 +21,7 @@
 
 #include <IService.h>
 #include <IServiceRunner.h>
+#include <IClient.h>
 #include <IMethodCallHandler.h>
 
 namespace ctx {
@@ -43,7 +44,7 @@ namespace ctx {
                void onUserActivated();
                void onUserDeactivated();
 
-               IMethodCallHandler* createMethodCallHandler();
+               IMethodCallHandler* createMethodCallHandler(IClient* client);
 
                GDBusConnection* getConnection();
 

diff --git a/src/server-dummy/SensorRecorderService.cpp b/src/server-dummy/SensorRecorderService.cpp
index 06cf899..5ef92f8 100644 (file)
--- a/src/server-dummy/SensorRecorderService.cpp
+++ b/src/server-dummy/SensorRecorderService.cpp
@@ -66,7 +66,7 @@ void SensorRecorderService::onUserDeactivated()
 {
 }
 
-IMethodCallHandler* SensorRecorderService::createMethodCallHandler()
+IMethodCallHandler* SensorRecorderService::createMethodCallHandler(IClient* client)
 {
        return NULL;
 }

diff --git a/src/server/MethodCallHandler.cpp b/src/server/MethodCallHandler.cpp
index 8a20944..6acc120 100644 (file)
--- a/src/server/MethodCallHandler.cpp
+++ b/src/server/MethodCallHandler.cpp
@@ -24,8 +24,8 @@
 
 using namespace ctx;
 
-MethodCallHandler::MethodCallHandler() :
-       __caller(NULL)
+MethodCallHandler::MethodCallHandler(IClient* client) :
+       __caller(client)
 {
 }
 
@@ -33,11 +33,6 @@ MethodCallHandler::~MethodCallHandler()
 {
 }
 
-void MethodCallHandler::setCaller(IClient* client)
-{
-       __caller = client;
-}
-
 void MethodCallHandler::onMethodCalled(IMethodCall* methodCall)
 {
        try {

diff --git a/src/server/MethodCallHandler.h b/src/server/MethodCallHandler.h
index cde2a2b..83ff751 100644 (file)
--- a/src/server/MethodCallHandler.h
+++ b/src/server/MethodCallHandler.h
@@ -27,10 +27,9 @@ namespace ctx {
 
        class MethodCallHandler : public IMethodCallHandler {
        public:
-               MethodCallHandler();
+               MethodCallHandler(IClient* client);
                ~MethodCallHandler();
 
-               void setCaller(IClient* client);
                void onMethodCalled(IMethodCall* methodCall);
                void onDisconnected();
 

diff --git a/src/server/SensorRecorderService.cpp b/src/server/SensorRecorderService.cpp
index 9846d00..8fba83b 100644 (file)
--- a/src/server/SensorRecorderService.cpp
+++ b/src/server/SensorRecorderService.cpp
@@ -82,9 +82,9 @@ void SensorRecorderService::onUserDeactivated()
 {
 }
 
-IMethodCallHandler* SensorRecorderService::createMethodCallHandler()
+IMethodCallHandler* SensorRecorderService::createMethodCallHandler(IClient* client)
 {
-       return new MethodCallHandler();
+       return new MethodCallHandler(client);
 }
 
 GDBusConnection* SensorRecorderService::getConnection()