elementary: Improve include file modularity

Move stuff out of elm_priv.h

Signed-off-by: Mike McCormack <mj.mccormack@samsung.com>
git-svn-id: svn+ssh://svn.enlightenment.org/var/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 3651363..b53d698 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"
 
 static const char SIG_CHILD_ADDED[] = "child,added";
 static const char SIG_CHILD_REMOVED[] = "child,removed";

diff --git a/src/lib/elm_diskselector.c b/src/lib/elm_diskselector.c
index c446f55..8c69c51 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 a942213..e8d248d 100644 (file)
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -1,6 +1,7 @@
 #include <Elementary.h>
 #include <Elementary_Cursor.h>
 #include "elm_priv.h"
+#include "els_scroller.h"
 
 
 /* Maximum chunk size to be inserted to the entry at once

diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index d2f2085..5583848 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"
 
 /* --
  * TODO:

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 26e84be..93c4fff 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 ec1a264..9bac798 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 f5e15b4..fc1832c 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"
 
 typedef struct _Widget_Data Widget_Data;
 

diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index 39a4350..fba1729 100644 (file)
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -1,5 +1,6 @@
 #include <Elementary.h>
 #include "elm_priv.h"
+#include "els_box.h"
 
 typedef struct _Widget_Data Widget_Data;
 

diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 7b7a703..7d24011 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 e255d20..5693450 100644 (file)
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -4,6 +4,7 @@
 
 #include "Elementary.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_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 8eee9c1..e00e770 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_photocam.c b/src/lib/elm_photocam.c
index 23ba11e..b196228 100644 (file)
--- a/src/lib/elm_photocam.c
+++ b/src/lib/elm_photocam.c
@@ -1,5 +1,6 @@
 #include <Elementary.h>
 #include "elm_priv.h"
+#include "els_scroller.h"
 
 /*
  * TODO (maybe - optional future stuff):

diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h
index b2866fe..1b17e4e 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 6bc3736..562d90a 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 9d123b4..59c1a62 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"
 
 static Elm_Theme theme_default =
 {

diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index ebb794b..7e7723f 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 73c3ede..fa52050 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 a2c8abc..914e360 100644 (file)
--- 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 0d720df..9f61d29 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)))