Rename the class Json to avoid symbol conflicts with Jsoncpp

[platform/core/context/context-provider.git] / src / battery-stats / HeartDbReader.h

diff --git a/src/battery-stats/HeartDbReader.h b/src/battery-stats/HeartDbReader.h
index b219919..6e5b08d 100644 (file)
--- a/src/battery-stats/HeartDbReader.h
+++ b/src/battery-stats/HeartDbReader.h
@@ -32,12 +32,12 @@ namespace ctx {
 
                bool dbOpen();
                void dbClose();
-               bool readCpuLog(int __lastHeartAccessTime, std::vector<Json>* cpuUsageLog);
+               bool readCpuLog(int __lastHeartAccessTime, std::vector<CtxJson1>* cpuUsageLog);
                bool requestSync();
 
        private:
                static int __cpuUsageLogCb(void *userData, int dim, char **value, char **column);
-               static void __convertCpuUsageLog(Json& row, Json* newRow);
+               static void __convertCpuUsageLog(CtxJson1& row, CtxJson1* newRow);
 
                bool __initializeDBusConnection();
                void __releaseDBusConnection();