Changeset 9672 in orxonox.OLD for trunk/src/lib/lang/new_object_list.h

Timestamp:

Aug 21, 2006, 5:58:01 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: ClassList objectively implemented. This is not the fastest, but the most modular approach.
Now is the question of redundancy in code writing:
Should the ClassWriter explicitely declare a Class with superclasses, or should on runtime each object decide for itself, as it is done in BaseObject at the moment… questions questions questions…

File:

• trunk/src/lib/lang/new_object_list.h (modified) (6 diffs)

trunk/src/lib/lang/new_object_list.h

@@ -25 +25 @@
 public:
   class IteratorBase { };
+  struct ClassEntry{
+    inline ClassEntry (NewObjectListBase* objectList, NewObjectListBase::IteratorBase* iterator) : _objectList(objectList), _iterator(iterator) {}
+    NewObjectListBase*                _objectList;
+    NewObjectListBase::IteratorBase*  _iterator;
+  };
 
 public:
@@ -45 +50 @@
   static const std::list<std::string>&  getClassNames();
 
-  virtual void unregisterObject(std::list<NewObjectListBase::IteratorBase*> _iterators) = 0;
+  virtual void unregisterObject(IteratorBase* _iterators) = 0;
 
 protected:
@@ -91 +96 @@
   {
   public:
-    Iterator(iterator it) { it = it; }
-    typename NewObjectList::iterator it;
+    Iterator(iterator it) { _it = it; }
+    inline iterator& it() { return _it; }
+    typename NewObjectList::iterator _it;
   };
 
@@ -102 +108 @@
   inline const list&      objects() const { return _objects; };
 
-  NewObjectListBase::IteratorBase* registerObject(T* object, NewObjectListBase* objectList);
-  void unregisterObject(const IteratorBase& iterator);
-  virtual void unregisterObject(std::list<NewObjectListBase::IteratorBase*> _iterators) = 0;
+  NewObjectListBase::IteratorBase* registerObject(T* object);
+  void unregisterObject(IteratorBase* iterator);
 
   virtual void debug() const;
@@ -145 +150 @@
 
 template <class T>
-    NewObjectListBase::IteratorBase* NewObjectList<T>::registerObject(T* object, NewObjectListBase* objectList)
+    NewObjectListBase::IteratorBase* NewObjectList<T>::registerObject(T* object)
 {
-  if(this->_typeOfList.empty())
-  {
-    this->_typeOfList.push_back(objectList);
-  }
-
   this->_objects.push_front(object);
   return new Iterator(this->_objects.begin());
@@ -157 +157 @@
 
 template <class T>
-void NewObjectList<T>::unregisterObject(const IteratorBase& iterator)
+void NewObjectList<T>::unregisterObject(IteratorBase* iterator)
 {
-  this->_objects.erase(static_cast<Iterator>(iterator));
+  this->_objects.erase(static_cast<Iterator*>(iterator)->it());
   //_objects.erase(std::find(_objects.begin(), _objects.end(), object));
 }