elementary: updated sources to fix warnings.

Signed-off-by: Aharon Hillel <a.hillel@partner.samsung.com>
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@68336 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/bin/test_box.c b/src/bin/test_box.c
index 6008753..82e290d 100644 (file)
--- a/src/bin/test_box.c
+++ b/src/bin/test_box.c
@@ -343,10 +343,10 @@ _index_get(void)
 }
 
 static void
-_index_remove(int index)
+_index_remove(int i)
 {
-   if (index >= ICON_MAX) return;
-   radio_index[index] = EINA_FALSE;
+   if (i >= ICON_MAX) return;
+   radio_index[i] = EINA_FALSE;
 }
 
 static void
@@ -361,21 +361,21 @@ static Evas_Object *
 _radio_new(Evas_Object *obj)
 {
    Evas_Object *ic, *rd;
-   int index;
+   int idx;
    char buf[PATH_MAX];
    Evas_Object *rdg;
 
-   index = _index_get();
-   if (index == -1) return NULL;
+   idx = _index_get();
+   if (idx == -1) return NULL;
 
    ic = elm_icon_add(obj);
    snprintf(buf, sizeof(buf), "%s/images/icon_%02d.png",
-            elm_app_data_dir_get(), index);
+            elm_app_data_dir_get(), idx);
    elm_icon_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
 
    rd = elm_radio_add(obj);
-   elm_radio_state_value_set(rd, index);
+   elm_radio_state_value_set(rd, idx);
    evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(rd, EVAS_HINT_FILL, 0.5);
    elm_object_part_content_set(rd, "icon", ic);

diff --git a/src/bin/test_calendar.c b/src/bin/test_calendar.c
index 246adb4..8bc5161 100644 (file)
--- a/src/bin/test_calendar.c
+++ b/src/bin/test_calendar.c
@@ -172,9 +172,9 @@ _print_cal_info(Evas_Object *cal, Evas_Object *en)
    int year_min, year_max;
    Eina_Bool sel_enabled;
    const char **wds;
-   struct tm stime;
+   struct tm stm;
 
-   if (!elm_calendar_selected_time_get(cal, &stime))
+   if (!elm_calendar_selected_time_get(cal, &stm))
      return;
 
    interval = elm_calendar_interval_get(cal);
@@ -186,7 +186,7 @@ _print_cal_info(Evas_Object *cal, Evas_Object *en)
             "  Day: %i, Mon: %i, Year %i, WeekDay: %i<br/>"
             "  Interval: %0.2f, Year_Min: %i, Year_Max %i, Sel Enabled : %i<br/>"
             "  Weekdays: %s, %s, %s, %s, %s, %s, %s<br/>",
-            stime.tm_mday, stime.tm_mon, stime.tm_year + 1900, stime.tm_wday,
+            stm.tm_mday, stm.tm_mon, stm.tm_year + 1900, stm.tm_wday,
             interval, year_min, year_max, sel_enabled,
             wds[0], wds[1], wds[2], wds[3], wds[4], wds[5], wds[6]);
 
@@ -200,10 +200,10 @@ _print_cal_info_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
 }
 
 static char *
-_format_month_year(struct tm *stime)
+_format_month_year(struct tm *stm)
 {
    char buf[32];
-   if (!strftime(buf, sizeof(buf), "%b %y", stime)) return NULL;
+   if (!strftime(buf, sizeof(buf), "%b %y", stm)) return NULL;
    return strdup(buf);
 }
 

diff --git a/src/bin/test_gengrid.c b/src/bin/test_gengrid.c
index e285e12..0146e0c 100644 (file)
--- a/src/bin/test_gengrid.c
+++ b/src/bin/test_gengrid.c
@@ -60,14 +60,14 @@ set_api_state(api_data *api)
 
       case GRID_TOOLTIP_SET_TEXT: /* 6 */
            {
-              Elm_Gengrid_Item *item = elm_gengrid_first_item_get(grid);
+              Elm_Object_Item *item = elm_gengrid_first_item_get(grid);
               elm_gengrid_item_tooltip_text_set(item, "This is the first item");
            }
          break;
 
       case GRID_TOOLTIP_UNSET: /* 7 */
            {
-              Elm_Gengrid_Item *item = elm_gengrid_first_item_get(grid);
+              Elm_Object_Item *item = elm_gengrid_first_item_get(grid);
               elm_gengrid_item_tooltip_unset(item);
            }
          break;

