rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=ce8cf45dd551371155cc3340b7b57cf872e30668
commit ce8cf45dd551371155cc3340b7b57cf872e30668 Author: Andrii Kroitor <an.kroi...@samsung.com> Date: Thu Jul 23 17:49:05 2015 +0300 groupedit: remove unused style_get/set functions --- src/bin/ui/workspace/groupedit.c | 19 ---- src/bin/ui/workspace/groupedit.h | 30 ------ tests/test_groupedit/groupedit_style_get.c | 109 ---------------------- tests/test_groupedit/groupedit_style_set.c | 145 ----------------------------- tests/test_groupedit/test_groupedit.h | 7 -- 5 files changed, 310 deletions(-) diff --git a/src/bin/ui/workspace/groupedit.c b/src/bin/ui/workspace/groupedit.c index 0733fa4..2b8a917 100644 --- a/src/bin/ui/workspace/groupedit.c +++ b/src/bin/ui/workspace/groupedit.c @@ -265,25 +265,6 @@ groupedit_add(Evas_Object *parent) return obj; } -Eina_Bool -groupedit_style_set(Evas_Object *obj, const char *style) -{ - WS_GROUPEDIT_DATA_GET(obj, sd); - assert(style != NULL); - - if (!strcmp(sd->style, style)) return true; - _style_set(obj, style); - - return true; -} - -const char * -groupedit_style_get(Evas_Object *obj) -{ - WS_GROUPEDIT_DATA_GET(obj, sd); - return sd->style; -} - /******************************************************************************/ /******************************************************************************/ diff --git a/src/bin/ui/workspace/groupedit.h b/src/bin/ui/workspace/groupedit.h index ab43681..a7c3768 100644 --- a/src/bin/ui/workspace/groupedit.h +++ b/src/bin/ui/workspace/groupedit.h @@ -72,36 +72,6 @@ TODO("aspect for groupedit") //Eina_Bool //ws_groupedit_aspect_set(Evas_Object *obj, double x, double y); -/** - * Set the new style to groupedit object. - * - * @param obj The groupedit object, - * @param style The name of style that will be set. - * - * @return EINA_TRUE on success or EINA_FALSE, on errors. - * - * @note if the style description missing for some groupedit parts (container, - * handlers), will be used default style. - * - * @ingroup Groupedit - */ -Eina_Bool -groupedit_style_set(Evas_Object *obj, const char *style); - -/** - * Get the current style name of groupedit. - * - * @param obj The groupedit object. - * - * @return the style name. - * - * @ingroup Groupedit - */ -const char * -groupedit_style_get(Evas_Object *obj); - - - /******************************************************************************/ /******************************************************************************/ diff --git a/tests/test_groupedit/groupedit_style_get.c b/tests/test_groupedit/groupedit_style_get.c deleted file mode 100644 index 2418a0b..0000000 --- a/tests/test_groupedit/groupedit_style_get.c +++ /dev/null @@ -1,109 +0,0 @@ -/** - * Edje Theme Editor - * Copyright (C) 2013-2014 Samsung Electronics. - * - * This file is part of Edje Theme Editor. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; If not, see www.gnu.org/licenses/lgpl.html. - */ - -#include "test_groupedit.h" - -/** - * @addtogroup groupedit_test - * @{ - * @addtogroup groupedit_style_get - * @{ - * Groupedit - * <TABLE> - * @} - */ - -/** - * @addtogroup groupedit_style_get - * @{ - * <tr> - * <td>groupedit_style_get</td> - * <td>groupedit_style_get_test_p</td> - * <td> - * @precondition - * @step 1 initialize elementary library - * @step 2 create parent window - * @step 3 create a groupedit - * - * @procedure - * @step 1 set the new style to groupedit - * @step 2 get the style name from groupedit - * @step 3 check returned value - * </td> - * <td>(Evas_Object *) groupedit, "default"</td> - * <td>EINA_TRUE, "default"</td> - * </tr> - * @} - */ -EFLETE_TEST(groupedit_style_get_test_p) -{ - Evas_Object *parent, *groupedit; - - elm_init(0, 0); - - parent = elm_win_add(NULL, "test", ELM_WIN_BASIC); - - groupedit = groupedit_add(parent); - groupedit_style_set(groupedit, "default"); - ck_assert_msg(strcmp(groupedit_style_get(groupedit), "default") == 0, - "Failed to get the groupedit a style."); - - evas_object_del(parent); - - elm_shutdown(); -} -END_TEST - -/** - * @addtogroup groupedit_style_get - * @{ - * <tr> - * <td>groupedit_style_get</td> - * <td>groupedit_style_get_test_n</td> - * <td> - * @precondition - * @step 1 initialize elementary library - * - * @procedure - * @step 1 get the a new style name - * @step 2 check returned value - * </td> - * <td>NULL, "default"</td> - * <td>EINA_FALSE</td> - * </tr> - * @} - */ -EFLETE_TEST(groupedit_style_get_test_n) -{ - elm_init(0, 0); - - ck_assert_msg(!groupedit_style_get(NULL), - "Getting a style from NULL object."); - - elm_shutdown(); -} -END_TEST - -/** - * @addtogroup groupedit_style_get - * @{ - * </TABLE> - * @} - * @} - */ diff --git a/tests/test_groupedit/groupedit_style_set.c b/tests/test_groupedit/groupedit_style_set.c deleted file mode 100644 index 96e8195..0000000 --- a/tests/test_groupedit/groupedit_style_set.c +++ /dev/null @@ -1,145 +0,0 @@ -/** - * Edje Theme Editor - * Copyright (C) 2013-2014 Samsung Electronics. - * - * This file is part of Edje Theme Editor. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; If not, see www.gnu.org/licenses/lgpl.html. - */ - -#include "test_groupedit.h" - -/** - * @addtogroup groupedit_test - * @{ - * @addtogroup groupedit_style_set - * @{ - * Groupedit - * <TABLE> - * @} - */ - -/** - * @addtogroup groupedit_style_set - * @{ - * <tr> - * <td>groupedit_style_set</td> - * <td>groupedit_style_set_test_p</td> - * <td> - * @precondition - * @step 1 initialize elementary library - * @step 2 create parent window - * @step 3 create a groupedit - * - * @procedure - * @step 1 set the new style to groupedit - * @step 2 check returned value - * </td> - * <td>(Evas_Object *) groupedit, "default"</td> - * <td>EINA_TRUE</td> - * </tr> - * @} - */ -EFLETE_TEST(groupedit_style_set_test_p) -{ - Evas_Object *parent, *groupedit; - - elm_init(0, 0); - - parent = elm_win_add(NULL, "test", ELM_WIN_BASIC); - - groupedit = groupedit_add(parent); - ck_assert_msg(groupedit_style_set(groupedit, "default"), - "Failed to set the groupedit a style."); - - evas_object_del(parent); - - elm_shutdown(); -} -END_TEST - -/** - * @addtogroup groupedit_style_set - * @{ - * <tr> - * <td>groupedit_style_set</td> - * <td>groupedit_style_set_test_n1</td> - * <td> - * @precondition - * @step 1 initialize elementary library - * - * @procedure - * @step 1 set the a new style name - * @step 2 check returned value - * </td> - * <td>NULL, "default"</td> - * <td>EINA_FALSE</td> - * </tr> - * @} - */ -EFLETE_TEST(groupedit_style_set_test_n1) -{ - elm_init(0, 0); - - ck_assert_msg(!groupedit_style_set(NULL, "default"), - "Setted to NULL object style."); - - elm_shutdown(); -} -END_TEST - -/** - * @addtogroup groupedit_style_set - * @{ - * <tr> - * <td>groupedit_style_set</td> - * <td>groupedit_style_set_test_n2</td> - * <td> - * @precondition - * @step 1 initialize elementary library - * @step 2 create parent window - * @step 3 create a groupedit - * - * @procedure - * @step 1 call groupedit_style_set - * @step 2 check returned value - * </td> - * <td>(Evas_Object *) groupedit, NULL</td> - * <td>EINA_FALSE</td> - * </tr> - * @} - */ -EFLETE_TEST(groupedit_style_set_test_n2) -{ - Evas_Object *parent, *groupedit; - - elm_init(0, 0); - - parent = elm_win_add(NULL, "test", ELM_WIN_BASIC); - - groupedit = groupedit_add(parent); - ck_assert_msg(!groupedit_style_set(groupedit, NULL), - "Setted NULL style to groupedit object"); - - elm_shutdown(); -} -END_TEST - - -/** - * @addtogroup groupedit_style_set - * @{ - * </TABLE> - * @} - * @} - */ diff --git a/tests/test_groupedit/test_groupedit.h b/tests/test_groupedit/test_groupedit.h index b1d5aae..23ab5e0 100644 --- a/tests/test_groupedit/test_groupedit.h +++ b/tests/test_groupedit/test_groupedit.h @@ -52,13 +52,6 @@ void groupedit_container_size_set_test_n(int); void groupedit_container_size_get_test_p(int); void groupedit_container_size_get_test_n(int); -void groupedit_style_set_test_p(int); -void groupedit_style_set_test_n1(int); -void groupedit_style_set_test_n2(int); - -void groupedit_style_get_test_p(int); -void groupedit_style_get_test_n(int); - void groupedit_edit_object_set_test_p(int); void groupedit_edit_object_unset_test_p(int); --