some work ...

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 "String.h"
-	#include "File.h"
-}
+#include "File.h"
 
-#undef IN_NAMESPACE_EDN
-
-#endif

Sources/tools/NameSpaceEdn/File.h

@@ -23,31 +23,32 @@
  *******************************************************************************
  */
 
+#ifndef __EDN__FILE_H__
+#define __EDN__FILE_H__
 
-#ifndef _IN_NAMESPACE_EDN_
-#	error This will be include only in "edn.h"
-#else 
-
-class File
+namespace Edn
 {
-	public:
-		            File(void) { m_lineNumberOpen=0; }
-		            File(Edn::String &filename, int32_t LineNumber = 0);
-		            File(Edn::String &filename, Edn::String &folder, int32_t lineNumber = 0);
-		            ~File(void);
-		Edn::String GetFolder(void);
-		Edn::String GetShortFilename(void);
-		Edn::String GetCompleateName(void);
-		int32_t     GetLineNumber(void);
-		
-		void        SetCompleateName(Edn::String &newFilename);
-		
-	private :
-		void        ExtranctAndName(Edn::String &inputString);
-		Edn::String m_folder;
-		Edn::String m_shortFilename;
-		int32_t     m_lineNumberOpen;
-};
+	class File
+	{
+		public:
+			            File(void) { m_lineNumberOpen=0; }
+			            File(Edn::String &filename, int32_t LineNumber = 0);
+			            File(Edn::String &filename, Edn::String &folder, int32_t lineNumber = 0);
+			            ~File(void);
+			Edn::String GetFolder(void);
+			Edn::String GetShortFilename(void);
+			Edn::String GetCompleateName(void);
+			int32_t     GetLineNumber(void);
+			
+			void        SetCompleateName(Edn::String &newFilename);
+			
+		private :
+			void        ExtranctAndName(Edn::String &inputString);
+			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_
-#	error This will be include only in "edn.h"
-#else 
-
+namespace Edn
+{
 	class String
 	{
 		public:
@@ -77,6 +77,7 @@
 	};
 
 	void TestUntaire_String(void);
+}
 
 #endif