summaryrefslogtreecommitdiff
path: root/src/lib/elementary
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-03-07 10:56:32 -0500
committerCedric BAIL <cedric.bail@free.fr>2019-03-07 14:17:12 -0800
commitb93361d921d1eb112df809e1a69b1c9974e9d2d1 (patch)
tree9c6dfc096db509ba555ae6323ebd1f9440df1ba2 /src/lib/elementary
parent71f49619dc81bc5c790e245c8cc6a8b8ee6ab0fe (diff)
elm: fix legacy headers to never include (non-installed) eo headers
Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D8230
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/elc_multibuttonentry.h3
-rw-r--r--src/lib/elementary/elm_button.h3
-rw-r--r--src/lib/elementary/elm_check.h1
-rw-r--r--src/lib/elementary/elm_check_legacy.h2
-rw-r--r--src/lib/elementary/elm_flip.h3
-rw-r--r--src/lib/elementary/elm_frame.h3
-rw-r--r--src/lib/elementary/elm_image.h3
-rw-r--r--src/lib/elementary/elm_interface_fileselector.h3
-rw-r--r--src/lib/elementary/elm_layout.h4
-rw-r--r--src/lib/elementary/elm_panes.h4
-rw-r--r--src/lib/elementary/elm_photocam.h3
-rw-r--r--src/lib/elementary/elm_progressbar.h3
-rw-r--r--src/lib/elementary/elm_radio.h4
-rw-r--r--src/lib/elementary/elm_slider.h4
-rw-r--r--src/lib/elementary/elm_spinner.h3
-rw-r--r--src/lib/elementary/elm_textpath.h4
-rw-r--r--src/lib/elementary/elm_toolbar.h4
-rw-r--r--src/lib/elementary/elm_web.h9
-rw-r--r--src/lib/elementary/elm_win.h6
19 files changed, 2 insertions, 67 deletions
diff --git a/src/lib/elementary/elc_multibuttonentry.h b/src/lib/elementary/elc_multibuttonentry.h
index 75fe7a1b99..e17c1c946f 100644
--- a/src/lib/elementary/elc_multibuttonentry.h
+++ b/src/lib/elementary/elc_multibuttonentry.h
@@ -58,9 +58,6 @@
58 */ 58 */
59 59
60#include "elc_multibuttonentry_common.h" 60#include "elc_multibuttonentry_common.h"
61#ifdef EFL_EO_API_SUPPORT
62#include "elc_multibuttonentry_eo.h"
63#endif
64#ifndef EFL_NOLEGACY_API_SUPPORT 61#ifndef EFL_NOLEGACY_API_SUPPORT
65#include "elc_multibuttonentry_legacy.h" 62#include "elc_multibuttonentry_legacy.h"
66#endif 63#endif
diff --git a/src/lib/elementary/elm_button.h b/src/lib/elementary/elm_button.h
index 49053e54f1..47385657af 100644
--- a/src/lib/elementary/elm_button.h
+++ b/src/lib/elementary/elm_button.h
@@ -67,9 +67,6 @@
67 * @{ 67 * @{
68 */ 68 */
69 69
70#ifdef EFL_EO_API_SUPPORT
71#include "efl_ui_button_eo.h"
72#endif
73#ifndef EFL_NOLEGACY_API_SUPPORT 70#ifndef EFL_NOLEGACY_API_SUPPORT
74#include "elm_button_legacy.h" 71#include "elm_button_legacy.h"
75#endif 72#endif
diff --git a/src/lib/elementary/elm_check.h b/src/lib/elementary/elm_check.h
index b0e404e8bc..056dee46a8 100644
--- a/src/lib/elementary/elm_check.h
+++ b/src/lib/elementary/elm_check.h
@@ -60,7 +60,6 @@
60 */ 60 */
61 61
62#ifdef EFL_EO_API_SUPPORT 62#ifdef EFL_EO_API_SUPPORT
63#include "efl_ui_check_eo.h"
64#define EFL_UI_CHECK_EVENT_CHANGED EFL_UI_NSTATE_EVENT_CHANGED 63#define EFL_UI_CHECK_EVENT_CHANGED EFL_UI_NSTATE_EVENT_CHANGED
65#endif 64#endif
66#ifndef EFL_NOLEGACY_API_SUPPORT 65#ifndef EFL_NOLEGACY_API_SUPPORT
diff --git a/src/lib/elementary/elm_check_legacy.h b/src/lib/elementary/elm_check_legacy.h
index b4192e74e4..075203693e 100644
--- a/src/lib/elementary/elm_check_legacy.h
+++ b/src/lib/elementary/elm_check_legacy.h
@@ -51,6 +51,4 @@ EAPI void elm_check_state_set(Evas_Object *obj, Eina_Bool
51 */ 51 */
52EAPI void elm_check_state_pointer_set(Evas_Object *obj, Eina_Bool *statep); 52EAPI void elm_check_state_pointer_set(Evas_Object *obj, Eina_Bool *statep);
53 53
54#ifdef EFL_EO_API_SUPPORT
55# include "efl_ui_check_eo.legacy.h" 54# include "efl_ui_check_eo.legacy.h"
56#endif
diff --git a/src/lib/elementary/elm_flip.h b/src/lib/elementary/elm_flip.h
index cbac3689ae..475ce98220 100644
--- a/src/lib/elementary/elm_flip.h
+++ b/src/lib/elementary/elm_flip.h
@@ -35,9 +35,6 @@
35 * @{ 35 * @{
36 */ 36 */
37 37
38#ifdef EFL_EO_API_SUPPORT
39#include "efl_ui_flip_eo.h"
40#endif
41#ifndef EFL_NOLEGACY_API_SUPPORT 38#ifndef EFL_NOLEGACY_API_SUPPORT
42#include "efl_ui_flip_legacy.h" 39#include "efl_ui_flip_legacy.h"
43#endif 40#endif
diff --git a/src/lib/elementary/elm_frame.h b/src/lib/elementary/elm_frame.h
index ee20193983..3ae891cb98 100644
--- a/src/lib/elementary/elm_frame.h
+++ b/src/lib/elementary/elm_frame.h
@@ -48,9 +48,6 @@
48 * @{ 48 * @{
49 */ 49 */
50 50
51#ifdef EFL_EO_API_SUPPORT
52#include "efl_ui_frame_eo.h"
53#endif
54#ifndef EFL_NOLEGACY_API_SUPPORT 51#ifndef EFL_NOLEGACY_API_SUPPORT
55#include "efl_ui_frame_legacy.h" 52#include "efl_ui_frame_legacy.h"
56#endif 53#endif
diff --git a/src/lib/elementary/elm_image.h b/src/lib/elementary/elm_image.h
index 45329a35d9..ab3f7b59d9 100644
--- a/src/lib/elementary/elm_image.h
+++ b/src/lib/elementary/elm_image.h
@@ -67,9 +67,6 @@
67 * @{ 67 * @{
68 */ 68 */
69 69
70#ifdef EFL_EO_API_SUPPORT
71#include <elm_image_eo.h>
72#endif
73#ifndef EFL_NOLEGACY_API_SUPPORT 70#ifndef EFL_NOLEGACY_API_SUPPORT
74#include <elm_image_legacy.h> 71#include <elm_image_legacy.h>
75#endif 72#endif
diff --git a/src/lib/elementary/elm_interface_fileselector.h b/src/lib/elementary/elm_interface_fileselector.h
index 2e01555324..d8867f618c 100644
--- a/src/lib/elementary/elm_interface_fileselector.h
+++ b/src/lib/elementary/elm_interface_fileselector.h
@@ -1,9 +1,6 @@
1#ifndef ELM_INTEFARCE_FILESELECTOR_H 1#ifndef ELM_INTEFARCE_FILESELECTOR_H
2#define ELM_INTEFARCE_FILESELECTOR_H 2#define ELM_INTEFARCE_FILESELECTOR_H
3 3
4#ifdef EFL_EO_API_SUPPORT
5#include "elm_interface_fileselector_eo.h"
6#endif
7#ifndef EFL_NOLEGACY_API_SUPPORT 4#ifndef EFL_NOLEGACY_API_SUPPORT
8#include "elm_interface_fileselector_eo.legacy.h" 5#include "elm_interface_fileselector_eo.legacy.h"
9#endif 6#endif
diff --git a/src/lib/elementary/elm_layout.h b/src/lib/elementary/elm_layout.h
index 2947f169f8..475ac1c54c 100644
--- a/src/lib/elementary/elm_layout.h
+++ b/src/lib/elementary/elm_layout.h
@@ -167,10 +167,6 @@
167 */ 167 */
168 168
169#include <elm_layout_common.h> 169#include <elm_layout_common.h>
170#ifdef EFL_EO_API_SUPPORT
171#include <efl_ui_layout_base.eo.h>
172#include <efl_ui_layout.eo.h>
173#endif
174#ifndef EFL_NOLEGACY_API_SUPPORT 170#ifndef EFL_NOLEGACY_API_SUPPORT
175#include <elm_layout_legacy.h> 171#include <elm_layout_legacy.h>
176#endif 172#endif
diff --git a/src/lib/elementary/elm_panes.h b/src/lib/elementary/elm_panes.h
index 10eaf35e4e..9704b39c4d 100644
--- a/src/lib/elementary/elm_panes.h
+++ b/src/lib/elementary/elm_panes.h
@@ -54,10 +54,6 @@
54 * @{ 54 * @{
55 */ 55 */
56 56
57#ifdef EFL_EO_API_SUPPORT
58#include "efl_ui_panes_eo.h"
59#include "efl_ui_panes_part.eo.h"
60#endif
61#ifndef EFL_NOLEGACY_API_SUPPORT 57#ifndef EFL_NOLEGACY_API_SUPPORT
62#include "elm_panes_legacy.h" 58#include "elm_panes_legacy.h"
63#endif 59#endif
diff --git a/src/lib/elementary/elm_photocam.h b/src/lib/elementary/elm_photocam.h
index 54ffb6d463..7286366711 100644
--- a/src/lib/elementary/elm_photocam.h
+++ b/src/lib/elementary/elm_photocam.h
@@ -80,9 +80,6 @@ struct _Elm_Photocam_Error
80 Eina_Bool open_error; 80 Eina_Bool open_error;
81}; 81};
82 82
83#ifdef EFL_EO_API_SUPPORT
84#include "efl_ui_image_zoomable_eo.h"
85#endif
86#ifndef EFL_NOLEGACY_API_SUPPORT 83#ifndef EFL_NOLEGACY_API_SUPPORT
87#include "elm_photocam_legacy.h" 84#include "elm_photocam_legacy.h"
88#endif 85#endif
diff --git a/src/lib/elementary/elm_progressbar.h b/src/lib/elementary/elm_progressbar.h
index 7df3b3e052..8c57fcf76a 100644
--- a/src/lib/elementary/elm_progressbar.h
+++ b/src/lib/elementary/elm_progressbar.h
@@ -63,9 +63,6 @@
63 */ 63 */
64 64
65#include "elm_progressbar_common.h" 65#include "elm_progressbar_common.h"
66#ifdef EFL_EO_API_SUPPORT
67#include "efl_ui_progressbar_eo.h"
68#endif
69#ifndef EFL_NOLEGACY_API_SUPPORT 66#ifndef EFL_NOLEGACY_API_SUPPORT
70#include "elm_progressbar_legacy.h" 67#include "elm_progressbar_legacy.h"
71#endif 68#endif
diff --git a/src/lib/elementary/elm_radio.h b/src/lib/elementary/elm_radio.h
index 4a58cac81d..dfedb190c9 100644
--- a/src/lib/elementary/elm_radio.h
+++ b/src/lib/elementary/elm_radio.h
@@ -64,10 +64,6 @@
64 * @{ 64 * @{
65 */ 65 */
66 66
67#ifdef EFL_EO_API_SUPPORT
68#include "efl_ui_radio_eo.h"
69#define EFL_UI_RADIO_EVENT_CHANGED EFL_UI_NSTATE_EVENT_CHANGED
70#endif
71#ifndef EFL_NOLEGACY_API_SUPPORT 67#ifndef EFL_NOLEGACY_API_SUPPORT
72#include "elm_radio_legacy.h" 68#include "elm_radio_legacy.h"
73#endif 69#endif
diff --git a/src/lib/elementary/elm_slider.h b/src/lib/elementary/elm_slider.h
index 40aab8301d..2895342fcd 100644
--- a/src/lib/elementary/elm_slider.h
+++ b/src/lib/elementary/elm_slider.h
@@ -75,10 +75,6 @@
75 */ 75 */
76 76
77#include "elm_slider_common.h" 77#include "elm_slider_common.h"
78#ifdef EFL_EO_API_SUPPORT
79#include "elm_slider_eo.h"
80#include "elm_slider_part_indicator_eo.h"
81#endif
82#ifndef EFL_NOLEGACY_API_SUPPORT 78#ifndef EFL_NOLEGACY_API_SUPPORT
83#include "elm_slider_legacy.h" 79#include "elm_slider_legacy.h"
84#endif 80#endif
diff --git a/src/lib/elementary/elm_spinner.h b/src/lib/elementary/elm_spinner.h
index 6da9976379..bbfe2f2fa4 100644
--- a/src/lib/elementary/elm_spinner.h
+++ b/src/lib/elementary/elm_spinner.h
@@ -57,9 +57,6 @@
57 * @{ 57 * @{
58 */ 58 */
59 59
60#ifdef EFL_EO_API_SUPPORT
61#include "elm_spinner_eo.h"
62#endif
63#ifndef EFL_NOLEGACY_API_SUPPORT 60#ifndef EFL_NOLEGACY_API_SUPPORT
64#include "elm_spinner_legacy.h" 61#include "elm_spinner_legacy.h"
65#endif 62#endif
diff --git a/src/lib/elementary/elm_textpath.h b/src/lib/elementary/elm_textpath.h
index 780f1fa222..064c865bf3 100644
--- a/src/lib/elementary/elm_textpath.h
+++ b/src/lib/elementary/elm_textpath.h
@@ -3,10 +3,6 @@
3 * @ingroup Elementary 3 * @ingroup Elementary
4 */ 4 */
5 5
6#ifdef EFL_EO_API_SUPPORT
7#include "efl_ui_textpath.eo.h"
8#define EFL_UI_RADIO_EVENT_CHANGED EFL_UI_NSTATE_EVENT_CHANGED
9#endif
10#ifndef EFL_NOLEGACY_API_SUPPORT 6#ifndef EFL_NOLEGACY_API_SUPPORT
11#include "elm_textpath_legacy.h" 7#include "elm_textpath_legacy.h"
12#endif 8#endif
diff --git a/src/lib/elementary/elm_toolbar.h b/src/lib/elementary/elm_toolbar.h
index 9e9ec74d37..5dcfaa838f 100644
--- a/src/lib/elementary/elm_toolbar.h
+++ b/src/lib/elementary/elm_toolbar.h
@@ -69,10 +69,6 @@
69 */ 69 */
70 70
71#include <elm_toolbar_common.h> 71#include <elm_toolbar_common.h>
72#ifdef EFL_EO_API_SUPPORT
73#include <elm_toolbar_eo.h>
74#include <elm_toolbar_item_eo.h>
75#endif
76#ifndef EFL_NOLEGACY_API_SUPPORT 72#ifndef EFL_NOLEGACY_API_SUPPORT
77#include <elm_toolbar_legacy.h> 73#include <elm_toolbar_legacy.h>
78#endif 74#endif
diff --git a/src/lib/elementary/elm_web.h b/src/lib/elementary/elm_web.h
index 226677ef2e..3ec5e9a42a 100644
--- a/src/lib/elementary/elm_web.h
+++ b/src/lib/elementary/elm_web.h
@@ -93,15 +93,6 @@
93 */ 93 */
94 94
95#include "elm_web_common.h" 95#include "elm_web_common.h"
96#ifdef EFL_EO_API_SUPPORT
97#include "elm_web_eo.h"
98
99#undef ELM_WEB_CLASS
100#define ELM_WEB_CLASS elm_web_real_class_get()
101
102EAPI const Efl_Class *elm_web_real_class_get(void);
103
104#endif
105#ifndef EFL_NOLEGACY_API_SUPPORT 96#ifndef EFL_NOLEGACY_API_SUPPORT
106#include "elm_web_legacy.h" 97#include "elm_web_legacy.h"
107#endif 98#endif
diff --git a/src/lib/elementary/elm_win.h b/src/lib/elementary/elm_win.h
index 7720b980cb..3e45dd15ff 100644
--- a/src/lib/elementary/elm_win.h
+++ b/src/lib/elementary/elm_win.h
@@ -104,13 +104,11 @@
104 */ 104 */
105 105
106#include <elm_win_common.h> 106#include <elm_win_common.h>
107#ifdef EFL_EO_API_SUPPORT
108#include <elm_win_eo.h>
109#endif
110#ifndef EFL_NOLEGACY_API_SUPPORT 107#ifndef EFL_NOLEGACY_API_SUPPORT
111#include <elm_win_legacy.h> 108#include <elm_win_legacy.h>
112#endif 109#endif
113 110/* FIXME: what the actual fuck. */
111# include <elm_win_eo.h>
114/** 112/**
115 * @} 113 * @}
116 */ 114 */