Changeset 9765 in orxonox.OLD for branches/new_class_id/src/lib/util/loading/load_param_class_description.cc

Timestamp:

Sep 19, 2006, 5:49:58 PM (18 years ago)

Author:

bensch

Message:

compiles again

File:

• branches/new_class_id/src/lib/util/loading/load_param_class_description.cc (modified) (10 diffs)

branches/new_class_id/src/lib/util/loading/load_param_class_description.cc

@@ -14 +14 @@
 */
 
-#include "load_param_description.h"
+#include "load_param_class_description.h"
 
 #include "multi_type.h"
@@ -125 +125 @@
  *  A list, that holds all the classes that are loadable (classes not objects!!)
  */
-std::list<LoadClassDescription*>* LoadClassDescription::classList = NULL;
+std::list<LoadParamClassDescription*>* LoadParamClassDescription::classList = NULL;
 
 /**
  *  if the description of Parameters should be executed
  */
-bool LoadClassDescription::parametersDescription = false;
+bool LoadParamClassDescription::parametersDescription = false;
 
 /**
  * @param className the name of the class to be loadable
  */
-LoadClassDescription::LoadClassDescription(const std::string& className)
+LoadParamClassDescription::LoadParamClassDescription(const std::string& className)
 {
   this->className = className;
 
-  if (LoadClassDescription::classList == NULL)
-    LoadClassDescription::classList = new std::list<LoadClassDescription*>;
-
-  LoadClassDescription::classList->push_back(this);
+  if (LoadParamClassDescription::classList == NULL)
+    LoadParamClassDescription::classList = new std::list<LoadParamClassDescription*>;
+
+  LoadParamClassDescription::classList->push_back(this);
 }
 
@@ -148 +148 @@
  *  deletes a classDescription (deletes all the parameterDescriptions as well
  */
-LoadClassDescription::~LoadClassDescription()
+LoadParamClassDescription::~LoadParamClassDescription()
 {
   std::list<LoadParamDescription*>::iterator it = this->paramList.begin();
@@ -158 +158 @@
 }
 
-void LoadClassDescription::deleteAllDescriptions()
-{
-  if (LoadClassDescription::classList != NULL)
-  {
-    while (!LoadClassDescription::classList->empty())
-    {
-      delete LoadClassDescription::classList->front();
-      LoadClassDescription::classList->pop_front();
-    }
-    delete LoadClassDescription::classList;
-  }
-  LoadClassDescription::classList = NULL;
+void LoadParamClassDescription::deleteAllDescriptions()
+{
+  if (LoadParamClassDescription::classList != NULL)
+  {
+    while (!LoadParamClassDescription::classList->empty())
+    {
+      delete LoadParamClassDescription::classList->front();
+      LoadParamClassDescription::classList->pop_front();
+    }
+    delete LoadParamClassDescription::classList;
+  }
+  LoadParamClassDescription::classList = NULL;
 }
 
@@ -180 +180 @@
    Otherwise it returns a new classDescription
  */
-LoadClassDescription* LoadClassDescription::addClass(const std::string& className)
-{
-  if (LoadClassDescription::classList != NULL)
-  {
-    std::list<LoadClassDescription*>::iterator it = LoadClassDescription::classList->begin();
-    while (it != LoadClassDescription::classList->end())
+LoadParamClassDescription* LoadParamClassDescription::addClass(const std::string& className)
+{
+  if (LoadParamClassDescription::classList != NULL)
+  {
+    std::list<LoadParamClassDescription*>::iterator it = LoadParamClassDescription::classList->begin();
+    while (it != LoadParamClassDescription::classList->end())
     {
       if ((*it)->className == className)
@@ -194 +194 @@
     }
   }
-  return new LoadClassDescription(className);
+  return new LoadParamClassDescription(className);
 }
 
@@ -201 +201 @@
  * @param paramName the name of the parameter to add.
  */
-LoadParamDescription* LoadClassDescription::addParam(const std::string& paramName)
+LoadParamDescription* LoadParamClassDescription::addParam(const std::string& paramName)
 {
   std::list<LoadParamDescription*>::iterator it = this->paramList.begin();
@@ -224 +224 @@
  * @todo implement it
  */
-void LoadClassDescription::printAll(const std::string& fileName)
+void LoadParamClassDescription::printAll(const std::string& fileName)
 {
   PRINT(3)("===============================================================\n");
   PRINT(3)(" Listing all the Loadable Options (loaded since Game started).\n\n");
-  if (LoadClassDescription::classList != NULL)
-  {
-    std::list<LoadClassDescription*>::iterator classDesc = LoadClassDescription::classList->begin();
-    while (classDesc != LoadClassDescription::classList->end())
+  if (LoadParamClassDescription::classList != NULL)
+  {
+    std::list<LoadParamClassDescription*>::iterator classDesc = LoadParamClassDescription::classList->begin();
+    while (classDesc != LoadParamClassDescription::classList->end())
     {
       PRINT(3)("<%s>\n", (*classDesc)->className.c_str());
@@ -255 +255 @@
  * !! The strings MUST NOT be deleted !!
  */
-std::list<std::string> LoadClassDescription::searchClassWithShort(const std::string& classNameBegin)
+std::list<std::string> LoadParamClassDescription::searchClassWithShort(const std::string& classNameBegin)
 {
   /// FIXME
@@ -262 +262 @@
   std::list<const std::string&> retVal;
 
-  tIterator<LoadClassDescription>* iterator = LoadClassDescription::classList->getIterator();
-  LoadClassDescription* enumClassDesc = iterator->firstElement();
+  tIterator<LoadParamClassDescription>* iterator = LoadParamClassDescription::classList->getIterator();
+  LoadParamClassDescription* enumClassDesc = iterator->firstElement();
   while (enumClassDesc)
   {