code cleanup

Change-Id: Ia8c0bab00afde6e63190b8e7790e6fc32189e0f0
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/src/ise-stt-option.cpp b/src/ise-stt-option.cpp
index a1d36ed..e4e748c 100644 (file)
--- a/src/ise-stt-option.cpp
+++ b/src/ise-stt-option.cpp
@@ -57,7 +57,7 @@ static void language_set_genlist_radio_cb(void *data, Evas_Object *obj, void *ev
 static Eina_Bool close_setting_window_idler_cb(void *data);
 static Evas_Object *create_language_list(Evas_Object *parent);
 
-const char *supported_language[7] = {
+const char *supported_language[] = {
     "auto",
     "en_US",
     "es_US",
@@ -67,7 +67,7 @@ const char *supported_language[7] = {
     "ko_KR",
 };
 
-const char *disp_lang_array[7] = {
+const char *disp_lang_array[] = {
     "",
     "English (United States)",
     "Español (América Latina)",
@@ -111,7 +111,6 @@ const char* get_lang_label(char lang[])
 
 static int get_language_value()
 {
-#if 1
     int lang = 0, ret = 0;
 
     ret = preference_get_int(PREFERENCE_ISE_STT_LANGUAGE, &lang);
@@ -120,15 +119,8 @@ static int get_language_value()
         preference_set_int(PREFERENCE_ISE_STT_LANGUAGE, STT_VOICE_N66_AUTO); //auto
         lang = STT_VOICE_N66_AUTO;
     }
-#else
-    int lang = 0, ret = 0;
 
-    ret = vconf_get_int(VCONFKEY_ISE_STT_LANGUAGE, &lang);
-    if (ret !=0) {
-        LOGD("Vconf_get_int error!(%d)", ret);
-    }
-#endif
-    if (lang < 0 || lang > 6) {
+    if (lang < 0 || lang > (int)(sizeof(supported_language)/sizeof(supported_language[0])-1)) {
         LOGD("vconf lang orig(%d) to be 0", lang);
         lang = 0;
     }
@@ -142,19 +134,11 @@ static void set_language_value(int type)
     // Add implementation to store language type.
     int ret = 0;
 
-#if 1
     ret = preference_set_int(PREFERENCE_ISE_STT_LANGUAGE, (int)type);
     if (PREFERENCE_ERROR_NONE != ret){
         LOGD("preference_set_int error!(%d)", ret);
     }
 
-#else
-    ret = vconf_set_int(VCONFKEY_ISE_STT_LANGUAGE, (int) type);
-    if (ret != 0) {
-        LOGD("Vconf_set_int error!(%d)", ret);
-        return;
-    }
-#endif
     LOGD("language type (%d)", type);
 
     // Update string
@@ -452,7 +436,7 @@ static Evas_Object *create_language_list(Evas_Object *parent)
     itc_1text.func.text_get = __get_genlist_item_label;
     itc_1text.func.content_get = __get_genlist_item_content;
 
-    for (i = 1; i < 7; i++)
+    for (i = 1; i < (long)(sizeof(disp_lang_array)/sizeof(disp_lang_array[0])); i++)
     {
         char *s = (char *)disp_lang_array[i];
 
@@ -467,7 +451,7 @@ static Evas_Object *create_language_list(Evas_Object *parent)
             elm_genlist_item_show(item, ELM_GENLIST_ITEM_SCROLLTO_MIDDLE);
         }
 
-        if ( item == NULL ) {
+        if (item == NULL) {
             LOGD("elm_genlist_item_append was failed");
             break;
         }