summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-03-07 10:58:15 -0500
committerCedric BAIL <cedric.bail@free.fr>2019-03-07 14:17:18 -0800
commit33f1094fd7b83fce78f0a11a6264a0c521d52daa (patch)
tree08e1af9a545abea5eb00cc6c65db59de08f8aaaf
parent1ae67a9286271a6d11000871e90c31c5fbbb07b3 (diff)
elm: unfuck public headers (only a little)
ideally Elementary.h should include only legacy code (T7667) and Efl_Ui.h should include only eo code. this is not the case, and fixing it would require undoing years of careful planning to make this type of thing extra frustrating Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D8233
-rw-r--r--src/lib/elementary/Efl_Ui.h10
-rw-r--r--src/lib/elementary/Elementary.h7
2 files changed, 14 insertions, 3 deletions
diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h
index bca10e3455..d5db6923d0 100644
--- a/src/lib/elementary/Efl_Ui.h
+++ b/src/lib/elementary/Efl_Ui.h
@@ -8,6 +8,10 @@
8# define EFL_EO_API_SUPPORT 8# define EFL_EO_API_SUPPORT
9#endif 9#endif
10 10
11/* FIXME: wtf? */
12#ifndef EFL_UI_RADIO_EVENT_CHANGED
13# define EFL_UI_RADIO_EVENT_CHANGED EFL_UI_NSTATE_EVENT_CHANGED
14#endif
11/* Standard headers for standard system calls etc. */ 15/* Standard headers for standard system calls etc. */
12#include <stdio.h> 16#include <stdio.h>
13#include <stdlib.h> 17#include <stdlib.h>
@@ -189,12 +193,15 @@ EAPI void efl_ui_focus_relation_free(Efl_Ui_Focus_Relations *rel);
189# include <efl_ui_table_static.eo.h> 193# include <efl_ui_table_static.eo.h>
190# include <efl_ui_image.eo.h> 194# include <efl_ui_image.eo.h>
191# include <efl_ui_win.eo.h> 195# include <efl_ui_win.eo.h>
196/* FIXME: what the actual fuck. */
197# include <elm_win_eo.h>
192# include <efl_ui_win_inlined.eo.h> 198# include <efl_ui_win_inlined.eo.h>
193# include <efl_ui_win_socket.eo.h> 199# include <efl_ui_win_socket.eo.h>
194# include <efl_ui_relative_layout.eo.h> 200# include <efl_ui_relative_layout.eo.h>
195 201
196/* FIXME: Efl.Ui.Text must not use elm_general.h */ 202/* FIXME: Efl.Ui.Text must not use elm_general.h */
197# warning Efl.Ui.Text is not available yet without Elementary.h 203// no.
204//# warning Efl.Ui.Text is not available yet without Elementary.h
198# if 0 205# if 0
199# include <efl_ui_text_interactive.eo.h> 206# include <efl_ui_text_interactive.eo.h>
200# include <efl_ui_text.eo.h> 207# include <efl_ui_text.eo.h>
@@ -223,6 +230,7 @@ EAPI void efl_ui_focus_relation_free(Efl_Ui_Focus_Relations *rel);
223# include <efl_ui_progressbar_eo.h> 230# include <efl_ui_progressbar_eo.h>
224# include <efl_ui_radio_eo.h> 231# include <efl_ui_radio_eo.h>
225# include <efl_ui_panes_eo.h> 232# include <efl_ui_panes_eo.h>
233# include <efl_ui_panes_part.eo.h>
226 234
227/** 235/**
228 * Initialize Elementary 236 * Initialize Elementary
diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h
index c37c41df0a..60bd21fa7f 100644
--- a/src/lib/elementary/Elementary.h
+++ b/src/lib/elementary/Elementary.h
@@ -148,7 +148,11 @@ EAPI extern Elm_Version *elm_version;
148#include <elm_focus.h> 148#include <elm_focus.h>
149 149
150#if defined (EFL_EO_API_SUPPORT) && defined (EFL_BETA_API_SUPPORT) 150#if defined (EFL_EO_API_SUPPORT) && defined (EFL_BETA_API_SUPPORT)
151 151/* FIXME: wtf? */
152#ifndef EFL_UI_RADIO_EVENT_CHANGED
153# define EFL_UI_RADIO_EVENT_CHANGED EFL_UI_NSTATE_EVENT_CHANGED
154#endif
155# include <efl_ui.eot.h>
152//define focus manager earlier since focus object and manager is circular 156//define focus manager earlier since focus object and manager is circular
153typedef Eo Efl_Ui_Focus_Manager; 157typedef Eo Efl_Ui_Focus_Manager;
154#define _EFL_UI_FOCUS_MANAGER_EO_CLASS_TYPE 158#define _EFL_UI_FOCUS_MANAGER_EO_CLASS_TYPE
@@ -167,7 +171,6 @@ EAPI void efl_ui_focus_relation_free(Efl_Ui_Focus_Relations *rel);
167# include <efl_ui_focus_layer.eo.h> 171# include <efl_ui_focus_layer.eo.h>
168# include <elm_interface_scrollable.h> 172# include <elm_interface_scrollable.h>
169# include <elm_interface_scrollable.eo.h> 173# include <elm_interface_scrollable.eo.h>
170# include <elm_spinner_eo.h>
171#endif 174#endif
172 175
173#include <elm_tooltip.h> 176#include <elm_tooltip.h>