elementary: Improve include file modularity

Move stuff out of elm_priv.h

Signed-off-by: Mike McCormack <mj.mccormack@samsung.com>
git-svn-id: https://svn.enlightenment.org/svn/e/trunk/elementary@63900 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/elm_box.c b/src/lib/elm_box.c
index 831a977..7b45c07 100644 (file)
--- a/src/lib/elm_box.c
+++ b/src/lib/elm_box.c
@@ -1,5 +1,6 @@
 #include <Elementary.h>
 #include "elm_priv.h"
+#include "els_box.h"
 
 #define SIG_CHILD_ADDED "child,added"
 #define SIG_CHILD_REMOVED "child,removed"

diff --git a/src/lib/elm_carousel.c b/src/lib/elm_carousel.c
index 24b325d..dff4e3e 100644 (file)
--- a/src/lib/elm_carousel.c
+++ b/src/lib/elm_carousel.c
@@ -1,5 +1,6 @@
 #include <Elementary.h>
 #include "elm_priv.h"
+#include "els_scroller.h"
 
 // FIXME: this is NOT the carousel - yet!
 

diff --git a/src/lib/elm_diskselector.c b/src/lib/elm_diskselector.c
index 896d4e4..d3ad63d 100644 (file)
--- a/src/lib/elm_diskselector.c
+++ b/src/lib/elm_diskselector.c
@@ -1,5 +1,6 @@
 #include <Elementary.h>
 #include "elm_priv.h"
+#include "els_scroller.h"
 
 #ifndef MAX
 # define MAX(a, b) (((a) > (b)) ? (a) : (b))

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index fde93ff..08e8cc0 100644 (file)
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -2,6 +2,7 @@
 #include <Elementary_Cursor.h>
 #include "elm_priv.h"
 #include "elm_module_priv.h"
+#include "els_scroller.h"
 
 /* Maximum chunk size to be inserted to the entry at once
  * FIXME: This size is arbitrary, should probably choose a better size.

diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index b5785d0..85f2f70 100644 (file)
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -1,6 +1,7 @@
 #include <Elementary.h>
 #include <Elementary_Cursor.h>
 #include "elm_priv.h"
+#include "els_scroller.h"
 
  typedef struct _Widget_Data Widget_Data;
  typedef struct _Pan         Pan;

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index a032a30..2b90946 100644 (file)
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -3,6 +3,7 @@
 #include <Elementary.h>
 #include <Elementary_Cursor.h>
 #include "elm_priv.h"
+#include "els_scroller.h"
 
 #define SWIPE_MOVES         12
 #define MAX_ITEMS_PER_BLOCK 32

diff --git a/src/lib/elm_icon.c b/src/lib/elm_icon.c
index 56d30b5..adcb468 100644 (file)
--- a/src/lib/elm_icon.c
+++ b/src/lib/elm_icon.c
@@ -1,5 +1,6 @@
 #include <Elementary.h>
 #include "elm_priv.h"
+#include "els_icon.h"
 
 #ifdef ELM_EFREET
 #define NON_EXISTING (void *)-1

diff --git a/src/lib/elm_image.c b/src/lib/elm_image.c
index 71ca1e6..bb99309 100644 (file)
--- a/src/lib/elm_image.c
+++ b/src/lib/elm_image.c
@@ -1,5 +1,6 @@
 #include <Elementary.h>
 #include "elm_priv.h"
+#include "els_icon.h"
 
 /**
  * @defgroup Image Image

diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index 468f646..2e5cd90 100644 (file)
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -3,6 +3,7 @@
  */
 #include <Elementary.h>
 #include "elm_priv.h"
