change some file position

2012-04-24 09:42:14 +02:00 · 2012-04-24 09:42:14 +02:00 · cd2b72d369
commit cd2b72d369
parent 5cc4a1a779
37 changed files with 60 additions and 61 deletions
--- a/jni/appl/Buffer/Buffer.cpp
+++ b/jni/appl/Buffer/Buffer.cpp
@ -24,7 +24,7 @@
 */
 
 #include <appl/Debug.h>
-#include <tools_globals.h>
+#include <appl/global.h>
 #include <Buffer.h>
 #include <BufferManager.h>
 #include <ewol/EObject.h>
--- a/jni/appl/Buffer/BufferEmpty.cpp
+++ b/jni/appl/Buffer/BufferEmpty.cpp
@ -24,7 +24,7 @@
 */
 
 #include <appl/Debug.h>
-#include <tools_globals.h>
+#include <appl/global.h>
 #include <BufferEmpty.h>
 #include <ColorizeManager.h>
 #include <MainWindows.h>
--- a/jni/appl/Buffer/BufferManager.cpp
+++ b/jni/appl/Buffer/BufferManager.cpp
@ -25,7 +25,7 @@


 #include <appl/Debug.h>
-#include <tools_globals.h>
+#include <appl/global.h>
 #include <BufferManager.h>
 #include <ewol/EObject.h>
 #include <ewol/EObjectManager.h>
--- a/jni/appl/Buffer/BufferManager.h
+++ b/jni/appl/Buffer/BufferManager.h
@ -29,7 +29,7 @@
 #include <Buffer.h>
 #include <BufferText.h>
 #include <BufferEmpty.h>
-#include <MsgBroadcast.h>
+#include <appl/globalMsg.h>
 #include <ewol/Widget.h>

 namespace BufferManager
--- a/jni/appl/Buffer/BufferText.cpp
+++ b/jni/appl/Buffer/BufferText.cpp
@ -24,7 +24,7 @@
 */
 
 #include <appl/Debug.h>
-#include <tools_globals.h>
+#include <appl/global.h>
 #include <BufferText.h>
 #include <etk/RegExp.h>
 #include <etk/unicode.h>
--- a/jni/appl/Buffer/EdnBuf/EdnBuf.cpp
+++ b/jni/appl/Buffer/EdnBuf/EdnBuf.cpp
@ -26,7 +26,7 @@
 #include <etk/Types.h>
 #include <etk/unicode.h>
 #include <appl/Debug.h>
-#include <tools_globals.h>
+#include <appl/global.h>
 #include <EdnBuf.h>


--- a/jni/appl/Buffer/EdnBuf/EdnBuf.h
+++ b/jni/appl/Buffer/EdnBuf/EdnBuf.h
--- a/jni/appl/Buffer/EdnBuf/EdnBufHistory.cpp
+++ b/jni/appl/Buffer/EdnBuf/EdnBufHistory.cpp
@ -25,7 +25,7 @@


 #include <appl/Debug.h>
-#include <tools_globals.h>
+#include <appl/global.h>
 #include <EdnBufHistory.h>


--- a/jni/appl/Buffer/EdnBuf/EdnBufHistory.h
+++ b/jni/appl/Buffer/EdnBuf/EdnBufHistory.h
--- a/jni/appl/Buffer/EdnBuf/EdnBuf_HighLight.cpp
+++ b/jni/appl/Buffer/EdnBuf/EdnBuf_HighLight.cpp
@ -24,7 +24,7 @@
 */

 #include <appl/Debug.h>
-#include <tools_globals.h>
+#include <appl/global.h>
 #include <EdnBuf.h>


--- a/jni/appl/Buffer/EdnBuf/EdnBuf_History.cpp
+++ b/jni/appl/Buffer/EdnBuf/EdnBuf_History.cpp
@ -24,7 +24,7 @@
 */

 #include <appl/Debug.h>
-#include <tools_globals.h>
+#include <appl/global.h>
 #include <EdnBuf.h>


--- a/jni/appl/Buffer/EdnBuf/EdnBuf_Selection.cpp
+++ b/jni/appl/Buffer/EdnBuf/EdnBuf_Selection.cpp
@ -24,7 +24,7 @@
 */

 #include <appl/Debug.h>
