hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=9c2748d95b030f156cefd09b10f5f317682e231a

commit 9c2748d95b030f156cefd09b10f5f317682e231a
Author: Hermet Park <her...@hermet.pe.kr>
Date:   Sun May 1 17:31:37 2016 +0900

    code refactoring.
    
    put declarations at proper positions.
---
 src/lib/Enventor.h.in      | 86 +++++++++++++++++++++++++++++++++++++++++++---
 src/lib/Enventor_Legacy.h  | 81 -------------------------------------------
 src/lib/enventor_private.h | 19 ----------
 3 files changed, 82 insertions(+), 104 deletions(-)

diff --git a/src/lib/Enventor.h.in b/src/lib/Enventor.h.in
index 3798ae8..cd5cebf 100644
--- a/src/lib/Enventor.h.in
+++ b/src/lib/Enventor.h.in
@@ -13,6 +13,88 @@ extern "C"
 #include <Efl_Config.h>
 #include <Elementary.h>
 
+/***
+ * Compatible ABI for Win32
+ ***/
+#ifdef _WIN32
+# ifdef EAPI
+#  undef EAPI
+# endif
+# ifdef ENVENTOR_WIN32_BUILD_SUPPORT
+#  define EAPI __declspec(dllexport)
+# else
+#  define EAPI __declspec(dllimport)
+# endif
+# ifdef EOAPI
+#  undef EOAPI
+# endif
+#define EOAPI EAPI
+#endif
+
+typedef enum
+{
+   ENVENTOR_CTXPOPUP_TYPE_SLIDER = 0,
+   ENVENTOR_CTXPOPUP_TYPE_LIST,
+   ENVENTOR_CTXPOPUP_TYPE_TOGGLE,
+   ENVENTOR_CTXPOPUP_TYPE_IMAGE
+} Enventor_Ctxpopup_Type;
+
+typedef enum
+{
+   ENVENTOR_PATH_TYPE_EDJ = 0,
+   ENVENTOR_PATH_TYPE_IMAGE,
+   ENVENTOR_PATH_TYPE_SOUND,
+   ENVENTOR_PATH_TYPE_FONT,
+   ENVENTOR_PATH_TYPE_DATA,
+   ENVENTOR_PATH_TYPE_LAST
+} Enventor_Path_Type;
+
+typedef struct
+{
+   Evas_Coord x;
+   Evas_Coord y;
+   float relx;
+   float rely;
+} Enventor_Live_View_Cursor;
+
+typedef struct
+{
+   Evas_Coord w;
+   Evas_Coord h;
+} Enventor_Live_View_Size;
+
+typedef struct
+{
+   int cur_line;
+   int max_line;
+} Enventor_Cursor_Line;
+
+typedef struct
+{
+   Eina_Bool self_changed : 1;
+} Enventor_EDC_Modified;
+
+typedef enum {
+   ENVENTOR_TEMPLATE_INSERT_DEFAULT,
+   ENVENTOR_TEMPLATE_INSERT_LIVE_EDIT
+} Enventor_Template_Insert_Type;
+
+typedef enum {
+   ENVENTOR_SYNTAX_COLOR_STRING,
+   ENVENTOR_SYNTAX_COLOR_COMMENT,
+   ENVENTOR_SYNTAX_COLOR_MACRO,
+   ENVENTOR_SYNTAX_COLOR_SYMBOL,
+   ENVENTOR_SYNTAX_COLOR_MAIN_KEYWORD,
+   ENVENTOR_SYNTAX_COLOR_SUB_KEYWORD,
+   ENVENTOR_SYNTAX_COLOR_CONSTANT,
+   ENVENTOR_SYNTAX_COLOR_SCRIPT_FUNC,
+   ENVENTOR_SYNTAX_COLOR_SCRIPT_KEYWORD,
+   ENVENTOR_SYNTAX_COLOR_LAST
+} Enventor_Syntax_Color_Type;
+
+EAPI int enventor_init(int argc, char **argv);
+EAPI int enventor_shutdown(void);
+
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include "Enventor_Legacy.h"
 #endif
@@ -21,10 +103,6 @@ extern "C"
 #include "Enventor_Eo.h"
 #endif
 
