Rename the class Json to avoid symbol conflicts with Jsoncpp

[platform/core/context/context-provider.git] / src / social-stats / DbHandle.cpp

diff --git a/src/social-stats/DbHandle.cpp b/src/social-stats/DbHandle.cpp
index 7e1b6cc..e9e498d 100644 (file)
--- a/src/social-stats/DbHandle.cpp
+++ b/src/social-stats/DbHandle.cpp
@@ -31,7 +31,7 @@ SocialDbHandle::~SocialDbHandle()
 {
 }
 
-int SocialDbHandle::read(Json filter)
+int SocialDbHandle::read(CtxJson1 filter)
 {
        std::string query;
        const char *subject = reqProvider->getSubject();
@@ -52,7 +52,7 @@ int SocialDbHandle::read(Json filter)
        return ERR_NONE;
 }
 
-std::string SocialDbHandle::createWhereClause(Json filter)
+std::string SocialDbHandle::createWhereClause(CtxJson1 filter)
 {
        std::stringstream whereClause;
        int commType = -1;
@@ -79,7 +79,7 @@ std::string SocialDbHandle::createWhereClause(Json filter)
        return whereClause.str();
 }
 
-std::string SocialDbHandle::createSqlFreqAddress(Json filter)
+std::string SocialDbHandle::createSqlFreqAddress(CtxJson1 filter)
 {
        std::stringstream query;
        int limit = DEFAULT_LIMIT;
@@ -100,9 +100,9 @@ std::string SocialDbHandle::createSqlFreqAddress(Json filter)
        return query.str();
 }
 
-std::string SocialDbHandle::createSqlFrequency(Json filter)
+std::string SocialDbHandle::createSqlFrequency(CtxJson1 filter)
 {
-       Json filterCleaned;
+       CtxJson1 filterCleaned;
        std::string weekStr;
        std::string timeOfDay;
        std::string address;
@@ -145,11 +145,11 @@ std::string SocialDbHandle::createSqlFrequency(Json filter)
        return query.str();
 }
 
-void SocialDbHandle::replyTriggerItem(int error, Json &jsonResult)
+void SocialDbHandle::replyTriggerItem(int error, CtxJson1 &jsonResult)
 {
        IF_FAIL_VOID_TAG(STR_EQ(reqProvider->getSubject(), SOCIAL_SUBJ_FREQUENCY), _E, "Invalid subject");
 
-       Json results;
+       CtxJson1 results;
        std::string valStr;
        int val;