[Orxonox-commit 1049] r5769 - code/branches/core5/src/libraries/core

[landauf at orxonox.net]

Author: landauf
Date: 2009-09-23 20:53:33 +0200 (Wed, 23 Sep 2009)
New Revision: 5769

Modified:
   code/branches/core5/src/libraries/core/ClassFactory.h
   code/branches/core5/src/libraries/core/Factory.h
   code/branches/core5/src/libraries/core/Identifier.cc
Log:
moved BaseFactory from Factory.h to ClassFactory.h

Modified: code/branches/core5/src/libraries/core/ClassFactory.h
===================================================================
--- code/branches/core5/src/libraries/core/ClassFactory.h	2009-09-23 18:43:45 UTC (rev 5768)
+++ code/branches/core5/src/libraries/core/ClassFactory.h	2009-09-23 18:53:33 UTC (rev 5769)
@@ -47,6 +47,17 @@
 namespace orxonox
 {
     // ###############################
+    // ###       BaseFactory       ###
+    // ###############################
+    //! Base-class of ClassFactory.
+    class _CoreExport BaseFactory
+    {
+        public:
+            virtual BaseObject* fabricate(BaseObject* creator) = 0;
+            virtual ~BaseFactory() {};
+    };
+
+    // ###############################
     // ###      ClassFactory       ###
     // ###############################
     //! The ClassFactory is able to create new objects of a specific class.

Modified: code/branches/core5/src/libraries/core/Factory.h
===================================================================
--- code/branches/core5/src/libraries/core/Factory.h	2009-09-23 18:43:45 UTC (rev 5768)
+++ code/branches/core5/src/libraries/core/Factory.h	2009-09-23 18:53:33 UTC (rev 5769)
@@ -85,17 +85,6 @@
             std::map<std::string, Identifier*> identifierStringMap_;            //!< The map, mapping the name with the Identifier
             std::map<uint32_t, Identifier*> identifierNetworkIDMap_;        //!< The map, mapping the network ID with the Identifier
     };
-
-    // ###############################
-    // ###       BaseFactory       ###
-    // ###############################
-    //! Base-class of ClassFactory. Has to be defined separate because of circular dependencies.
-    class _CoreExport BaseFactory
-    {
-        public:
-            virtual BaseObject* fabricate(BaseObject* creator) = 0;
-            virtual ~BaseFactory() {};
-    };
 }
 
 #endif /* _Factory_H__ */

Modified: code/branches/core5/src/libraries/core/Identifier.cc
===================================================================
--- code/branches/core5/src/libraries/core/Identifier.cc	2009-09-23 18:43:45 UTC (rev 5768)
+++ code/branches/core5/src/libraries/core/Identifier.cc	2009-09-23 18:53:33 UTC (rev 5769)
@@ -38,7 +38,7 @@
 #include "util/StringUtils.h"
 #include "ConfigValueContainer.h"
 #include "ConsoleCommand.h"
-#include "Factory.h"
+#include "ClassFactory.h"
 #include "XMLPort.h"
 
 namespace orxonox