Apply Tizen C++ coding style to Request

Change-Id: Id9a84a7c8804fad2acd3bbb6d78f93f0e2046899
Signed-off-by: Somin Kim <somin926.kim@samsung.com>

diff --git a/src/ClientRequest.cpp b/src/ClientRequest.cpp
index 6bd1e8a..f2f81d5 100644 (file)
--- a/src/ClientRequest.cpp
+++ b/src/ClientRequest.cpp
@@ -74,7 +74,7 @@ bool ctx::ClientRequest::reply(int error)
 bool ctx::ClientRequest::reply(int error, ctx::Json& requestResult)
 {
        IF_FAIL_RETURN(__invocation, true);
-       IF_FAIL_RETURN(_type != REQ_READ_SYNC, true);
+       IF_FAIL_RETURN(__type != REQ_READ_SYNC, true);
 
        std::string result = requestResult.str();
        IF_FAIL_RETURN(!result.empty(), false);
@@ -110,6 +110,6 @@ bool ctx::ClientRequest::reply(int error, ctx::Json& requestResult, ctx::Json& d
 
 bool ctx::ClientRequest::publish(int error, ctx::Json& data)
 {
-       DBusServer::publish(__dbusSender, _reqId, _subject, error, data.str());
+       DBusServer::publish(__dbusSender, __reqId, __subject, error, data.str());
        return true;
 }

diff --git a/src/Request.cpp b/src/Request.cpp
index cac54e6..32745c0 100644 (file)
--- a/src/Request.cpp
+++ b/src/Request.cpp
@@ -19,10 +19,10 @@
 #include "Request.h"
 
 ctx::RequestInfo::RequestInfo(int type, int reqId, const char* subj, const char* desc) :
-       _type(type),
-       _reqId(reqId),
-       _subject(subj),
-       _description(desc)
+       __type(type),
+       __reqId(reqId),
+       __subject(subj),
+       __description(desc)
 {
 }
 
@@ -32,12 +32,12 @@ ctx::RequestInfo::~RequestInfo()
 
 int ctx::RequestInfo::getType()
 {
-       return _type;
+       return __type;
 }
 
 int ctx::RequestInfo::getId()
 {
-       return _reqId;
+       return __reqId;
 }
 
 const ctx::Credentials* ctx::RequestInfo::getCredentials()
@@ -57,10 +57,10 @@ const char* ctx::RequestInfo::getClient()
 
 const char* ctx::RequestInfo::getSubject()
 {
-       return _subject.c_str();
+       return __subject.c_str();
 }
 
 ctx::Json& ctx::RequestInfo::getDescription()
 {
-       return _description;
+       return __description;
 }

diff --git a/src/Request.h b/src/Request.h
index 7225fc1..9750b2f 100644 (file)
--- a/src/Request.h
+++ b/src/Request.h
@@ -45,10 +45,10 @@ namespace ctx {
                virtual bool publish(int error, ctx::Json &data) = 0;
 
        protected:
-               int _type;
-               int _reqId;
-               std::string _subject;
-               ctx::Json _description;
+               int __type;
+               int __reqId;
+               std::string __subject;
+               ctx::Json __description;
        };
 
 }      /* namespace ctx */

diff --git a/src/trigger/FactRequest.cpp b/src/trigger/FactRequest.cpp
index 9ae72dd..4483a81 100644 (file)
--- a/src/trigger/FactRequest.cpp
+++ b/src/trigger/FactRequest.cpp
@@ -40,7 +40,7 @@ const char* FactRequest::getClient()
 bool FactRequest::reply(int error)
 {
        IF_FAIL_RETURN(!__replied && __ctxMonitor, true);
-       __ctxMonitor->replyResult(_reqId, error);
+       __ctxMonitor->replyResult(__reqId, error);
        __replied = (error != ERR_NONE);
        return true;
 }
@@ -48,7 +48,7 @@ bool FactRequest::reply(int error)
 bool FactRequest::reply(int error, Json& requestResult)
 {
        IF_FAIL_RETURN(!__replied && __ctxMonitor, true);
-       __ctxMonitor->replyResult(_reqId, error, &requestResult);
+       __ctxMonitor->replyResult(__reqId, error, &requestResult);
        __replied = (error != ERR_NONE);
        return true;
 }
@@ -56,13 +56,13 @@ bool FactRequest::reply(int error, Json& requestResult)
 bool FactRequest::reply(int error, Json& requestResult, Json& dataRead)
 {
        IF_FAIL_RETURN(!__replied && __ctxMonitor, true);
-       __ctxMonitor->replyResult(_reqId, error, _subject.c_str(), &getDescription(), &dataRead);
+       __ctxMonitor->replyResult(__reqId, error, __subject.c_str(), &getDescription(), &dataRead);
        return (__replied = true);
 }
 
 bool FactRequest::publish(int error, Json& data)
 {
        IF_FAIL_RETURN(__ctxMonitor, true);
-       __ctxMonitor->publishFact(_reqId, error, _subject.c_str(), &getDescription(), &data);
+       __ctxMonitor->publishFact(__reqId, error, __subject.c_str(), &getDescription(), &data);
        return true;
 }