-EAPI int enventor_init(int argc, char **argv);
-EAPI int enventor_shutdown(void);
-EAPI Evas_Object *enventor_object_add(Evas_Object *parent);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/lib/Enventor_Legacy.h b/src/lib/Enventor_Legacy.h
index 3e1b54d..aad0368 100644
--- a/src/lib/Enventor_Legacy.h
+++ b/src/lib/Enventor_Legacy.h
@@ -1,84 +1,3 @@
-/***
- * Compatible ABI for Win32
- ***/
-#ifdef _WIN32
-# ifdef EAPI
-#  undef EAPI
-# endif
-# ifdef ENVENTOR_WIN32_BUILD_SUPPORT
-#  define EAPI __declspec(dllexport)
-# else
-#  define EAPI __declspec(dllimport)
-# endif
-# ifdef EOAPI
-#  undef EOAPI
-# endif
-#define EOAPI EAPI
-#endif
-
-typedef enum
-{
-   ENVENTOR_CTXPOPUP_TYPE_SLIDER = 0,
-   ENVENTOR_CTXPOPUP_TYPE_LIST,
-   ENVENTOR_CTXPOPUP_TYPE_TOGGLE,
-   ENVENTOR_CTXPOPUP_TYPE_IMAGE
-} Enventor_Ctxpopup_Type;
-
-typedef enum
-{
-   ENVENTOR_PATH_TYPE_EDJ = 0,
-   ENVENTOR_PATH_TYPE_IMAGE,
-   ENVENTOR_PATH_TYPE_SOUND,
-   ENVENTOR_PATH_TYPE_FONT,
-   ENVENTOR_PATH_TYPE_DATA,
-   ENVENTOR_PATH_TYPE_LAST
-} Enventor_Path_Type;
-
-typedef struct
-{
-   Evas_Coord x;
-   Evas_Coord y;
-   float relx;
-   float rely;
-} Enventor_Live_View_Cursor;
-
-typedef struct
-{
-   Evas_Coord w;
-   Evas_Coord h;
-} Enventor_Live_View_Size;
-
-typedef struct
-{
-   int cur_line;
-   int max_line;
-} Enventor_Cursor_Line;
-
-typedef struct
-{
-   Eina_Bool self_changed : 1;
-} Enventor_EDC_Modified;
-
-typedef enum {
-   ENVENTOR_TEMPLATE_INSERT_DEFAULT,
-   ENVENTOR_TEMPLATE_INSERT_LIVE_EDIT
-} Enventor_Template_Insert_Type;
-
-typedef enum {
-   ENVENTOR_SYNTAX_COLOR_STRING,
-   ENVENTOR_SYNTAX_COLOR_COMMENT,
-   ENVENTOR_SYNTAX_COLOR_MACRO,
-   ENVENTOR_SYNTAX_COLOR_SYMBOL,
-   ENVENTOR_SYNTAX_COLOR_MAIN_KEYWORD,
-   ENVENTOR_SYNTAX_COLOR_SUB_KEYWORD,
-   ENVENTOR_SYNTAX_COLOR_CONSTANT,
-   ENVENTOR_SYNTAX_COLOR_SCRIPT_FUNC,
-   ENVENTOR_SYNTAX_COLOR_SCRIPT_KEYWORD,
-   ENVENTOR_SYNTAX_COLOR_LAST
-} Enventor_Syntax_Color_Type;
-
-EAPI int enventor_init(int argc, char **argv);
-EAPI int enventor_shutdown(void);
 EAPI Evas_Object *enventor_object_add(Evas_Object *parent);
 EAPI Eina_Bool enventor_object_file_set(Evas_Object *obj, const char *file);
 
diff --git a/src/lib/enventor_private.h b/src/lib/enventor_private.h
index 74a1052..2ce11d0 100644
--- a/src/lib/enventor_private.h
+++ b/src/lib/enventor_private.h
@@ -1,25 +1,6 @@
 #ifndef __ENVENTOR_PRIVATE_H__
 #define __ENVENTOR_PRIVATE_H__
 
-/***
- * Compatible ABI for Win32
- ***/
-#ifdef _WIN32
-# ifdef EAPI
-#  undef EAPI
-# endif
-# ifdef ENVENTOR_WIN32_BUILD_SUPPORT
-#  define EAPI __declspec(dllexport)
-# else
-#  define EAPI __declspec(dllimport)
-# endif
-# ifdef EOAPI
-#  undef EOAPI
-# endif
-#define EOAPI EAPI
-#endif
-
-
 #include "common.h"
 
 #define QUOT "&quot;"

-- 


Reply via email to