Changeset 7219 in orxonox.OLD for branches/std/src/lib/util

Timestamp:

Mar 12, 2006, 5:14:44 PM (19 years ago)

Author:

bensch

Message:

orxonox/std: less char*

Location:

branches/std/src/lib/util

Files:

• executor/functor_list.h (modified) (1 diff)
• loading/load_param_description.cc (modified) (9 diffs)
• loading/load_param_description.h (modified) (1 diff)
• multi_type.cc (modified) (2 diffs)
• multi_type.h (modified) (2 diffs)

branches/std/src/lib/util/executor/functor_list.h

@@ -21 +21 @@
    l_SHORT:     short
    l_FLOAT:     float
-   l_CSTRING:    const char*
+   l_STRING:    const std::string&
    l_XML_ELEM:  TiXmlElement*
  */

branches/std/src/lib/util/loading/load_param_description.cc

@@ -134 +134 @@
  * @param className the name of the class to be loadable
  */
-LoadClassDescription::LoadClassDescription(const char* className)
-{
-  this->className = new char[strlen(className)+1];
-  strcpy(this->className, className);
+LoadClassDescription::LoadClassDescription(const std::string& className)
+{
+  this->className = className;
 
   if (LoadClassDescription::classList == NULL)
@@ -156 +155 @@
     this->paramList.pop_front();
   }
-
-  delete[] this->className;
 }
 
@@ -182 +179 @@
    Otherwise it returns a new classDescription
  */
-LoadClassDescription* LoadClassDescription::addClass(const char* className)
+LoadClassDescription* LoadClassDescription::addClass(const std::string& className)
 {
   if (LoadClassDescription::classList != NULL)
@@ -189 +186 @@
     while (it != LoadClassDescription::classList->end())
     {
-      if (!strcmp((*it)->className, className))
+      if ((*it)->className == className)
       {
         return (*it);
@@ -200 +197 @@
 
 /**
- *  does the same as addClass(const char* className), but with params
+ *  does the same as addClass(const std::string& className), but with params
  * @param paramName the name of the parameter to add.
  */
-LoadParamDescription* LoadClassDescription::addParam(const char* paramName)
+LoadParamDescription* LoadClassDescription::addParam(const std::string& paramName)
 {
   std::list<LoadParamDescription*>::iterator it = this->paramList.begin();
@@ -226 +223 @@
  * @todo implement it
  */
-void LoadClassDescription::printAll(const char* fileName)
+void LoadClassDescription::printAll(const std::string& fileName)
 {
   PRINT(3)("===============================================================\n");
@@ -235 +232 @@
     while (classDesc != LoadClassDescription::classList->end())
     {
-      PRINT(3)("<%s>\n", (*classDesc)->className);
+      PRINT(3)("<%s>\n", (*classDesc)->className.c_str());
       std::list<LoadParamDescription*>::iterator param = (*classDesc)->paramList.begin();
       while (param != (*classDesc)->paramList.end())
@@ -242 +239 @@
         param++;
       }
-      PRINT(3)("</%s>\n\n", (*classDesc)->className);
+      PRINT(3)("</%s>\n\n", (*classDesc)->className.c_str());
       classDesc++;
     }
@@ -257 +254 @@
  * !! The strings MUST NOT be deleted !!
  */
-std::list<const char*> LoadClassDescription::searchClassWithShort(const char* classNameBegin)
+std::list<std::string> LoadClassDescription::searchClassWithShort(const std::string& classNameBegin)
 {
   /// FIXME
   // NOT USED
 /*  unsigned int searchLength = strlen(classNameBegin);
-  std::list<const char*> retVal;
+  std::list<const std::string&> retVal;
 
   tIterator<LoadClassDescription>* iterator = LoadClassDescription::classList->getIterator();

branches/std/src/lib/util/loading/load_param_description.h

@@ -59 +59 @@
   friend class CLoadParam;
 public:
-  LoadClassDescription(const char* className);
+  LoadClassDescription(const std::string& className);
   ~LoadClassDescription();
 
-  static LoadClassDescription* addClass(const char* className);
-  LoadParamDescription* addParam(const char* paramName);
+  static LoadClassDescription* addClass(const std::string& className);
+  LoadParamDescription* addParam(const std::string& paramName);
 
   static void deleteAllDescriptions();
 
-  static void printAll(const char* fileName = NULL);
-  static std::list<const char*> searchClassWithShort(const char* classNameBegin);
-  //  static const LoadParamDescription* getClass(const char* className);
+  static void printAll(const std::string& fileName = "");
+  static std::list<std::string> searchClassWithShort(const std::string& classNameBegin);
+  //  static const LoadParamDescription* getClass(const std::string& className);
 
 private:
   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
+  std::string                              className;              //!< name of the class
 
   std::list<LoadParamDescription*>         paramList;              //!< List of parameters this class knows.

branches/std/src/lib/util/multi_type.cc

@@ -93 +93 @@
 {
   this->setChar(value);
-}
-
-/**
- * @brief creates a multiType out of a C-String
- * @param value the Value of this MulitType
- */
-MultiType::MultiType(const char* value)
-{
-  this->setString(value);
 }
 
@@ -485 +476 @@
  * @returns: the Type as MT_Type
  */
-MT_Type MultiType::StringToMultiType(const char* type)
-{
-  if (!strncmp(type, "bool", 4))
+MT_Type MultiType::StringToMultiType(const std::string& type)
+{
+  if (type == "bool")
     return MT_BOOL;
-  if (!strncmp(type, "int", 3))
+  if (type == "int")
     return MT_INT;
-  if (!strncmp(type, "float", 5))
+  if (type, "float")
     return MT_FLOAT;
-  if (!strncmp(type, "char", 4))
+  if (type == "char")
     return MT_CHAR;
-  if (!strncmp(type, "string", 6))
+  if (type == "string")
     return MT_STRING;
 

branches/std/src/lib/util/multi_type.h

@@ -39 +39 @@
     MultiType(double value);
     MultiType(char value);
-    MultiType(const char* value);
     MultiType(const std::string& value);
     MultiType(const MultiType& multiType);
@@ -95 +94 @@
 
     static const char* MultiTypeToString(MT_Type type);
-    static MT_Type StringToMultiType(const char* type);
+    static MT_Type StringToMultiType(const std::string& type);
 
   private: