Fix build warning

Change-Id: Id3ab81a554d4eabd2cd83e851b8f3c4043d8315f

diff --git a/src/include/ise.h b/src/include/ise.h
index b39ee10..61f7183 100644 (file)
--- a/src/include/ise.h
+++ b/src/include/ise.h
@@ -36,12 +36,14 @@
 #define MAIN_ENTRY_XML_PATH_720X1280   "/usr/share/isf/ise/ise-default/720x1280/default/wearable/main_entry.xml"
 #define MAIN_ENTRY_XML_PATH MAIN_ENTRY_XML_PATH_720X1280
 #else
+#ifndef MAIN_ENTRY_XML_PATH
 #define MAIN_ENTRY_XML_PATH_480X800    "/usr/share/isf/ise/ise-default/720x1280/default/sdk/main_entry_480x800.xml"
 #define MAIN_ENTRY_XML_PATH_540X960    "/usr/share/isf/ise/ise-default/720x1280/default/sdk/main_entry_540x960.xml"
 #define MAIN_ENTRY_XML_PATH_720X1280   "/usr/share/isf/ise/ise-default/720x1280/default/sdk/main_entry.xml"
 #define MAIN_ENTRY_XML_PATH_1440X2560  "/usr/share/isf/ise/ise-default/720x1280/default/sdk/main_entry_1440x2560.xml"
 #define MAIN_ENTRY_XML_PATH MAIN_ENTRY_XML_PATH_720X1280
 #endif
+#endif
 
 #define DEFAULT_KEYBOARD_ISE_UUID "org.tizen.ise-engine-default"
 

diff --git a/src/ise-emoticon-mode.cpp b/src/ise-emoticon-mode.cpp
index 1cd8239..ea16138 100644 (file)
--- a/src/ise-emoticon-mode.cpp
+++ b/src/ise-emoticon-mode.cpp
@@ -584,7 +584,7 @@ void ise_set_private_key_for_emoticon_mode(const emoticon_group_t emoticon_group
             sclchar* imagebg[SCL_BUTTON_STATE_MAX] = {
                const_cast<sclchar*>("button/B09_Qwerty_btn_press.png"), const_cast<sclchar*>(""), const_cast<sclchar*>("")};
 
-            g_ui->set_private_key(group_name, "", NULL, imagebg, 0, const_cast<sclchar*>(group_name), TRUE);
+            g_ui->set_private_key(group_name, const_cast<sclchar*>(""), NULL, imagebg, 0, const_cast<sclchar*>(group_name), TRUE);
         }
     }
 }

diff --git a/src/ise.cpp b/src/ise.cpp
index f413e17..7c46c23 100644 (file)
--- a/src/ise.cpp
+++ b/src/ise.cpp
@@ -181,13 +181,13 @@ static void ise_set_cm_private_key(scluint cm_key_id)
             const_cast<sclchar*>("emoticon/icon_emotion_nor_55x55.png"),
             const_cast<sclchar*>("emoticon/icon_emotion_press_55x55.png"),
             const_cast<sclchar*>("emoticon/icon_emotion_dim_55x55.png")};
-        g_ui->set_private_key("CM_KEY", "", imagelabel, NULL, 0, USER_KEYSTRING_EMOTICON, TRUE);
+        g_ui->set_private_key("CM_KEY", const_cast<sclchar*>(""), imagelabel, NULL, 0, const_cast<sclchar*>(USER_KEYSTRING_EMOTICON), TRUE);
     } else if (strcmp(_cm_key_list[cm_key_id], USER_KEYSTRING_OPTION) == 0) {
         sclchar* imagelabel[SCL_BUTTON_STATE_MAX] = {
             const_cast<sclchar*>("setting icon/B09_icon_setting_nor_54x54.png"),
             const_cast<sclchar*>("setting icon/B09_icon_setting_press_54x54.png"),
             const_cast<sclchar*>("setting icon/B09_icon_setting_dim_54x54.png")};
-        g_ui->set_private_key("CM_KEY", "", imagelabel, NULL, 0, USER_KEYSTRING_OPTION, TRUE);
+        g_ui->set_private_key("CM_KEY", const_cast<sclchar*>(""), imagelabel, NULL, 0, const_cast<sclchar*>(USER_KEYSTRING_OPTION), TRUE);
     }
 }
 

diff --git a/src/option.cpp b/src/option.cpp
index 5671e77..540a4ae 100644 (file)
--- a/src/option.cpp
+++ b/src/option.cpp
@@ -259,35 +259,35 @@ static void _main_gl_sel(void *data, Evas_Object *obj, void *event_info)
             case SETTING_ITEM_ID_AUTO_CAPITALISE: {
                 if (item) {
                     state = _update_check_button_state(item, obj);
-                    check_autocapitalise_change_callback((void *)(state), NULL, NULL);
+                    check_autocapitalise_change_callback((void *)(intptr_t)(state), NULL, NULL);
                 }
             break;
             }
             case SETTING_ITEM_ID_AUTO_PUNCTUATE: {
                 if (item) {
                     state = _update_check_button_state(item, obj);
-                    check_autopunctuate_change_callback((void *)(state), NULL, NULL);
+                    check_autopunctuate_change_callback((void *)(intptr_t)(state), NULL, NULL);
                 }
             break;
             }
             case SETTING_ITEM_ID_SOUND: {
                 if (item) {
                     state = _update_check_button_state(item, obj);
-                    check_sound_change_callback((void *)(state), NULL, NULL);
+                    check_sound_change_callback((void *)(intptr_t)(state), NULL, NULL);
                 }
             break;
             }
             case SETTING_ITEM_ID_VIBRATION: {
                 if (item) {
                     state = _update_check_button_state(item, obj);
-                    check_vibration_change_callback((void *)(state), NULL, NULL);
+                    check_vibration_change_callback((void *)(intptr_t)(state), NULL, NULL);
                 }
             break;
             }
             case SETTING_ITEM_ID_CHARACTER_PRE: {
                 if (item) {
                     state = _update_check_button_state(item, obj);
-                    check_character_pre_change_callback((void *)(state), NULL, NULL);
+                    check_character_pre_change_callback((void *)(intptr_t)(state), NULL, NULL);
                 }
             break;
             }
@@ -888,8 +888,9 @@ static void language_selected(void *data, Evas_Object *obj, void *event_info)
                     info->enabled = FALSE;
                     elm_check_state_set(obj, EINA_FALSE);
 
-                    char buf[256] = {0};
-                    snprintf(buf, 256, SUPPORTED_MAX_LANGUAGES, MAX_SELECTED_LANGUAGES);
+                    char buf[256] = { 0 };
+                    const sclchar *suppoted_max_languages = SUPPORTED_MAX_LANGUAGES;
+                    snprintf(buf, sizeof(buf), suppoted_max_languages, MAX_SELECTED_LANGUAGES);
                     language_view_popup_show(obj, type, buf, NULL);
                 }
             }

diff --git a/src/sdk/sdk.h b/src/sdk/sdk.h
index c61ca41..b1f61e1 100755 (executable)
--- a/src/sdk/sdk.h
+++ b/src/sdk/sdk.h
@@ -34,7 +34,9 @@
 #elif _WEARABLE
 #define MAIN_ENTRY_XML_PATH "/usr/share/isf/ise/ise-default/720x1280/default/wearable/main_entry.xml"
 #else
+#ifndef MAIN_ENTRY_XML_PATH
 #define MAIN_ENTRY_XML_PATH "/usr/share/isf/ise/ise-default/720x1280/default/sdk/main_entry.xml"
 #endif
+#endif
 
 #endif