[Refactoring] Changed elm_xxx_label_set/get() APIs to elm_object_text_set/get().

Change-Id: I741a1527348b9841bc5e9bf6daeec6c7b23f4968

diff --git a/src/lib/elc_navigationbar_ex.c b/src/lib/elc_navigationbar_ex.c
index 5d377b9..5668531 100644 (file)
--- a/src/lib/elc_navigationbar_ex.c
+++ b/src/lib/elc_navigationbar_ex.c
@@ -688,7 +688,7 @@ elm_navigationbar_ex_item_title_button_set(Elm_Navigationbar_ex_Item* item, char
         snprintf(buf, sizeof(buf), "elm.swallow.btn%d", button_type);\r
      }\r
    if (btn_label)\r
-     elm_button_label_set(btn, btn_label);\r
+     elm_object_text_set(btn, btn_label);\r
    if (icon)\r
      elm_button_icon_set(btn, icon);\r
    elm_object_focus_allow_set(btn, EINA_FALSE);\r

diff --git a/src/lib/elm_controlbar.c b/src/lib/elm_controlbar.c
index 5346585..7f9fe27 100644 (file)
--- a/src/lib/elm_controlbar.c
+++ b/src/lib/elm_controlbar.c
@@ -931,7 +931,7 @@ _create_item_layout(Evas_Object * parent, Elm_Controlbar_Item * it, Evas_Object
    elm_layout_content_set(obj, "item", *item);
 
    if (it->text)
-     elm_button_label_set(*item, it->text);
+     elm_object_text_set(*item, it->text);
    if (it->icon_path)
      *icon = _create_item_icon(*item, it, "elm.swallow.icon");
 
@@ -2153,7 +2153,7 @@ elm_controlbar_item_label_set(Elm_Controlbar_Item * it, const char *label)
    if (label != NULL)
      {
         it->text = eina_stringshare_add(label);
-        elm_button_label_set(it->base_item, it->text);
+        elm_object_text_set(it->base_item, it->text);
      }
    if (it->wd->disabled || it->disabled)
      elm_widget_disabled_set(it->base_item, EINA_TRUE);

diff --git a/src/lib/elm_datefield.c b/src/lib/elm_datefield.c
index fc294f7..e8db405 100644 (file)
--- a/src/lib/elm_datefield.c
+++ b/src/lib/elm_datefield.c
@@ -227,7 +227,7 @@ _ampm_clicked_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNU
        str = _get_i18n_string(data, PM_STR);
        if (str)
          {
-         elm_button_label_set(wd->time[TIME_AMPM], str);
+         elm_object_text_set(wd->time[TIME_AMPM], str);
             free(str);
          }
         wd->hour += HOUR_12H_MAXIMUM;
@@ -237,7 +237,7 @@ _ampm_clicked_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNU
        str = _get_i18n_string(data, AM_STR);
        if (str)
          {
-         elm_button_label_set(wd->time[TIME_AMPM], str);
+         elm_object_text_set(wd->time[TIME_AMPM], str);
             free(str);
          }
         wd->hour -= HOUR_12H_MAXIMUM;
@@ -419,7 +419,7 @@ _entry_unfocused_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
                  i18n_str = _get_i18n_string(data, PM_STR);
                  if (i18n_str)
                    {
-               elm_button_label_set(wd->time[TIME_AMPM], i18n_str);
+               elm_object_text_set(wd->time[TIME_AMPM], i18n_str);
                       free(i18n_str);
                    }
               }
@@ -428,7 +428,7 @@ _entry_unfocused_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
                  i18n_str = _get_i18n_string(data, AM_STR);
                  if (i18n_str)
                    {
-               elm_button_label_set(wd->time[TIME_AMPM], i18n_str);
+               elm_object_text_set(wd->time[TIME_AMPM], i18n_str);
                       free(i18n_str);
                    }
               }
@@ -780,7 +780,7 @@ _date_update(Evas_Object *obj)
             i18n_str = _get_i18n_string(obj, PM_STR);
             if (i18n_str)
               {
-              elm_button_label_set(wd->time[TIME_AMPM], i18n_str);
+              elm_object_text_set(wd->time[TIME_AMPM], i18n_str);
                  free(i18n_str);
               }
           }
