Changeset 5111 in orxonox.OLD for trunk/src/util/loading

Timestamp:

Aug 23, 2005, 11:13:56 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: reverted the last steps, because they created a huge pack of seg-faults

Location:

trunk/src/util/loading

Files:

• load_param.cc (modified) (9 diffs)
• load_param.h (modified) (2 diffs)

trunk/src/util/loading/load_param.cc

@@ -17 +17 @@
 
 #include "list.h"
+#include "array.h"
 #include "base_object.h"
 
@@ -295 +296 @@
 
   tIterator<LoadParamDescription>* iterator = this->paramList->getIterator();
-  LoadParamDescription* enumParamDesc = iterator->firstElement();
+  LoadParamDescription* enumParamDesc = iterator->nextElement();
   while (enumParamDesc)
     {
@@ -314 +315 @@
 {
   tIterator<LoadClassDescription>* iterator = LoadClassDescription::classList->getIterator();
-  LoadClassDescription* enumClassDesc = iterator->firstElement();
+  LoadClassDescription* enumClassDesc = iterator->nextElement();
   while (enumClassDesc)
     {
@@ -336 +337 @@
 {
   tIterator<LoadParamDescription>* iterator = this->paramList->getIterator();
-  LoadParamDescription* enumParamDesc = iterator->firstElement();
+  LoadParamDescription* enumParamDesc = iterator->nextElement();
   while (enumParamDesc)
     {
@@ -362 +363 @@
   PRINT(3)(" Listing all the Loadable Options (loaded since Game started).\n\n");
   tIterator<LoadClassDescription>* classIT = LoadClassDescription::classList->getIterator();
-  LoadClassDescription* enumClassDesc = classIT->firstElement();
+  LoadClassDescription* enumClassDesc = classIT->nextElement();
   while (enumClassDesc)
     {
       PRINT(3)("<%s>\n", enumClassDesc->className);
       tIterator<LoadParamDescription>* paramIT = enumClassDesc->paramList->getIterator();
-      LoadParamDescription* enumParamDesc = paramIT->firstElement();
+      LoadParamDescription* enumParamDesc = paramIT->nextElement();
       while (enumParamDesc)
         {
@@ -385 +386 @@
  * searches for classes, which beginn with classNameBegin
  * @param classNameBegin the beginning string of a Class
- * @return a NEW char-array with ClassNames. The LIST should be deleted afterwards,
+ * @return a NEW char-array with ClassNames. The ARRAY should be deleted afterwards,
  * !! The strings MUST NOT be deleted !!
  */
-tList<const char>* LoadClassDescription::searchClassWithShort(const char* classNameBegin)
+Array<char*>* LoadClassDescription::searchClassWithShort(const char* classNameBegin)
 {
   unsigned int searchLength = strlen(classNameBegin);
-  tList<const char>* retVal = new tList<const char>;
+  Array<char*>* retVal = new Array<char*>;
 
   tIterator<LoadClassDescription>* iterator = LoadClassDescription::classList->getIterator();
-  LoadClassDescription* enumClassDesc = iterator->firstElement();
+  LoadClassDescription* enumClassDesc = iterator->nextElement();
   while (enumClassDesc)
   {
@@ -400 +401 @@
         !strncasecmp(enumClassDesc->className, classNameBegin, searchLength))
     {
-      retVal->add(enumClassDesc->className);
+      retVal->addEntry(enumClassDesc->className);
     }
     enumClassDesc = iterator->nextElement();
@@ -406 +407 @@
   delete iterator;
 
+  retVal->finalizeArray();
   return retVal;
 }
@@ -412 +414 @@
 // {
 //   tIterator<LoadClassDescription>* iterator = LoadClassDescription::classList->getIterator();
-//   LoadClassDescription* enumClassDesc = iterator->firstElement();
+//   LoadClassDescription* enumClassDesc = iterator->nextElement();
 //   while (enumClassDesc)
 //   {

trunk/src/util/loading/load_param.h

@@ -31 +31 @@
 // Forward Declaration //
 template<class T> class tList;
+template<class T> class Array;
 
 //! macro that makes it even more easy to load a Parameter
@@ -311 +312 @@
 
   static void printAll(const char* fileName = NULL);
-  static tList<const char>* searchClassWithShort(const char* classNameBegin);
+  static Array<char*>* searchClassWithShort(const char* classNameBegin);
 //  static const LoadParamDescription* getClass(const char* className);