From 4fd5b2f1323884449c5e05c42944b51b3833a889 Mon Sep 17 00:00:00 2001
From: Jaehyun Cho <jae_hyun.cho@samsung.com>
Date: Mon, 2 Feb 2015 20:05:50 +0900
Subject: [PATCH] common: Move <Enventor.h> to common header file of
 application.

Move <Enventor.h> to common.h to let application files include
<Enventor.h> and <Elementary.h> easily by including only "common.h".
---
 src/bin/base_gui.c    | 1 -
 src/bin/config_data.c | 1 -
 src/bin/console.c     | 1 -
 src/bin/file_mgr.c    | 3 ---
 src/bin/globals.c     | 1 -
 src/bin/goto.c        | 3 ---
 src/bin/live_edit.c   | 3 ---
 src/bin/main.c        | 3 ---
 src/bin/menu.c        | 3 ---
 src/bin/newfile.c     | 3 ---
 src/bin/panes.c       | 1 -
 src/bin/search.c      | 3 ---
 src/bin/setting.c     | 1 -
 src/bin/statusbar.c   | 1 -
 src/bin/tools.c       | 3 ---
 src/include/common.h  | 3 +++
 16 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/src/bin/base_gui.c b/src/bin/base_gui.c
index 3ed37a6..f7dc4f6 100644
--- a/src/bin/base_gui.c
+++ b/src/bin/base_gui.c
@@ -1,4 +1,3 @@
-#include <Elementary.h>
 #include "common.h"
 
 typedef struct base_s
diff --git a/src/bin/config_data.c b/src/bin/config_data.c
index ef6956e..75f2edb 100644
--- a/src/bin/config_data.c
+++ b/src/bin/config_data.c
@@ -1,4 +1,3 @@
-#include <Elementary.h>
 #include "common.h"
 
 typedef struct config_s
diff --git a/src/bin/console.c b/src/bin/console.c
index ee606e5..4d98a2c 100644
--- a/src/bin/console.c
+++ b/src/bin/console.c
@@ -1,4 +1,3 @@
-#include <Elementary.h>
 #include "common.h"
 
 void
diff --git a/src/bin/file_mgr.c b/src/bin/file_mgr.c
index fe3e261..435a583 100644
--- a/src/bin/file_mgr.c
+++ b/src/bin/file_mgr.c
@@ -2,10 +2,7 @@
 #include "config.h"
 #endif
 
-#define ENVENTOR_BETA_API_SUPPORT 1
-
 #include <Eio.h>
-#include <Enventor.h>
 #include "common.h"
 
 typedef struct file_mgr_s {
diff --git a/src/bin/globals.c b/src/bin/globals.c
index 0c37495..6253fe3 100644
--- a/src/bin/globals.c
+++ b/src/bin/globals.c
@@ -1,4 +1,3 @@
-#include <Elementary.h>
 #include "common.h"
 
 const char *DEFAULT_EDC_PATH_FORMAT = "/tmp/enventor_%d.edc";
diff --git a/src/bin/goto.c b/src/bin/goto.c
index 0c2f724..e5e6d69 100644
--- a/src/bin/goto.c
+++ b/src/bin/goto.c
@@ -2,9 +2,6 @@
 #include "config.h"
 #endif
 
-#define ENVENTOR_BETA_API_SUPPORT 1
-
-#include <Enventor.h>
 #include "common.h"
 
 typedef struct goto_s
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index 1e76935..1aa2b40 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -2,10 +2,7 @@
 #include "config.h"
 #endif
 
-#define ENVENTOR_BETA_API_SUPPORT 1
-
 #include <Elementary_Cursor.h>
-#include <Enventor.h>
 #include "common.h"
 
 typedef struct menu_data_s
diff --git a/src/bin/main.c b/src/bin/main.c
index 9c7117e..1b68e55 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -2,10 +2,7 @@
 #include "config.h"
 #endif
 
-#define ENVENTOR_BETA_API_SUPPORT 1
-
 #include <Eio.h>
-#include <Enventor.h>
 #include "common.h"
 
 typedef struct app_s
diff --git a/src/bin/menu.c b/src/bin/menu.c
index 365b1c5..3cc3f43 100644
--- a/src/bin/menu.c
+++ b/src/bin/menu.c
@@ -2,9 +2,6 @@
 #include "config.h"
 #endif
 
-#define ENVENTOR_BETA_API_SUPPORT 1
-
-#include <Enventor.h>
 #include "common.h"
 
 struct menu_s
diff --git a/src/bin/newfile.c b/src/bin/newfile.c
index e59b93d..c084db3 100644
--- a/src/bin/newfile.c
+++ b/src/bin/newfile.c
@@ -2,9 +2,6 @@
 #include "config.h"
 #endif
 
-#define ENVENTOR_BETA_API_SUPPORT 1
-
-#include <Enventor.h>
 #include "common.h"
 
 typedef struct new_data_s {
diff --git a/src/bin/panes.c b/src/bin/panes.c
index c7945fb..f17c062 100644
--- a/src/bin/panes.c
+++ b/src/bin/panes.c
@@ -1,4 +1,3 @@
-#include <Elementary.h>
 #include "common.h"
 
 static const double TRANSIT_TIME = 0.25;
diff --git a/src/bin/search.c b/src/bin/search.c
index 5a5ddfd..2f0d691 100644
--- a/src/bin/search.c
+++ b/src/bin/search.c
@@ -2,9 +2,6 @@
 #include "config.h"
 #endif
 
-#define ENVENTOR_BETA_API_SUPPORT 1
-
-#include <Enventor.h>
 #include "common.h"
 
 typedef struct search_s
diff --git a/src/bin/setting.c b/src/bin/setting.c
index f04a226..3ef0339 100644
--- a/src/bin/setting.c
+++ b/src/bin/setting.c
@@ -1,4 +1,3 @@
-#include <Elementary.h>
 #include "common.h"
 
 struct setting_s
diff --git a/src/bin/statusbar.c b/src/bin/statusbar.c
index 1af9a91..f90f797 100644
--- a/src/bin/statusbar.c
+++ b/src/bin/statusbar.c
@@ -1,4 +1,3 @@
-#include <Elementary.h>
 #include "common.h"
 
 typedef struct statusbar_s
diff --git a/src/bin/tools.c b/src/bin/tools.c
index 966143b..3d122b2 100644
--- a/src/bin/tools.c
+++ b/src/bin/tools.c
@@ -2,9 +2,6 @@
 #include "config.h"
 #endif
 
-#define ENVENTOR_BETA_API_SUPPORT 1
-
-#include <Enventor.h>
 #include "common.h"
 
 static void
diff --git a/src/include/common.h b/src/include/common.h
index 85f8795..7b80a0a 100644
--- a/src/include/common.h
+++ b/src/include/common.h
@@ -10,6 +10,9 @@ typedef struct statusbar_s stats_data;
 #define REL2_X 0.75f
 #define REL2_Y 0.75f
 
+#define ENVENTOR_BETA_API_SUPPORT 1
+#include <Enventor.h>
+
 #include "menu.h"
 #include "statusbar.h"
 #include "config_data.h"