diff --git a/src/bin/test_genlist.c b/src/bin/test_genlist.c
index 2d85b43..32dfbe2 100644 (file)
--- a/src/bin/test_genlist.c
+++ b/src/bin/test_genlist.c
@@ -38,12 +38,12 @@ set_api_state(api_data *api)
    switch(api->state)
      {/* Put all api-changes under switch */
       case HORIZONTAL_SET: /* 0 */
-         elm_genlist_horizontal_set(gl, ELM_LIST_LIMIT);
+         elm_genlist_mode_set(gl, ELM_LIST_LIMIT);
          break;
 
       case NO_SELECT_MODE_SET: /* 1 */
          elm_genlist_no_select_mode_set(gl, EINA_TRUE);
-         elm_genlist_horizontal_set(gl, ELM_LIST_SCROLL); /* Back to default */
+         elm_genlist_mode_set(gl, ELM_LIST_SCROLL); /* Back to default */
          break;
 
       case COMPRESS_MODE_SET: /* 2 */
@@ -2373,13 +2373,13 @@ Evas_Object *gl15_content_get(void *data, Evas_Object *obj, const char *part)
      }
    else if (!strcmp(part, "elm.edit.icon.2"))
      {
-        Evas_Object *ic = elm_icon_add(obj);
+        Evas_Object *icn = elm_icon_add(obj);
         snprintf(buf, sizeof(buf), "%s/images/icon_06.png", PACKAGE_DATA_DIR);
-        elm_icon_file_set(ic, buf, NULL);
-        evas_object_propagate_events_set(ic, EINA_FALSE);
-        evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
-        evas_object_smart_callback_add(ic, "clicked", _edit_icon_clicked_cb, (void *)tit->item);
-        return ic;
+        elm_icon_file_set(icn, buf, NULL);
+        evas_object_propagate_events_set(icn, EINA_FALSE);
+        evas_object_size_hint_aspect_set(icn, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
+        evas_object_smart_callback_add(icn, "clicked", _edit_icon_clicked_cb, (void *)tit->item);
+        return icn;
      }
    else return NULL;
 }

diff --git a/src/bin/test_index.c b/src/bin/test_index.c
index 23e61bd..2f8e4d9 100644 (file)
--- a/src/bin/test_index.c
+++ b/src/bin/test_index.c
@@ -7,7 +7,7 @@
 struct _Idx_Data_Type
 {
    Evas_Object *id;  /* Pointer to Index */
-   Elm_Genlist_Item *item; /* Item we use for search */
+   Elm_Object_Item *item; /* Item we use for search */
 };
 typedef struct _Idx_Data_Type Idx_Data_Type;
 
@@ -55,16 +55,16 @@ set_api_state(api_data *api)
          break;
 
       case INDEX_ITEM_DEL: /* 4 */
-         elm_index_item_del(d->id, elm_index_item_find(d->id, d->item));
+         elm_object_item_del(elm_index_item_find(d->id, d->item));
          break;
 
       case INDEX_ITEM_FIND: /* 5 */
            {
-              Elm_Index_Item *i = elm_index_item_find(d->id, d->item);
+              Elm_Object_Item *i = elm_index_item_find(d->id, d->item);
               if(i)
                 {
                    printf("Item Find - Found Item.\n");
-                   elm_index_item_del(d->id, i);
+                   elm_object_item_del(i);
                 }
            }
          break;
@@ -202,7 +202,7 @@ test_index(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
              elm_index_item_append(id, buf, glit);
 
              if (*buf == 'G')  /* Just init dt->item later used in API test */
-               api->dt.item = it;
+               api->dt.item = glit;
           }
         j += 2;
      }

diff --git a/src/edje_externals/elm.c b/src/edje_externals/elm.c
index b400d12..4f9a8f3 100644 (file)
--- a/src/edje_externals/elm.c
+++ b/src/edje_externals/elm.c
@@ -36,9 +36,9 @@ _external_obj_del(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *obj
 }
 
 void
-external_signal(void *data __UNUSED__, Evas_Object *obj, const char *signal, const char *source)
+external_signal(void *data __UNUSED__, Evas_Object *obj, const char *sig, const char *source)
 {
-       char *_signal = strdup(signal);
+       char *_signal = strdup(sig);
        char *p = _signal;
        Evas_Object *content;
 
@@ -48,7 +48,7 @@ external_signal(void *data __UNUSED__, Evas_Object *obj, const char *signal, con
 
        if((*p=='\0') || (*(p+1)!=':'))
        {
-               ERR("Invalid External Signal received: '%s' '%s'\n", signal, source);
+               ERR("Invalid External Signal received: '%s' '%s'\n", sig, source);
                free(_signal);
                return ;
        }
@@ -68,7 +68,7 @@ external_signal(void *data __UNUSED__, Evas_Object *obj, const char *signal, con
        content = type->content_get(type->data, obj, _signal);
        free(_signal);
        if(content)
-               edje_object_signal_emit(content, signal + (p - _signal), source);
+               edje_object_signal_emit(content, sig + (p - _signal), source);
 }
 
 const char *