-#include <tools_globals.h>
+#include <appl/global.h>
 #include <EdnBuf.h>


--- a/jni/appl/tools/EdnTemplate/EdnVectorBuf.cpp
+++ b/jni/appl/tools/EdnTemplate/EdnVectorBuf.cpp
@ -24,7 +24,7 @@
 */

 #include <appl/Debug.h>
-#include <tools_globals.h>
+#include <appl/global.h>
 #include <EdnVectorBuf.h>

 #undef __class__
--- a/jni/appl/tools/EdnTemplate/EdnVectorBuf.h
+++ b/jni/appl/tools/EdnTemplate/EdnVectorBuf.h
--- a/jni/appl/Colorize/Colorize.cpp
+++ b/jni/appl/Colorize/Colorize.cpp
@ -24,7 +24,7 @@
 */

 #include <appl/Debug.h>
-#include <tools_globals.h>
+#include <appl/global.h>
 #include <Colorize.h>


--- a/jni/appl/Colorize/ColorizeManager.cpp
+++ b/jni/appl/Colorize/ColorizeManager.cpp
@ -23,7 +23,7 @@
 *******************************************************************************
 */
 #include <appl/Debug.h>
-#include <tools_globals.h>
+#include <appl/global.h>
 #include <ColorizeManager.h>
 #include <tinyXML/tinyxml.h>
 #include <ewol/EObject.h>
--- a/jni/appl/Colorize/ColorizeManager.h
+++ b/jni/appl/Colorize/ColorizeManager.h
@ -27,7 +27,7 @@
 #define __COLORIZE_MANAGER_H__

 #include <Colorize.h>
