Changeset 9664 in orxonox.OLD for trunk/src/lib

Timestamp:

Aug 20, 2006, 7:50:38 PM (18 years ago)

Author:

bensch

Message:

some more thoughts… but it looks like a hard one

Location:

trunk/src/lib/lang

Files:

• new_class_id.cc (modified) (2 diffs)
• new_class_id.h (modified) (2 diffs)
• new_object_list.cc (modified) (1 diff)
• new_object_list.h (modified) (4 diffs)

trunk/src/lib/lang/new_class_id.cc

@@ -26 +26 @@
  */
 NewClassID::NewClassID ()
-    : _className("")
+    : _objectList(NULL)
 {}
 
@@ -35 +35 @@
 NewClassID::~NewClassID ()
 {
-  // delete what has to be deleted here
+  assert(_objectList != NULL);
+
+  //  _objectList->unregister(this);
 }
 

trunk/src/lib/lang/new_class_id.h

@@ -9 +9 @@
 
 #include "type_info.h"
-#include <set>
 #include <string>
 
@@ -21 +20 @@
   ~NewClassID();
 
-  void registerObject(NewObjectListBase* object);
+  template<class T> void registerObject(T* object, NewObjectList<T>& list);
 
 private:
-  std::string                   _className;
-
+  NewObjectListBase*            _objectList;
 };
 
 
+template<class T> void NewClassID::registerObject(T* object, NewObjectList<T>& objectList)
+{
+  this->_objectList = &objectList;
+  objectList.registerObject(object);
+}
+
 #endif /* _NEW_CLASS_ID_H */

trunk/src/lib/lang/new_object_list.cc

@@ -29 +29 @@
   this->_id = NewObjectListBase::_idCounter++;
 
-
 }
 

trunk/src/lib/lang/new_object_list.h

@@ -32 +32 @@
   bool compareName(const NewObjectListBase& more) { return this->_name < more.name(); };
   bool compareID(const NewObjectListBase& more) { return this->_id < more.id(); };
-
 
   static unsigned int                   classCount() { return _idCounter; };
@@ -75 +74 @@
   typedef typename list::iterator     iterator;
 
-
 public:
   NewObjectList(const std::string& name);
@@ -83 +81 @@
   inline const list&      objects() const { return _objects; };
 
+  void registerObject(T* object);
+  void unregisterObject(T* object);
 
 private:
@@ -112 +112 @@
 }
 
+template <class T>
+void NewObjectList<T>::registerObject(T* object)
+{
+  this->_objects.push_back(object);
+}
+
+template <class T>
+void NewObjectList<T>::unregisterObject(T* object)
+{
+  _objects.erase(std::find(_objects.begin(), _objects.end(), object));
+}
+
+
 #endif /* _NEW_OBJECT_LIST_H */