using namespace std;
-#define MMI_KEY_INPUT_EVENT "input-event"
-#define MMI_KEY_VOICE_TOUCH "voice-touch"
-#define MMI_KEY_VOICE_RECOGNITION "voice-recognition"
-#define MMI_KEY_SCREEN_KEY "screen-key"
-#define MMI_KEY_OUTPUT_EVENT "output-event" // changed result
-#define MMI_KEY_ASR_PARTIAL_RESULT "asr-partial-result"
-#define MMI_KEY_ASR_FINAL_RESULT "asr-final-result"
+#define MMI_KEY_INPUT_EVENT "inputEvent"
+#define MMI_KEY_VOICE_TOUCH "voiceTouch"
+#define MMI_KEY_VOICE_RECOGNITION "voiceRecognition"
+#define MMI_KEY_SCREEN_KEY "screenKey"
+#define MMI_KEY_OUTPUT_EVENT "outputEvent" // changed result
+#define MMI_KEY_ASR_PARTIAL_RESULT "asrPartialResult"
+#define MMI_KEY_ASR_FINAL_RESULT "asrFinalResult"
#define MMI_KEY_RESULT "result"
#define MMI_KEY_REJECT "reject"
#define MMI_KEY_ERROR "error"
#define MMI_KEY_REASON "reason"
#define MMI_KEY_TIMESTAMP "timestamp"
-#define MMI_KEY_UI_CLICKABLE_OBJECT "ui-clickable-object"
-#define MMI_KEY_UI_CLICKED_OBJECT "ui-clicked-object"
-#define MMI_KEY_UI_OBJECT_RESULT_TYPE "ui-object-result-type"
-#define MMI_KEY_SHOW_TOOLTIPS "show-tooltips" // TODO: make as enum type
-#define MMI_KEY_SHOW_GRIDS "show-grids" // TODO: make as enum type
-#define MMI_KEY_CLICK_OBJECT "click-object" // TODO: make as enum type
-#define MMI_KEY_FOREGROUND_APP "foreground-app"
-#define MMI_KEY_TOOLTIP_TYPE "tooltip-type"
-#define MMI_KEY_TOOLTIP_TYPE_NUMBER "tooltip-number"
-#define MMI_KEY_TOOLTIP_TYPE_TEXT "tooltip-text"
-#define MMI_KEY_NUM_OF_CLICKABLE_OBJECTS "num-of-clickable-objects"
-#define MMI_KEY_INFO_OF_CLICKABLE_OBJECTS "info-of-clickable-objects"
-#define MMI_KEY_INFO_OF_CLICKED_OBJECTS "info-of-clicked-objects"
+#define MMI_KEY_UI_CLICKABLE_OBJECT "uiClickableObject"
+#define MMI_KEY_UI_CLICKED_OBJECT "uiClickedObject"
+#define MMI_KEY_UI_OBJECT_RESULT_TYPE "uiObjectResultType"
+#define MMI_KEY_SHOW_TOOLTIPS "showTooltips" // TODO: make as enum type
+#define MMI_KEY_SHOW_GRIDS "showGrids" // TODO: make as enum type
+#define MMI_KEY_CLICK_OBJECT "clickObject" // TODO: make as enum type
+#define MMI_KEY_FOREGROUND_APP "foregroundApp"
+#define MMI_KEY_TOOLTIP_TYPE "tooltipType"
+#define MMI_KEY_TOOLTIP_TYPE_NUMBER "tooltipNumber"
+#define MMI_KEY_TOOLTIP_TYPE_TEXT "tooltipText"
+#define MMI_KEY_NUM_OF_CLICKABLE_OBJECTS "numOfClickableObjects"
+#define MMI_KEY_INFO_OF_CLICKABLE_OBJECTS "infoOfClickableObjects"
+#define MMI_KEY_INFO_OF_CLICKED_OBJECTS "infoOfClickedObjects"
#define MMI_KEY_UI_OBJECT_INDEX "idx"
-#define MMI_KEY_UI_OBJECT_X "x"
-#define MMI_KEY_UI_OBJECT_Y "y"
-#define MMI_KEY_UI_OBJECT_WIDTH "w"
-#define MMI_KEY_UI_OBJECT_HEIGHT "h"
-#define MMI_KEY_UI_OBJECT_TEXT "ui-object-text"
-#define MMI_KEY_GRID_DEPTH "grid-depth"
-
-#define MMI_REASON_NO_MATCHED_COMMANDS "no-matched-commands"
-#define MMI_REASON_NO_CLICKABLE_OBJECTS "no-clickable-objects"
+#define MMI_KEY_UI_OBJECT_X "coordX"
+#define MMI_KEY_UI_OBJECT_Y "coordY"
+#define MMI_KEY_UI_OBJECT_WIDTH "width"
+#define MMI_KEY_UI_OBJECT_HEIGHT "height"
+#define MMI_KEY_UI_OBJECT_TEXT "uiObjectText"
+#define MMI_KEY_GRID_DEPTH "gridDepth"
+
+#define MMI_REASON_NO_MATCHED_COMMANDS "noMatchedCommands"
+#define MMI_REASON_NO_CLICKABLE_OBJECTS "noClickableObjects"
class JsonProvider {