-#include <MsgBroadcast.h>
+#include <appl/globalMsg.h>
 #include <ewol/Widget.h>

 typedef enum {
--- a/jni/appl/Gui/BufferView.cpp
+++ b/jni/appl/Gui/BufferView.cpp
@ -24,7 +24,7 @@
 */

 #include <appl/Debug.h>
-#include <tools_globals.h>
+#include <appl/global.h>
 #include <BufferView.h>
 #include <BufferManager.h>
 #include <ColorizeManager.h>
--- a/jni/appl/Gui/BufferView.h
+++ b/jni/appl/Gui/BufferView.h
@ -28,7 +28,7 @@
 #include <appl/Debug.h>
 #include <CodeView.h>
 #include <BufferManager.h>
-#include <MsgBroadcast.h>
+#include <appl/globalMsg.h>
 #include <ewol/widget/List.h>

 //!< EObject name :
--- a/jni/appl/Gui/CodeView.cpp
+++ b/jni/appl/Gui/CodeView.cpp
@ -27,7 +27,7 @@
 #include <CodeView.h>

 #include <appl/Debug.h>
-#include <tools_globals.h>
+#include <appl/global.h>
 #include <CodeView.h>
 #include <BufferManager.h>
 #include <ColorizeManager.h>
--- a/jni/appl/Gui/CodeView.h
+++ b/jni/appl/Gui/CodeView.h
@ -29,7 +29,7 @@
 #include <appl/Debug.h>
 #include <CodeView.h>
 #include <BufferManager.h>
-#include <MsgBroadcast.h>
+#include <appl/globalMsg.h>

 #include <etk/Types.h>
 #include <ewol/widget/WidgetScrolled.h>
--- a/jni/appl/Gui/MainWindows.cpp
+++ b/jni/appl/Gui/MainWindows.cpp
@ -24,7 +24,7 @@
 */

 #include <appl/Debug.h>
-#include <tools_globals.h>
+#include <appl/global.h>
 #include <MainWindows.h>
 #include <CodeView.h>
 #include <BufferView.h>
--- a/jni/appl/Gui/MainWindows.h
+++ b/jni/appl/Gui/MainWindows.h
@ -26,7 +26,7 @@
 #define __MAIN_WINDOWS_H__

 #include <appl/Debug.h>
-#include <MsgBroadcast.h>
+#include <appl/globalMsg.h>

 #include <CodeView.h>
 #include <BufferView.h>
--- a/jni/appl/Gui/Search.cpp
+++ b/jni/appl/Gui/Search.cpp
@ -24,12 +24,12 @@
 */


-#include "tools_globals.h"
+#include "appl/global.h"
 #include "Search.h"
 #include "SearchData.h"
 #include "BufferManager.h"
 #include "MainWindows.h"
-#include "MsgBroadcast.h"
+#include "appl/globalMsg.h"

 #undef __class__
 #define __class__	"Search"
--- a/jni/appl/Gui/SearchData.cpp
+++ b/jni/appl/Gui/SearchData.cpp
@ -23,7 +23,7 @@
 *******************************************************************************
 */

-#include <tools_globals.h>
+#include <appl/global.h>
 #include <SearchData.h>


--- a/jni/appl/Highlight/Highlight.cpp
+++ b/jni/appl/Highlight/Highlight.cpp
@ -24,7 +24,7 @@
 */

 #include <appl/Debug.h>
-#include <tools_globals.h>
+#include <appl/global.h>
 #include <Highlight.h>
 #include <tinyXML/tinyxml.h>

--- a/jni/appl/Highlight/HighlightManager.cpp
+++ b/jni/appl/Highlight/HighlightManager.cpp
@ -24,7 +24,7 @@
 */

 #include <appl/Debug.h>
-#include <tools_globals.h>
+#include <appl/global.h>
 #include <HighlightManager.h>
 #include <ewol/EObject.h>
 #include <ewol/EObjectManager.h>
--- a/jni/appl/Highlight/HighlightManager.h
+++ b/jni/appl/Highlight/HighlightManager.h
@ -28,7 +28,7 @@


 #include <etk/UString.h>
-#include <MsgBroadcast.h>
+#include <appl/globalMsg.h>
 #include <Highlight.h>
 #include <ewol/Widget.h>

--- a/jni/appl/Highlight/HighlightPattern.cpp
+++ b/jni/appl/Highlight/HighlightPattern.cpp
@ -23,7 +23,7 @@
 *******************************************************************************
 */
 #include <appl/Debug.h>
-#include <tools_globals.h>
+#include <appl/global.h>
 #include <HighlightPattern.h>
 #include <ColorizeManager.h>

--- a/jni/appl/ctags/CTagsManager.cpp
+++ b/jni/appl/ctags/CTagsManager.cpp
@ -24,7 +24,7 @@
 */

 #include <appl/Debug.h>
-#include <tools_globals.h>
+#include <appl/global.h>
 #include <CTagsManager.h>
 #include <BufferManager.h>
 #include <ewol/EObject.h>
--- a/jni/appl/ctags/CTagsManager.h
+++ b/jni/appl/ctags/CTagsManager.h
@ -28,7 +28,7 @@


 #include <ewol/Widget.h>
-#include "MsgBroadcast.h"
+#include "appl/globalMsg.h"
 #include "readtags.h"

 #define MAX_REG_EXP_SEARCH	(1024)
--- a/jni/appl/tools/tools_globals.cpp
+++ b/jni/appl/tools/tools_globals.cpp
@ -23,9 +23,9 @@
 *******************************************************************************
 */

-#include <tools_globals.h>
+#include <appl/global.h>
 #include <ColorizeManager.h>
-#include <MsgBroadcast.h>
+#include <appl/globalMsg.h>
 #include <ewol/EObject.h>

 #undef __class__
--- a/jni/appl/tools/tools_globals.h
+++ b/jni/appl/tools/tools_globals.h
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file tools_globals.h
+ * @file appl/global.h
 * @brief Editeur De N'ours : Globals Values (header)
 * @author Edouard DUPIN
 * @date 05/12/2010
--- a/jni/appl/tools/MsgBroadcast.cpp
+++ b/jni/appl/tools/MsgBroadcast.cpp
@ -23,7 +23,7 @@
 *******************************************************************************
 */

-#include <MsgBroadcast.h>
+#include <appl/globalMsg.h>


 ////////////////////////////////////////////////////////////////////////
--- a/jni/appl/tools/MsgBroadcast.h
+++ b/jni/appl/tools/MsgBroadcast.h
@ -1,6 +1,6 @@
 /**
 *******************************************************************************
- * @file MsgBroadcast.h
+ * @file appl/globalMsg.h
 * @brief Editeur De N'ours : message beetween thread and GUI elements ... (header)
 * @author Edouard DUPIN
 * @date 04/02/2011
--- a/jni/appl/init.cpp
+++ b/jni/appl/init.cpp
@ -23,10 +23,14 @@
 *******************************************************************************
 */

-#include <appl/Debug.h>
-#include <tools_globals.h>
-#include <etk/File.h>
+#include <etk/UString.h>
 #include <ewol/ewol.h>
+#include <ewol/EObject.h>
+#include <ewol/WidgetManager.h>
+
+#include <appl/Debug.h>
+#include <appl/global.h>
+#include <etk/File.h>
 #include <Gui/MainWindows.h>
 #include <BufferManager.h>
 #include <ColorizeManager.h>
@ -35,10 +39,7 @@
 #include <unistd.h>
 #include <readtags.h>
 #include <CTagsManager.h>
-#include <etk/UString.h>
-#include <ewol/EObject.h>
-#include <ewol/WidgetManager.h>
-#include <tools/MsgBroadcast.h>
+#include <globalMsg.h>

 MainWindows * basicWindows = NULL;

--- a/jni/file.mk
+++ b/jni/file.mk
@ -8,22 +8,10 @@
 FILE_LIST+=		appl/ctags/readtags.cpp \
 				appl/ctags/CTagsManager.cpp

-
 # Globals debug tool:
 FILE_LIST+=		appl/Debug.cpp \
-				appl/tools/tools_globals.cpp
-
-# Buffers internal:
-FILE_LIST+=		appl/tools/EdnTemplate/EdnVectorBuf.cpp \
-				appl/tools/EdnBuf/EdnBuf.cpp \
-				appl/tools/EdnBuf/EdnBuf_HighLight.cpp \
-				appl/tools/EdnBuf/EdnBuf_History.cpp \
-				appl/tools/EdnBuf/EdnBuf_Selection.cpp \
-				appl/tools/EdnBuf/EdnBufHistory.cpp
-				
-
-# Tools internal:
-FILE_LIST+=		appl/tools/MsgBroadcast.cpp
+				appl/global.cpp \
+				appl/globalMsg.cpp

 # Gui:
 FILE_LIST+=		appl/Gui/BufferView.cpp \
@ -32,14 +20,24 @@ FILE_LIST+=		appl/Gui/BufferView.cpp \
 				appl/Gui/Search.cpp \
 				appl/Gui/SearchData.cpp

-# Basic Interface :
-FILE_LIST+=		appl/Buffer/Buffer.cpp \
+# All needed for the buffer management :
+FILE_LIST+=		appl/Buffer/EdnVectorBuf.cpp \
+				appl/Buffer/EdnBuf/EdnBuf.cpp \
+				appl/Buffer/EdnBuf/EdnBuf_HighLight.cpp \
+				appl/Buffer/EdnBuf/EdnBuf_History.cpp \
+				appl/Buffer/EdnBuf/EdnBuf_Selection.cpp \
+				appl/Buffer/EdnBuf/EdnBufHistory.cpp \
+				appl/Buffer/Buffer.cpp \
 				appl/Buffer/BufferText.cpp \
 				appl/Buffer/BufferEmpty.cpp \
-				appl/Buffer/BufferManager.cpp \
-				appl/Colorize/Colorize.cpp \
-				appl/Colorize/ColorizeManager.cpp \
-				appl/Highlight/HighlightPattern.cpp \
+				appl/Buffer/BufferManager.cpp
+
+# Generic color management for the text editor : 
+FILE_LIST+=		appl/Colorize/Colorize.cpp \
+				appl/Colorize/ColorizeManager.cpp
+
+# syntax coloration for the text editor
+FILE_LIST+=		appl/Highlight/HighlightPattern.cpp \
 				appl/Highlight/Highlight.cpp \
 				appl/Highlight/HighlightManager.cpp