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

Timestamp:

Feb 13, 2006, 2:59:17 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: removed some std::list

Location:

trunk/src/util/loading

Files:

• load_param.cc (modified) (1 diff)
• load_param.h (modified) (1 diff)
• load_param_description.cc (modified) (10 diffs)
• load_param_description.h (modified) (2 diffs)

trunk/src/util/loading/load_param.cc

@@ -18 +18 @@
 #include "load_param.h"
 #include "load_param_description.h"
-
-#include "list.h"
 
 #include <stdarg.h>

trunk/src/util/loading/load_param.h

@@ -30 +30 @@
 
 // Forward Declaration //
-template<class T> class tList;
 class LoadClassDescription;
 class LoadParamDescription;

trunk/src/util/loading/load_param_description.cc

@@ -17 +17 @@
 
 #include "multi_type.h"
-#include "list.h"
 #include <stdarg.h>
 #include "stdlibincl.h"
@@ -130 +129 @@
  *  A list, that holds all the classes that are loadable (classes not objects!!)
  */
-tList<LoadClassDescription>* LoadClassDescription::classList = NULL;
+std::list<LoadClassDescription*>* LoadClassDescription::classList = NULL;
 
 /**
@@ -146 +145 @@
 
   if (LoadClassDescription::classList == NULL)
-    LoadClassDescription::classList = new tList<LoadClassDescription>;
-
-  LoadClassDescription::classList->add(this);
-
-  this->paramList = new tList<LoadParamDescription>;
+    LoadClassDescription::classList = new std::list<LoadClassDescription*>;
+
+  LoadClassDescription::classList->push_back(this);
 }
 
@@ -158 +155 @@
 LoadClassDescription::~LoadClassDescription()
 {
-  tIterator<LoadParamDescription>* iterator = this->paramList->getIterator();
-  LoadParamDescription* enumParamDesc = iterator->firstElement();
-  while (enumParamDesc)
-  {
-    delete enumParamDesc;
-    enumParamDesc = iterator->nextElement();
-  }
-  delete iterator;
-  delete this->paramList;
+  std::list<LoadParamDescription*>::iterator it = this->paramList.begin();
+  while (!this->paramList.empty())
+  {
+    delete this->paramList.front();
+    this->paramList.pop_front();
+  }
 
   delete[] this->className;
@@ -175 +169 @@
   if (LoadClassDescription::classList != NULL)
   {
-    tIterator<LoadClassDescription>* iterator = LoadClassDescription::classList->getIterator();
-    LoadClassDescription* delElem = iterator->firstElement();
-    while (delElem != NULL)
-    {
-      delete delElem;
-      delElem = iterator->nextElement();
-    }
-    delete iterator;
+    while (!LoadClassDescription::classList->empty())
+    {
+      delete LoadClassDescription::classList->front();
+      LoadClassDescription::classList->pop_front();
+    }
     delete LoadClassDescription::classList;
   }
@@ -200 +191 @@
   if (LoadClassDescription::classList != NULL)
   {
-    tIterator<LoadClassDescription>* iterator = LoadClassDescription::classList->getIterator();
-    LoadClassDescription* enumClassDesc = iterator->firstElement();
-    while (enumClassDesc)
-    {
-      if (!strcmp(enumClassDesc->className, className))
+    std::list<LoadClassDescription*>::iterator it = LoadClassDescription::classList->begin();
+    while (it != LoadClassDescription::classList->end())
+    {
+      if (!strcmp((*it)->className, className))
       {
-        delete iterator;
-        return enumClassDesc;
-      }
-      enumClassDesc = iterator->nextElement();
-    }
-    delete iterator;
+        return (*it);
+      }
+      it++;
+    }
   }
   return new LoadClassDescription(className);
@@ -222 +210 @@
 LoadParamDescription* LoadClassDescription::addParam(const char* paramName)
 {
-  tIterator<LoadParamDescription>* iterator = this->paramList->getIterator();
-  LoadParamDescription* enumParamDesc = iterator->firstElement();
-  while (enumParamDesc)
-  {
-    if (!strcmp(enumParamDesc->paramName, paramName))
-    {
-      delete iterator;
-          //return enumParamDesc;
+  std::list<LoadParamDescription*>::iterator it = this->paramList.begin();
+  while (it != this->paramList.end())
+  {
+    if (!strcmp((*it)->paramName, paramName))
+    {
       return NULL;
     }
-    enumParamDesc = iterator->nextElement();
-  }
-  delete iterator;
+    it++;
+  }
 
   LoadParamDescription* newParam = new LoadParamDescription(paramName);
 
-  this->paramList->add(newParam);
+  this->paramList.push_back(newParam);
   return newParam;
 }
@@ -253 +237 @@
   if (LoadClassDescription::classList != NULL)
   {
-    tIterator<LoadClassDescription>* classIT = LoadClassDescription::classList->getIterator();
-    LoadClassDescription* enumClassDesc = classIT->firstElement();
-    while (enumClassDesc)
-    {
-      PRINT(3)("<%s>\n", enumClassDesc->className);
-      tIterator<LoadParamDescription>* paramIT = enumClassDesc->paramList->getIterator();
-      LoadParamDescription* enumParamDesc = paramIT->firstElement();
-      while (enumParamDesc)
+    std::list<LoadClassDescription*>::iterator classDesc = LoadClassDescription::classList->begin();
+    while (classDesc != LoadClassDescription::classList->end())
+    {
+      PRINT(3)("<%s>\n", (*classDesc)->className);
+      std::list<LoadParamDescription*>::iterator param = (*classDesc)->paramList.begin();
+      while (param != (*classDesc)->paramList.end())
       {
-        enumParamDesc->print();
-        enumParamDesc = paramIT->nextElement();
-      }
-      delete paramIT;
-
-      PRINT(3)("</%s>\n\n", enumClassDesc->className);
-      enumClassDesc = classIT->nextElement();
-    }
-    delete classIT;
+        (*param)->print();
+        param++;
+      }
+      PRINT(3)("</%s>\n\n", (*classDesc)->className);
+      classDesc++;
+    }
   }
   else
@@ -283 +262 @@
  * !! The strings MUST NOT be deleted !!
  */
