From 2ca1f8a75a33879b309a83eac37741f29bf7d867 Mon Sep 17 00:00:00 2001 From: Lukasz Stanislawski Date: Fri, 17 Oct 2014 16:56:11 +0100 Subject: [PATCH] atspi: properly include at-spi headers. Summary: Change requested by TAsn. Previuosly AT-SPI headers were kept private and included directly into elementary source code. From now on, AT-SPI headers can be included from Elementary.h public header, however will be marked as beta APIs. Commit includes following changes: * include all atspi headers into new elm_interfaces.h header. * marking all at-spi interfaces methods/properties as @protected. * wrap all common headers with EFL_BETA_API_SUPPORT. * make some common APIs visible in lib, by adding EAPI attribute (if someone decides to use beta APIs). Test Plan: out-off tree build with gcc, g++ Reviewers: tasn Reviewed By: tasn Subscribers: seoz, q66, kuuko Maniphest Tasks: T1721 Differential Revision: https://phab.enlightenment.org/D1528 --- legacy/elementary/src/lib/Elementary.h.in | 1 + legacy/elementary/src/lib/Makefile.am | 1 + legacy/elementary/src/lib/elc_ctxpopup.c | 11 +++------ legacy/elementary/src/lib/elc_fileselector.c | 11 +++------ .../src/lib/elc_fileselector_button.c | 6 ++--- .../src/lib/elc_fileselector_entry.c | 7 ++---- legacy/elementary/src/lib/elc_hoversel.c | 12 +++------- .../elementary/src/lib/elc_multibuttonentry.c | 6 ++--- legacy/elementary/src/lib/elc_naviframe.c | 11 +++------ legacy/elementary/src/lib/elc_player.c | 11 +++------ legacy/elementary/src/lib/elc_popup.c | 11 +++------ legacy/elementary/src/lib/elm_actionslider.c | 6 ++--- .../elementary/src/lib/elm_atspi_app_object.c | 8 ++----- .../elementary/src/lib/elm_atspi_app_object.h | 6 +++++ legacy/elementary/src/lib/elm_atspi_bridge.c | 14 ----------- legacy/elementary/src/lib/elm_bg.c | 6 ++--- legacy/elementary/src/lib/elm_box.c | 6 ++--- legacy/elementary/src/lib/elm_bubble.c | 6 ++--- legacy/elementary/src/lib/elm_button.c | 12 +++------- legacy/elementary/src/lib/elm_calendar.c | 11 +++------ legacy/elementary/src/lib/elm_check.c | 12 +++------- legacy/elementary/src/lib/elm_clock.c | 6 ++--- legacy/elementary/src/lib/elm_colorselector.c | 11 +++------ legacy/elementary/src/lib/elm_conform.c | 6 ++--- legacy/elementary/src/lib/elm_datetime.c | 6 ++--- legacy/elementary/src/lib/elm_dayselector.c | 6 ++--- legacy/elementary/src/lib/elm_diskselector.c | 11 +++------ legacy/elementary/src/lib/elm_entry.c | 14 ++++------- legacy/elementary/src/lib/elm_flip.c | 6 ++--- legacy/elementary/src/lib/elm_flipselector.c | 12 +++------- legacy/elementary/src/lib/elm_frame.c | 6 ++--- legacy/elementary/src/lib/elm_gengrid.c | 11 +++------ legacy/elementary/src/lib/elm_genlist.c | 11 +++------ legacy/elementary/src/lib/elm_glview.c | 6 ++--- legacy/elementary/src/lib/elm_grid.c | 6 ++--- legacy/elementary/src/lib/elm_hover.c | 6 ++--- legacy/elementary/src/lib/elm_icon.c | 6 ++--- legacy/elementary/src/lib/elm_image.c | 15 ++++-------- legacy/elementary/src/lib/elm_index.c | 6 ++--- .../src/lib/elm_interface_atspi_accessible.c | 10 +++----- .../src/lib/elm_interface_atspi_accessible.eo | 2 +- .../src/lib/elm_interface_atspi_accessible.h | 17 ++++++++++++- .../src/lib/elm_interface_atspi_action.c | 6 ++--- .../src/lib/elm_interface_atspi_component.c | 4 ---- .../src/lib/elm_interface_atspi_component.eo | 2 +- .../lib/elm_interface_atspi_editable_text.c | 5 ++-- .../src/lib/elm_interface_atspi_image.c | 6 ++--- .../src/lib/elm_interface_atspi_image.eo | 2 +- .../src/lib/elm_interface_atspi_selection.c | 5 ++-- .../src/lib/elm_interface_atspi_text.c | 9 +++---- .../src/lib/elm_interface_atspi_text.h | 16 ++++++++++++- .../src/lib/elm_interface_atspi_value.c | 5 ++-- .../src/lib/elm_interface_atspi_widget.c | 11 +++------ .../lib/elm_interface_atspi_widget_action.c | 10 +++----- .../lib/elm_interface_atspi_widget_action.h | 14 +++++++++++ .../src/lib/elm_interface_atspi_window.c | 1 - legacy/elementary/src/lib/elm_interfaces.h | 24 +++++++++++++++++++ legacy/elementary/src/lib/elm_inwin.c | 6 ++--- legacy/elementary/src/lib/elm_label.c | 6 ++--- legacy/elementary/src/lib/elm_layout.c | 6 ++--- legacy/elementary/src/lib/elm_list.c | 11 +++------ legacy/elementary/src/lib/elm_map.c | 11 +++------ legacy/elementary/src/lib/elm_mapbuf.c | 6 ++--- legacy/elementary/src/lib/elm_menu.c | 6 ++--- legacy/elementary/src/lib/elm_notify.c | 6 ++--- legacy/elementary/src/lib/elm_panel.c | 11 +++------ legacy/elementary/src/lib/elm_panes.c | 6 ++--- legacy/elementary/src/lib/elm_photo.c | 6 ++--- legacy/elementary/src/lib/elm_photocam.c | 11 +++------ legacy/elementary/src/lib/elm_plug.c | 6 ++--- legacy/elementary/src/lib/elm_prefs.c | 6 ++--- legacy/elementary/src/lib/elm_progressbar.c | 6 ++--- legacy/elementary/src/lib/elm_radio.c | 11 +++------ legacy/elementary/src/lib/elm_scroller.c | 11 +++------ .../elementary/src/lib/elm_segment_control.c | 6 ++--- legacy/elementary/src/lib/elm_separator.c | 6 ++--- legacy/elementary/src/lib/elm_slider.c | 15 ++++-------- legacy/elementary/src/lib/elm_slideshow.c | 11 +++------ legacy/elementary/src/lib/elm_spinner.c | 15 ++++-------- legacy/elementary/src/lib/elm_table.c | 6 ++--- legacy/elementary/src/lib/elm_thumb.c | 6 ++--- legacy/elementary/src/lib/elm_toolbar.c | 11 +++------ legacy/elementary/src/lib/elm_video.c | 11 +++------ legacy/elementary/src/lib/elm_web2.c | 6 ++--- legacy/elementary/src/lib/elm_widget.c | 1 - legacy/elementary/src/lib/elm_win.c | 14 +++-------- 86 files changed, 260 insertions(+), 455 deletions(-) create mode 100644 legacy/elementary/src/lib/elm_atspi_app_object.h diff --git a/legacy/elementary/src/lib/Elementary.h.in b/legacy/elementary/src/lib/Elementary.h.in index 91d9f35814..9f6bfdb627 100644 --- a/legacy/elementary/src/lib/Elementary.h.in +++ b/legacy/elementary/src/lib/Elementary.h.in @@ -183,6 +183,7 @@ EAPI extern Elm_Version *elm_version; #include #include #include +#include #include #include diff --git a/legacy/elementary/src/lib/Makefile.am b/legacy/elementary/src/lib/Makefile.am index 44ac1a15ac..5bbe572184 100644 --- a/legacy/elementary/src/lib/Makefile.am +++ b/legacy/elementary/src/lib/Makefile.am @@ -152,6 +152,7 @@ elm_app_client.h \ elm_app_client_view_eo.h \ elm_app_client_view.h \ elm_app.h \ +elm_atspi_app_object.h \ elm_authors.h \ elm_bg.h \ elm_bg_eo.h \ diff --git a/legacy/elementary/src/lib/elc_ctxpopup.c b/legacy/elementary/src/lib/elc_ctxpopup.c index 8f1973dde0..9ae6ac1960 100644 --- a/legacy/elementary/src/lib/elc_ctxpopup.c +++ b/legacy/elementary/src/lib/elc_ctxpopup.c @@ -2,19 +2,14 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_ctxpopup.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#include "elm_interface_atspi_widget_action.h" -#include "elm_interface_atspi_widget_action.eo.h" - #define MY_CLASS ELM_CTXPOPUP_CLASS #define MY_CLASS_NAME "Elm_Ctxpopup" diff --git a/legacy/elementary/src/lib/elc_fileselector.c b/legacy/elementary/src/lib/elc_fileselector.c index 9ca256314e..e1145c4739 100644 --- a/legacy/elementary/src/lib/elc_fileselector.c +++ b/legacy/elementary/src/lib/elc_fileselector.c @@ -9,19 +9,14 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED + #include #include "elm_priv.h" #include "elm_interface_fileselector.h" #include "elm_widget_fileselector.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#include "elm_interface_atspi_widget_action.h" -#include "elm_interface_atspi_widget_action.eo.h" - #define MY_CLASS ELM_FILESELECTOR_CLASS #define MY_CLASS_NAME "Elm_Fileselector" diff --git a/legacy/elementary/src/lib/elc_fileselector_button.c b/legacy/elementary/src/lib/elc_fileselector_button.c index 3891389e72..52b2a2a180 100644 --- a/legacy/elementary/src/lib/elc_fileselector_button.c +++ b/legacy/elementary/src/lib/elc_fileselector_button.c @@ -2,15 +2,13 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" #include "elm_interface_fileselector.h" #include "elm_widget_fileselector_button.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_FILESELECTOR_BUTTON_CLASS #define MY_CLASS_NAME "Elm_Fileselector_Button" diff --git a/legacy/elementary/src/lib/elc_fileselector_entry.c b/legacy/elementary/src/lib/elc_fileselector_entry.c index 35b18e807f..3983750aa9 100644 --- a/legacy/elementary/src/lib/elc_fileselector_entry.c +++ b/legacy/elementary/src/lib/elc_fileselector_entry.c @@ -3,16 +3,13 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" #include "elm_interface_fileselector.h" #include "elm_widget_fileselector_entry.h" - -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_FILESELECTOR_ENTRY_CLASS #define MY_CLASS_NAME "Elm_Fileselector_Entry" diff --git a/legacy/elementary/src/lib/elc_hoversel.c b/legacy/elementary/src/lib/elc_hoversel.c index a8f7a13a2a..27db5a5a03 100644 --- a/legacy/elementary/src/lib/elc_hoversel.c +++ b/legacy/elementary/src/lib/elc_hoversel.c @@ -2,19 +2,13 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_hoversel.h" - -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#include "elm_interface_atspi_widget_action.h" -#include "elm_interface_atspi_widget_action.eo.h" - #define MY_CLASS ELM_HOVERSEL_CLASS #define MY_CLASS_NAME "Elm_Hoversel" diff --git a/legacy/elementary/src/lib/elc_multibuttonentry.c b/legacy/elementary/src/lib/elc_multibuttonentry.c index d394453d3b..0204133a21 100644 --- a/legacy/elementary/src/lib/elc_multibuttonentry.c +++ b/legacy/elementary/src/lib/elc_multibuttonentry.c @@ -2,14 +2,12 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_multibuttonentry.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_MULTIBUTTONENTRY_CLASS #define MY_CLASS_NAME "Elm_Multibuttonentry" diff --git a/legacy/elementary/src/lib/elc_naviframe.c b/legacy/elementary/src/lib/elc_naviframe.c index 7a54e84703..b25e7453b7 100644 --- a/legacy/elementary/src/lib/elc_naviframe.c +++ b/legacy/elementary/src/lib/elc_naviframe.c @@ -2,19 +2,14 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_naviframe.h" #include "elm_widget_container.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#include "elm_interface_atspi_widget_action.h" -#include "elm_interface_atspi_widget_action.eo.h" - #define MY_CLASS ELM_NAVIFRAME_CLASS #define MY_CLASS_NAME "Elm_Naviframe" diff --git a/legacy/elementary/src/lib/elc_player.c b/legacy/elementary/src/lib/elc_player.c index 1e0c46230a..a2f1a8e835 100644 --- a/legacy/elementary/src/lib/elc_player.c +++ b/legacy/elementary/src/lib/elc_player.c @@ -4,19 +4,14 @@ #include +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_layout.h" #include "elm_widget_player.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#include "elm_interface_atspi_widget_action.h" -#include "elm_interface_atspi_widget_action.eo.h" - #define MY_CLASS ELM_PLAYER_CLASS #define MY_CLASS_NAME "Elm_Player" diff --git a/legacy/elementary/src/lib/elc_popup.c b/legacy/elementary/src/lib/elc_popup.c index 8daa8be0b6..fad656c543 100644 --- a/legacy/elementary/src/lib/elc_popup.c +++ b/legacy/elementary/src/lib/elc_popup.c @@ -2,18 +2,13 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_popup.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#include "elm_interface_atspi_widget_action.h" -#include "elm_interface_atspi_widget_action.eo.h" - #define MY_CLASS ELM_POPUP_CLASS #define MY_CLASS_NAME "Elm_Popup" diff --git a/legacy/elementary/src/lib/elm_actionslider.c b/legacy/elementary/src/lib/elm_actionslider.c index ec9d72c435..98ca1fe640 100644 --- a/legacy/elementary/src/lib/elm_actionslider.c +++ b/legacy/elementary/src/lib/elm_actionslider.c @@ -2,16 +2,14 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include #include "elm_priv.h" #include "elm_widget_actionslider.h" #include "elm_widget_layout.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_ACTIONSLIDER_CLASS #define MY_CLASS_NAME "Elm_Actionslider" diff --git a/legacy/elementary/src/lib/elm_atspi_app_object.c b/legacy/elementary/src/lib/elm_atspi_app_object.c index 6313250c88..08932cfcf2 100644 --- a/legacy/elementary/src/lib/elm_atspi_app_object.c +++ b/legacy/elementary/src/lib/elm_atspi_app_object.c @@ -2,16 +2,12 @@ #include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_widget.h" #include "elm_priv.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED - -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" -#include "elm_atspi_app_object.eo.h" - extern Eina_List *_elm_win_list; typedef struct _Elm_Atspi_App_Object_Data Elm_Atspi_App_Object_Data; diff --git a/legacy/elementary/src/lib/elm_atspi_app_object.h b/legacy/elementary/src/lib/elm_atspi_app_object.h new file mode 100644 index 0000000000..53042f86fc --- /dev/null +++ b/legacy/elementary/src/lib/elm_atspi_app_object.h @@ -0,0 +1,6 @@ +#ifdef EFL_EO_API_SUPPORT +#include "elm_atspi_app_object.eo.h" +#endif +#ifndef EFL_NOLEGACY_API_SUPPORT +#include "elm_atspi_app_object.eo.legacy.h" +#endif diff --git a/legacy/elementary/src/lib/elm_atspi_bridge.c b/legacy/elementary/src/lib/elm_atspi_bridge.c index cba44ba2d7..a3f5e24099 100644 --- a/legacy/elementary/src/lib/elm_atspi_bridge.c +++ b/legacy/elementary/src/lib/elm_atspi_bridge.c @@ -18,20 +18,6 @@ #include "elm_priv.h" #include -#include "elm_atspi_app_object.eo.h" - -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" -#include "elm_interface_atspi_component.eo.h" -#include "elm_interface_atspi_window.eo.h" -#include "elm_interface_atspi_action.eo.h" -#include "elm_interface_atspi_value.eo.h" -#include "elm_interface_atspi_image.eo.h" -#include "elm_interface_atspi_selection.eo.h" -#include "elm_interface_atspi_text.h" -#include "elm_interface_atspi_text.eo.h" -#include "elm_interface_atspi_editable_text.eo.h" - /* * Accessibility Bus info not defined in atspi-constants.h */ diff --git a/legacy/elementary/src/lib/elm_bg.c b/legacy/elementary/src/lib/elm_bg.c index b791fe02ea..425586a9e1 100644 --- a/legacy/elementary/src/lib/elm_bg.c +++ b/legacy/elementary/src/lib/elm_bg.c @@ -2,15 +2,13 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_bg.h" #include "elm_widget_layout.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_BG_CLASS #define MY_CLASS_NAME "Elm_Bg" diff --git a/legacy/elementary/src/lib/elm_box.c b/legacy/elementary/src/lib/elm_box.c index 94440542df..b6a84dbefd 100644 --- a/legacy/elementary/src/lib/elm_box.c +++ b/legacy/elementary/src/lib/elm_box.c @@ -2,15 +2,13 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" #include "els_box.h" #include "elm_widget_box.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_BOX_CLASS #define MY_CLASS_NAME "Elm_Box" #define MY_CLASS_NAME_LEGACY "elm_box" diff --git a/legacy/elementary/src/lib/elm_bubble.c b/legacy/elementary/src/lib/elm_bubble.c index dd3d299f94..54e4d7d60b 100644 --- a/legacy/elementary/src/lib/elm_bubble.c +++ b/legacy/elementary/src/lib/elm_bubble.c @@ -2,15 +2,13 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_bubble.h" #include "elm_widget_layout.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_BUBBLE_CLASS #define MY_CLASS_NAME "Elm_Bubble" diff --git a/legacy/elementary/src/lib/elm_button.c b/legacy/elementary/src/lib/elm_button.c index e994f1680d..3083a7b8ae 100644 --- a/legacy/elementary/src/lib/elm_button.c +++ b/legacy/elementary/src/lib/elm_button.c @@ -2,6 +2,9 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_button.h" @@ -9,15 +12,6 @@ #define MY_CLASS ELM_BUTTON_CLASS -// ATSPI Accessibility -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#include "elm_interface_atspi_widget_action.h" -#include "elm_interface_atspi_widget_action.eo.h" - -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS_NAME "Elm_Button" #define MY_CLASS_NAME_LEGACY "elm_button" diff --git a/legacy/elementary/src/lib/elm_calendar.c b/legacy/elementary/src/lib/elm_calendar.c index 70a8213a8d..6810790678 100644 --- a/legacy/elementary/src/lib/elm_calendar.c +++ b/legacy/elementary/src/lib/elm_calendar.c @@ -2,18 +2,13 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_calendar.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#include "elm_interface_atspi_widget_action.h" -#include "elm_interface_atspi_widget_action.eo.h" - #define MY_CLASS ELM_CALENDAR_CLASS #define MY_CLASS_NAME "Elm_Calendar" diff --git a/legacy/elementary/src/lib/elm_check.c b/legacy/elementary/src/lib/elm_check.c index ce8a43734d..9077d5e493 100644 --- a/legacy/elementary/src/lib/elm_check.c +++ b/legacy/elementary/src/lib/elm_check.c @@ -2,20 +2,14 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_check.h" #include "elm_widget_layout.h" - -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#include "elm_interface_atspi_widget_action.h" -#include "elm_interface_atspi_widget_action.eo.h" - #define MY_CLASS ELM_CHECK_CLASS #define MY_CLASS_NAME "Elm_Check" diff --git a/legacy/elementary/src/lib/elm_clock.c b/legacy/elementary/src/lib/elm_clock.c index 473b5e9c65..72191a9234 100644 --- a/legacy/elementary/src/lib/elm_clock.c +++ b/legacy/elementary/src/lib/elm_clock.c @@ -2,14 +2,12 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_clock.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_CLOCK_CLASS #define MY_CLASS_NAME "Elm_Clock" diff --git a/legacy/elementary/src/lib/elm_colorselector.c b/legacy/elementary/src/lib/elm_colorselector.c index e4b6fff3e4..425024354e 100644 --- a/legacy/elementary/src/lib/elm_colorselector.c +++ b/legacy/elementary/src/lib/elm_colorselector.c @@ -2,18 +2,13 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_colorselector.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#include "elm_interface_atspi_widget_action.h" -#include "elm_interface_atspi_widget_action.eo.h" - #define MY_CLASS ELM_COLORSELECTOR_CLASS #define MY_CLASS_NAME "Elm_Colorselector" diff --git a/legacy/elementary/src/lib/elm_conform.c b/legacy/elementary/src/lib/elm_conform.c index 56da8bb713..13e95af092 100644 --- a/legacy/elementary/src/lib/elm_conform.c +++ b/legacy/elementary/src/lib/elm_conform.c @@ -2,15 +2,13 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_conform.h" #include "elm_widget_layout.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_CONFORMANT_CLASS #define MY_CLASS_NAME "Elm_Conformant" diff --git a/legacy/elementary/src/lib/elm_datetime.c b/legacy/elementary/src/lib/elm_datetime.c index 9c8d0c1a25..e9fa349b7e 100644 --- a/legacy/elementary/src/lib/elm_datetime.c +++ b/legacy/elementary/src/lib/elm_datetime.c @@ -2,14 +2,12 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_datetime.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_DATETIME_CLASS #define MY_CLASS_NAME "Elm_Datetime" diff --git a/legacy/elementary/src/lib/elm_dayselector.c b/legacy/elementary/src/lib/elm_dayselector.c index fc718ca4e6..b002922c0f 100644 --- a/legacy/elementary/src/lib/elm_dayselector.c +++ b/legacy/elementary/src/lib/elm_dayselector.c @@ -2,15 +2,13 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_dayselector.h" #include "elm_widget_container.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_DAYSELECTOR_CLASS #define MY_CLASS_NAME "Elm_Dayselector" diff --git a/legacy/elementary/src/lib/elm_diskselector.c b/legacy/elementary/src/lib/elm_diskselector.c index 304ded6045..02b5d67f40 100644 --- a/legacy/elementary/src/lib/elm_diskselector.c +++ b/legacy/elementary/src/lib/elm_diskselector.c @@ -2,19 +2,14 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_diskselector.h" #include "elm_interface_scrollable.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#include "elm_interface_atspi_widget_action.h" -#include "elm_interface_atspi_widget_action.eo.h" - #define DISPLAY_ITEM_NUM_MIN 3 #define MY_CLASS ELM_DISKSELECTOR_CLASS diff --git a/legacy/elementary/src/lib/elm_entry.c b/legacy/elementary/src/lib/elm_entry.c index af407b61b0..7582ff13a2 100644 --- a/legacy/elementary/src/lib/elm_entry.c +++ b/legacy/elementary/src/lib/elm_entry.c @@ -2,6 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define ELM_INTERFACE_ATSPI_TEXT_PROTECTED +#define ELM_INTERFACE_ATSPI_EDITABLE_TEXT_PROTECTED + #include #include #include "elm_priv.h" @@ -9,16 +13,6 @@ #define MY_CLASS ELM_ENTRY_CLASS -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#define ELM_INTERFACE_ATSPI_TEXT_PROTECTED -#define ELM_INTERFACE_ATSPI_EDITABLE_TEXT_PROTECTED - -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" -#include "elm_interface_atspi_text.h" -#include "elm_interface_atspi_text.eo.h" -#include "elm_interface_atspi_editable_text.eo.h" - #define MY_CLASS_NAME "Elm_Entry" #define MY_CLASS_NAME_LEGACY "elm_entry" diff --git a/legacy/elementary/src/lib/elm_flip.c b/legacy/elementary/src/lib/elm_flip.c index a001c31182..99f7458c57 100644 --- a/legacy/elementary/src/lib/elm_flip.c +++ b/legacy/elementary/src/lib/elm_flip.c @@ -2,15 +2,13 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_flip.h" #include "elm_widget_container.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_FLIP_CLASS #define MY_CLASS_NAME "Elm_Flip" diff --git a/legacy/elementary/src/lib/elm_flipselector.c b/legacy/elementary/src/lib/elm_flipselector.c index fd90c48418..8d3ce13917 100644 --- a/legacy/elementary/src/lib/elm_flipselector.c +++ b/legacy/elementary/src/lib/elm_flipselector.c @@ -2,19 +2,13 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_flipselector.h" - -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#include "elm_interface_atspi_widget_action.h" -#include "elm_interface_atspi_widget_action.eo.h" - #define MY_CLASS ELM_FLIPSELECTOR_CLASS #define MY_CLASS_NAME "Elm_Flipselector" diff --git a/legacy/elementary/src/lib/elm_frame.c b/legacy/elementary/src/lib/elm_frame.c index d32a7eb06f..7720656cce 100644 --- a/legacy/elementary/src/lib/elm_frame.c +++ b/legacy/elementary/src/lib/elm_frame.c @@ -2,15 +2,13 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_frame.h" #include "elm_widget_layout.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_FRAME_CLASS #define MY_CLASS_NAME "Elm_Frame" diff --git a/legacy/elementary/src/lib/elm_gengrid.c b/legacy/elementary/src/lib/elm_gengrid.c index 9896479e89..9c2605b79d 100644 --- a/legacy/elementary/src/lib/elm_gengrid.c +++ b/legacy/elementary/src/lib/elm_gengrid.c @@ -2,20 +2,15 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED + #include #include #include "elm_priv.h" #include "elm_widget_gengrid.h" #include "elm_interface_scrollable.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#include "elm_interface_atspi_widget_action.h" -#include "elm_interface_atspi_widget_action.eo.h" - #define MY_PAN_CLASS ELM_GENGRID_PAN_CLASS #define MY_PAN_CLASS_NAME "Elm_Gengrid_Pan" diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c index 9b4d8894d4..061e0a4c2f 100644 --- a/legacy/elementary/src/lib/elm_genlist.c +++ b/legacy/elementary/src/lib/elm_genlist.c @@ -4,6 +4,9 @@ #include +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED + #include #include @@ -11,14 +14,6 @@ #include "elm_widget_genlist.h" #include "elm_interface_scrollable.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#include "elm_interface_atspi_widget_action.h" -#include "elm_interface_atspi_widget_action.eo.h" - #define MY_PAN_CLASS ELM_GENLIST_PAN_CLASS #define MY_PAN_CLASS_NAME "Elm_Genlist_Pan" diff --git a/legacy/elementary/src/lib/elm_glview.c b/legacy/elementary/src/lib/elm_glview.c index d8056952f2..26c11a83c1 100644 --- a/legacy/elementary/src/lib/elm_glview.c +++ b/legacy/elementary/src/lib/elm_glview.c @@ -2,15 +2,13 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_glview.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_GLVIEW_CLASS #define MY_CLASS_NAME "Elm_Glview" diff --git a/legacy/elementary/src/lib/elm_grid.c b/legacy/elementary/src/lib/elm_grid.c index 6b41855e42..7c703519ed 100644 --- a/legacy/elementary/src/lib/elm_grid.c +++ b/legacy/elementary/src/lib/elm_grid.c @@ -2,15 +2,13 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_grid.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_GRID_CLASS #define MY_CLASS_NAME "Elm_Grid" #define MY_CLASS_NAME_LEGACY "elm_grid" diff --git a/legacy/elementary/src/lib/elm_hover.c b/legacy/elementary/src/lib/elm_hover.c index ecb2e2288b..66b6f612e0 100644 --- a/legacy/elementary/src/lib/elm_hover.c +++ b/legacy/elementary/src/lib/elm_hover.c @@ -2,15 +2,13 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_hover.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_HOVER_CLASS #define MY_CLASS_NAME "Elm_Hover" diff --git a/legacy/elementary/src/lib/elm_icon.c b/legacy/elementary/src/lib/elm_icon.c index 4af3b7a8ee..55f4269731 100644 --- a/legacy/elementary/src/lib/elm_icon.c +++ b/legacy/elementary/src/lib/elm_icon.c @@ -2,6 +2,8 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" @@ -11,10 +13,6 @@ #define NON_EXISTING (void *)-1 static const char *icon_theme = NULL; -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_ICON_CLASS #define MY_CLASS_NAME "Elm_Icon" #define MY_CLASS_NAME_LEGACY "elm_icon" diff --git a/legacy/elementary/src/lib/elm_image.c b/legacy/elementary/src/lib/elm_image.c index 2e9b418400..cab94bf65e 100644 --- a/legacy/elementary/src/lib/elm_image.c +++ b/legacy/elementary/src/lib/elm_image.c @@ -2,22 +2,15 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_IMAGE_PROTECTED +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_image.h" -#define ELM_INTERFACE_ATSPI_IMAGE_PROTECTED -#include "elm_interface_atspi_image.eo.h" - -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#include "elm_interface_atspi_widget_action.h" -#include "elm_interface_atspi_widget_action.eo.h" - #define FMT_SIZE_T "%zu" #define MY_CLASS ELM_IMAGE_CLASS diff --git a/legacy/elementary/src/lib/elm_index.c b/legacy/elementary/src/lib/elm_index.c index a94aa0728d..9fd65b9e0e 100644 --- a/legacy/elementary/src/lib/elm_index.c +++ b/legacy/elementary/src/lib/elm_index.c @@ -2,6 +2,8 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" @@ -9,10 +11,6 @@ #include "elm_widget_layout.h" #include "elm_widget_index.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_INDEX_CLASS #define MY_CLASS_NAME "Elm_Index" diff --git a/legacy/elementary/src/lib/elm_interface_atspi_accessible.c b/legacy/elementary/src/lib/elm_interface_atspi_accessible.c index 7c2eb23266..4ddb369619 100644 --- a/legacy/elementary/src/lib/elm_interface_atspi_accessible.c +++ b/legacy/elementary/src/lib/elm_interface_atspi_accessible.c @@ -2,16 +2,12 @@ #include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_widget.h" #include "elm_priv.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED - -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - - const char* Atspi_Name[] = { "invalid", "accelerator label", @@ -273,7 +269,7 @@ _elm_interface_atspi_accessible_relation_set_get(Eo *obj EINA_UNUSED, void *pd E return NULL; } -void elm_atspi_attributes_list_free(Eina_List *list) +EAPI void elm_atspi_attributes_list_free(Eina_List *list) { Elm_Atspi_Attribute *attr; EINA_LIST_FREE(list, attr) diff --git a/legacy/elementary/src/lib/elm_interface_atspi_accessible.eo b/legacy/elementary/src/lib/elm_interface_atspi_accessible.eo index 28cf4679b1..9ee5980acb 100644 --- a/legacy/elementary/src/lib/elm_interface_atspi_accessible.eo +++ b/legacy/elementary/src/lib/elm_interface_atspi_accessible.eo @@ -75,7 +75,7 @@ mixin Elm_Interface_Atspi_Accessible () int idx; } } - description { + description @protected { get { /*@ Gets widget contextual information. */ } diff --git a/legacy/elementary/src/lib/elm_interface_atspi_accessible.h b/legacy/elementary/src/lib/elm_interface_atspi_accessible.h index b38ef08970..32c9b95203 100644 --- a/legacy/elementary/src/lib/elm_interface_atspi_accessible.h +++ b/legacy/elementary/src/lib/elm_interface_atspi_accessible.h @@ -1,3 +1,7 @@ +#ifndef ELM_INTERFACE_ATSPI_ACCESSIBLE_H +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_H + +#ifdef EFL_BETA_API_SUPPORT /** * ATSPI object state set. @@ -250,7 +254,9 @@ typedef struct _Elm_Atspi_Relation Elm_Atspi_Relation; /** * Free Elm_Atspi_Attributes_List */ -void elm_atspi_attributes_list_free(Eina_List *list); +EAPI void elm_atspi_attributes_list_free(Eina_List *list); + +#ifdef EFL_EO_API_SUPPORT /** * Emits ATSPI 'StateChanged' dbus signal. @@ -316,3 +322,12 @@ void elm_atspi_attributes_list_free(Eina_List *list); */ #define elm_interface_atspi_accessible_active_descendants_changed_signal_emit(obj, desc) \ eo_do(obj, eo_event_callback_call(ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_ACTIVE_DESCENDANT_CHANGED, desc)); + +#include "elm_interface_atspi_accessible.eo.h" +#endif +#ifndef EFL_NOLEGACY_API_SUPPORT +#include "elm_interface_atspi_accessible.eo.legacy.h" +#endif + +#endif +#endif diff --git a/legacy/elementary/src/lib/elm_interface_atspi_action.c b/legacy/elementary/src/lib/elm_interface_atspi_action.c index ef3d9d07ef..14e3808fdf 100644 --- a/legacy/elementary/src/lib/elm_interface_atspi_action.c +++ b/legacy/elementary/src/lib/elm_interface_atspi_action.c @@ -2,14 +2,12 @@ #include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACTION_PROTECTED + #include #include "elm_widget.h" #include "elm_priv.h" -#define ELM_INTERFACE_ATSPI_ACTION_PROTECTED - -#include "elm_interface_atspi_action.eo.h" - EOLIAN const char * _elm_interface_atspi_action_localized_name_get(Eo *obj, void *pd EINA_UNUSED, int id) { diff --git a/legacy/elementary/src/lib/elm_interface_atspi_component.c b/legacy/elementary/src/lib/elm_interface_atspi_component.c index 0f0f48a95b..6218df4a2f 100644 --- a/legacy/elementary/src/lib/elm_interface_atspi_component.c +++ b/legacy/elementary/src/lib/elm_interface_atspi_component.c @@ -3,14 +3,10 @@ #endif #define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED -#include "atspi/atspi-constants.h" #include #include "elm_priv.h" -#include "elm_interface_atspi_component.eo.h" -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" EOLIAN static void diff --git a/legacy/elementary/src/lib/elm_interface_atspi_component.eo b/legacy/elementary/src/lib/elm_interface_atspi_component.eo index 39c77cef3e..9955ffbcff 100644 --- a/legacy/elementary/src/lib/elm_interface_atspi_component.eo +++ b/legacy/elementary/src/lib/elm_interface_atspi_component.eo @@ -92,7 +92,7 @@ mixin Elm_Interface_Atspi_Component () } return: bool; } - focus_grab { + focus_grab @protected { /*@ Focuses accessible widget. @return true if focus grab focus has successed, false otherwise. */ diff --git a/legacy/elementary/src/lib/elm_interface_atspi_editable_text.c b/legacy/elementary/src/lib/elm_interface_atspi_editable_text.c index 8a0a9c9a82..bebe223dbe 100644 --- a/legacy/elementary/src/lib/elm_interface_atspi_editable_text.c +++ b/legacy/elementary/src/lib/elm_interface_atspi_editable_text.c @@ -2,11 +2,10 @@ #include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_EDITABLE_TEXT_PROTECTED + #include #include "elm_widget.h" #include "elm_priv.h" -#define ELM_INTERFACE_ATSPI_EDITABLE_TEXT_PROTECTED - -#include "elm_interface_atspi_editable_text.eo.h" #include "elm_interface_atspi_editable_text.eo.c" diff --git a/legacy/elementary/src/lib/elm_interface_atspi_image.c b/legacy/elementary/src/lib/elm_interface_atspi_image.c index bc4df190af..05c39284f1 100644 --- a/legacy/elementary/src/lib/elm_interface_atspi_image.c +++ b/legacy/elementary/src/lib/elm_interface_atspi_image.c @@ -2,14 +2,12 @@ #include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_IMAGE_PROTECTED + #include #include "elm_widget.h" #include "elm_priv.h" -#define ELM_INTERFACE_ATSPI_IMAGE_PROTECTED - -#include "elm_interface_atspi_image.eo.h" - static void _free_desc(void *data) { diff --git a/legacy/elementary/src/lib/elm_interface_atspi_image.eo b/legacy/elementary/src/lib/elm_interface_atspi_image.eo index 5483efc3d5..6d9ea80715 100644 --- a/legacy/elementary/src/lib/elm_interface_atspi_image.eo +++ b/legacy/elementary/src/lib/elm_interface_atspi_image.eo @@ -18,7 +18,7 @@ mixin Elm_Interface_Atspi_Image () int height; } } - description { + description @protected { get { /* Gets textual description of image */ } diff --git a/legacy/elementary/src/lib/elm_interface_atspi_selection.c b/legacy/elementary/src/lib/elm_interface_atspi_selection.c index 31519f48bd..5e2c1e70f5 100644 --- a/legacy/elementary/src/lib/elm_interface_atspi_selection.c +++ b/legacy/elementary/src/lib/elm_interface_atspi_selection.c @@ -2,11 +2,10 @@ #include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_VALUE_PROTECTED + #include #include "elm_widget.h" #include "elm_priv.h" -#define ELM_INTERFACE_ATSPI_VALUE_PROTECTED - -#include "elm_interface_atspi_selection.eo.h" #include "elm_interface_atspi_selection.eo.c" diff --git a/legacy/elementary/src/lib/elm_interface_atspi_text.c b/legacy/elementary/src/lib/elm_interface_atspi_text.c index 39e0e771a1..792d27c4c8 100644 --- a/legacy/elementary/src/lib/elm_interface_atspi_text.c +++ b/legacy/elementary/src/lib/elm_interface_atspi_text.c @@ -2,17 +2,14 @@ #include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_TEXT_PROTECTED + #include #include "elm_widget.h" #include "elm_priv.h" -#define ELM_INTERFACE_ATSPI_TEXT_PROTECTED - -#include "elm_interface_atspi_text.h" -#include "elm_interface_atspi_text.eo.h" - void -elm_atspi_text_text_attribute_free(Elm_Atspi_Text_Attribute *attr) +EAPI elm_atspi_text_text_attribute_free(Elm_Atspi_Text_Attribute *attr) { if (!attr) return; if (attr->name) eina_stringshare_del(attr->name); diff --git a/legacy/elementary/src/lib/elm_interface_atspi_text.h b/legacy/elementary/src/lib/elm_interface_atspi_text.h index 2af43652de..be1abc688b 100644 --- a/legacy/elementary/src/lib/elm_interface_atspi_text.h +++ b/legacy/elementary/src/lib/elm_interface_atspi_text.h @@ -1,3 +1,7 @@ +#ifndef ELM_INTERFACE_ATSPI_TEXT_H +#define ELM_INTERFACE_ATSPI_TEXT_H + +#ifdef EFL_BETA_API_SUPPORT enum _Elm_Atspi_Text_Granulatity { @@ -40,7 +44,7 @@ typedef enum _Elm_Atspi_Text_Clip_Type Elm_Atspi_Text_Clip_Type; /** * @brief Free Elm_Atspi_Text_Attribute structure */ -void elm_atspi_text_text_attribute_free(Elm_Atspi_Text_Attribute *attr); +EAPI void elm_atspi_text_text_attribute_free(Elm_Atspi_Text_Attribute *attr); typedef struct _Elm_Atspi_Text_Change_Info Elm_Atspi_Text_Change_Info; @@ -51,3 +55,13 @@ struct _Elm_Atspi_Text_Change_Info size_t pos; size_t len; }; + +#ifdef EFL_EO_API_SUPPORT +#include "elm_interface_atspi_text.eo.h" +#endif +#ifndef EFL_NOLEGACY_API_SUPPORT +#include "elm_interface_atspi_text.eo.legacy.h" +#endif + +#endif +#endif diff --git a/legacy/elementary/src/lib/elm_interface_atspi_value.c b/legacy/elementary/src/lib/elm_interface_atspi_value.c index f42f03b84d..f51a0a9a43 100644 --- a/legacy/elementary/src/lib/elm_interface_atspi_value.c +++ b/legacy/elementary/src/lib/elm_interface_atspi_value.c @@ -2,11 +2,10 @@ #include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_VALUE_PROTECTED + #include #include "elm_widget.h" #include "elm_priv.h" -#define ELM_INTERFACE_ATSPI_VALUE_PROTECTED - -#include "elm_interface_atspi_value.eo.h" #include "elm_interface_atspi_value.eo.c" diff --git a/legacy/elementary/src/lib/elm_interface_atspi_widget.c b/legacy/elementary/src/lib/elm_interface_atspi_widget.c index c524611b53..cf04d89fa5 100644 --- a/legacy/elementary/src/lib/elm_interface_atspi_widget.c +++ b/legacy/elementary/src/lib/elm_interface_atspi_widget.c @@ -2,20 +2,15 @@ #include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED + #include #include "elm_widget.h" #include "elm_priv.h" #include "assert.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED - -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" -#include "elm_interface_atspi_component.eo.h" -#include "elm_interface_atspi_widget.eo.h" - typedef struct _Elm_Interface_Atspi_Widget_Data Elm_Interface_Atspi_Widget_Data; struct _Elm_Interface_Atspi_Widget_Data { diff --git a/legacy/elementary/src/lib/elm_interface_atspi_widget_action.c b/legacy/elementary/src/lib/elm_interface_atspi_widget_action.c index 8ab5e06f5e..1cc2b58053 100644 --- a/legacy/elementary/src/lib/elm_interface_atspi_widget_action.c +++ b/legacy/elementary/src/lib/elm_interface_atspi_widget_action.c @@ -2,16 +2,12 @@ #include "elementary_config.h" #endif -#include -#include "elm_widget.h" -#include "elm_priv.h" - #define ELM_INTERFACE_ATSPI_ACTION_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#include "elm_interface_atspi_action.eo.h" -#include "elm_interface_atspi_widget_action.h" -#include "elm_interface_atspi_widget_action.eo.h" +#include +#include "elm_widget.h" +#include "elm_priv.h" extern Eina_Hash *_elm_key_bindings; diff --git a/legacy/elementary/src/lib/elm_interface_atspi_widget_action.h b/legacy/elementary/src/lib/elm_interface_atspi_widget_action.h index 8002edfe4e..329e229418 100644 --- a/legacy/elementary/src/lib/elm_interface_atspi_widget_action.h +++ b/legacy/elementary/src/lib/elm_interface_atspi_widget_action.h @@ -1,3 +1,7 @@ +#ifndef ELM_INTERFACE_ATSPI_WIDGET_ACTION_H +#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_H + +#ifdef EFL_BETA_API_SUPPORT struct _Elm_Atspi_Action { @@ -8,3 +12,13 @@ struct _Elm_Atspi_Action }; typedef struct _Elm_Atspi_Action Elm_Atspi_Action; + +#ifdef EFL_EO_API_SUPPORT +#include "elm_interface_atspi_widget_action.eo.h" +#endif +#ifndef EFL_NOLEGACY_API_SUPPORT +#include "elm_interface_atspi_widget_action.eo.legacy.h" +#endif + +#endif +#endif diff --git a/legacy/elementary/src/lib/elm_interface_atspi_window.c b/legacy/elementary/src/lib/elm_interface_atspi_window.c index 6a45800206..7ef0c18b29 100644 --- a/legacy/elementary/src/lib/elm_interface_atspi_window.c +++ b/legacy/elementary/src/lib/elm_interface_atspi_window.c @@ -6,5 +6,4 @@ #include "elm_widget.h" #include "elm_priv.h" -#include "elm_interface_atspi_window.eo.h" #include "elm_interface_atspi_window.eo.c" diff --git a/legacy/elementary/src/lib/elm_interfaces.h b/legacy/elementary/src/lib/elm_interfaces.h index aa170aa9bc..a77c8cb659 100644 --- a/legacy/elementary/src/lib/elm_interfaces.h +++ b/legacy/elementary/src/lib/elm_interfaces.h @@ -1,5 +1,29 @@ +#include "elm_interface_atspi_accessible.h" +#include "elm_interface_atspi_text.h" +#include "elm_interface_atspi_widget_action.h" + #ifdef EFL_EO_API_SUPPORT #include "elm_interface_scrollable.h" +#ifdef EFL_BETA_API_SUPPORT +#include "elm_interface_atspi_action.eo.h" +#include "elm_interface_atspi_component.eo.h" +#include "elm_interface_atspi_editable_text.eo.h" +#include "elm_interface_atspi_image.eo.h" +#include "elm_interface_atspi_selection.eo.h" +#include "elm_interface_atspi_value.eo.h" +#include "elm_interface_atspi_widget.eo.h" +#include "elm_interface_atspi_window.eo.h" +#endif #endif #ifndef EFL_NOLEGACY_API_SUPPORT +#ifdef EFL_BETA_API_SUPPORT +#include "elm_interface_atspi_action.eo.legacy.h" +#include "elm_interface_atspi_component.eo.legacy.h" +#include "elm_interface_atspi_editable_text.eo.legacy.h" +#include "elm_interface_atspi_image.eo.legacy.h" +#include "elm_interface_atspi_selection.eo.legacy.h" +#include "elm_interface_atspi_value.eo.legacy.h" +#include "elm_interface_atspi_widget.eo.legacy.h" +#include "elm_interface_atspi_window.eo.legacy.h" +#endif #endif diff --git a/legacy/elementary/src/lib/elm_inwin.c b/legacy/elementary/src/lib/elm_inwin.c index cf6a21cecb..f6abc2cc97 100644 --- a/legacy/elementary/src/lib/elm_inwin.c +++ b/legacy/elementary/src/lib/elm_inwin.c @@ -2,16 +2,14 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_inwin.h" #include "elm_widget_layout.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_INWIN_CLASS #define MY_CLASS_NAME "Elm_Inwin" diff --git a/legacy/elementary/src/lib/elm_label.c b/legacy/elementary/src/lib/elm_label.c index dc938f2f11..24c6474ddf 100644 --- a/legacy/elementary/src/lib/elm_label.c +++ b/legacy/elementary/src/lib/elm_label.c @@ -2,16 +2,14 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_layout.h" #include "elm_widget_label.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_LABEL_CLASS #define MY_CLASS_NAME "Elm_Label" diff --git a/legacy/elementary/src/lib/elm_layout.c b/legacy/elementary/src/lib/elm_layout.c index 59e0410462..7c0675e2c7 100644 --- a/legacy/elementary/src/lib/elm_layout.c +++ b/legacy/elementary/src/lib/elm_layout.c @@ -2,15 +2,13 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_layout.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_LAYOUT_CLASS #define MY_CLASS_NAME "Elm_Layout" diff --git a/legacy/elementary/src/lib/elm_list.c b/legacy/elementary/src/lib/elm_list.c index 25ed9c703b..37c3b9d2b6 100644 --- a/legacy/elementary/src/lib/elm_list.c +++ b/legacy/elementary/src/lib/elm_list.c @@ -2,20 +2,15 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_list.h" #include "elm_interface_scrollable.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#include "elm_interface_atspi_widget_action.h" -#include "elm_interface_atspi_widget_action.eo.h" - #define MY_CLASS ELM_LIST_CLASS #define MY_CLASS_NAME "Elm_List" diff --git a/legacy/elementary/src/lib/elm_map.c b/legacy/elementary/src/lib/elm_map.c index 6d28fbdfcc..ea574e981c 100644 --- a/legacy/elementary/src/lib/elm_map.c +++ b/legacy/elementary/src/lib/elm_map.c @@ -2,20 +2,15 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_map.h" #include "elm_interface_scrollable.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#include "elm_interface_atspi_widget_action.h" -#include "elm_interface_atspi_widget_action.eo.h" - #define MY_PAN_CLASS ELM_MAP_PAN_CLASS #define MY_PAN_CLASS_NAME "Elm_Map_Pan" diff --git a/legacy/elementary/src/lib/elm_mapbuf.c b/legacy/elementary/src/lib/elm_mapbuf.c index 367f99e792..cf2f7fcbbc 100644 --- a/legacy/elementary/src/lib/elm_mapbuf.c +++ b/legacy/elementary/src/lib/elm_mapbuf.c @@ -2,16 +2,14 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_mapbuf.h" #include "elm_widget_container.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_MAPBUF_CLASS #define MY_CLASS_NAME "Elm_Mapbuf" diff --git a/legacy/elementary/src/lib/elm_menu.c b/legacy/elementary/src/lib/elm_menu.c index 95ce2bb663..cf255f76a0 100644 --- a/legacy/elementary/src/lib/elm_menu.c +++ b/legacy/elementary/src/lib/elm_menu.c @@ -2,15 +2,13 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_menu.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_MENU_CLASS #define MY_CLASS_NAME "Elm_Menu" diff --git a/legacy/elementary/src/lib/elm_notify.c b/legacy/elementary/src/lib/elm_notify.c index 60307a19cc..92bff9612e 100644 --- a/legacy/elementary/src/lib/elm_notify.c +++ b/legacy/elementary/src/lib/elm_notify.c @@ -2,16 +2,14 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_notify.h" #include "elm_widget_container.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_NOTIFY_CLASS #define MY_CLASS_NAME "Elm_Notify" diff --git a/legacy/elementary/src/lib/elm_panel.c b/legacy/elementary/src/lib/elm_panel.c index 945ca6b2e0..65e778a565 100644 --- a/legacy/elementary/src/lib/elm_panel.c +++ b/legacy/elementary/src/lib/elm_panel.c @@ -2,6 +2,9 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED + #include #include "elm_priv.h" @@ -9,14 +12,6 @@ #include "els_box.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#include "elm_interface_atspi_widget_action.h" -#include "elm_interface_atspi_widget_action.eo.h" - #define MY_CLASS ELM_PANEL_CLASS #define MY_CLASS_NAME "Elm_Panel" diff --git a/legacy/elementary/src/lib/elm_panes.c b/legacy/elementary/src/lib/elm_panes.c index 5c0bc1ab3f..0f8d2a4225 100644 --- a/legacy/elementary/src/lib/elm_panes.c +++ b/legacy/elementary/src/lib/elm_panes.c @@ -2,16 +2,14 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_layout.h" #include "elm_widget_panes.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_PANES_CLASS #define MY_CLASS_NAME "Elm_Panes" diff --git a/legacy/elementary/src/lib/elm_photo.c b/legacy/elementary/src/lib/elm_photo.c index c14c3579bc..d16a54cd16 100644 --- a/legacy/elementary/src/lib/elm_photo.c +++ b/legacy/elementary/src/lib/elm_photo.c @@ -2,15 +2,13 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_photo.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_PHOTO_CLASS #define MY_CLASS_NAME "Elm_Photo" diff --git a/legacy/elementary/src/lib/elm_photocam.c b/legacy/elementary/src/lib/elm_photocam.c index efeca66974..dc88c0b061 100644 --- a/legacy/elementary/src/lib/elm_photocam.c +++ b/legacy/elementary/src/lib/elm_photocam.c @@ -2,20 +2,15 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_photocam.h" #include "elm_interface_scrollable.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#include "elm_interface_atspi_widget_action.h" -#include "elm_interface_atspi_widget_action.eo.h" - #define MY_PAN_CLASS ELM_PHOTOCAM_PAN_CLASS #define MY_PAN_CLASS_NAME "Elm_Photocam_Pan" diff --git a/legacy/elementary/src/lib/elm_plug.c b/legacy/elementary/src/lib/elm_plug.c index a6680981e3..68bcd8b04f 100644 --- a/legacy/elementary/src/lib/elm_plug.c +++ b/legacy/elementary/src/lib/elm_plug.c @@ -2,15 +2,13 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_plug.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_PLUG_CLASS #define MY_CLASS_NAME "Elm_Plug" diff --git a/legacy/elementary/src/lib/elm_prefs.c b/legacy/elementary/src/lib/elm_prefs.c index 12e4302931..822f7c9584 100644 --- a/legacy/elementary/src/lib/elm_prefs.c +++ b/legacy/elementary/src/lib/elm_prefs.c @@ -2,6 +2,8 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" @@ -10,10 +12,6 @@ #include "Eo.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_PREFS_CLASS #define MY_CLASS_NAME "Elm_Prefs" diff --git a/legacy/elementary/src/lib/elm_progressbar.c b/legacy/elementary/src/lib/elm_progressbar.c index fd85bc61c7..27b7d3bb6a 100644 --- a/legacy/elementary/src/lib/elm_progressbar.c +++ b/legacy/elementary/src/lib/elm_progressbar.c @@ -2,16 +2,14 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_progressbar.h" #include "elm_widget_layout.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_PROGRESSBAR_CLASS #define MY_CLASS_NAME "Elm_Progressbar" diff --git a/legacy/elementary/src/lib/elm_radio.c b/legacy/elementary/src/lib/elm_radio.c index 0a4741e334..da253f1f3a 100644 --- a/legacy/elementary/src/lib/elm_radio.c +++ b/legacy/elementary/src/lib/elm_radio.c @@ -2,20 +2,15 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_radio.h" #include "elm_widget_layout.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#include "elm_interface_atspi_widget_action.h" -#include "elm_interface_atspi_widget_action.eo.h" - #define MY_CLASS ELM_RADIO_CLASS #define MY_CLASS_NAME "Elm_Radio" diff --git a/legacy/elementary/src/lib/elm_scroller.c b/legacy/elementary/src/lib/elm_scroller.c index fc26e68d17..c59c0fbd3a 100644 --- a/legacy/elementary/src/lib/elm_scroller.c +++ b/legacy/elementary/src/lib/elm_scroller.c @@ -2,6 +2,9 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED + #include #include "elm_priv.h" @@ -9,14 +12,6 @@ #include "elm_widget_layout.h" #include "elm_widget_scroller.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#include "elm_interface_atspi_widget_action.h" -#include "elm_interface_atspi_widget_action.eo.h" - #define MY_CLASS ELM_SCROLLER_CLASS #define MY_CLASS_NAME "Elm_Scroller" diff --git a/legacy/elementary/src/lib/elm_segment_control.c b/legacy/elementary/src/lib/elm_segment_control.c index c256ceb2f4..5b9522002a 100644 --- a/legacy/elementary/src/lib/elm_segment_control.c +++ b/legacy/elementary/src/lib/elm_segment_control.c @@ -2,15 +2,13 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_segment_control.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_SEGMENT_CONTROL_CLASS #define MY_CLASS_NAME "Elm_Segment_Control" diff --git a/legacy/elementary/src/lib/elm_separator.c b/legacy/elementary/src/lib/elm_separator.c index fd95d8a25f..55d9a9b2a8 100644 --- a/legacy/elementary/src/lib/elm_separator.c +++ b/legacy/elementary/src/lib/elm_separator.c @@ -2,16 +2,14 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_separator.h" #include "elm_widget_layout.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_SEPARATOR_CLASS #define MY_CLASS_NAME "Elm_Separator" diff --git a/legacy/elementary/src/lib/elm_slider.c b/legacy/elementary/src/lib/elm_slider.c index ea753d5433..82707ec08b 100644 --- a/legacy/elementary/src/lib/elm_slider.c +++ b/legacy/elementary/src/lib/elm_slider.c @@ -2,23 +2,16 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define ELM_INTERFACE_ATSPI_VALUE_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_slider.h" #include "elm_widget_layout.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#include "elm_interface_atspi_widget_action.h" -#include "elm_interface_atspi_widget_action.eo.h" - -#define ELM_INTERFACE_ATSPI_VALUE_PROTECTED -#include "elm_interface_atspi_value.eo.h" - #define MY_CLASS ELM_SLIDER_CLASS #define MY_CLASS_NAME "Elm_Slider" diff --git a/legacy/elementary/src/lib/elm_slideshow.c b/legacy/elementary/src/lib/elm_slideshow.c index ae4d00bdc3..7e930e2bc9 100644 --- a/legacy/elementary/src/lib/elm_slideshow.c +++ b/legacy/elementary/src/lib/elm_slideshow.c @@ -2,19 +2,14 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_slideshow.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#include "elm_interface_atspi_widget_action.h" -#include "elm_interface_atspi_widget_action.eo.h" - #define MY_CLASS ELM_SLIDESHOW_CLASS #define MY_CLASS_NAME "Elm_Slideshow" diff --git a/legacy/elementary/src/lib/elm_spinner.c b/legacy/elementary/src/lib/elm_spinner.c index 20b1c0cece..7043b39594 100644 --- a/legacy/elementary/src/lib/elm_spinner.c +++ b/legacy/elementary/src/lib/elm_spinner.c @@ -2,6 +2,10 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define ELM_INTERFACE_ATSPI_VALUE_PROTECTED +#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED + #include #include @@ -10,17 +14,6 @@ #include "Eo.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - -#define ELM_INTERFACE_ATSPI_VALUE_PROTECTED -#include "elm_interface_atspi_value.eo.h" - -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#include "elm_interface_atspi_widget_action.h" -#include "elm_interface_atspi_widget_action.eo.h" - #define MY_CLASS ELM_SPINNER_CLASS #define MY_CLASS_NAME "Elm_Spinner" diff --git a/legacy/elementary/src/lib/elm_table.c b/legacy/elementary/src/lib/elm_table.c index b39db12b8b..973c5b9a5c 100644 --- a/legacy/elementary/src/lib/elm_table.c +++ b/legacy/elementary/src/lib/elm_table.c @@ -2,15 +2,13 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_table.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_TABLE_CLASS #define MY_CLASS_NAME "Elm_Table" diff --git a/legacy/elementary/src/lib/elm_thumb.c b/legacy/elementary/src/lib/elm_thumb.c index 1b3749c532..ddc91345f7 100644 --- a/legacy/elementary/src/lib/elm_thumb.c +++ b/legacy/elementary/src/lib/elm_thumb.c @@ -2,15 +2,13 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_thumb.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS_NAME "Elm_Thumb" #define MY_CLASS_NAME_LEGACY "elm_thumb" diff --git a/legacy/elementary/src/lib/elm_toolbar.c b/legacy/elementary/src/lib/elm_toolbar.c index 82793e4c9d..29e1171b4c 100644 --- a/legacy/elementary/src/lib/elm_toolbar.c +++ b/legacy/elementary/src/lib/elm_toolbar.c @@ -2,20 +2,15 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED + #include #include "elm_priv.h" #include "elm_widget_toolbar.h" #include "els_box.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#include "elm_interface_atspi_widget_action.h" -#include "elm_interface_atspi_widget_action.eo.h" - #define MY_CLASS ELM_TOOLBAR_CLASS #define MY_CLASS_NAME "Elm_Toolbar" diff --git a/legacy/elementary/src/lib/elm_video.c b/legacy/elementary/src/lib/elm_video.c index c4b25eea29..b589dd29df 100644 --- a/legacy/elementary/src/lib/elm_video.c +++ b/legacy/elementary/src/lib/elm_video.c @@ -4,6 +4,9 @@ #include +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED + #include #include "elm_priv.h" @@ -13,14 +16,6 @@ /* TODO: add buffering support to Emotion and display buffering * progress in the theme when needed */ -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#include "elm_interface_atspi_widget_action.h" -#include "elm_interface_atspi_widget_action.eo.h" - #define MY_CLASS ELM_VIDEO_CLASS #define MY_CLASS_NAME "Elm_Video" diff --git a/legacy/elementary/src/lib/elm_web2.c b/legacy/elementary/src/lib/elm_web2.c index ad4aa3f6a1..4106693ffe 100644 --- a/legacy/elementary/src/lib/elm_web2.c +++ b/legacy/elementary/src/lib/elm_web2.c @@ -2,6 +2,8 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED + #include #include "elm_priv.h" @@ -11,10 +13,6 @@ #include #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" - #define MY_CLASS ELM_WEB_CLASS #define MY_CLASS_NAME "Elm_Web" diff --git a/legacy/elementary/src/lib/elm_widget.c b/legacy/elementary/src/lib/elm_widget.c index d6af6ffbe2..ab312b9156 100644 --- a/legacy/elementary/src/lib/elm_widget.c +++ b/legacy/elementary/src/lib/elm_widget.c @@ -7,7 +7,6 @@ #include "elm_priv.h" #include "elm_widget_container.h" #include "elm_interface_scrollable.h" -#include "elm_interface_atspi_widget.eo.h" #define MY_CLASS ELM_WIDGET_CLASS diff --git a/legacy/elementary/src/lib/elm_win.c b/legacy/elementary/src/lib/elm_win.c index c7e3466971..8945f54f9e 100644 --- a/legacy/elementary/src/lib/elm_win.c +++ b/legacy/elementary/src/lib/elm_win.c @@ -2,23 +2,15 @@ # include "elementary_config.h" #endif +#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED + #include #include #include "elm_priv.h" #include "elm_widget_menu.h" -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED - -#include "elm_interface_atspi_accessible.h" -#include "elm_interface_atspi_accessible.eo.h" -#include "elm_interface_atspi_window.eo.h" -#include "elm_interface_atspi_widget.eo.h" - -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#include "elm_interface_atspi_widget_action.h" -#include "elm_interface_atspi_widget_action.eo.h" - #define MY_CLASS ELM_WIN_CLASS #define MY_CLASS_NAME "Elm_Win"