Fix build error

[platform/core/uifw/inputdelegator.git] / src / w-input-emoticon.cpp

diff --git a/src/w-input-emoticon.cpp b/src/w-input-emoticon.cpp
index e3b9b9d..f0c64f2 100755 (executable)
--- a/src/w-input-emoticon.cpp
+++ b/src/w-input-emoticon.cpp
@@ -41,7 +41,7 @@ vector <int> recent_emoji_list;
 
 typedef struct {
     int code;
-    char* name;
+    const char* name;
 }Emoticon;
 
 static Elm_Object_Item *it_emoticon_empty = NULL;
@@ -257,13 +257,6 @@ Emoticon emoticon_info[EMOTICON_CNT] = {
 };
 
 
-static Eina_Bool _custom_back_cb(void *data, Elm_Object_Item *it)
-{
-    _back_to_genlist_for_selector();
-    return EINA_TRUE;
-}
-
-
 //---------------------------------------------------------------------------------------//
 
 static Eina_Bool _custom_back_cb2(void *data, Elm_Object_Item *it)
@@ -313,12 +306,12 @@ void get_recent_emoticons(vector <int> &emoticon_list)
     PRINTFUNC(DLOG_DEBUG, "str = %s", str);
 
     if (str != NULL) {
-        char *tok;
-        tok = strtok(str, ",");
+        char *tok, *ptr;
+        tok = strtok_r(str, ",", &ptr);
         while (tok != NULL) {
             PRINTFUNC(DLOG_DEBUG, "tok = %s", tok);
             emoticon_list.push_back(strtol(tok, (char **)NULL, 10));
-            tok = strtok(NULL, ",");
+            tok = strtok_r(NULL, ",", &ptr);
         }
     }
 
@@ -330,7 +323,7 @@ void get_recent_emoticons(vector <int> &emoticon_list)
 
 void set_recent_emoticons(vector <int> &emoticon_list, int val)
 {
-    int i;
+    unsigned int i;
     int ret = PREFERENCE_ERROR_NONE;
 
     if (emoticon_list.size() > 0) {
@@ -378,7 +371,7 @@ static void _emoticon_item_clicked_cb(void *data, Evas_Object * obj, void *event
     set_recent_emoticons(recent_emoji_list, index);
 
     int length;
-    const Eina_Unicode unicode_event[2] = { emoticon_info[index].code, 0 };
+    const Eina_Unicode unicode_event[2] = { (Eina_Unicode)emoticon_info[index].code, 0 };
     char* utf_8 = eina_unicode_unicode_to_utf8(unicode_event, &length);
 
     reply_to_sender_by_callback((const char*)utf_8, "emoticon");
@@ -400,7 +393,7 @@ Evas_Object* get_emoticon_button(Evas_Object* parent, int index){
      evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
      int length;
-     const Eina_Unicode unicode_event[2] = { emoticon_info[index].code, 0 };
+     const Eina_Unicode unicode_event[2] = { (Eina_Unicode)emoticon_info[index].code, 0 };
      char* utf_8 = eina_unicode_unicode_to_utf8(unicode_event, &length);
      elm_object_part_text_set(btn, "elm.text", utf_8);
 
@@ -424,7 +417,7 @@ Evas_Object* get_recent_emoticon_button(Evas_Object* parent, int index){
      evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
      int length;
-     const Eina_Unicode unicode_event[2] = { emoticon_info[recent_emoji_list.at(index)].code, 0 };
+     const Eina_Unicode unicode_event[2] = { (Eina_Unicode)emoticon_info[recent_emoji_list.at(index)].code, 0 };
      char* utf_8 = eina_unicode_unicode_to_utf8(unicode_event, &length);
      elm_object_part_text_set(btn, "elm.text", utf_8);
 
@@ -481,7 +474,7 @@ static void _emoticon_gl_content_unswallowed_cb(void *data, Evas_Object *obj, vo
             emoticon_contents_pool[index+2].used = 0;
         }
     } else if (!strcmp(itc->item_style, "3button_flat_recent")) {
-        int index = (int)elm_object_item_data_get(it);
+        unsigned int index = (int)elm_object_item_data_get(it);
         //PRINTFUNC(DLOG_DEBUG,"index = %d",index);
 
         if (index < recent_emoji_list.size()) {
@@ -499,7 +492,7 @@ static void _emoticon_gl_content_unswallowed_cb(void *data, Evas_Object *obj, vo
 static Evas_Object * __emoticon_gl_recent_content_get(void *data, Evas_Object *obj, const char *part)
 {
     if (is_content_reuse_on) {
-        int index = (int)data;
+        unsigned int index = (unsigned int)data;
         int new_index = 0;
 
     //PRINTFUNC(DLOG_DEBUG,"%s %d", part, index);
@@ -525,7 +518,7 @@ static Evas_Object * __emoticon_gl_recent_content_get(void *data, Evas_Object *o
             return btn;
         }
     } else {
-        int index = (int)data;
+        unsigned int index = (unsigned int)data;
         int new_index = 0;
 
     //    PRINTFUNC(DLOG_DEBUG,"%s %d", part, index);
@@ -579,7 +572,7 @@ static Evas_Object * __emoticon_gl_emoticon_content_get(void *data, Evas_Object
             elm_object_part_text_set(btn, "elm.text", strdup(utf_8));
 #else
             int length;
-            const Eina_Unicode unicode_event[2] = { emoticon_info[new_index].code, 0 };
+            const Eina_Unicode unicode_event[2] = { (Eina_Unicode)emoticon_info[new_index].code, 0 };
             char* utf_8 = eina_unicode_unicode_to_utf8(unicode_event, &length);
             elm_object_part_text_set(btn, "elm.text", utf_8);
             evas_object_data_set(btn, "index", (void*)new_index);
@@ -627,7 +620,7 @@ void _create_reusable_recents(Evas_Object *parent)
         return;
     }
 
-    int i;
+    unsigned int i;
     for (i = 0; i < recent_emoji_list.size(); i++ ) {
         emoticon_recents_pool[i].index = i;
         emoticon_recents_pool[i].content = get_recent_emoticon_button(parent, i);
@@ -792,7 +785,7 @@ void _update_emoticon_items(void *data)
     if (!gl)
         return;
 
-    int i;
+    unsigned int i;
     Elm_Object_Item *it = NULL;
     Elm_Object_Item *first_it = NULL;