Changeset 1574 for code/branches/core3/src/core/Loader.cc

Timestamp:

Jun 9, 2008, 4:35:38 AM (16 years ago)

Author:

landauf

Message:

big change in ObjectList: separated the class into a non-template base and a template wrapper for the base. this also changes the Iterator, there is now a non-template IteratorBase. this brings much more flexibility, like iterating through all objects of a given identifier without knowing the type. however this needs a dynamic_cast, which isn't quite optimal, but I think there are much worser things than that out there.

there isn't much you have to know about this, except there is no more ObjectList<myClass>::start() function but a ObjectList<myClass>::begin() to be more STLish. another thing: ObjectList<myClass>::end() points now to the element _after_ the last element, so it's possible to iterate in a for-loop until (it != ObjectList<myClass>::end()). the reason is the same as above. however, (it) as a boolean still works perfectly fine.

File:

• code/branches/core3/src/core/Loader.cc (modified) (2 diffs)

code/branches/core3/src/core/Loader.cc

@@ -32 +32 @@
 #include "Identifier.h"
 #include "Iterator.h"
+#include "ObjectList.h"
 #include "Debug.h"
 #include "CoreIncludes.h"
@@ -91 +92 @@
     void Loader::unload(const ClassTreeMask& mask)
     {
-        for (Iterator<BaseObject> it = ObjectList<BaseObject>::begin(); it; )
+        for (Iterator<BaseObject> it = ObjectList<BaseObject>::begin(); it != ObjectList<BaseObject>::end(); )
         {
             if (mask.isIncluded(it->getIdentifier()))