[my-place] internal definitions.

Change-Id: Idac0a7d8f0fae8ebf13cff1c7cb5094b10b2455d
Signed-off-by: Marcin Masternak <m.masternak@samsung.com>

diff --git a/include/DatabaseManager.h b/include/DatabaseManager.h
index d1f819d..46f549a 100644 (file)
--- a/include/DatabaseManager.h
+++ b/include/DatabaseManager.h
@@ -34,7 +34,7 @@ namespace ctx {
                 * @param[in]   tableName       A table name to be created.
                 * @param[in]   columns         Columns. In SQL format. INTEGER, REAL, and TEXT types are allowed.
                 * @param[in]   option          Additional options. Allows NULL.
-                * @param[in]   listener        A listner object to receive the result. Allows NULL.
+                * @param[in]   listener        A listener object to receive the result. Allows NULL.
                 */
                bool createTable(unsigned int queryId, const char *tableName, const char *columns, const char *option = NULL, IDatabaseListener *listener = NULL);
 
@@ -43,7 +43,7 @@ namespace ctx {
                 * @param[in]   queryId         This number will be returned through IDatabaseListener::onInserted().
                 * @param[in]   tableName       A table name in which the record is inserted.
                 * @param[in]   record          A json object containing key, value pairs.
-                * @param[in]   listener        A listner object to receive the result. Allows NULL.
+                * @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);
 
@@ -51,7 +51,7 @@ namespace ctx {
                 * @brief               Executes a SQL query. Async.
                 * @param[in]   queryId         This number will be returned through IDatabaseListener::onExecuted().
                 * @param[in]   query           A query to be executed.
-                * @param[in]   listener        A listner object to receive the result.
+                * @param[in]   listener        A listener object to receive the result.
                 */
                bool execute(unsigned int queryId, const char *query, IDatabaseListener *listener = NULL);
 

diff --git a/include/MyPlaceTypes.h b/include/MyPlaceTypes.h
index 9de3fdc..2593649 100644 (file)
--- a/include/MyPlaceTypes.h
+++ b/include/MyPlaceTypes.h
@@ -22,20 +22,27 @@
 #include <ctime>
 #include <ProviderTypes.h>
 
-#define PLACE_DETECTION_SUBJECT      SUBJ_PLACE_DETECTION
-
-#define PLACE_DATA_READ              "PlacesList"
-#define PLACE_CATEG_ID               "CategId"
-#define PLACE_CATEG_CONFIDENCE       "CategConfidence"
-#define PLACE_NAME                   "Name"
-#define PLACE_LOCATION               "Location"
-#define PLACE_LOCATION_LATITUDE      "Latitude"
-#define PLACE_LOCATION_LONGITUDE     "Longitude"
-#define PLACE_LOCATION_ACCURACY      "Accuracy"
-#define PLACE_WIFI_APS               "WifiAPs"
-#define PLACE_WIFI_AP_MAC            "Mac"
-#define PLACE_WIFI_AP_NETWORK_NAME   "Network"
-#define PLACE_CREATE_DATE            "CreateDate"
+#define PLACE_DETECTION_SUBJECT         SUBJ_PLACE_DETECTION
+
+#define PLACE_DETECTION_REQUEST         "Request"
+#define PLACE_DETECTION_REQUEST_CONSENT "UserConsent"
+#define PLACE_DETECTION_REQUEST_LIST    "PlacesList"
+
+#define MYPLACE_SETTING_VALUE_TRUE      "true"
+#define MYPLACE_SETTING_VALUE_FALSE     "false"
+
+#define PLACE_DATA_READ                 "PlacesList"
+#define PLACE_CATEG_ID                  "CategId"
+#define PLACE_CATEG_CONFIDENCE          "CategConfidence"
+#define PLACE_NAME                      "Name"
+#define PLACE_LOCATION                  "Location"
+#define PLACE_LOCATION_LATITUDE         "Latitude"
+#define PLACE_LOCATION_LONGITUDE        "Longitude"
+#define PLACE_LOCATION_ACCURACY         "Accuracy"
+#define PLACE_WIFI_APS                  "WifiAPs"
+#define PLACE_WIFI_AP_MAC               "Mac"
+#define PLACE_WIFI_AP_NETWORK_NAME      "Network"
+#define PLACE_CREATE_DATE               "CreateDate"
 
 namespace ctx {