+#include "els_box.h"
 
 /**
  * @defgroup Index Index

diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 03cb8fc..cfa6feb 100644 (file)
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -1,5 +1,6 @@
 #include <Elementary.h>
 #include "elm_priv.h"
+#include "els_scroller.h"
 
 #define SWIPE_MOVES 12
 

diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index be1f1eb..0af009f 100644 (file)
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -4,7 +4,7 @@
 
 #include "Elementary.h"
 #include "elm_priv.h"
-//#include "els_scroller.h"
+#include "els_scroller.h"
 
 typedef struct _Widget_Data Widget_Data;
 typedef struct _Pan Pan;

diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c
index 6ee2350..30c9089 100644 (file)
--- a/src/lib/elm_panel.c
+++ b/src/lib/elm_panel.c
@@ -1,5 +1,7 @@
 #include <Elementary.h>
 #include "elm_priv.h"
+#include "els_scroller.h"
+#include "els_box.h"
 
 typedef struct _Widget_Data Widget_Data;
 struct _Widget_Data

diff --git a/src/lib/elm_photo.c b/src/lib/elm_photo.c
index 4371e4e..4432f67 100644 (file)
--- a/src/lib/elm_photo.c
+++ b/src/lib/elm_photo.c
@@ -1,5 +1,7 @@
 #include <Elementary.h>
 #include "elm_priv.h"
+#include "els_icon.h"
+#include "els_scroller.h"
 
 typedef struct _Widget_Data Widget_Data;
 

diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h
index 75d6701..2744ade 100644 (file)
--- a/src/lib/elm_priv.h
+++ b/src/lib/elm_priv.h
@@ -13,11 +13,6 @@
 # include <Ecore_WinCE.h>
 #endif
 
-#include "els_pan.h"
-#include "els_scroller.h"
-#include "els_box.h"
-#include "els_icon.h"
-
 #include "elm_widget.h"
 
 #define CRITICAL(...) EINA_LOG_DOM_CRIT(_elm_log_dom, __VA_ARGS__)

diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index e20e26c..830b965 100644 (file)
--- a/src/lib/elm_scroller.c
+++ b/src/lib/elm_scroller.c
@@ -1,5 +1,6 @@
 #include <Elementary.h>
 #include "elm_priv.h"
+#include "els_scroller.h"
 
 typedef struct _Widget_Data Widget_Data;
 

diff --git a/src/lib/elm_theme.c b/src/lib/elm_theme.c
index 8f2956e..b4ecf1b 100644 (file)
--- a/src/lib/elm_theme.c
+++ b/src/lib/elm_theme.c
@@ -1,5 +1,6 @@
 #include <Elementary.h>
 #include "elm_priv.h"
+#include "els_icon.h"
 
 /**
  * @defgroup Theme Theme

diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index dc214c0..451aa1b 100644 (file)
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -1,5 +1,8 @@
 #include <Elementary.h>
 #include "elm_priv.h"
+#include "els_scroller.h"
+#include "els_box.h"
+#include "els_icon.h"
 
 typedef struct _Widget_Data Widget_Data;
 

diff --git a/src/lib/els_box.c b/src/lib/els_box.c
index e84c27d..3288434 100644 (file)
--- a/src/lib/els_box.c
+++ b/src/lib/els_box.c
@@ -1,5 +1,6 @@
 #include <Elementary.h>
 #include "elm_priv.h"
+#include "els_box.h"
 
 static void
 _smart_extents_calculate(Evas_Object *box, Evas_Object_Box_Data *priv, int horizontal, int homogeneous)

diff --git a/src/lib/els_icon.c b/src/lib/els_icon.c
index 83b3af8..0d3dd0b 100755 (executable)
--- a/src/lib/els_icon.c
+++ b/src/lib/els_icon.c
@@ -1,5 +1,6 @@
 #include <Elementary.h>
 #include "elm_priv.h"
+#include "els_icon.h"
 
 typedef struct _Smart_Data Smart_Data;
 

diff --git a/src/lib/els_scroller.c b/src/lib/els_scroller.c
index 18f0b6b..827a472 100644 (file)
--- a/src/lib/els_scroller.c
+++ b/src/lib/els_scroller.c
@@ -1,5 +1,7 @@
 #include <Elementary.h>
 #include "elm_priv.h"
+#include "els_scroller.h"
+#include "els_pan.h"
 
 #define SMART_NAME "els_scroller"
 #define API_ENTRY Smart_Data *sd; sd = evas_object_smart_data_get(obj); if ((!obj) || (!sd) || (evas_object_type_get(obj) && strcmp(evas_object_type_get(obj), SMART_NAME)))