Rename the class Json to avoid symbol conflicts with Jsoncpp

[platform/core/context/context-provider.git] / common / include / DatabaseManager.h

diff --git a/common/include/DatabaseManager.h b/common/include/DatabaseManager.h
index a0fe0ad..c7aa403 100644 (file)
--- a/common/include/DatabaseManager.h
+++ b/common/include/DatabaseManager.h
@@ -45,7 +45,7 @@ namespace ctx {
                 * @param[in]   record          A json object containing key, value pairs.
                 * @param[in]   listener        A listener object to receive the result. Allows NULL.
                 */
-               bool insert(unsigned int queryId, const char *tableName, Json record, IDatabaseListener *listener = NULL);
+               bool insert(unsigned int queryId, const char *tableName, CtxJson1 record, IDatabaseListener *listener = NULL);
 
                /**
                 * @brief               Executes a SQL query. Async.
@@ -70,7 +70,7 @@ namespace ctx {
                 * @param[in]   record          A json object containing key, value pairs.
                 * @param[out]  rowId           The row id of the inserted record. If fails, a negative integer.
                 */
-               bool insertSync(const char *tableName, Json record, int64_t *rowId);
+               bool insertSync(const char *tableName, CtxJson1 record, int64_t *rowId);
 
                /**
                 * @brief               Executes a SQL query. Sync.
@@ -78,7 +78,7 @@ namespace ctx {
                 * @param[in]   query           A query to be executed.
                 * @param[out]  records         Query result.
                 */
-               bool executeSync(const char *query, std::vector<Json> *records);
+               bool executeSync(const char *query, std::vector<CtxJson1> *records);
 
        private:
                static bool __init();