From 94b4002c3553ecaf822ce78995f0e4f85fae2ca1 Mon Sep 17 00:00:00 2001 From: Lukasz Stanislawski Date: Wed, 14 Jan 2015 14:49:41 +0100 Subject: [PATCH] Do not explicite include atspi headers. Summary: fixes make check failures on atspi tests. Reviewers: cedric Subscribers: seoz Maniphest Tasks: T2001 Differential Revision: https://phab.enlightenment.org/D1870 --- src/tests/elm_test_actionslider.c | 6 +----- src/tests/elm_test_atspi.c | 7 +------ src/tests/elm_test_bg.c | 6 +----- src/tests/elm_test_box.c | 6 +----- src/tests/elm_test_bubble.c | 6 +----- src/tests/elm_test_button.c | 12 ++---------- src/tests/elm_test_calendar.c | 6 +----- src/tests/elm_test_check.c | 5 +---- src/tests/elm_test_clock.c | 6 +----- src/tests/elm_test_colorselector.c | 5 +---- src/tests/elm_test_conformant.c | 6 +----- src/tests/elm_test_ctxpopup.c | 6 +----- src/tests/elm_test_datetime.c | 6 +----- src/tests/elm_test_dayselector.c | 6 +----- src/tests/elm_test_diskselector.c | 6 +----- src/tests/elm_test_entry.c | 9 ++------- src/tests/elm_test_fileselector.c | 5 +---- src/tests/elm_test_fileselector_button.c | 6 +----- src/tests/elm_test_fileselector_entry.c | 6 +----- src/tests/elm_test_flip.c | 5 +---- src/tests/elm_test_flipselector.c | 5 +---- src/tests/elm_test_frame.c | 5 +---- src/tests/elm_test_gengrid.c | 5 +---- src/tests/elm_test_genlist.c | 5 +---- src/tests/elm_test_glview.c | 5 +---- src/tests/elm_test_grid.c | 5 +---- src/tests/elm_test_hover.c | 5 +---- src/tests/elm_test_hoversel.c | 5 +---- src/tests/elm_test_icon.c | 5 +---- src/tests/elm_test_image.c | 5 +---- src/tests/elm_test_index.c | 5 +---- src/tests/elm_test_inwin.c | 5 +---- src/tests/elm_test_label.c | 5 +---- src/tests/elm_test_layout.c | 5 +---- src/tests/elm_test_list.c | 9 ++------- src/tests/elm_test_map.c | 5 +---- src/tests/elm_test_mapbuf.c | 5 +---- src/tests/elm_test_menu.c | 5 +---- src/tests/elm_test_multibuttonentry.c | 5 +---- src/tests/elm_test_naviframe.c | 5 +---- src/tests/elm_test_notify.c | 5 +---- src/tests/elm_test_panel.c | 5 +---- src/tests/elm_test_panes.c | 5 +---- src/tests/elm_test_photo.c | 5 +---- src/tests/elm_test_photocam.c | 5 +---- src/tests/elm_test_player.c | 5 +---- src/tests/elm_test_plug.c | 5 +---- src/tests/elm_test_popup.c | 5 +---- src/tests/elm_test_prefs.c | 5 +---- src/tests/elm_test_progressbar.c | 5 +---- src/tests/elm_test_radio.c | 5 +---- src/tests/elm_test_scroller.c | 5 +---- src/tests/elm_test_segmentcontrol.c | 5 +---- src/tests/elm_test_separator.c | 5 +---- src/tests/elm_test_slider.c | 5 +---- src/tests/elm_test_slideshow.c | 5 +---- src/tests/elm_test_spinner.c | 5 +---- src/tests/elm_test_table.c | 5 +---- src/tests/elm_test_thumb.c | 5 +---- src/tests/elm_test_toolbar.c | 5 +---- src/tests/elm_test_video.c | 5 +---- src/tests/elm_test_web.c | 5 +---- src/tests/elm_test_win.c | 9 ++------- 63 files changed, 67 insertions(+), 282 deletions(-) diff --git a/src/tests/elm_test_actionslider.c b/src/tests/elm_test_actionslider.c index 4974587..83c7bfc 100644 --- a/src/tests/elm_test_actionslider.c +++ b/src/tests/elm_test_actionslider.c @@ -2,14 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - - START_TEST (elm_atspi_role_get) { Evas_Object *win, *actionslider; diff --git a/src/tests/elm_test_atspi.c b/src/tests/elm_test_atspi.c index 1e6bb69..da616ff 100644 --- a/src/tests/elm_test_atspi.c +++ b/src/tests/elm_test_atspi.c @@ -3,17 +3,12 @@ #endif #define ELM_INTERNAL_API_ARGESFSDFEFC +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_priv.h" #include "elm_suite.h" -#include "elm_atspi_app_object.eo.h" - -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - static Evas_Object *g_win, *g_btn, *g_bg; void generate_app(void) diff --git a/src/tests/elm_test_bg.c b/src/tests/elm_test_bg.c index 1d341db..fd5e8d9 100644 --- a/src/tests/elm_test_bg.c +++ b/src/tests/elm_test_bg.c @@ -2,14 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - - START_TEST (elm_atspi_role_get) { Evas_Object *win, *bg; diff --git a/src/tests/elm_test_box.c b/src/tests/elm_test_box.c index eacfbae..3f2808c 100644 --- a/src/tests/elm_test_box.c +++ b/src/tests/elm_test_box.c @@ -2,14 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - - START_TEST (elm_atspi_role_get) { Evas_Object *win, *box; diff --git a/src/tests/elm_test_bubble.c b/src/tests/elm_test_bubble.c index e3f59fc..f7bf360 100644 --- a/src/tests/elm_test_bubble.c +++ b/src/tests/elm_test_bubble.c @@ -2,14 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - - START_TEST (elm_atspi_role_get) { Evas_Object *win, *bubble; diff --git a/src/tests/elm_test_button.c b/src/tests/elm_test_button.c index f00408f..cef4090 100644 --- a/src/tests/elm_test_button.c +++ b/src/tests/elm_test_button.c @@ -2,19 +2,11 @@ # include "elementary_config.h" #endif -#include -#include "elm_suite.h" - #define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED -#include "elm_interface_atspi_component.eo.h" - #define ELM_INTERFACE_ATSPI_ACTION_PROTECTED -#include "elm_interface_atspi_action.eo.h" - +#include +#include "elm_suite.h" START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_calendar.c b/src/tests/elm_test_calendar.c index 6366f6b..714b370 100644 --- a/src/tests/elm_test_calendar.c +++ b/src/tests/elm_test_calendar.c @@ -2,14 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - - START_TEST (elm_atspi_role_get) { Evas_Object *win, *calendar; diff --git a/src/tests/elm_test_check.c b/src/tests/elm_test_check.c index 5e1c177..8ff9cab 100644 --- a/src/tests/elm_test_check.c +++ b/src/tests/elm_test_check.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_check_onoff_text) { Evas_Object *win, *check; diff --git a/src/tests/elm_test_clock.c b/src/tests/elm_test_clock.c index 4a7a602..fdccab9 100644 --- a/src/tests/elm_test_clock.c +++ b/src/tests/elm_test_clock.c @@ -2,14 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - - START_TEST (elm_atspi_role_get) { Evas_Object *win, *clk; diff --git a/src/tests/elm_test_colorselector.c b/src/tests/elm_test_colorselector.c index d74a5f6..78c3abd 100644 --- a/src/tests/elm_test_colorselector.c +++ b/src/tests/elm_test_colorselector.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_colorselector_palette) { Evas_Object *win, *c; diff --git a/src/tests/elm_test_conformant.c b/src/tests/elm_test_conformant.c index 478569c..1c96c13 100644 --- a/src/tests/elm_test_conformant.c +++ b/src/tests/elm_test_conformant.c @@ -2,14 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - - START_TEST (elm_atspi_role_get) { Evas_Object *win, *conformant; diff --git a/src/tests/elm_test_ctxpopup.c b/src/tests/elm_test_ctxpopup.c index cc744e6..905530e 100644 --- a/src/tests/elm_test_ctxpopup.c +++ b/src/tests/elm_test_ctxpopup.c @@ -2,14 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - - START_TEST (elm_atspi_role_get) { Evas_Object *win, *ctxpopup; diff --git a/src/tests/elm_test_datetime.c b/src/tests/elm_test_datetime.c index 06128c1..ce3ad1d 100644 --- a/src/tests/elm_test_datetime.c +++ b/src/tests/elm_test_datetime.c @@ -2,14 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - - START_TEST (elm_atspi_role_get) { Evas_Object *win, *datetime; diff --git a/src/tests/elm_test_dayselector.c b/src/tests/elm_test_dayselector.c index 1eebfd0..c3e0fda 100644 --- a/src/tests/elm_test_dayselector.c +++ b/src/tests/elm_test_dayselector.c @@ -2,14 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - - START_TEST (elm_atspi_role_get) { Evas_Object *win, *dayselector; diff --git a/src/tests/elm_test_diskselector.c b/src/tests/elm_test_diskselector.c index e0296c4..34fba23 100644 --- a/src/tests/elm_test_diskselector.c +++ b/src/tests/elm_test_diskselector.c @@ -2,14 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - - START_TEST (elm_atspi_role_get) { Evas_Object *win, *diskselector; diff --git a/src/tests/elm_test_entry.c b/src/tests/elm_test_entry.c index 87e17e6..f8c614b 100644 --- a/src/tests/elm_test_entry.c +++ b/src/tests/elm_test_entry.c @@ -2,15 +2,10 @@ # include "elementary_config.h" #endif -#include -#include "elm_suite.h" - #define ELM_INTERFACE_ATSPI_TEXT_PROTECTED #define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_text.h" -#include "elm_interface_atspi_text.eo.h" -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" +#include +#include "elm_suite.h" START_TEST (elm_entry_del) { diff --git a/src/tests/elm_test_fileselector.c b/src/tests/elm_test_fileselector.c index 11e52b1..cda9ed0 100644 --- a/src/tests/elm_test_fileselector.c +++ b/src/tests/elm_test_fileselector.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_fileselector_button.c b/src/tests/elm_test_fileselector_button.c index a6c4774..fab98ef 100644 --- a/src/tests/elm_test_fileselector_button.c +++ b/src/tests/elm_test_fileselector_button.c @@ -2,14 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - - START_TEST (elm_atspi_role_get) { Evas_Object *win, *fs_button; diff --git a/src/tests/elm_test_fileselector_entry.c b/src/tests/elm_test_fileselector_entry.c index 0f02292..5dedd89 100644 --- a/src/tests/elm_test_fileselector_entry.c +++ b/src/tests/elm_test_fileselector_entry.c @@ -2,14 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - - START_TEST (elm_atspi_role_get) { Evas_Object *win, *fs_entry; diff --git a/src/tests/elm_test_flip.c b/src/tests/elm_test_flip.c index 1f2635c..bd7d16f 100644 --- a/src/tests/elm_test_flip.c +++ b/src/tests/elm_test_flip.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_flipselector.c b/src/tests/elm_test_flipselector.c index 2e9a0d9..c14039f 100644 --- a/src/tests/elm_test_flipselector.c +++ b/src/tests/elm_test_flipselector.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_frame.c b/src/tests/elm_test_frame.c index d3a6463..2744e97 100644 --- a/src/tests/elm_test_frame.c +++ b/src/tests/elm_test_frame.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_gengrid.c b/src/tests/elm_test_gengrid.c index c3fc99e..cd10fd7 100644 --- a/src/tests/elm_test_gengrid.c +++ b/src/tests/elm_test_gengrid.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_genlist.c b/src/tests/elm_test_genlist.c index 9387e0b..d3bb70d 100644 --- a/src/tests/elm_test_genlist.c +++ b/src/tests/elm_test_genlist.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_glview.c b/src/tests/elm_test_glview.c index 1129c9d..1ad462c 100644 --- a/src/tests/elm_test_glview.c +++ b/src/tests/elm_test_glview.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_grid.c b/src/tests/elm_test_grid.c index bdacbb9..9f05261 100644 --- a/src/tests/elm_test_grid.c +++ b/src/tests/elm_test_grid.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_hover.c b/src/tests/elm_test_hover.c index 4aafb2f..c7d4551 100644 --- a/src/tests/elm_test_hover.c +++ b/src/tests/elm_test_hover.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_hoversel.c b/src/tests/elm_test_hoversel.c index d4f2757..4bb6aaf 100644 --- a/src/tests/elm_test_hoversel.c +++ b/src/tests/elm_test_hoversel.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_icon.c b/src/tests/elm_test_icon.c index 71525d0..757e00d 100644 --- a/src/tests/elm_test_icon.c +++ b/src/tests/elm_test_icon.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_image.c b/src/tests/elm_test_image.c index c8db645..a5f229b 100644 --- a/src/tests/elm_test_image.c +++ b/src/tests/elm_test_image.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_index.c b/src/tests/elm_test_index.c index ad0655a..a07b76e 100644 --- a/src/tests/elm_test_index.c +++ b/src/tests/elm_test_index.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_inwin.c b/src/tests/elm_test_inwin.c index f5693b7..a5bcfc7 100644 --- a/src/tests/elm_test_inwin.c +++ b/src/tests/elm_test_inwin.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_label.c b/src/tests/elm_test_label.c index e0f0e06..813ef2f 100644 --- a/src/tests/elm_test_label.c +++ b/src/tests/elm_test_label.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_layout.c b/src/tests/elm_test_layout.c index 37f5cfd..f1d4571 100644 --- a/src/tests/elm_test_layout.c +++ b/src/tests/elm_test_layout.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_list.c b/src/tests/elm_test_list.c index 0b86990..4578dd1 100644 --- a/src/tests/elm_test_list.c +++ b/src/tests/elm_test_list.c @@ -2,15 +2,10 @@ # include "elementary_config.h" #endif -#include -#include "elm_suite.h" - #define ELM_INTERFACE_ATSPI_SELECTION_PROTECTED -#include "elm_interface_atspi_selection.eo.h" - #define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" +#include +#include "elm_suite.h" #if 0 // Skip following tests until Elm_Widget_Item will migrate to Eo infrastructure diff --git a/src/tests/elm_test_map.c b/src/tests/elm_test_map.c index 80d4e94..81935d5 100644 --- a/src/tests/elm_test_map.c +++ b/src/tests/elm_test_map.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_mapbuf.c b/src/tests/elm_test_mapbuf.c index e124481..e9d571a 100644 --- a/src/tests/elm_test_mapbuf.c +++ b/src/tests/elm_test_mapbuf.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_menu.c b/src/tests/elm_test_menu.c index 49b1243..1975db1 100644 --- a/src/tests/elm_test_menu.c +++ b/src/tests/elm_test_menu.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_multibuttonentry.c b/src/tests/elm_test_multibuttonentry.c index 390142d..3c29ee3 100644 --- a/src/tests/elm_test_multibuttonentry.c +++ b/src/tests/elm_test_multibuttonentry.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_naviframe.c b/src/tests/elm_test_naviframe.c index 8a52470..7e68447 100644 --- a/src/tests/elm_test_naviframe.c +++ b/src/tests/elm_test_naviframe.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_notify.c b/src/tests/elm_test_notify.c index e4c360c..a213fa2 100644 --- a/src/tests/elm_test_notify.c +++ b/src/tests/elm_test_notify.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_panel.c b/src/tests/elm_test_panel.c index eef52ce..2e34739 100644 --- a/src/tests/elm_test_panel.c +++ b/src/tests/elm_test_panel.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_panes.c b/src/tests/elm_test_panes.c index c643dc4..fc28691 100644 --- a/src/tests/elm_test_panes.c +++ b/src/tests/elm_test_panes.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_photo.c b/src/tests/elm_test_photo.c index ab0342e..322c363 100644 --- a/src/tests/elm_test_photo.c +++ b/src/tests/elm_test_photo.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_photocam.c b/src/tests/elm_test_photocam.c index 4d1f445..f60604f 100644 --- a/src/tests/elm_test_photocam.c +++ b/src/tests/elm_test_photocam.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_player.c b/src/tests/elm_test_player.c index 4940047..be62d89 100644 --- a/src/tests/elm_test_player.c +++ b/src/tests/elm_test_player.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_plug.c b/src/tests/elm_test_plug.c index 51ca61a..c8ad289 100644 --- a/src/tests/elm_test_plug.c +++ b/src/tests/elm_test_plug.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_popup.c b/src/tests/elm_test_popup.c index e85950e..6da552a 100644 --- a/src/tests/elm_test_popup.c +++ b/src/tests/elm_test_popup.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_prefs.c b/src/tests/elm_test_prefs.c index 8eb1112..a441845 100644 --- a/src/tests/elm_test_prefs.c +++ b/src/tests/elm_test_prefs.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_progressbar.c b/src/tests/elm_test_progressbar.c index 4f33dd8..fe6900a 100644 --- a/src/tests/elm_test_progressbar.c +++ b/src/tests/elm_test_progressbar.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_radio.c b/src/tests/elm_test_radio.c index c31cea2..c0a92a2 100644 --- a/src/tests/elm_test_radio.c +++ b/src/tests/elm_test_radio.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_scroller.c b/src/tests/elm_test_scroller.c index 665ae56..9ccbc41 100644 --- a/src/tests/elm_test_scroller.c +++ b/src/tests/elm_test_scroller.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_segmentcontrol.c b/src/tests/elm_test_segmentcontrol.c index 316ffbc..5c60feb 100644 --- a/src/tests/elm_test_segmentcontrol.c +++ b/src/tests/elm_test_segmentcontrol.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_separator.c b/src/tests/elm_test_separator.c index 7133c43..869b8ee 100644 --- a/src/tests/elm_test_separator.c +++ b/src/tests/elm_test_separator.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_slider.c b/src/tests/elm_test_slider.c index 06d9b76..99874b9 100644 --- a/src/tests/elm_test_slider.c +++ b/src/tests/elm_test_slider.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_slideshow.c b/src/tests/elm_test_slideshow.c index ef2ff8e..fb2828f 100644 --- a/src/tests/elm_test_slideshow.c +++ b/src/tests/elm_test_slideshow.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_spinner.c b/src/tests/elm_test_spinner.c index 5fa0bb8..41049d2 100644 --- a/src/tests/elm_test_spinner.c +++ b/src/tests/elm_test_spinner.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_table.c b/src/tests/elm_test_table.c index 95b76d4..ad0d805 100644 --- a/src/tests/elm_test_table.c +++ b/src/tests/elm_test_table.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_thumb.c b/src/tests/elm_test_thumb.c index 7d40c56..68db163 100644 --- a/src/tests/elm_test_thumb.c +++ b/src/tests/elm_test_thumb.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_toolbar.c b/src/tests/elm_test_toolbar.c index cff47ad..7e4a6b5 100644 --- a/src/tests/elm_test_toolbar.c +++ b/src/tests/elm_test_toolbar.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_video.c b/src/tests/elm_test_video.c index 1e07e7f..100feaa 100644 --- a/src/tests/elm_test_video.c +++ b/src/tests/elm_test_video.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_web.c b/src/tests/elm_test_web.c index 0557edd..d1b8ea7 100644 --- a/src/tests/elm_test_web.c +++ b/src/tests/elm_test_web.c @@ -2,13 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include #include "elm_suite.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - START_TEST (elm_atspi_role_get) { diff --git a/src/tests/elm_test_win.c b/src/tests/elm_test_win.c index 63558f8..702d2c7 100644 --- a/src/tests/elm_test_win.c +++ b/src/tests/elm_test_win.c @@ -2,15 +2,10 @@ # include "elementary_config.h" #endif -#include -#include "elm_suite.h" - #define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED -#include "elm_interface_atspi_component.eo.h" +#include +#include "elm_suite.h" START_TEST (elm_atspi_role_get) -- 2.7.4