Changeset 9661 in orxonox.OLD for trunk/src/lib/lang/new_class_list.h

Timestamp:

Aug 20, 2006, 12:21:18 PM (18 years ago)

Author:

bensch

Message:

renamings

File:

• trunk/src/lib/lang/new_class_list.h (modified) (3 diffs)

trunk/src/lib/lang/new_class_list.h

@@ -13 +13 @@
 
 #define DeclareClass(ClassName) \
-   NewClassList ClassID_##ClassName(ClassName)
+   NewObjectList ClassID_##ClassName(ClassName)
 
 #define DeclareInClass(ClassName) \
-   NewClassList classList(ClassName)
+   NewObjectList classList(ClassName)
 
-class NewClassListBase
+class NewObjectListBase
 {
 public:
@@ -26 +26 @@
   static int classCount() { return _idCounter; };
 
+  bool compareName(const NewObjectListBase& more) { return this->_name < more.name(); };
+  bool compareID(const NewObjectListBase& more) { return this->_id < more.id(); };
+
 protected:
-  NewClassListBase(const std::string& className);
+  NewObjectListBase(const std::string& className);
+  ~NewObjectListBase();
 private:
-  NewClassListBase(const NewClassListBase&);
+  NewObjectListBase(const NewObjectListBase&);
 
+  static bool exists(const std::string& className);
 
 private:
@@ -37 +42 @@
 
 private:
+  typedef std::set<NewObjectListBase*>  cList;
+
   static int                           _idCounter;      //!< A counter, that gives all classes a Unique ClassID. Access to this Variable is to be Thread-Safe.
-  static std::set<NewClassListBase>    _classes;        //!< A Set of all the classes in existance.
+  static cList*                        _classes;        //!< A Set of all the classes in existance.
 };
 
-template<class T> class NewClassList : public NewClassListBase
+
+/////////////////////////
+//// TEMPLATISATION /////
+/////////////////////////
+template<class T> class NewObjectList : public NewObjectListBase
 {
 public:
-  NewClassList(const std::string& name);
-  ~NewClassList();
+  NewObjectList(const std::string& name);
+  ~NewObjectList();
 
 private:
   //! the copy constructor will be hidden.
-  NewClassList(const NewClassList& definer) {};
+  NewObjectList(const NewObjectList& definer) {};
 };
 
 template <class T>
-NewClassList<T>::NewClassList(const std::string& name)
-    : NewClassListBase(name)
+NewObjectList<T>::NewObjectList(const std::string& name)
+    : NewObjectListBase(name)
 {}
 
 template <class T>
-NewClassList<T>::~NewClassList()
+NewObjectList<T>::~NewObjectList()
 {}