-tList<const char>* LoadClassDescription::searchClassWithShort(const char* classNameBegin)
-{
-  unsigned int searchLength = strlen(classNameBegin);
-  tList<const char>* retVal = new tList<const char>;
+std::list<const char*> LoadClassDescription::searchClassWithShort(const char* classNameBegin)
+{
+  /// FIXME
+  // NOT USED
+/*  unsigned int searchLength = strlen(classNameBegin);
+  std::list<const char*> retVal;
 
   tIterator<LoadClassDescription>* iterator = LoadClassDescription::classList->getIterator();
@@ -301 +282 @@
   delete iterator;
 
-  return retVal;
-}
+  return retVal;*/
+}

trunk/src/util/loading/load_param_description.h

@@ -23 +23 @@
 
 #include "base_object.h"
+#include <list>
 
 // Forward Declaration //
-template<class T> class tList;
 class MultiType;
 
@@ -68 +68 @@
 
   static void printAll(const char* fileName = NULL);
-  static tList<const char>* searchClassWithShort(const char* classNameBegin);
+  static std::list<const char*> searchClassWithShort(const char* classNameBegin);
 //  static const LoadParamDescription* getClass(const char* className);
 
  private:
-  static bool                          parametersDescription;  //!< if parameter-description should be enabled.
-  static tList<LoadClassDescription>*  classList;              //!< a list, that stores all the loadable classes. (after one instance has been loaded)
-  char*                                className;              //!< name of the class
+  static bool                              parametersDescription;  //!< if parameter-description should be enabled.
+  static std::list<LoadClassDescription*>* classList;              //!< a list, that stores all the loadable classes. (after one instance has been loaded)
+  char*                                    className;              //!< name of the class
 
-  tList<LoadParamDescription>*         paramList;              //!< List of parameters this class knows.
+  std::list<LoadParamDescription*>         paramList;              //!< List of parameters this class knows.
 };