summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric Bail <cedric.bail@samsung.com>2013-07-22 20:25:10 +0900
committerCedric Bail <cedric.bail@samsung.com>2013-07-23 11:27:34 +0900
commit409cd8723d666de72ddcefdb68ef678b54891286 (patch)
tree22b22857f74c88501c2a17ecb2f0ea35e1d8cb14
parente304f479a7a1bc109d1f118a52e8f58101057039 (diff)
elementary: fix header inclusion order.
-rw-r--r--src/bin/config.c2
-rw-r--r--src/bin/elementary_codegen.c4
-rw-r--r--src/bin/quicklaunch.c3
-rw-r--r--src/bin/test_main_menu.c2
-rw-r--r--src/edje_externals/elm.c4
-rw-r--r--src/lib/elm_gesture_layer_extra_gestures.c4
-rw-r--r--src/modules/access_output/mod.c3
-rw-r--r--src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c5
-rw-r--r--src/modules/prefs/prefs_iface.c4
-rw-r--r--src/modules/test_entry/mod.c3
-rw-r--r--src/modules/test_map/mod.c5
11 files changed, 28 insertions, 11 deletions
diff --git a/src/bin/config.c b/src/bin/config.c
index 60ae145a9..b9c81006e 100644
--- a/src/bin/config.c
+++ b/src/bin/config.c
@@ -1,7 +1,7 @@
1#include <Elementary.h>
2#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
3# include "elementary_config.h" 2# include "elementary_config.h"
4#endif 3#endif
4#include <Elementary.h>
5#ifndef ELM_LIB_QUICKLAUNCH 5#ifndef ELM_LIB_QUICKLAUNCH
6 6
7typedef struct _Theme Theme; 7typedef struct _Theme Theme;
diff --git a/src/bin/elementary_codegen.c b/src/bin/elementary_codegen.c
index b12c79eb3..4f270581f 100644
--- a/src/bin/elementary_codegen.c
+++ b/src/bin/elementary_codegen.c
@@ -1,5 +1,3 @@
1#include <Elementary.h>
2
3#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
4# include "elementary_config.h" 2# include "elementary_config.h"
5#endif 3#endif
@@ -12,6 +10,8 @@
12#include <Edje_Edit.h> 10#include <Edje_Edit.h>
13#include <Eina.h> 11#include <Eina.h>
14 12
13#include <Elementary.h>
14
15#include <ctype.h> 15#include <ctype.h>
16#include <fcntl.h> 16#include <fcntl.h>
17#include <locale.h> 17#include <locale.h>
diff --git a/src/bin/quicklaunch.c b/src/bin/quicklaunch.c
index 3913a745e..4caad3be0 100644
--- a/src/bin/quicklaunch.c
+++ b/src/bin/quicklaunch.c
@@ -1,4 +1,3 @@
1#include <Elementary.h>
2#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
3# include "elementary_config.h" 2# include "elementary_config.h"
4#endif 3#endif
@@ -18,6 +17,8 @@
18#include <signal.h> 17#include <signal.h>
19#include <sys/wait.h> 18#include <sys/wait.h>
20 19
20#include <Elementary.h>
21
21#ifdef HAVE_ENVIRON 22#ifdef HAVE_ENVIRON
22extern char **environ; 23extern char **environ;
23#endif 24#endif
diff --git a/src/bin/test_main_menu.c b/src/bin/test_main_menu.c
index f031fd73d..e7a527df2 100644
--- a/src/bin/test_main_menu.c
+++ b/src/bin/test_main_menu.c
@@ -1,7 +1,7 @@
1#include <Elementary.h>
2#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
3# include "elementary_config.h" 2# include "elementary_config.h"
4#endif 3#endif
4#include <Elementary.h>
5#ifndef ELM_LIB_QUICKLAUNCH 5#ifndef ELM_LIB_QUICKLAUNCH
6 6
7static void 7static void
diff --git a/src/edje_externals/elm.c b/src/edje_externals/elm.c
index 423322810..9a316fbbb 100644
--- a/src/edje_externals/elm.c
+++ b/src/edje_externals/elm.c
@@ -1,3 +1,7 @@
1#ifdef HAVE_CONFIG_H
2# include "elementary_config.h"
3#endif
4
1#include "Elementary.h" 5#include "Elementary.h"
2#include "private.h" 6#include "private.h"
3 7
diff --git a/src/lib/elm_gesture_layer_extra_gestures.c b/src/lib/elm_gesture_layer_extra_gestures.c
index 97468a307..fec7f8f3c 100644
--- a/src/lib/elm_gesture_layer_extra_gestures.c
+++ b/src/lib/elm_gesture_layer_extra_gestures.c
@@ -1,3 +1,7 @@
1#ifdef HAVE_CONFIG_H
2# include "elementary_config.h"
3#endif
4
1#include <Eina.h> 5#include <Eina.h>
2#include <Elementary.h> 6#include <Elementary.h>
3 7
diff --git a/src/modules/access_output/mod.c b/src/modules/access_output/mod.c
index 91e5bb2d2..4a9816e22 100644
--- a/src/modules/access_output/mod.c
+++ b/src/modules/access_output/mod.c
@@ -1,8 +1,9 @@
1#include <Elementary.h>
2#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
3# include "elementary_config.h" 2# include "elementary_config.h"
4#endif 3#endif
5 4
5#include <Elementary.h>
6
6/* to enable this module 7/* to enable this module
7export ELM_MODULES="access_output>access/api" 8export ELM_MODULES="access_output>access/api"
8export ELM_ACCESS_MODE=1 9export ELM_ACCESS_MODE=1
diff --git a/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c b/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
index 5773b264f..d5595edd7 100644
--- a/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
+++ b/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
@@ -1,9 +1,10 @@
1#include <Elementary.h>
2#include "elm_priv.h"
3#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
4#include "elementary_config.h" 2#include "elementary_config.h"
5#endif 3#endif
6 4
5#include <Elementary.h>
6#include "elm_priv.h"
7
7#define DATETIME_FIELD_COUNT 6 8#define DATETIME_FIELD_COUNT 6
8#define FIELD_FORMAT_LEN 3 9#define FIELD_FORMAT_LEN 3
9#define DISKSELECTOR_MIN_ITEMS 4 10#define DISKSELECTOR_MIN_ITEMS 4
diff --git a/src/modules/prefs/prefs_iface.c b/src/modules/prefs/prefs_iface.c
index f3ec07199..5d1b12bcc 100644
--- a/src/modules/prefs/prefs_iface.c
+++ b/src/modules/prefs/prefs_iface.c
@@ -1,3 +1,7 @@
1#ifdef HAVE_CONFIG_H
2# include "elementary_config.h"
3#endif
4
1#include "Elementary.h" 5#include "Elementary.h"
2#include "private.h" 6#include "private.h"
3 7
diff --git a/src/modules/test_entry/mod.c b/src/modules/test_entry/mod.c
index 0b978e6ad..c3620b2e7 100644
--- a/src/modules/test_entry/mod.c
+++ b/src/modules/test_entry/mod.c
@@ -1,8 +1,9 @@
1#include <Elementary.h>
2#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
3# include "elementary_config.h" 2# include "elementary_config.h"
4#endif 3#endif
5 4
5#include <Elementary.h>
6
6// module api funcs needed 7// module api funcs needed
7EAPI int 8EAPI int
8elm_modapi_init(void *m __UNUSED__) 9elm_modapi_init(void *m __UNUSED__)
diff --git a/src/modules/test_map/mod.c b/src/modules/test_map/mod.c
index a075cdd2a..4bbdcea29 100644
--- a/src/modules/test_map/mod.c
+++ b/src/modules/test_map/mod.c
@@ -1,9 +1,10 @@
1#include "Elementary.h"
2#include <Eina.h>
3#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
4# include "elementary_config.h" 2# include "elementary_config.h"
5#endif 3#endif
6 4
5#include "Elementary.h"
6#include <Eina.h>
7
7EAPI char * 8EAPI char *
8map_module_source_name_get(void) 9map_module_source_name_get(void)
9{ 10{