From 96be3cd83d3426c5a9eb8d903245c51927567dc6 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <zmike@samsung.com>
Date: Fri, 27 Sep 2019 11:07:17 -0400
Subject: efl_ui: remove efl_ui_text headers from Efl_Ui.h for now

these require legacy types and headers, which should not be brought into
this header

Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de>
Differential Revision: https://phab.enlightenment.org/D10235
---
 src/lib/elementary/Efl_Ui.h   | 3 ++-
 src/lib/elementary/elm_priv.h | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/lib/elementary')

diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h
index a546fa4..b6b0228 100644
--- a/src/lib/elementary/Efl_Ui.h
+++ b/src/lib/elementary/Efl_Ui.h
@@ -245,12 +245,13 @@ EAPI Eina_Bool efl_ui_win_autodel_get(const Efl_Ui_Win *obj);
 # include <efl_ui_win_socket.eo.h>
 # include <efl_ui_relative_layout.eo.h>
 
-/* FIXME: Efl.Ui.Text must not use elm_general.h */
+/* FIXME: Efl.Ui.Text must not use elm_general.h
 # include <elm_general.h>
 # include <efl_text_interactive.eo.h>
 # include <efl_ui_text.eo.h>
 # include <efl_ui_text_editable.eo.h>
 # include <efl_ui_text_async.eo.h>
+*/
 
 # include <efl_ui_animation_view.eo.h>
 # include <efl_ui_clock.eo.h>
diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index 8cb7ee5..fede13f 100644
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -166,6 +166,13 @@
 # include "efl_ui_selection_manager.eo.h"
 # include "efl_datetime_manager.eo.h"
 
+//FIXME this needs to not use elm_general.h and go to Efl_Ui.h
+# include <elm_general.h>
+# include <efl_text_interactive.eo.h>
+# include <efl_ui_text.eo.h>
+# include <efl_ui_text_editable.eo.h>
+# include <efl_ui_text_async.eo.h>
+
 extern const char *_efl_model_property_itemw;
 extern const char *_efl_model_property_itemh;
 extern const char *_efl_model_property_selfw;
-- 
cgit v1.1