Change variable names

Change-Id: Ibf6e92a76c59e78e80e3f2d674860a5eb51531d5
Signed-off-by: sooyeon <sooyeon.kim@samsung.com>

diff --git a/src/mmimgr/iu/json_provider.cpp b/src/mmimgr/iu/json_provider.cpp
index 1ec0ffe..8018fa6 100644 (file)
--- a/src/mmimgr/iu/json_provider.cpp
+++ b/src/mmimgr/iu/json_provider.cpp
@@ -25,7 +25,7 @@ JsonProvider::~JsonProvider()
         mAsrFinalObj = nullptr;
     }
 
-       GList* uiList = json_array_get_elements(mUiClckbleArr);
+       GList* uiList = json_array_get_elements(mUiClickableArr);
        GList* iter;
        JsonObject* data;
        if (g_list_length(uiList) > 0) {
@@ -40,17 +40,17 @@ JsonProvider::~JsonProvider()
                        iter = g_list_next(iter);
                }
        }
-    if (mUiClckbleArr) {
-        json_array_unref(mUiClckbleArr);
-        mUiClckbleArr = nullptr;
+    if (mUiClickableArr) {
+        json_array_unref(mUiClickableArr);
+        mUiClickableArr = nullptr;
     }
-    if (mUiClckbleObjObj) {
-        json_object_unref(mUiClckbleObjObj);
-        mUiClckbleObjObj = nullptr;
+    if (mUiClickableObj) {
+        json_object_unref(mUiClickableObj);
+        mUiClickableObj = nullptr;
     }
-    if (mUiClckedObjObj) {
-        json_object_unref(mUiClckedObjObj);
-        mUiClckedObjObj = nullptr;
+    if (mUiClickedObj) {
+        json_object_unref(mUiClickedObj);
+        mUiClickedObj = nullptr;
     }
     if (mRejectObj) {
         json_object_unref(mRejectObj);
@@ -103,15 +103,15 @@ void JsonProvider::setAsrFinalResult(const char* result, int timeStamp)
 
 void JsonProvider::setUiClickableObject(const char* resultType, const char* fgApp, const char* tooltipType, int numClickableObj, int timeStamp)
 {
-    if (!mUiClckbleObjObj)
-        mUiClckbleObjObj = json_object_new();
+    if (!mUiClickableObj)
+        mUiClickableObj = json_object_new();
 
-       json_object_set_object_member(mRootObj, MMI_KEY_UI_CLICKABLE_OBJECT, mUiClckbleObjObj);
-       json_object_set_string_member(mUiClckbleObjObj, MMI_KEY_UI_OBJECT_RESULT_TYPE, resultType);
-       json_object_set_string_member(mUiClckbleObjObj, MMI_KEY_FOREGROUND_APP, fgApp);
-       json_object_set_string_member(mUiClckbleObjObj, MMI_KEY_TOOLTIP_TYPE, tooltipType);
-       json_object_set_int_member(mUiClckbleObjObj, MMI_KEY_NUM_OF_CLICKABLE_OBJECTS, numClickableObj);
-       json_object_set_int_member(mUiClckbleObjObj, MMI_KEY_TIMESTAMP, timeStamp);
+       json_object_set_object_member(mRootObj, MMI_KEY_UI_CLICKABLE_OBJECT, mUiClickableObj);
+       json_object_set_string_member(mUiClickableObj, MMI_KEY_UI_OBJECT_RESULT_TYPE, resultType);
+       json_object_set_string_member(mUiClickableObj, MMI_KEY_FOREGROUND_APP, fgApp);
+       json_object_set_string_member(mUiClickableObj, MMI_KEY_TOOLTIP_TYPE, tooltipType);
+       json_object_set_int_member(mUiClickableObj, MMI_KEY_NUM_OF_CLICKABLE_OBJECTS, numClickableObj);
+       json_object_set_int_member(mUiClickableObj, MMI_KEY_TIMESTAMP, timeStamp);
 
        mNumClickableObj = numClickableObj;
        
@@ -119,13 +119,13 @@ void JsonProvider::setUiClickableObject(const char* resultType, const char* fgAp
 
 void JsonProvider::addInfoClickableObject(int idx, int x, int y, int w, int h, const char* text)
 {
-    if (!mUiClckbleArr) {
-        mUiClckbleArr = json_array_new();
-               json_object_set_array_member(mUiClckbleObjObj, MMI_KEY_INFO_OF_CLICKABLE_OBJECTS, mUiClckbleArr);
+    if (!mUiClickableArr) {
+        mUiClickableArr = json_array_new();
+               json_object_set_array_member(mUiClickableObj, MMI_KEY_INFO_OF_CLICKABLE_OBJECTS, mUiClickableArr);
        }
 
        JsonObject* obj = json_object_new();
-       json_array_add_object_element(mUiClckbleArr, obj);
+       json_array_add_object_element(mUiClickableArr, obj);
        json_object_set_int_member(obj, MMI_KEY_UI_OBJECT_INDEX, idx);
        json_object_set_int_member(obj, MMI_KEY_UI_OBJECT_X, x);
        json_object_set_int_member(obj, MMI_KEY_UI_OBJECT_Y, y);
@@ -136,16 +136,16 @@ void JsonProvider::addInfoClickableObject(int idx, int x, int y, int w, int h, c
 
 void JsonProvider::setUiClickedObject(const char* fgApp, int timeStamp, int idx, int x, int y, int w, int h, const char* text)
 {
-    if (!mUiClckedObjObj)
-        mUiClckedObjObj = json_object_new();
+    if (!mUiClickedObj)
+        mUiClickedObj = json_object_new();
 
-       json_object_set_object_member(mRootObj, MMI_KEY_UI_CLICKED_OBJECT, mUiClckedObjObj);
-       json_object_set_string_member(mUiClckedObjObj, MMI_KEY_UI_OBJECT_RESULT_TYPE, MMI_KEY_CLICK_OBJECT);
-       json_object_set_string_member(mUiClckedObjObj, MMI_KEY_FOREGROUND_APP, fgApp);
-       json_object_set_int_member(mUiClckedObjObj, MMI_KEY_TIMESTAMP, timeStamp);
+       json_object_set_object_member(mRootObj, MMI_KEY_UI_CLICKED_OBJECT, mUiClickedObj);
+       json_object_set_string_member(mUiClickedObj, MMI_KEY_UI_OBJECT_RESULT_TYPE, MMI_KEY_CLICK_OBJECT);
+       json_object_set_string_member(mUiClickedObj, MMI_KEY_FOREGROUND_APP, fgApp);
+       json_object_set_int_member(mUiClickedObj, MMI_KEY_TIMESTAMP, timeStamp);
 
        JsonObject* obj = json_object_new();
-       json_object_set_object_member(mUiClckedObjObj, MMI_KEY_INFO_OF_CLICKED_OBJECTS, obj);
+       json_object_set_object_member(mUiClickedObj, MMI_KEY_INFO_OF_CLICKED_OBJECTS, obj);
        json_object_set_int_member(obj, MMI_KEY_UI_OBJECT_INDEX, idx);
        json_object_set_int_member(obj, MMI_KEY_UI_OBJECT_X, x);
        json_object_set_int_member(obj, MMI_KEY_UI_OBJECT_Y, y);

diff --git a/src/mmimgr/iu/json_provider.h b/src/mmimgr/iu/json_provider.h
index 6734419..e7fd06e 100644 (file)
--- a/src/mmimgr/iu/json_provider.h
+++ b/src/mmimgr/iu/json_provider.h
@@ -71,9 +71,9 @@ private:
     JsonArray* mOutputArr = nullptr;
     JsonObject* mAsrPartialObj = nullptr;
     JsonObject* mAsrFinalObj = nullptr;
-    JsonObject* mUiClckbleObjObj = nullptr;
-    JsonArray* mUiClckbleArr = nullptr;
-    JsonObject* mUiClckedObjObj = nullptr;
+    JsonObject* mUiClickableObj = nullptr;
+    JsonArray* mUiClickableArr = nullptr;
+    JsonObject* mUiClickedObj = nullptr;
     JsonObject* mRejectObj = nullptr;
     JsonObject* mErrorObj = nullptr;