From f07d0d3ff65c82ca9c04059f54fcf81bef32f55c Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <zmike@osg.samsung.com>
Date: Wed, 14 Feb 2018 21:14:52 -0500
Subject: [PATCH] naviframe: remove 'style' property

---
 src/lib/elementary/elc_naviframe.c        | 26 +++++++++++++----------
 src/lib/elementary/elc_naviframe_legacy.h | 21 ++++++++++++++++++
 src/lib/elementary/elm_naviframe_item.eo  | 12 +----------
 src/lib/elementary/elm_widget_naviframe.h |  1 -
 4 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index d05ad4701e..c683a6e721 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -181,7 +181,6 @@ _item_free(Elm_Naviframe_Item_Data *it)
 
    ELM_NAVIFRAME_DATA_GET(WIDGET(it), sd);
 
-   eina_stringshare_del(it->style);
    eina_stringshare_del(it->title_label);
    eina_stringshare_del(it->subtitle_label);
 
@@ -334,12 +333,12 @@ _item_style_set(Elm_Naviframe_Item_Data *it,
    if (!item_style)
      {
         strcpy(buf, "item/basic");
-        eina_stringshare_replace(&it->style, "basic");
+        elm_wdg_item_style_set(efl_super(EO_OBJ(it), ELM_NAVIFRAME_ITEM_CLASS), "basic");
      }
    else
      {
         snprintf(buf, sizeof(buf), "item/%s", item_style);
-        eina_stringshare_replace(&it->style, item_style);
+        elm_wdg_item_style_set(efl_super(EO_OBJ(it), ELM_NAVIFRAME_ITEM_CLASS),  item_style);
      }
 
    if (!elm_layout_theme_set(VIEW(it), "naviframe", buf,
@@ -403,7 +402,7 @@ _elm_naviframe_efl_ui_widget_theme_apply(Eo *obj, Elm_Naviframe_Data *sd)
      {
         sstyle = efl_ui_widget_style_get(VIEW(it));
         if ((style && sstyle) && strcmp(style, sstyle))
-          _item_style_set(it, it->style);
+          _item_style_set(it, elm_wdg_item_style_get(EO_OBJ(it)));
         _item_signals_emit(it);
         _item_title_enabled_update(it, EINA_FALSE);
      }
@@ -1880,25 +1879,30 @@ _elm_naviframe_bottom_item_get(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *sd)
 }
 
 EOLIAN static void
-_elm_naviframe_item_style_set(Eo *eo_item EINA_UNUSED,
+_elm_naviframe_item_elm_widget_item_style_set(Eo *eo_item EINA_UNUSED,
                               Elm_Naviframe_Item_Data *nit,
                               const char *item_style)
 {
-   if (item_style && !strcmp(item_style, nit->style)) return;
+   if (item_style && eina_streq(item_style, elm_wdg_item_style_get(EO_OBJ(nit)))) return;
 
    if (!item_style)
-     if (!strcmp("basic", nit->style)) return;
+     if (eina_streq("basic", elm_wdg_item_style_get(EO_OBJ(nit)))) return;
 
    _item_style_set(nit, item_style);
    _item_signals_emit(nit);
    _item_title_enabled_update(nit, EINA_FALSE);
 }
 
-EOLIAN static const char *
-_elm_naviframe_item_style_get(Eo *eo_item EINA_UNUSED,
-                              Elm_Naviframe_Item_Data *nit)
+EAPI void
+elm_naviframe_item_style_set(Elm_Object_Item *obj, const char *style)
 {
-   return nit->style;
+   elm_wdg_item_style_set(obj, style);
+}
+
+EAPI const char *
+elm_naviframe_item_style_get(const Elm_Object_Item *obj)
+{
+   return elm_wdg_item_style_get(obj);
 }
 
 EINA_DEPRECATED EAPI void
diff --git a/src/lib/elementary/elc_naviframe_legacy.h b/src/lib/elementary/elc_naviframe_legacy.h
index a1b7d46303..7bcba3a6a3 100644
--- a/src/lib/elementary/elc_naviframe_legacy.h
+++ b/src/lib/elementary/elc_naviframe_legacy.h
@@ -1,2 +1,23 @@
+/**
+ * @brief Set an item style.
+ *
+ * @param[in] obj The object.
+ * @param[in] style The current item style name. @c null would be default
+ *
+ * @ingroup Elm_Naviframe_Item
+ */
+EAPI void elm_naviframe_item_style_set(Elm_Object_Item *obj, const char *style);
+
+/**
+ * @brief Get an item style.
+ *
+ * @param[in] obj The object.
+ *
+ * @return The current item style name. @c null would be default
+ *
+ * @ingroup Elm_Naviframe_Item
+ */
+EAPI const char *elm_naviframe_item_style_get(const Elm_Object_Item *obj);
+
 #include "elm_naviframe_item.eo.legacy.h"
 #include "elm_naviframe.eo.legacy.h"
diff --git a/src/lib/elementary/elm_naviframe_item.eo b/src/lib/elementary/elm_naviframe_item.eo
index 761a6692e6..9ff730cd47 100644
--- a/src/lib/elementary/elm_naviframe_item.eo
+++ b/src/lib/elementary/elm_naviframe_item.eo
@@ -6,17 +6,6 @@ class Elm.Naviframe.Item(Elm.Widget.Item, Efl.Ui.Legacy)
    legacy_prefix: elm_naviframe_item;
    eo_prefix: elm_obj_naviframe_item;
    methods {
-        @property style {
-             get {
-                 [[Get an item style.]]
-             }
-             set {
-                 [[Set an item style.]]
-             }
-             values {
-                 style: string @nullable; [[The current item style name. $null would be default]]
-             }
-        }
       pop_to {
             [[Pop the top item and delete the items between the top and the
               above one on the given item.
@@ -82,6 +71,7 @@ class Elm.Naviframe.Item(Elm.Widget.Item, Efl.Ui.Legacy)
         Elm.Widget.Item.part_text { get; set; }
         Elm.Widget.Item.part_content { get; set; }
         Elm.Widget.Item.part_content_unset;
+        Elm.Widget.Item.style { set; }
         Efl.Access.children { get; }
    }
 }
diff --git a/src/lib/elementary/elm_widget_naviframe.h b/src/lib/elementary/elm_widget_naviframe.h
index d92ea3fa50..b8db0b1a02 100644
--- a/src/lib/elementary/elm_widget_naviframe.h
+++ b/src/lib/elementary/elm_widget_naviframe.h
@@ -55,7 +55,6 @@ struct _Elm_Naviframe_Item_Data
    Evas_Display_Mode dispmode;
    Elm_Naviframe_Item_Pop_Cb pop_cb;
    void        *pop_data;
-   const char  *style;
    const char  *title_label;
    const char  *subtitle_label;