Changeset 10114 in orxonox.OLD for trunk/src/lib/lang/object_list.h

Timestamp:

Dec 19, 2006, 11:55:26 PM (17 years ago)

Author:

patrick

Message:

merged network back to trunk

File:

• trunk/src/lib/lang/object_list.h (modified) (5 diffs)

trunk/src/lib/lang/object_list.h

@@ -32 +32 @@
  * @brief Use this macro to easily define a Class to store its own ObjectListDefinition
  * @param ClassName: the Name of the Class.
- * @param ID: optional set a Fixed ID.
- */
-#define ObjectListDefinitionID(ClassName, ID) \
-   ObjectList<ClassName> ClassName::_objectList(#ClassName, ID)
-
-/**
- * @brief Use this macro to easily define a Class to store its own ObjectListDefinition
- * @param ClassName: the Name of the Class.
  */
 #define ObjectListDefinition(ClassName) \
-    ObjectListDefinitionID(ClassName, -1)
+    ObjectList<ClassName> ClassName::_objectList(#ClassName)
 
 class BaseObject;
@@ -109 +101 @@
 
 protected:
-  ObjectListBase(const std::string& className, int id = -1);
+  ObjectListBase(const std::string& className);
   virtual ~ObjectListBase();
 
@@ -133 +125 @@
   static NameMap*               _classesByName;     //!< A Map of all the classes in existance.
   static std::list<std::string> _classNames;        //!< A list of all the registered ClassNames.
+
+public:
+  static void replaceIDMap( const std::map<std::string, int>& str2id );
+  static std::map<std::string, int>* createStrToId();
 };
 
@@ -199 +195 @@
 
 public:
-  ObjectList(const std::string& name, int id = -1);
+  ObjectList(const std::string& name);
   ~ObjectList();
 
@@ -256 +252 @@
  */
 template <class T>
-ObjectList<T>::ObjectList(const std::string& name, int id)
-    : ObjectListBase(name, id)
+ObjectList<T>::ObjectList(const std::string& name)
+    : ObjectListBase(name)
 {}