some work ...

Makefile

@@ -159,9 +159,9 @@ CXXFILES+=		tools/AL/AL_Mutex.cpp					\
 				tools/MsgBroadcast/AccelKey.cpp			\
 				tools/charset/charsetTable.cpp			\
 				tools/charset/charset.cpp				\
-				tools/EdnRegExp/EdnRegExp.cpp			\
 				tools/NameSpaceEdn/File.cpp				\
-				tools/NameSpaceEdn/String.cpp
+				tools/NameSpaceEdn/String.cpp			\
+				tools/NameSpaceEdn/RegExp.cpp
 
 # Gui:
 CXXFILES+=		CustumWidget/BufferView/BufferView.cpp		\

Sources/Buffer/BufferText.cpp

@@ -29,6 +29,7 @@
 #include "BufferText.h"
 #include "toolsMemory.h"
 #include "Edn.h"
+#include "RegExp.h"
 
 #undef __class__
 #define __class__	"BufferText"
@@ -1145,7 +1146,6 @@ void BufferText::AddChar(char * UTF8data)
 	UpdateWindowsPosition();
 }
 
-#include "EdnRegExp.h"
 
 int32_t BufferText::FindLine(Edn::String &data)
 {

Sources/Highlight/HighlightPattern.h

@@ -29,7 +29,7 @@
 class HighlightPattern;
 
 #include "Edn.h"
-#include "EdnRegExp.h"
+#include "RegExp.h"
 #include "Colorize.h"
 #include "EdnVectorBin.h"
 #include "tinyxml.h"

Sources/tools/NameSpaceEdn/Edn.h

@@ -28,17 +28,8 @@
 #include "toolsMemory.h"
 #include "EdnVectorBin.h"
 
-#ifndef __EDN_H__
-#define __EDN_H__
 
-#define _IN_NAMESPACE_EDN_ (plop)
+#include "String.h"
 
-namespace Edn
+#include "File.h"
-{
-	#include "String.h"
-	#include "File.h"
-}
 
-#undef IN_NAMESPACE_EDN
-
-#endif

Sources/tools/NameSpaceEdn/File.h

@@ -23,13 +23,13 @@
  *******************************************************************************
  */
 
+#ifndef __EDN__FILE_H__
+#define __EDN__FILE_H__
 
-#ifndef _IN_NAMESPACE_EDN_
+namespace Edn
-#	error This will be include only in "edn.h"
-#else 
-
-class File
 {
+	class File
+	{
 		public:
 			            File(void) { m_lineNumberOpen=0; }
 			            File(Edn::String &filename, int32_t LineNumber = 0);
@@ -47,7 +47,8 @@ class File
 			Edn::String m_folder;
 			Edn::String m_shortFilename;
 			int32_t     m_lineNumberOpen;
-};
+	};
+}
 
 #endif
 

Sources/tools/NameSpaceEdn/RegExp.cpp

@@ -1,6 +1,6 @@
 /**
  *******************************************************************************
- * @file EdnRegExp.cpp
+ * @file RegExp.cpp
  * @brief Editeur De N'ours : Regular expression annalyser (sources)
  * @author Edouard DUPIN
  * @date 04/04/2011
@@ -26,7 +26,7 @@
 #include "tools_debug.h"
 #include "tools_globals.h"
 #include "toolsMemory.h"
-#include "EdnRegExp.h"
+#include "RegExp.h"
 
 
 // internal define to permit to have all neeed system

Sources/tools/NameSpaceEdn/RegExp.h

@@ -1,6 +1,6 @@
 /**
  *******************************************************************************
- * @file EdnRegExp.h
+ * @file RegExp.h
  * @brief Editeur De N'ours : Regular expression annalyser (header)
  * @author Edouard DUPIN
  * @date 04/04/2011

Sources/tools/NameSpaceEdn/String.h

@@ -22,11 +22,11 @@
  *
  *******************************************************************************
  */
+#ifndef __END__STRING_H__
+#define __END__STRING_H__
 
-#ifndef _IN_NAMESPACE_EDN_
+namespace Edn
-#	error This will be include only in "edn.h"
+{
-#else 
-
 	class String
 	{
 		public:
@@ -77,6 +77,7 @@
 	};
 
 	void TestUntaire_String(void);
+}
 
 #endif