Changeset 9684 in orxonox.OLD for branches/new_class_id/src/lib/util/loading/factory.h

Timestamp:

Aug 22, 2006, 1:34:31 AM (18 years ago)

Author:

bensch

Message:

orxonox/branches/new_class_id: slowly but surely reimplementing to the new groove… way to go

File:

• branches/new_class_id/src/lib/util/loading/factory.h (modified) (3 diffs)

branches/new_class_id/src/lib/util/loading/factory.h

@@ -38 +38 @@
 
 //! The Factory is a loadable object handler
-class Factory : public BaseObject {
-
- public:
+class Factory : public BaseObject
+{
+  NewObjectListDeclaration(Factory);
+public:
   virtual ~Factory ();
 
@@ -46 +47 @@
 
   static  BaseObject* fabricate(const std::string& className);
-  static  BaseObject* fabricate(ClassID classID);
+  static  BaseObject* fabricate(int classID);
   static  BaseObject* fabricate(const TiXmlElement* root = NULL);
 
 
-  bool operator==(ClassID classID) const;
+  bool operator==(int classID) const;
   bool operator==(const char* className) const;
   bool operator==(const std::string& className) const;
 
-  protected:
-    Factory (const std::string& factoryName, ClassID classID);
-    virtual BaseObject* fabricateObject(const TiXmlElement* root = NULL) const = 0;
+protected:
+  Factory (const std::string& factoryName, int classID);
+  virtual BaseObject* fabricateObject(const TiXmlElement* root = NULL) const = 0;
 
-  protected:
-    const ClassID                 classID;              //!< The Class-Identifyer of the Factory.
-    const std::string             className;            //!< The name of the Class.
-    static std::list<Factory*>*   factoryList;          //!< List of Registered Factories
+protected:
+  const int                     classID;              //!< The Class-Identifyer of the Factory.
+  const std::string             className;            //!< The name of the Class.
+  static std::list<Factory*>*   factoryList;          //!< List of Registered Factories
 };
 
@@ -70 +71 @@
 template<class T> class tFactory : public Factory
 {
- public:
- /**
-  * @brief creates a new type Factory to enable the loading of T
-  * @param factoryName the Name of the Factory to load.
-  * @param classID the ID of the Class to be created.
-  */
-  tFactory (const char* factoryName, ClassID classID)
-   : Factory(factoryName, classID)
+public:
+  /**
+   * @brief creates a new type Factory to enable the loading of T
+   * @param factoryName the Name of the Factory to load.
+   * @param classID the ID of the Class to be created.
+   */
+  tFactory (const char* factoryName, int classID)
+      : Factory(factoryName, classID)
   {  }
 
-  private:
-   /**
-    * @brief fabricates an Object of type T, with the constructor T::T(const TiXmlElemnt*)
-    * @param root the TiXmlElement T should load parameters from.
-    * @return the newly fabricated T.
-    */
-    virtual BaseObject* fabricateObject(const TiXmlElement* root = NULL) const
-    {
-      return new T(root);
-    }
+private:
+  /**
+   * @brief fabricates an Object of type T, with the constructor T::T(const TiXmlElemnt*)
+   * @param root the TiXmlElement T should load parameters from.
+   * @return the newly fabricated T.
+   */
+  virtual BaseObject* fabricateObject(const TiXmlElement* root = NULL) const
+  {
+    return new T(root);
+  }
 };