Changeset 9685 in orxonox.OLD for branches/new_class_id/src/lib/lang/new_object_list.h

Timestamp:

Aug 22, 2006, 1:16:23 PM (18 years ago)

Author:

bensch

Message:

adapted many classes to the new ClassID System, now comes the hard part… Scripting… then Network… wow this will be so bad :/

File:

• branches/new_class_id/src/lib/lang/new_object_list.h (modified) (4 diffs)

branches/new_class_id/src/lib/lang/new_object_list.h

@@ -8 +8 @@
 #define _NEW_OBJECT_LIST_H
 
-#include "type_info.h"
+#include "new_class_id.h"
 #include <map>
 #include <list>
@@ -40 +40 @@
 
 public:
-  inline int id() const { return _id; };
-  inline const std::string& name() const { return _name; };
-  bool operator==(int id) const { return _id == id; };
-  bool operator==(const std::string& name) const { return _name == name; };
+  inline int id() const { return _identity.id(); };
+  inline const std::string& name() const { return _identity.name(); };
+  bool operator==(int id) const { return _identity == id; };
+  bool operator==(const std::string& name) const { return _identity == name; };
 
   virtual void debug() const = 0;
@@ -69 +69 @@
   typedef std::map<std::string, NewObjectListBase*> classNameMap;//!< The Generic Map.
 
-  int                           _id;                //!< The ID of the class.
-  std::string                   _name;              //!< The Name of the Class.
+  NewClassID                    _identity;          //!< The Identity of the Class (ID and Name).
 
 private:
@@ -114 +113 @@
   inline const list&      objects() const { return _objects; };
 
+  inline iterator begin() { return _objects.begin(); };
+  inline const_iterator begin() const { return _objects.begin(); };
+  inline iterator  end() { return _objects.end(); };
+  inline const_iterator  end() const { return _objects.end(); };
+
+  inline bool empty() const { return _objects.empty(); };
+  inline int size() const { return _objects.size(); };
+  inline T* front() const { return _objects.front(); };
+  inline T* back() const { return _objects.back(); };
+
   NewObjectListBase::IteratorBase* registerObject(T* object);
   void unregisterObject(IteratorBase* iterator);