@@ -790,7 +790,7 @@ _date_update(Evas_Object *obj)
             i18n_str = _get_i18n_string(obj, AM_STR);
             if (i18n_str)
               {
-              elm_button_label_set(wd->time[TIME_AMPM], i18n_str);
+              elm_object_text_set(wd->time[TIME_AMPM], i18n_str);
                  free(i18n_str);
               }
           }

diff --git a/src/lib/elm_dayselector.c b/src/lib/elm_dayselector.c
index 1b0c97c..798fc7c 100644 (file)
--- a/src/lib/elm_dayselector.c
+++ b/src/lib/elm_dayselector.c
@@ -191,7 +191,7 @@ elm_dayselector_add(Evas_Object *parent)
         wd->check[idx]=elm_check_add(wd->base);
         elm_widget_sub_object_add(obj, wd->check[idx]);
         evas_object_smart_callback_add(wd->check[idx], "changed", _check_clicked, obj);
-        elm_check_label_set(wd->check[idx], label[idx] );
+        elm_object_text_set(wd->check[idx], label[idx] );
         edje_object_part_swallow(wd->base, day_name[idx], wd->check[idx]);
         elm_object_style_set(wd->check[idx], style_name[idx]);
      }

diff --git a/src/lib/elm_multibuttonentry.c b/src/lib/elm_multibuttonentry.c
index 9f72c79..7d7d692 100644 (file)
--- a/src/lib/elm_multibuttonentry.c
+++ b/src/lib/elm_multibuttonentry.c
@@ -393,7 +393,7 @@ _contracted_state_set(Evas_Object *obj, int contracted)
                        if (count > 0)
                          {
                             snprintf(buf, sizeof(buf), "... + %d", count);
-                            elm_label_label_set(wd->end, buf);
+                            elm_object_text_set(wd->end, buf);
                             evas_object_size_hint_min_get(wd->end, &w_label_count, NULL);
                          }
 
@@ -405,7 +405,7 @@ _contracted_state_set(Evas_Object *obj, int contracted)
 
                             count++;
                             snprintf(buf, sizeof(buf), "... + %d", count);
-                            elm_label_label_set(wd->end, buf);
+                            elm_object_text_set(wd->end, buf);
                             evas_object_size_hint_min_get(wd->end, &w_label_count, NULL);
 
                             elm_box_pack_end(wd->box, wd->end);

diff --git a/src/lib/elm_popup.c b/src/lib/elm_popup.c
index 5cf68b7..0e4a9de 100644 (file)
--- a/src/lib/elm_popup.c
+++ b/src/lib/elm_popup.c
@@ -202,7 +202,7 @@ _elm_popup_add_button(Evas_Object *obj, const char *text, int response_id)
    btn = elm_button_add(obj);
    snprintf(buf, sizeof(buf), "popup_button/%s", elm_widget_style_get(obj));
    elm_object_style_set(btn, buf);
-   elm_button_label_set(btn, text);
+   elm_object_text_set(btn, text);
    adata->response_id = response_id;
    adata->obj = obj;
    adata->btn = btn;
@@ -454,7 +454,7 @@ elm_popup_desc_get(Evas_Object *obj)
    Widget_Data *wd = elm_widget_data_get(obj);
 
    if (!wd) return NULL;
-   return elm_label_label_get(wd->desc_label);
+   return elm_object_text_get(wd->desc_label);
 }
 
 /**

diff --git a/src/lib/elm_searchbar.c b/src/lib/elm_searchbar.c
index fda1424..352ed98 100644 (file)
--- a/src/lib/elm_searchbar.c
+++ b/src/lib/elm_searchbar.c
@@ -220,7 +220,7 @@ EAPI Evas_Object *elm_searchbar_add(Evas_Object *parent)
    snprintf(buf, sizeof(buf), "searchbar/%s", elm_widget_style_get(obj));
    elm_object_style_set(wd->cancel_btn, buf);
 
-   elm_button_label_set(wd->cancel_btn, "Cancel");
+   elm_object_text_set(wd->cancel_btn, "Cancel");
    evas_object_smart_callback_add(wd->cancel_btn, "clicked", _cancel_clicked, obj);
    elm_widget_sub_object_add(obj, wd->cancel_btn);