re-factor ExtEditor header.

diff --git a/lua/lua-plugin.h b/lua/lua-plugin.h
index a7f37cd..a427667 100644 (file)
--- a/lua/lua-plugin.h
+++ b/lua/lua-plugin.h
@@ -31,7 +31,7 @@ LUALIB_API int (luaopen_myos) (lua_State * L);
 
 #define LUA_IMELIB_CONTEXT "__context"
 
-typedef struct{
+typedef struct _lua_command_t{
   const char * command_name;
   const char * lua_function_name;
   const char * description;
@@ -39,13 +39,13 @@ typedef struct{
   const char * help; /* optional. */
 } lua_command_t;
 
-typedef struct{
+typedef struct _lua_command_candidate_t{
   const char * suggest;
   const char * help;
   const char * content;
 } lua_command_candidate_t;
 
-typedef struct{
+typedef struct _lua_trigger_t{
   const char * lua_function_name;
   const char * description;
   /*< private, skip it, and register it into Special Table directly with * wildcard. >*/

diff --git a/src/ExtEditor.cc b/src/ExtEditor.cc
index a4b2104..2c6cce0 100644 (file)
--- a/src/ExtEditor.cc
+++ b/src/ExtEditor.cc
@@ -21,6 +21,13 @@
 
 #include <string>
 
+extern "C" {
+#include <lua.h>
+#include <lualib.h>
+#include <lauxlib.h>
+#include "lua-plugin.h"
+}
+
 #include "Config.h"
 #include "Pointer.h"
 #include "LookupTable.h"

diff --git a/src/ExtEditor.h b/src/ExtEditor.h
index f194835..2e918fe 100644 (file)
--- a/src/ExtEditor.h
+++ b/src/ExtEditor.h
@@ -22,12 +22,9 @@
 #define __PY_EXT_EDITOR_
 
 #include <glib.h>
-extern "C" {
-#include <lua.h>
-#include <lualib.h>
-#include <lauxlib.h>
-#include "lua-plugin.h"
-}
+
+typedef struct _IBusEnginePlugin IBusEnginePlugin;
+typedef struct _lua_command_candidate_t lua_command_candidate_t;
 
 namespace PY {