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

Timestamp:

Mar 12, 2006, 3:00:04 PM (19 years ago)

Author:

bensch

Message:

orxonox/std:: more strings

Location:

branches/std/src/lib/util

Files:

• executor/functor_list.h (modified) (1 diff)
• loading/resource_manager.cc (modified) (1 diff)
• multi_type.cc (modified) (1 diff)
• multi_type.h (modified) (1 diff)

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

@@ -74 +74 @@
 //#define l_VECTOR_DEFAULT   Vector(0,0,0)        //!< Default value for a VECTOR
 
-#define l_CSTRING_TYPE     const char*          //!< The type of a CSTRING
-#define l_CSTRING_FUNC     isCString            //!< The function to parse a CSTRING
-#define l_CSTRING_NAME     "cstring"            //!< The name of a CSTRING
-#define l_CSTRING_PARAM    MT_STRING            //!< the type of the parameter CSTRING
-#define l_CSTRING_DEFAULT  ""                   //!< a default Value for an CSTRING
-
 #define l_STRING_TYPE      const std::string&   //!< The type of a STRING
 #define l_STRING_FUNC      isString             //!< The function to parse a STRING
 #define l_STRING_NAME      "string"             //!< The name of a STRING
-#define l_STRING_PARAM     MT_CSTRING           //!< the type of the parameter STRING
+#define l_STRING_PARAM     MT_STRING           //!< the type of the parameter STRING
 #define l_STRING_DEFAULT   ""                   //!< a default Value for an STRING
 

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

@@ -849 +849 @@
   {
     std::string homeDir;
-    std::string newName = name.substr(1, name.size()-1);
+    std::string newName = name.substr(1);
 #ifdef __WIN32__
     homeDir = getenv("USERPROFILE");

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

@@ -55 +55 @@
       break;
     case MT_STRING:
-    case MT_CSTRING:
       this->storedString = "";
       break;

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

@@ -24 +24 @@
   MT_EXT1            = 32,                 //!< An external Type.
   MT_EXT2            = 64,                 //!< An external Type.
-
-  MT_CSTRING         = 128,                //!< An entire String.
 } MT_Type;