rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=b4ac5948490018d3082333ab23f73502fab9c2a9

commit b4ac5948490018d3082333ab23f73502fab9c2a9
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date:   Fri Mar 25 12:11:01 2016 +0200

    eflete: delete archic window getter
    
    Change-Id: I476693e332b2d7ce33b5c33e0102d18bc0e7ae8b
---
 src/bin/eflete.c                    |  8 -----
 src/bin/eflete.h                    |  9 -----
 src/bin/ui/image_manager.c          |  2 +-
 src/bin/ui/property_group.c         |  2 +-
 tests/Makefile.am                   |  1 -
 tests/test_eflete/main_window_get.c | 72 -------------------------------------
 tests/test_eflete/test_eflete.c     |  2 --
 tests/test_eflete/test_eflete.h     |  2 --
 8 files changed, 2 insertions(+), 96 deletions(-)

diff --git a/src/bin/eflete.c b/src/bin/eflete.c
index 6543132..9d7ac65 100644
--- a/src/bin/eflete.c
+++ b/src/bin/eflete.c
@@ -31,14 +31,6 @@ App_Data ap;
 static Eina_Bool do_block = true;
 
 Evas_Object *
-main_window_get(void)
-{
-   assert(ap.win != NULL);
-
-   return ap.win;
-}
-
-Evas_Object *
 colorselector_get(void)
 {
    if (!ap.colorsel) ap.colorsel = colorselector_add(ap.win);
diff --git a/src/bin/eflete.h b/src/bin/eflete.h
index 079298c..b3a2953 100644
--- a/src/bin/eflete.h
+++ b/src/bin/eflete.h
@@ -174,15 +174,6 @@ void
 eflete_main_loop_quit(void);
 
 /**
- * This function get pointer to main window of application.
- *
- * @return pointer to main window Evas_Object.
- * @ingroup Eflete
- */
-Evas_Object *
-main_window_get(void);
-
-/**
  * Get the colorselector object pointer.
  * The colorselector one for the entire application.
  *
diff --git a/src/bin/ui/image_manager.c b/src/bin/ui/image_manager.c
index 2d2f583..22bd011 100644
--- a/src/bin/ui/image_manager.c
+++ b/src/bin/ui/image_manager.c
@@ -491,7 +491,7 @@ image_manager_add()
 
    Image_Manager *img_mng = (Image_Manager *)mem_calloc(1, 
sizeof(Image_Manager));
 
-   img_mng->layout = elm_layout_add(main_window_get());
+   img_mng->layout = elm_layout_add(ap.win);
    elm_layout_theme_set(img_mng->layout, "layout", "image_manager", "default");
 
    img_mng->gengrid = elm_gengrid_add(img_mng->layout);
diff --git a/src/bin/ui/property_group.c b/src/bin/ui/property_group.c
index f8b5715..3b67231 100644
--- a/src/bin/ui/property_group.c
+++ b/src/bin/ui/property_group.c
@@ -1315,7 +1315,7 @@ ui_property_group_set(Evas_Object *property, Group *group)
         evas_object_size_hint_align_set(pd_group.info, EVAS_HINT_FILL, 0.0);
         elm_layout_file_set(pd_group.info, EFLETE_EDJ, 
"eflete/property/item/info");
 
-        pd_group.ctxpopup = elm_ctxpopup_add(main_window_get());
+        pd_group.ctxpopup = elm_ctxpopup_add(ap.win);
         elm_ctxpopup_direction_priority_set(pd_group.ctxpopup,
                                             ELM_CTXPOPUP_DIRECTION_DOWN,
                                             ELM_CTXPOPUP_DIRECTION_DOWN,
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0ce20c1..a6d43c5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -127,7 +127,6 @@ eflete_test_SOURCES = \
 ../tests/test_eflete/test_eflete.c \
 ../tests/test_eflete/app_init.c \
 ../tests/test_eflete/app_shutdown.c \
-../tests/test_eflete/main_window_get.c \
 ../tests/test_eflete/colorselector_get.c
 eflete_test_CFLAGS = ${FLAGS}
 eflete_test_LDADD = ${LD}
diff --git a/tests/test_eflete/main_window_get.c 
b/tests/test_eflete/main_window_get.c
deleted file mode 100644
index 967dd93..0000000
--- a/tests/test_eflete/main_window_get.c
+++ /dev/null
@@ -1,72 +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_eflete.h"
-
-/**
- * @addtogroup eflete_test
- * @{
- * @addtogroup main_window_get
- * @{
- * eflete
- * <TABLE>
- * @}
- */
-
-/**
- * @addtogroup main_window_get
- * @{
- * <tr>
- * <td>main_window_get</td>
- * <td>main_window_get_test_p</td>
- * <td>
- * @precondition
- * @step 1 Initialize elementary library.
- * @step 2 Initialize requred libraries.
- * @step 3 Create application data structure.
- * @step 4 create main window
- *
- * @procedure
- * @step 1 call main_window_get
- * @step 2 check returned pointer
- * </td>
- * <td>void</td>
- * <td>Not NULL object</td>
- * </tr>
- * @}
- */
-EFLETE_TEST (main_window_get_test_p)
-{
-   elm_init(0,0);
-   app_init();
-   ui_main_window_add();
-
-   ck_assert_msg(main_window_get() != NULL, "Main window not exist");
-
-   elm_shutdown();
-}
-END_TEST
-
-/**
- * @addtogroup main_window_get
- * @{
- * </TABLE>
- * @}
- * @}
- */
diff --git a/tests/test_eflete/test_eflete.c b/tests/test_eflete/test_eflete.c
index b4fbc0a..e161c56 100644
--- a/tests/test_eflete/test_eflete.c
+++ b/tests/test_eflete/test_eflete.c
@@ -28,8 +28,6 @@ Suite* test_suite (void) {
    tcase_add_test(tcase, app_shutdown_test_p1);
    tcase_add_test(tcase, app_shutdown_test_p2);
 
-   tcase_add_test(tcase, main_window_get_test_p);
-
    tcase_add_test(tcase, colorselector_get_test_p);
 
    suite_add_tcase(suite, tcase);
diff --git a/tests/test_eflete/test_eflete.h b/tests/test_eflete/test_eflete.h
index bae584f..283c455 100644
--- a/tests/test_eflete/test_eflete.h
+++ b/tests/test_eflete/test_eflete.h
@@ -30,6 +30,4 @@ void app_init_test_p(int);
 void app_shutdown_test_p1(int);
 void app_shutdown_test_p2(int);
 
-void main_window_get_test_p(int);
-
 void colorselector_get_test_p(int);

-- 


Reply via email to