Rename the class Json to avoid symbol conflicts with Jsoncpp

[platform/core/context/context-provider.git] / src / sensor / SensorProvider.cpp

diff --git a/src/sensor/SensorProvider.cpp b/src/sensor/SensorProvider.cpp
index 47d5269..6bf6ee5 100644 (file)
--- a/src/sensor/SensorProvider.cpp
+++ b/src/sensor/SensorProvider.cpp
@@ -37,17 +37,17 @@ SensorProvider::~SensorProvider()
        delete sensorLogger;
 }
 
-int SensorProvider::subscribe(Json option, Json *requestResult)
+int SensorProvider::subscribe(CtxJson1 option, CtxJson1 *requestResult)
 {
        return ERR_NONE;
 }
 
-int SensorProvider::unsubscribe(Json option)
+int SensorProvider::unsubscribe(CtxJson1 option)
 {
        return ERR_NONE;
 }
 
-int SensorProvider::read(Json option, Json *requestResult)
+int SensorProvider::read(CtxJson1 option, CtxJson1 *requestResult)
 {
        int endTime = static_cast<int>(time(NULL)) + 1;
        int startTime = endTime - DEFAULT_QUERY_PERIOD - 1;
@@ -94,13 +94,13 @@ int SensorProvider::read(Json option, Json *requestResult)
        return ret;
 }
 
-int SensorProvider::write(Json data, Json *requestResult)
+int SensorProvider::write(CtxJson1 data, CtxJson1 *requestResult)
 {
        IF_FAIL_RETURN(sensorLogger, ERR_OPERATION_FAILED);
 
        std::string operation;
        std::string pkgId;
-       Json option;
+       CtxJson1 option;
        int retentionPeriod = DEFAULT_RETENTION;
 
        _J("Data", data);
@@ -125,16 +125,16 @@ int SensorProvider::write(Json data, Json *requestResult)
        return ERR_NOT_SUPPORTED;
 }
 
-bool SensorProvider::verifyOption(Json option)
+bool SensorProvider::verifyOption(CtxJson1 option)
 {
        std::list<std::string> keys;
        option.getKeys(&keys);
        return keys.size() == 0;
 }
 
-int SensorProvider::__addClient(std::string pkgId, int retentionPeriod, Json option)
+int SensorProvider::__addClient(std::string pkgId, int retentionPeriod, CtxJson1 option)
 {
-       Json tmp;
+       CtxJson1 tmp;
        int ret;
 
        /* Validate the retention period */
@@ -157,7 +157,7 @@ int SensorProvider::__addClient(std::string pkgId, int retentionPeriod, Json opt
 
 int SensorProvider::__removeClient(std::string pkgId)
 {
-       std::vector<Json> options;
+       std::vector<CtxJson1> options;
        int ret;
 
        /* Remove the app's request first */