From 78ee2d760ceb673ce49aea6544744552b0c8f82a Mon Sep 17 00:00:00 2001 From: hermet Date: Sat, 26 Nov 2011 04:55:03 +0000 Subject: [PATCH] elementary/toolbar, table, box - removed *homongenous* APIs git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@65603 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/Elementary.h.in | 49 ++++--------------------------------------------- src/lib/elm_box.c | 12 ------------ src/lib/elm_table.c | 12 ------------ src/lib/elm_toolbar.c | 12 ------------ 4 files changed, 4 insertions(+), 81 deletions(-) diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in index c06872c..eafd958 100644 --- a/src/lib/Elementary.h.in +++ b/src/lib/Elementary.h.in @@ -5850,8 +5850,6 @@ extern "C" { * @return EINA_TRUE if it's homogeneous, EINA_FALSE otherwise */ EAPI Eina_Bool elm_box_homogeneous_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - EINA_DEPRECATED EAPI void elm_box_homogenous_set(Evas_Object *obj, Eina_Bool homogenous) EINA_ARG_NONNULL(1); - EINA_DEPRECATED EAPI Eina_Bool elm_box_homogenous_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); /** * Add an object to the beginning of the pack list * @@ -7905,14 +7903,6 @@ extern "C" { */ EAPI Eina_Bool elm_table_homogeneous_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); /** - * @warning Use elm_table_homogeneous_set() instead - */ - EINA_DEPRECATED EAPI void elm_table_homogenous_set(Evas_Object *obj, Eina_Bool homogenous) EINA_ARG_NONNULL(1); - /** - * @warning Use elm_table_homogeneous_get() instead - */ - EINA_DEPRECATED EAPI Eina_Bool elm_table_homogenous_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - /** * @brief Set padding between cells. * * @param obj The layout object. @@ -15251,7 +15241,7 @@ extern "C" { EAPI Elm_Toolbar_Shrink_Mode elm_toolbar_mode_shrink_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); /** - * Enable/disable homogenous mode. + * Enable/disable homogeneous mode. * * @param obj The toolbar object * @param homogeneous Assume the items within the toolbar are of the @@ -15265,7 +15255,7 @@ extern "C" { EAPI void elm_toolbar_homogeneous_set(Evas_Object *obj, Eina_Bool homogeneous) EINA_ARG_NONNULL(1); /** - * Get whether the homogenous mode is enabled. + * Get whether the homogeneous mode is enabled. * * @param obj The toolbar object. * @return Assume the items within the toolbar are of the same height @@ -15276,37 +15266,6 @@ extern "C" { * @ingroup Toolbar */ EAPI Eina_Bool elm_toolbar_homogeneous_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - - /** - * Enable/disable homogenous mode. - * - * @param obj The toolbar object - * @param homogeneous Assume the items within the toolbar are of the - * same size (EINA_TRUE = on, EINA_FALSE = off). Default is @c EINA_FALSE. - * - * This will enable the homogeneous mode where items are of the same size. - * @see elm_toolbar_homogeneous_get() - * - * @deprecated use elm_toolbar_homogeneous_set() instead. - * - * @ingroup Toolbar - */ - EINA_DEPRECATED EAPI void elm_toolbar_homogenous_set(Evas_Object *obj, Eina_Bool homogenous) EINA_ARG_NONNULL(1); - - /** - * Get whether the homogenous mode is enabled. - * - * @param obj The toolbar object. - * @return Assume the items within the toolbar are of the same height - * and width (EINA_TRUE = on, EINA_FALSE = off). - * - * @see elm_toolbar_homogeneous_set() - * @deprecated use elm_toolbar_homogeneous_get() instead. - * - * @ingroup Toolbar - */ - EINA_DEPRECATED EAPI Eina_Bool elm_toolbar_homogenous_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); - /** * Set the parent object of the toolbar items' menus. * @@ -18829,7 +18788,7 @@ extern "C" { */ EINA_DEPRECATED EAPI void elm_genlist_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce) EINA_ARG_NONNULL(1); /** - * Enable/disable homogenous mode. + * Enable/disable homogeneous mode. * * @param obj The genlist object * @param homogeneous Assume the items within the genlist are of the @@ -18848,7 +18807,7 @@ extern "C" { */ EAPI void elm_genlist_homogeneous_set(Evas_Object *obj, Eina_Bool homogeneous) EINA_ARG_NONNULL(1); /** - * Get whether the homogenous mode is enabled. + * Get whether the homogeneous mode is enabled. * * @param obj The genlist object * @return Assume the items within the genlist are of the same height diff --git a/src/lib/elm_box.c b/src/lib/elm_box.c index b53d698..fc97788 100644 --- a/src/lib/elm_box.c +++ b/src/lib/elm_box.c @@ -448,12 +448,6 @@ elm_box_homogeneous_set(Evas_Object *obj, Eina_Bool homogeneous) } */ } -EINA_DEPRECATED EAPI void -elm_box_homogenous_set(Evas_Object *obj, Eina_Bool homogenous) -{ - elm_box_homogeneous_set(obj, homogenous); -} - EAPI Eina_Bool elm_box_homogeneous_get(const Evas_Object *obj) { @@ -463,12 +457,6 @@ elm_box_homogeneous_get(const Evas_Object *obj) return wd->homogeneous; } -EINA_DEPRECATED EAPI Eina_Bool -elm_box_homogenous_get(const Evas_Object *obj) -{ - return elm_box_homogeneous_get(obj); -} - EAPI void elm_box_pack_start(Evas_Object *obj, Evas_Object *subobj) { diff --git a/src/lib/elm_table.c b/src/lib/elm_table.c index 49b3c0f..532ccf4 100644 --- a/src/lib/elm_table.c +++ b/src/lib/elm_table.c @@ -157,12 +157,6 @@ elm_table_homogeneous_set(Evas_Object *obj, Eina_Bool homogeneous) evas_object_table_homogeneous_set(wd->tbl, homogeneous); } -EINA_DEPRECATED EAPI void -elm_table_homogenous_set(Evas_Object *obj, Eina_Bool homogenous) -{ - elm_table_homogeneous_set(obj, homogenous); -} - EAPI Eina_Bool elm_table_homogeneous_get(const Evas_Object *obj) { @@ -172,12 +166,6 @@ elm_table_homogeneous_get(const Evas_Object *obj) return evas_object_table_homogeneous_get(wd->tbl); } -EINA_DEPRECATED EAPI Eina_Bool -elm_table_homogenous_get(const Evas_Object *obj) -{ - return elm_table_homogeneous_get(obj); -} - EAPI void elm_table_padding_set(Evas_Object *obj, Evas_Coord horizontal, Evas_Coord vertical) { diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c index eb14738..79f4314 100644 --- a/src/lib/elm_toolbar.c +++ b/src/lib/elm_toolbar.c @@ -1660,12 +1660,6 @@ elm_toolbar_homogeneous_set(Evas_Object *obj, Eina_Bool homogeneous) evas_object_smart_calculate(wd->bx); } -EINA_DEPRECATED EAPI void -elm_toolbar_homogenous_set(Evas_Object *obj, Eina_Bool homogenous) -{ - elm_toolbar_homogeneous_set(obj, homogenous); -} - EAPI Eina_Bool elm_toolbar_homogeneous_get(const Evas_Object *obj) { @@ -1676,12 +1670,6 @@ elm_toolbar_homogeneous_get(const Evas_Object *obj) return wd->homogeneous; } -EINA_DEPRECATED EAPI Eina_Bool -elm_toolbar_homogenous_get(const Evas_Object *obj) -{ - return elm_toolbar_homogeneous_get(obj); -} - EAPI void elm_toolbar_menu_parent_set(Evas_Object *obj, Evas_Object *parent) { -- 2.7.4