Changeset 715 for code/branches/FICN/src/orxonox/core
- Timestamp:
- Dec 28, 2007, 11:33:10 PM (17 years ago)
- Location:
- code/branches/FICN/src/orxonox/core
- Files:
-
- 18 edited
-
ArgReader.cc (modified) (4 diffs)
-
ArgReader.h (modified) (3 diffs)
-
ClassFactory.h (modified) (3 diffs)
-
ConfigValueContainer.cc (modified) (42 diffs)
-
ConfigValueContainer.h (modified) (6 diffs)
-
Error.cc (modified) (1 diff)
-
Error.h (modified) (2 diffs)
-
Factory.cc (modified) (3 diffs)
-
Factory.h (modified) (3 diffs)
-
Identifier.cc (modified) (1 diff)
-
Identifier.h (modified) (9 diffs)
-
IdentifierList.cc (modified) (1 diff)
-
IdentifierList.h (modified) (2 diffs)
-
Language.cc (modified) (10 diffs)
-
Language.h (modified) (3 diffs)
-
OrxonoxClass.h (modified) (3 diffs)
-
OutputHandler.cc (modified) (1 diff)
-
OutputHandler.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/FICN/src/orxonox/core/ArgReader.cc
r708 r715 45 45 } 46 46 47 void ArgReader::checkArgument( String option, String &string, bool must)47 void ArgReader::checkArgument(std::string option, std::string &string, bool must) 48 48 { 49 49 int argpos = checkOption(option) + 1; … … 62 62 } 63 63 64 void ArgReader::checkArgument( String option, int &integer, bool must)64 void ArgReader::checkArgument(std::string option, int &integer, bool must) 65 65 { 66 66 int argpos = checkOption(option) + 1; … … 78 78 } 79 79 80 void ArgReader::checkArgument( String option, float &floating, bool must)80 void ArgReader::checkArgument(std::string option, float &floating, bool must) 81 81 { 82 82 int argpos = checkOption(option) + 1; … … 94 94 } 95 95 96 int ArgReader::checkOption( String option)96 int ArgReader::checkOption(std::string option) 97 97 { 98 98 for(int i = 1; i < counter_; i++) -
code/branches/FICN/src/orxonox/core/ArgReader.h
r708 r715 35 35 #define _ArgReader_H__ 36 36 37 #include <string> 38 37 39 #include "CorePrereqs.h" 38 39 #include "misc/String.h"40 40 41 41 namespace orxonox { … … 45 45 public: 46 46 ArgReader(int argc, char **argv); 47 void checkArgument( String option, String& string, bool must=false);48 void checkArgument( String option, int& integer, bool must=false);49 void checkArgument( String option, float& floating, bool must=false);47 void checkArgument(std::string option, std::string& string, bool must=false); 48 void checkArgument(std::string option, int& integer, bool must=false); 49 void checkArgument(std::string option, float& floating, bool must=false); 50 50 bool errorHandling(); 51 51 private: 52 int checkOption( String option);52 int checkOption(std::string option); 53 53 54 54 private: … … 56 56 char **arguments_; 57 57 bool fail_; 58 String errorStr_;58 std::string errorStr_; 59 59 }; 60 60 -
code/branches/FICN/src/orxonox/core/ClassFactory.h
r708 r715 36 36 #define _ClassFactory_H__ 37 37 38 #include <string> 39 38 40 #include "CorePrereqs.h" 39 41 40 #include "misc/String.h"41 42 #include "Factory.h" 42 43 #include "Identifier.h" … … 53 54 { 54 55 public: 55 static bool create(const String& name);56 static bool create(const std::string& name); 56 57 BaseObject* fabricate(); 57 58 … … 69 70 */ 70 71 template <class T> 71 bool ClassFactory<T>::create(const String& name)72 bool ClassFactory<T>::create(const std::string& name) 72 73 { 73 74 COUT(4) << "*** Create entry for " << name << " in Factory." << std::endl; -
code/branches/FICN/src/orxonox/core/ConfigValueContainer.cc
r708 r715 43 43 @param defvalue The default-value 44 44 */ 45 ConfigValueContainer::ConfigValueContainer(const String& classname, const String& varname, int defvalue)45 ConfigValueContainer::ConfigValueContainer(const std::string& classname, const std::string& varname, int defvalue) 46 46 { 47 47 this->bAddedDescription_ = false; … … 53 53 this->searchConfigFileLine(); // Search the entry in the config-file 54 54 55 String valueString = this->parseValueString(); // Parses the value string from the config-file-entry56 if (!this->parseSting(valueString, defvalue)) // Try to convert the string to a value 57 this->resetConfigFileEntry(); // The conversion failed 58 } 59 60 /** 61 @brief Constructor: Converts the default-value to a string, checks the config-file for a changed value, sets the intern value variable. 62 @param value This is only needed to determine the right type. 63 @param classname The name of the class the variable belongs to 64 @param varname The name of the variable 65 @param defvalue The default-value 66 */ 67 ConfigValueContainer::ConfigValueContainer(const String& classname, const String& varname, unsigned int defvalue)55 std::string valueString = this->parseValueString(); // Parses the value string from the config-file-entry 56 if (!this->parseSting(valueString, defvalue)) // Try to convert the string to a value 57 this->resetConfigFileEntry(); // The conversion failed 58 } 59 60 /** 61 @brief Constructor: Converts the default-value to a string, checks the config-file for a changed value, sets the intern value variable. 62 @param value This is only needed to determine the right type. 63 @param classname The name of the class the variable belongs to 64 @param varname The name of the variable 65 @param defvalue The default-value 66 */ 67 ConfigValueContainer::ConfigValueContainer(const std::string& classname, const std::string& varname, unsigned int defvalue) 68 68 { 69 69 this->bAddedDescription_ = false; … … 75 75 this->searchConfigFileLine(); // Search the entry in the config-file 76 76 77 String valueString = this->parseValueString(); // Parses the value string from the config-file-entry78 if (!this->parseSting(valueString, defvalue)) // Try to convert the string to a value 79 this->resetConfigFileEntry(); // The conversion failed 80 } 81 82 /** 83 @brief Constructor: Converts the default-value to a string, checks the config-file for a changed value, sets the intern value variable. 84 @param value This is only needed to determine the right type. 85 @param classname The name of the class the variable belongs to 86 @param varname The name of the variable 87 @param defvalue The default-value 88 */ 89 ConfigValueContainer::ConfigValueContainer(const String& classname, const String& varname, char defvalue)77 std::string valueString = this->parseValueString(); // Parses the value string from the config-file-entry 78 if (!this->parseSting(valueString, defvalue)) // Try to convert the string to a value 79 this->resetConfigFileEntry(); // The conversion failed 80 } 81 82 /** 83 @brief Constructor: Converts the default-value to a string, checks the config-file for a changed value, sets the intern value variable. 84 @param value This is only needed to determine the right type. 85 @param classname The name of the class the variable belongs to 86 @param varname The name of the variable 87 @param defvalue The default-value 88 */ 89 ConfigValueContainer::ConfigValueContainer(const std::string& classname, const std::string& varname, char defvalue) 90 90 { 91 91 this->bAddedDescription_ = false; … … 97 97 this->searchConfigFileLine(); // Search the entry in the config-file 98 98 99 String valueString = this->parseValueString(); // Parses the value string from the config-file-entry100 if (!this->parseSting(valueString, defvalue)) // Try to convert the string to a value 101 this->resetConfigFileEntry(); // The conversion failed 102 } 103 104 /** 105 @brief Constructor: Converts the default-value to a string, checks the config-file for a changed value, sets the intern value variable. 106 @param value This is only needed to determine the right type. 107 @param classname The name of the class the variable belongs to 108 @param varname The name of the variable 109 @param defvalue The default-value 110 */ 111 ConfigValueContainer::ConfigValueContainer(const String& classname, const String& varname, unsigned char defvalue)99 std::string valueString = this->parseValueString(); // Parses the value string from the config-file-entry 100 if (!this->parseSting(valueString, defvalue)) // Try to convert the string to a value 101 this->resetConfigFileEntry(); // The conversion failed 102 } 103 104 /** 105 @brief Constructor: Converts the default-value to a string, checks the config-file for a changed value, sets the intern value variable. 106 @param value This is only needed to determine the right type. 107 @param classname The name of the class the variable belongs to 108 @param varname The name of the variable 109 @param defvalue The default-value 110 */ 111 ConfigValueContainer::ConfigValueContainer(const std::string& classname, const std::string& varname, unsigned char defvalue) 112 112 { 113 113 this->bAddedDescription_ = false; … … 119 119 this->searchConfigFileLine(); // Search the entry in the config-file 120 120 121 String valueString = this->parseValueString(); // Parses the value string from the config-file-entry122 if (!this->parseSting(valueString, defvalue)) // Try to convert the string to a value 123 this->resetConfigFileEntry(); // The conversion failed 124 } 125 126 /** 127 @brief Constructor: Converts the default-value to a string, checks the config-file for a changed value, sets the intern value variable. 128 @param value This is only needed to determine the right type. 129 @param classname The name of the class the variable belongs to 130 @param varname The name of the variable 131 @param defvalue The default-value 132 */ 133 ConfigValueContainer::ConfigValueContainer(const String& classname, const String& varname, float defvalue)121 std::string valueString = this->parseValueString(); // Parses the value string from the config-file-entry 122 if (!this->parseSting(valueString, defvalue)) // Try to convert the string to a value 123 this->resetConfigFileEntry(); // The conversion failed 124 } 125 126 /** 127 @brief Constructor: Converts the default-value to a string, checks the config-file for a changed value, sets the intern value variable. 128 @param value This is only needed to determine the right type. 129 @param classname The name of the class the variable belongs to 130 @param varname The name of the variable 131 @param defvalue The default-value 132 */ 133 ConfigValueContainer::ConfigValueContainer(const std::string& classname, const std::string& varname, float defvalue) 134 134 { 135 135 this->bAddedDescription_ = false; … … 141 141 this->searchConfigFileLine(); // Search the entry in the config-file 142 142 143 String valueString = this->parseValueString(); // Parses the value string from the config-file-entry144 if (!this->parseSting(valueString, defvalue)) // Try to convert the string to a value 145 this->resetConfigFileEntry(); // The conversion failed 146 } 147 148 /** 149 @brief Constructor: Converts the default-value to a string, checks the config-file for a changed value, sets the intern value variable. 150 @param value This is only needed to determine the right type. 151 @param classname The name of the class the variable belongs to 152 @param varname The name of the variable 153 @param defvalue The default-value 154 */ 155 ConfigValueContainer::ConfigValueContainer(const String& classname, const String& varname, double defvalue)143 std::string valueString = this->parseValueString(); // Parses the value string from the config-file-entry 144 if (!this->parseSting(valueString, defvalue)) // Try to convert the string to a value 145 this->resetConfigFileEntry(); // The conversion failed 146 } 147 148 /** 149 @brief Constructor: Converts the default-value to a string, checks the config-file for a changed value, sets the intern value variable. 150 @param value This is only needed to determine the right type. 151 @param classname The name of the class the variable belongs to 152 @param varname The name of the variable 153 @param defvalue The default-value 154 */ 155 ConfigValueContainer::ConfigValueContainer(const std::string& classname, const std::string& varname, double defvalue) 156 156 { 157 157 this->bAddedDescription_ = false; … … 163 163 this->searchConfigFileLine(); // Search the entry in the config-file 164 164 165 String valueString = this->parseValueString(); // Parses the value string from the config-file-entry166 if (!this->parseSting(valueString, defvalue)) // Try to convert the string to a value 167 this->resetConfigFileEntry(); // The conversion failed 168 } 169 170 /** 171 @brief Constructor: Converts the default-value to a string, checks the config-file for a changed value, sets the intern value variable. 172 @param value This is only needed to determine the right type. 173 @param classname The name of the class the variable belongs to 174 @param varname The name of the variable 175 @param defvalue The default-value 176 */ 177 ConfigValueContainer::ConfigValueContainer(const String& classname, const String& varname, long double defvalue)165 std::string valueString = this->parseValueString(); // Parses the value string from the config-file-entry 166 if (!this->parseSting(valueString, defvalue)) // Try to convert the string to a value 167 this->resetConfigFileEntry(); // The conversion failed 168 } 169 170 /** 171 @brief Constructor: Converts the default-value to a string, checks the config-file for a changed value, sets the intern value variable. 172 @param value This is only needed to determine the right type. 173 @param classname The name of the class the variable belongs to 174 @param varname The name of the variable 175 @param defvalue The default-value 176 */ 177 ConfigValueContainer::ConfigValueContainer(const std::string& classname, const std::string& varname, long double defvalue) 178 178 { 179 179 this->bAddedDescription_ = false; … … 185 185 this->searchConfigFileLine(); // Search the entry in the config-file 186 186 187 String valueString = this->parseValueString(); // Parses the value string from the config-file-entry188 if (!this->parseSting(valueString, defvalue)) // Try to convert the string to a value 189 this->resetConfigFileEntry(); // The conversion failed 190 } 191 192 /** 193 @brief Constructor: Converts the default-value to a string, checks the config-file for a changed value, sets the intern value variable. 194 @param value This is only needed to determine the right type. 195 @param classname The name of the class the variable belongs to 196 @param varname The name of the variable 197 @param defvalue The default-value 198 */ 199 ConfigValueContainer::ConfigValueContainer(const String& classname, const String& varname, bool defvalue)187 std::string valueString = this->parseValueString(); // Parses the value string from the config-file-entry 188 if (!this->parseSting(valueString, defvalue)) // Try to convert the string to a value 189 this->resetConfigFileEntry(); // The conversion failed 190 } 191 192 /** 193 @brief Constructor: Converts the default-value to a string, checks the config-file for a changed value, sets the intern value variable. 194 @param value This is only needed to determine the right type. 195 @param classname The name of the class the variable belongs to 196 @param varname The name of the variable 197 @param defvalue The default-value 198 */ 199 ConfigValueContainer::ConfigValueContainer(const std::string& classname, const std::string& varname, bool defvalue) 200 200 { 201 201 this->bAddedDescription_ = false; … … 211 211 212 212 this->searchConfigFileLine(); // Search the entry in the config-file 213 String valueString = this->parseValueString(); // Parses the value string from the config-file-entry214 if (!this->parseSting(valueString, defvalue)) // Try to convert the string to a value 215 this->resetConfigFileEntry(); // The conversion failed 216 } 217 218 /** 219 @brief Constructor: Converts the default-value to a string, checks the config-file for a changed value, sets the intern value variable. 220 @param value This is only needed to determine the right type. 221 @param classname The name of the class the variable belongs to 222 @param varname The name of the variable 223 @param defvalue The default-value 224 */ 225 ConfigValueContainer::ConfigValueContainer(const String& classname, const String& varname, const String& defvalue)213 std::string valueString = this->parseValueString(); // Parses the value string from the config-file-entry 214 if (!this->parseSting(valueString, defvalue)) // Try to convert the string to a value 215 this->resetConfigFileEntry(); // The conversion failed 216 } 217 218 /** 219 @brief Constructor: Converts the default-value to a string, checks the config-file for a changed value, sets the intern value variable. 220 @param value This is only needed to determine the right type. 221 @param classname The name of the class the variable belongs to 222 @param varname The name of the variable 223 @param defvalue The default-value 224 */ 225 ConfigValueContainer::ConfigValueContainer(const std::string& classname, const std::string& varname, const std::string& defvalue) 226 226 { 227 227 this->bAddedDescription_ = false; … … 232 232 this->defvalueString_ = "\"" + defvalue + "\""; // Convert the string to a "config-file-string" with quotes 233 233 this->searchConfigFileLine(); // Search the entry in the config-file 234 String valueString = this->parseValueString(false); // Parses the value string from the config-file-entry235 if (!this->parseSting(valueString, defvalue)) // Try to convert the string to a value 236 this->resetConfigFileEntry(); // The conversion failed 237 } 238 239 /** 240 @brief Constructor: Converts the default-value to a string, checks the config-file for a changed value, sets the intern value variable. 241 @param value This is only needed to determine the right type. 242 @param classname The name of the class the variable belongs to 243 @param varname The name of the variable 244 @param defvalue The default-value 245 */ 246 ConfigValueContainer::ConfigValueContainer(const String& classname, const String& varname, const char* defvalue)234 std::string valueString = this->parseValueString(false); // Parses the value string from the config-file-entry 235 if (!this->parseSting(valueString, defvalue)) // Try to convert the string to a value 236 this->resetConfigFileEntry(); // The conversion failed 237 } 238 239 /** 240 @brief Constructor: Converts the default-value to a string, checks the config-file for a changed value, sets the intern value variable. 241 @param value This is only needed to determine the right type. 242 @param classname The name of the class the variable belongs to 243 @param varname The name of the variable 244 @param defvalue The default-value 245 */ 246 ConfigValueContainer::ConfigValueContainer(const std::string& classname, const std::string& varname, const char* defvalue) 247 247 { 248 248 this->bAddedDescription_ = false; … … 251 251 this->type_ = ConstChar; 252 252 253 this->defvalueString_ = "\"" + String(defvalue) + "\""; // Convert the string to a "config-file-string" with quotes254 this->searchConfigFileLine(); // Search the entry in the config-file 255 String valueString = this->parseValueString(false); // Parses the value string from the config-file-entry256 if (!this->parseSting(valueString, defvalue)) // Try to convert the string to a value 257 this->resetConfigFileEntry(); // The conversion failed 258 } 259 260 /** 261 @brief Constructor: Converts the default-value to a string, checks the config-file for a changed value, sets the intern value variable. 262 @param value This is only needed to determine the right type. 263 @param classname The name of the class the variable belongs to 264 @param varname The name of the variable 265 @param defvalue The default-value 266 */ 267 ConfigValueContainer::ConfigValueContainer(const String& classname, const String& varname, Vector2 defvalue)253 this->defvalueString_ = "\"" + std::string(defvalue) + "\""; // Convert the string to a "config-file-string" with quotes 254 this->searchConfigFileLine(); // Search the entry in the config-file 255 std::string valueString = this->parseValueString(false); // Parses the value string from the config-file-entry 256 if (!this->parseSting(valueString, defvalue)) // Try to convert the string to a value 257 this->resetConfigFileEntry(); // The conversion failed 258 } 259 260 /** 261 @brief Constructor: Converts the default-value to a string, checks the config-file for a changed value, sets the intern value variable. 262 @param value This is only needed to determine the right type. 263 @param classname The name of the class the variable belongs to 264 @param varname The name of the variable 265 @param defvalue The default-value 266 */ 267 ConfigValueContainer::ConfigValueContainer(const std::string& classname, const std::string& varname, Vector2 defvalue) 268 268 { 269 269 this->bAddedDescription_ = false; … … 280 280 281 281 this->searchConfigFileLine(); // Search the entry in the config-file 282 String valueString = this->parseValueString(); // Parses the value string from the config-file-entry283 if (!this->parseSting(valueString, defvalue)) // Try to convert the string to a value 284 this->resetConfigFileEntry(); // The conversion failed 285 } 286 287 /** 288 @brief Constructor: Converts the default-value to a string, checks the config-file for a changed value, sets the intern value variable. 289 @param value This is only needed to determine the right type. 290 @param classname The name of the class the variable belongs to 291 @param varname The name of the variable 292 @param defvalue The default-value 293 */ 294 ConfigValueContainer::ConfigValueContainer(const String& classname, const String& varname, Vector3 defvalue)282 std::string valueString = this->parseValueString(); // Parses the value string from the config-file-entry 283 if (!this->parseSting(valueString, defvalue)) // Try to convert the string to a value 284 this->resetConfigFileEntry(); // The conversion failed 285 } 286 287 /** 288 @brief Constructor: Converts the default-value to a string, checks the config-file for a changed value, sets the intern value variable. 289 @param value This is only needed to determine the right type. 290 @param classname The name of the class the variable belongs to 291 @param varname The name of the variable 292 @param defvalue The default-value 293 */ 294 ConfigValueContainer::ConfigValueContainer(const std::string& classname, const std::string& varname, Vector3 defvalue) 295 295 { 296 296 this->bAddedDescription_ = false; … … 307 307 308 308 this->searchConfigFileLine(); // Search the entry in the config-file 309 String valueString = this->parseValueString(); // Parses the value string from the config-file-entry310 if (!this->parseSting(valueString, defvalue)) // Try to convert the string to a value 311 this->resetConfigFileEntry(); // The conversion failed 312 } 313 314 /** 315 @brief Constructor: Converts the default-value to a string, checks the config-file for a changed value, sets the intern value variable. 316 @param value This is only needed to determine the right type. 317 @param classname The name of the class the variable belongs to 318 @param varname The name of the variable 319 @param defvalue The default-value 320 */ 321 ConfigValueContainer::ConfigValueContainer(const String& classname, const String& varname, ColourValue defvalue)309 std::string valueString = this->parseValueString(); // Parses the value string from the config-file-entry 310 if (!this->parseSting(valueString, defvalue)) // Try to convert the string to a value 311 this->resetConfigFileEntry(); // The conversion failed 312 } 313 314 /** 315 @brief Constructor: Converts the default-value to a string, checks the config-file for a changed value, sets the intern value variable. 316 @param value This is only needed to determine the right type. 317 @param classname The name of the class the variable belongs to 318 @param varname The name of the variable 319 @param defvalue The default-value 320 */ 321 ConfigValueContainer::ConfigValueContainer(const std::string& classname, const std::string& varname, ColourValue defvalue) 322 322 { 323 323 this->bAddedDescription_ = false; … … 334 334 335 335 this->searchConfigFileLine(); // Search the entry in the config-file 336 String valueString = this->parseValueString(); // Parses the value string from the config-file-entry337 if (!this->parseSting(valueString, defvalue)) // Try to convert the string to a value 338 this->resetConfigFileEntry(); // The conversion failed 339 } 340 341 /** 342 @brief Parses a given String into a value of the type of the associated variable and assigns it.343 @param input The string to convert 344 @return True if the string was successfully parsed 345 */ 346 bool ConfigValueContainer::parseSting(const String& input)336 std::string valueString = this->parseValueString(); // Parses the value string from the config-file-entry 337 if (!this->parseSting(valueString, defvalue)) // Try to convert the string to a value 338 this->resetConfigFileEntry(); // The conversion failed 339 } 340 341 /** 342 @brief Parses a given std::string into a value of the type of the associated variable and assigns it. 343 @param input The string to convert 344 @return True if the string was successfully parsed 345 */ 346 bool ConfigValueContainer::parseSting(const std::string& input) 347 347 { 348 348 if (this->type_ == ConfigValueContainer::Int) … … 382 382 @return True if the string was successfully parsed 383 383 */ 384 bool ConfigValueContainer::parseSting(const String& input, int defvalue)384 bool ConfigValueContainer::parseSting(const std::string& input, int defvalue) 385 385 { 386 386 return string2Number(this->value_.value_int_, input, defvalue); … … 393 393 @return True if the string was successfully parsed 394 394 */ 395 bool ConfigValueContainer::parseSting(const String& input, unsigned int defvalue)395 bool ConfigValueContainer::parseSting(const std::string& input, unsigned int defvalue) 396 396 { 397 397 return string2Number(this->value_.value_uint_, input, defvalue); … … 404 404 @return True if the string was successfully parsed 405 405 */ 406 bool ConfigValueContainer::parseSting(const String& input, char defvalue)406 bool ConfigValueContainer::parseSting(const std::string& input, char defvalue) 407 407 { 408 408 // I used value_int_ instead of value_char_ to avoid number <-> char confusion in the config-file … … 416 416 @return True if the string was successfully parsed 417 417 */ 418 bool ConfigValueContainer::parseSting(const String& input, unsigned char defvalue)418 bool ConfigValueContainer::parseSting(const std::string& input, unsigned char defvalue) 419 419 { 420 420 // I used value_uint_ instead of value_uchar_ to avoid number <-> char confusion in the config-file … … 428 428 @return True if the string was successfully parsed 429 429 */ 430 bool ConfigValueContainer::parseSting(const String& input, float defvalue)430 bool ConfigValueContainer::parseSting(const std::string& input, float defvalue) 431 431 { 432 432 return string2Number(this->value_.value_float_, input, defvalue); … … 439 439 @return True if the string was successfully parsed 440 440 */ 441 bool ConfigValueContainer::parseSting(const String& input, double defvalue)441 bool ConfigValueContainer::parseSting(const std::string& input, double defvalue) 442 442 { 443 443 return string2Number(this->value_.value_double_, input, defvalue); … … 450 450 @return True if the string was successfully parsed 451 451 */ 452 bool ConfigValueContainer::parseSting(const String& input, long double defvalue)452 bool ConfigValueContainer::parseSting(const std::string& input, long double defvalue) 453 453 { 454 454 return string2Number(this->value_.value_long_double_, input, defvalue); … … 461 461 @return True if the string was successfully parsed 462 462 */ 463 bool ConfigValueContainer::parseSting(const String& input, bool defvalue)463 bool ConfigValueContainer::parseSting(const std::string& input, bool defvalue) 464 464 { 465 465 // Try to parse the value-string - is it a word? … … 489 489 @return True if the string was successfully parsed 490 490 */ 491 bool ConfigValueContainer::parseSting(const String& input, const String& defvalue)491 bool ConfigValueContainer::parseSting(const std::string& input, const std::string& defvalue) 492 492 { 493 493 // Strip the quotes … … 514 514 @return True if the string was successfully parsed 515 515 */ 516 bool ConfigValueContainer::parseSting(const String& input, const char* defvalue)516 bool ConfigValueContainer::parseSting(const std::string& input, const char* defvalue) 517 517 { 518 518 // Strip the quotes … … 539 539 @return True if the string was successfully parsed 540 540 */ 541 bool ConfigValueContainer::parseSting(const String& input, const Vector2& defvalue)541 bool ConfigValueContainer::parseSting(const std::string& input, const Vector2& defvalue) 542 542 { 543 543 // Strip the value-string … … 548 548 if (pos1 < input.length() && pos2 < input.length() && pos1 < pos2) 549 549 { 550 std::vector< String> tokens = tokenize(input.substr(pos1, pos2 - pos1), ",");550 std::vector<std::string> tokens = tokenize(input.substr(pos1, pos2 - pos1), ","); 551 551 if (!string2Number(this->value_vector2_.x, tokens[0], defvalue.x)) 552 552 { … … 573 573 @return True if the string was successfully parsed 574 574 */ 575 bool ConfigValueContainer::parseSting(const String& input, const Vector3& defvalue)575 bool ConfigValueContainer::parseSting(const std::string& input, const Vector3& defvalue) 576 576 { 577 577 // Strip the value-string … … 582 582 if (pos1 < input.length() && pos2 < input.length() && pos1 < pos2) 583 583 { 584 std::vector< String> tokens = tokenize(input.substr(pos1, pos2 - pos1), ",");584 std::vector<std::string> tokens = tokenize(input.substr(pos1, pos2 - pos1), ","); 585 585 if (!string2Number(this->value_vector3_.x, tokens[0], defvalue.x)) 586 586 { … … 612 612 @return True if the string was successfully parsed 613 613 */ 614 bool ConfigValueContainer::parseSting(const String& input, const ColourValue& defvalue)614 bool ConfigValueContainer::parseSting(const std::string& input, const ColourValue& defvalue) 615 615 { 616 616 // Strip the value-string … … 621 621 if (pos1 < input.length() && pos2 < input.length() && pos1 < pos2) 622 622 { 623 std::vector< String> tokens = tokenize(input.substr(pos1, pos2 - pos1), ",");623 std::vector<std::string> tokens = tokenize(input.substr(pos1, pos2 - pos1), ","); 624 624 if (!string2Number(this->value_colourvalue_.r, tokens[0], defvalue.r)) 625 625 { … … 678 678 679 679 // The string of the section we're searching 680 String section = "";680 std::string section = ""; 681 681 section.append("["); 682 682 section.append(this->classname_); … … 685 685 // Iterate through all config-file-lines 686 686 bool success = false; 687 std::list< String>::iterator it1;687 std::list<std::string>::iterator it1; 688 688 for(it1 = ConfigValueContainer::getConfigFileLines().begin(); it1 != ConfigValueContainer::getConfigFileLines().end(); ++it1) 689 689 { … … 696 696 // We found the right section 697 697 bool bLineIsEmpty = false; 698 std::list< String>::iterator positionToPutNewLineAt;698 std::list<std::string>::iterator positionToPutNewLineAt; 699 699 700 700 // Iterate through all lines in the section 701 std::list< String>::iterator it2;701 std::list<std::string>::iterator it2; 702 702 for(it2 = ++it1; it2 != ConfigValueContainer::getConfigFileLines().end(); ++it2) 703 703 { … … 777 777 @return True = it's a comment 778 778 */ 779 bool ConfigValueContainer::isComment(const String& line)779 bool ConfigValueContainer::isComment(const std::string& line) 780 780 { 781 781 // Strip the line, whitespaces are disturbing 782 String teststring = getStrippedLine(line);782 std::string teststring = getStrippedLine(line); 783 783 784 784 // There are four possible comment-symbols: … … 798 798 @return True = it's empty 799 799 */ 800 bool ConfigValueContainer::isEmpty(const String& line)800 bool ConfigValueContainer::isEmpty(const std::string& line) 801 801 { 802 802 return getStrippedLine(line) == ""; … … 808 808 @return The stripped line 809 809 */ 810 String ConfigValueContainer::getStrippedLine(const String& line)811 { 812 String output = line;810 std::string ConfigValueContainer::getStrippedLine(const std::string& line) 811 { 812 std::string output = line; 813 813 unsigned int pos; 814 814 while ((pos = output.find(" ")) < output.length()) … … 825 825 @return The value-string 826 826 */ 827 String ConfigValueContainer::parseValueString(bool bStripped)828 { 829 String output;827 std::string ConfigValueContainer::parseValueString(bool bStripped) 828 { 829 std::string output; 830 830 if (bStripped) 831 831 output = this->getStrippedLine(*this->configFileLine_); … … 839 839 @returns a list, containing all entrys in the config-file. 840 840 */ 841 std::list< String>& ConfigValueContainer::getConfigFileLines()841 std::list<std::string>& ConfigValueContainer::getConfigFileLines() 842 842 { 843 843 // This is done to avoid problems while executing this code before main() 844 static std::list< String> configFileLinesStaticReference = std::list<String>();844 static std::list<std::string> configFileLinesStaticReference = std::list<std::string>(); 845 845 return configFileLinesStaticReference; 846 846 } … … 866 866 @param filename The name of the config-file 867 867 */ 868 void ConfigValueContainer::readConfigFile(const String& filename)868 void ConfigValueContainer::readConfigFile(const std::string& filename) 869 869 { 870 870 // This creates the file if it's not existing … … 913 913 @param filename The name of the config-file 914 914 */ 915 void ConfigValueContainer::writeConfigFile(const String& filename)915 void ConfigValueContainer::writeConfigFile(const std::string& filename) 916 916 { 917 917 // Make sure we stored the config-file in the list … … 930 930 931 931 // Iterate through the list an write the lines into the file 932 std::list< String>::iterator it;932 std::list<std::string>::iterator it; 933 933 for (it = ConfigValueContainer::getConfigFileLines().begin(); it != ConfigValueContainer::getConfigFileLines().end(); ++it) 934 934 { … … 943 943 @param description The description 944 944 */ 945 void ConfigValueContainer::description(const String& description)945 void ConfigValueContainer::description(const std::string& description) 946 946 { 947 947 if (!this->bAddedDescription_) 948 948 { 949 this->description_ = String("ConfigValueDescription::" + this->classname_ + "::" + this->varname_);949 this->description_ = std::string("ConfigValueDescription::" + this->classname_ + "::" + this->varname_); 950 950 Language::getLanguage().addEntry(description_, description); 951 951 this->bAddedDescription_ = true; -
code/branches/FICN/src/orxonox/core/ConfigValueContainer.h
r708 r715 44 44 45 45 #include <list> 46 #include <string> 46 47 47 48 #include "CorePrereqs.h" … … 51 52 #include "misc/Matrix3.h" 52 53 #include "misc/Quaternion.h" 53 #include "misc/String.h"54 54 #include "misc/ColourValue.h" 55 55 #include "Language.h" … … 93 93 }; 94 94 95 ConfigValueContainer(const String& classname, const String& varname, int defvalue);96 ConfigValueContainer(const String& classname, const String& varname, unsigned int defvalue);97 ConfigValueContainer(const String& classname, const String& varname, char defvalue);98 ConfigValueContainer(const String& classname, const String& varname, unsigned char defvalue);99 ConfigValueContainer(const String& classname, const String& varname, float defvalue);100 ConfigValueContainer(const String& classname, const String& varname, double defvalue);101 ConfigValueContainer(const String& classname, const String& varname, long double defvalue);102 ConfigValueContainer(const String& classname, const String& varname, bool defvalue);103 ConfigValueContainer(const String& classname, const String& varname, const String& defvalue);104 ConfigValueContainer(const String& classname, const String& varname, const char* defvalue);105 ConfigValueContainer(const String& classname, const String& varname, Vector2 defvalue);106 ConfigValueContainer(const String& classname, const String& varname, Vector3 defvalue);107 ConfigValueContainer(const String& classname, const String& varname, ColourValue defvalue);95 ConfigValueContainer(const std::string& classname, const std::string& varname, int defvalue); 96 ConfigValueContainer(const std::string& classname, const std::string& varname, unsigned int defvalue); 97 ConfigValueContainer(const std::string& classname, const std::string& varname, char defvalue); 98 ConfigValueContainer(const std::string& classname, const std::string& varname, unsigned char defvalue); 99 ConfigValueContainer(const std::string& classname, const std::string& varname, float defvalue); 100 ConfigValueContainer(const std::string& classname, const std::string& varname, double defvalue); 101 ConfigValueContainer(const std::string& classname, const std::string& varname, long double defvalue); 102 ConfigValueContainer(const std::string& classname, const std::string& varname, bool defvalue); 103 ConfigValueContainer(const std::string& classname, const std::string& varname, const std::string& defvalue); 104 ConfigValueContainer(const std::string& classname, const std::string& varname, const char* defvalue); 105 ConfigValueContainer(const std::string& classname, const std::string& varname, Vector2 defvalue); 106 ConfigValueContainer(const std::string& classname, const std::string& varname, Vector3 defvalue); 107 ConfigValueContainer(const std::string& classname, const std::string& varname, ColourValue defvalue); 108 108 109 109 /** @returns the value. @param value This is only needed to determine the right type. */ … … 124 124 inline ConfigValueContainer& getValue(bool& value) { value = this->value_.value_bool_; return *this; } 125 125 /** @returns the value. @param value This is only needed to determine the right type. */ 126 inline ConfigValueContainer& getValue( String& value) { value = this->value_string_; return *this; }126 inline ConfigValueContainer& getValue(std::string& value) { value = this->value_string_; return *this; } 127 127 /** @returns the value. @param value This is only needed to determine the right type. */ 128 128 inline ConfigValueContainer& getValue(const char* value) { value = this->value_string_.c_str(); return *this; } … … 134 134 inline ConfigValueContainer& getValue(ColourValue& value) { value = this->value_colourvalue_; return *this; } 135 135 136 void description(const String& description);136 void description(const std::string& description); 137 137 138 bool parseSting(const String& input);138 bool parseSting(const std::string& input); 139 139 void resetConfigFileEntry(); 140 140 void resetConfigValue(); 141 141 142 static String getStrippedLine(const String& line);143 static bool isEmpty(const String& line);144 static bool isComment(const String& line);142 static std::string getStrippedLine(const std::string& line); 143 static bool isEmpty(const std::string& line); 144 static bool isComment(const std::string& line); 145 145 146 146 private: 147 bool parseSting(const String& input, int defvalue);148 bool parseSting(const String& input, unsigned int defvalue);149 bool parseSting(const String& input, char defvalue);150 bool parseSting(const String& input, unsigned char defvalue);151 bool parseSting(const String& input, float defvalue);152 bool parseSting(const String& input, double defvalue);153 bool parseSting(const String& input, long double defvalue);154 bool parseSting(const String& input, bool defvalue);155 bool parseSting(const String& input, const String& defvalue);156 bool parseSting(const String& input, const char* defvalue);157 bool parseSting(const String& input, const Vector2& defvalue);158 bool parseSting(const String& input, const Vector3& defvalue);159 bool parseSting(const String& input, const ColourValue& defvalue);147 bool parseSting(const std::string& input, int defvalue); 148 bool parseSting(const std::string& input, unsigned int defvalue); 149 bool parseSting(const std::string& input, char defvalue); 150 bool parseSting(const std::string& input, unsigned char defvalue); 151 bool parseSting(const std::string& input, float defvalue); 152 bool parseSting(const std::string& input, double defvalue); 153 bool parseSting(const std::string& input, long double defvalue); 154 bool parseSting(const std::string& input, bool defvalue); 155 bool parseSting(const std::string& input, const std::string& defvalue); 156 bool parseSting(const std::string& input, const char* defvalue); 157 bool parseSting(const std::string& input, const Vector2& defvalue); 158 bool parseSting(const std::string& input, const Vector3& defvalue); 159 bool parseSting(const std::string& input, const ColourValue& defvalue); 160 160 161 static std::list< String>& getConfigFileLines();161 static std::list<std::string>& getConfigFileLines(); 162 162 static bool finishedReadingConfigFile(bool finished = false); 163 163 void searchConfigFileLine(); 164 String parseValueString(bool bStripped = true);164 std::string parseValueString(bool bStripped = true); 165 165 166 static void readConfigFile(const String& filename);167 static void writeConfigFile(const String& filename);166 static void readConfigFile(const std::string& filename); 167 static void writeConfigFile(const std::string& filename); 168 168 169 String classname_; //!< The name of the class the variable belongs to170 String varname_; //!< The name of the variable171 String defvalueString_; //!< The string of the default-variable169 std::string classname_; //!< The name of the class the variable belongs to 170 std::string varname_; //!< The name of the variable 171 std::string defvalueString_; //!< The string of the default-variable 172 172 173 173 union MultiType … … 183 183 } value_; //!< The value of the variable 184 184 185 String value_string_; //!< The value, if the variable is of the type string185 std::string value_string_; //!< The value, if the variable is of the type string 186 186 Vector2 value_vector2_; //!< The value, if the variable is of the type Vector2 187 187 Vector3 value_vector3_; //!< The value, if the variable is of the type Vector3 188 188 ColourValue value_colourvalue_; //!< The value, if the variable is of the type ColourValue 189 189 190 std::list< String>::iterator configFileLine_; //!< An iterator, pointing to the entry of the variable in the config-file190 std::list<std::string>::iterator configFileLine_; //!< An iterator, pointing to the entry of the variable in the config-file 191 191 192 192 VariableType type_; //!< The type of the variable -
code/branches/FICN/src/orxonox/core/Error.cc
r708 r715 36 36 } 37 37 38 Error::Error( String errorMsg, int errorCode)38 Error::Error(std::string errorMsg, int errorCode) 39 39 { 40 40 Error(errorCode, errorMsg); 41 41 } 42 42 43 Error::Error(int errorCode, String errorMsg)43 Error::Error(int errorCode, std::string errorMsg) 44 44 { 45 45 COUT(1) << "############################ "<< std::endl -
code/branches/FICN/src/orxonox/core/Error.h
r708 r715 29 29 #define _Error_H__ 30 30 31 #include <string> 32 31 33 #include "CorePrereqs.h" 32 33 #include "misc/String.h"34 34 35 35 namespace orxonox … … 39 39 public: 40 40 Error(); 41 Error( String errorMsg, int errorCode = 0);42 Error(int errorCode, String errorMsg = "");41 Error(std::string errorMsg, int errorCode = 0); 42 Error(int errorCode, std::string errorMsg = ""); 43 43 private: 44 44 -
code/branches/FICN/src/orxonox/core/Factory.cc
r708 r715 42 42 @param name The name of the wanted Identifier 43 43 */ 44 Identifier* Factory::getIdentifier(const String& name)44 Identifier* Factory::getIdentifier(const std::string& name) 45 45 { 46 46 return getFactoryPointer()->identifierStringMap_[name]; … … 61 61 @param identifier The identifier to add 62 62 */ 63 void Factory::add(const String& name, Identifier* identifier)63 void Factory::add(const std::string& name, Identifier* identifier) 64 64 { 65 65 getFactoryPointer()->identifierStringMap_[name] = identifier; … … 85 85 { 86 86 COUT(3) << "*** Factory -> Create class-hierarchy" << std::endl; 87 std::map< String, Identifier*>::iterator it;87 std::map<std::string, Identifier*>::iterator it; 88 88 it = getFactoryPointer()->identifierStringMap_.begin(); 89 89 (*getFactoryPointer()->identifierStringMap_.begin()).second->startCreatingHierarchy(); -
code/branches/FICN/src/orxonox/core/Factory.h
r708 r715 45 45 46 46 #include <map> 47 #include <string> 47 48 48 49 #include "CorePrereqs.h" 49 50 #include "misc/String.h"51 50 52 51 namespace orxonox … … 61 60 { 62 61 public: 63 static Identifier* getIdentifier(const String& name);62 static Identifier* getIdentifier(const std::string& name); 64 63 static Identifier* getIdentifier(const unsigned int id); 65 static void add(const String& name, Identifier* identifier);64 static void add(const std::string& name, Identifier* identifier); 66 65 static void changeNetworkID(Identifier* identifier, const unsigned int oldID, const unsigned int newID); 67 66 static void createClassHierarchy(); … … 74 73 ~Factory() {} // don't delete 75 74 76 std::map< String, Identifier*> identifierStringMap_; //!< The map, mapping the name with the Identifier75 std::map<std::string, Identifier*> identifierStringMap_; //!< The map, mapping the name with the Identifier 77 76 std::map<unsigned int, Identifier*> identifierNetworkIDMap_; //!< The map, mapping the network ID with the Identifier 78 77 }; -
code/branches/FICN/src/orxonox/core/Identifier.cc
r708 r715 118 118 @returns a reference to the Identifier map, containing all Identifiers. 119 119 */ 120 std::map< String, Identifier*>& Identifier::getIdentifierMap()120 std::map<std::string, Identifier*>& Identifier::getIdentifierMap() 121 121 { 122 static std::map< String, Identifier*> identifierMapStaticReference = std::map<String, Identifier*>();122 static std::map<std::string, Identifier*> identifierMapStaticReference = std::map<std::string, Identifier*>(); 123 123 return identifierMapStaticReference; 124 124 } -
code/branches/FICN/src/orxonox/core/Identifier.h
r708 r715 53 53 54 54 #include <map> 55 #include <string> 55 56 56 57 #include "CorePrereqs.h" 57 58 58 #include "misc/String.h"59 59 #include "ObjectList.h" 60 60 #include "IdentifierList.h" … … 112 112 113 113 /** @returns the name of the class the Identifier belongs to. */ 114 inline const String& getName() const { return this->name_; }114 inline const std::string& getName() const { return this->name_; } 115 115 116 116 /** @returns the parents of the class the Identifier belongs to. */ … … 130 130 131 131 /** @returns the ConfigValueContainer of a variable, given by the string of its name. @param varname The name of the variable */ 132 inline ConfigValueContainer* getConfigValueContainer(const String& varname)132 inline ConfigValueContainer* getConfigValueContainer(const std::string& varname) 133 133 { return this->configValues_[varname]; } 134 134 135 135 /** @brief Sets the ConfigValueContainer of a variable, given by the string of its name. @param varname The name of the variablee @param container The container */ 136 inline void setConfigValueContainer(const String& varname, ConfigValueContainer* container)136 inline void setConfigValueContainer(const std::string& varname, ConfigValueContainer* container) 137 137 { this->configValues_[varname] = container; } 138 138 139 static std::map< String, Identifier*>& getIdentifierMap();139 static std::map<std::string, Identifier*>& getIdentifierMap(); 140 140 141 141 private: … … 166 166 IdentifierList* children_; //!< The Children of the class the Identifier belongs to 167 167 168 String name_; //!< The name of the class the Identifier belongs to168 std::string name_; //!< The name of the class the Identifier belongs to 169 169 170 170 BaseFactory* factory_; //!< The Factory, able to create new objects of the given class (if available) … … 172 172 static int hierarchyCreatingCounter_s; //!< Bigger than zero if at least one Identifier stores its parents (its an int instead of a bool to avoid conflicts with multithreading) 173 173 unsigned int classID_; //!< The network ID to identify a class through the network 174 std::map< String, ConfigValueContainer*> configValues_; //!< A map to link the string of configurable variables with their ConfigValueContainer174 std::map<std::string, ConfigValueContainer*> configValues_; //!< A map to link the string of configurable variables with their ConfigValueContainer 175 175 }; 176 176 … … 189 189 { 190 190 public: 191 static ClassIdentifier<T>* registerClass(const IdentifierList* parents, const String& name, bool bRootClass);191 static ClassIdentifier<T>* registerClass(const IdentifierList* parents, const std::string& name, bool bRootClass); 192 192 static void addObject(T* object); 193 193 static ClassIdentifier<T>* getIdentifier(); 194 void setName(const String& name);194 void setName(const std::string& name); 195 195 196 196 private: … … 221 221 */ 222 222 template <class T> 223 ClassIdentifier<T>* ClassIdentifier<T>::registerClass(const IdentifierList* parents, const String& name, bool bRootClass)223 ClassIdentifier<T>* ClassIdentifier<T>::registerClass(const IdentifierList* parents, const std::string& name, bool bRootClass) 224 224 { 225 225 COUT(4) << "*** Register Class in " << name << "-Singleton." << std::endl; … … 265 265 */ 266 266 template <class T> 267 void ClassIdentifier<T>::setName(const String& name)267 void ClassIdentifier<T>::setName(const std::string& name) 268 268 { 269 269 // Make sure we didn't already set the name, to avoid duplicate entries in the Identifier map … … 271 271 { 272 272 this->name_ = name; 273 this->getIdentifierMap().insert(std::pair< String, Identifier*>(name, this));273 this->getIdentifierMap().insert(std::pair<std::string, Identifier*>(name, this)); 274 274 this->bSetName_ = true; 275 275 } -
code/branches/FICN/src/orxonox/core/IdentifierList.cc
r708 r715 130 130 @returns a string, containing a list of the names of all Identifiers in the list. 131 131 */ 132 String IdentifierList::toString() const132 std::string IdentifierList::toString() const 133 133 { 134 134 IdentifierListElement* temp = this->first_; 135 String output = "";135 std::string output = ""; 136 136 137 137 while (temp) -
code/branches/FICN/src/orxonox/core/IdentifierList.h
r708 r715 37 37 #define _IdentifierList_H__ 38 38 39 #include <string> 40 39 41 #include "CorePrereqs.h" 40 41 #include "misc/String.h"42 42 43 43 namespace orxonox … … 62 62 void remove(const Identifier* identifier); 63 63 bool isInList(const Identifier* identifier) const; 64 String toString() const;64 std::string toString() const; 65 65 66 66 IdentifierListElement* first_; //!< The first element in the list -
code/branches/FICN/src/orxonox/core/Language.cc
r708 r715 36 36 // ### LanguageEntry ### 37 37 // ############################### 38 LanguageEntry::LanguageEntry(const String& fallbackEntry)38 LanguageEntry::LanguageEntry(const std::string& fallbackEntry) 39 39 { 40 40 RegisterRootObject(LanguageEntry); … … 44 44 } 45 45 46 void LanguageEntry::setTranslation(const String& translation)46 void LanguageEntry::setTranslation(const std::string& translation) 47 47 { 48 48 if (translation.compare("") != 0) … … 52 52 } 53 53 54 void LanguageEntry::setDefault(const String& fallbackEntry)54 void LanguageEntry::setDefault(const std::string& fallbackEntry) 55 55 { 56 56 if (this->translatedEntry_.compare(this->fallbackEntry_) == 0) … … 85 85 } 86 86 87 void Language::createEntry(const LanguageEntryName& name, const String& entry)87 void Language::createEntry(const LanguageEntryName& name, const std::string& entry) 88 88 { 89 89 if (!this->languageEntries_[name]) … … 99 99 } 100 100 101 void Language::addEntry(const LanguageEntryName& name, const String& entry)102 { 103 std::map< String, LanguageEntry*>::const_iterator it = this->languageEntries_.find(name);101 void Language::addEntry(const LanguageEntryName& name, const std::string& entry) 102 { 103 std::map<std::string, LanguageEntry*>::const_iterator it = this->languageEntries_.find(name); 104 104 if (!it->second) 105 105 this->createEntry(name, entry); … … 112 112 } 113 113 114 const String& Language::getTranslation(const LanguageEntryName& name) const115 { 116 std::map< String, LanguageEntry*>::const_iterator it = this->languageEntries_.find(name);114 const std::string& Language::getTranslation(const LanguageEntryName& name) const 115 { 116 std::map<std::string, LanguageEntry*>::const_iterator it = this->languageEntries_.find(name); 117 117 if (it->second) 118 118 return it->second->getTranslation(); … … 124 124 } 125 125 126 const String Language::getFileName(const String& language)127 { 128 return String("translation_" + language + ".lang");126 const std::string Language::getFileName(const std::string& language) 127 { 128 return std::string("translation_" + language + ".lang"); 129 129 } 130 130 … … 154 154 { 155 155 file.getline(line, 1024); 156 String lineString = String(line);156 std::string lineString = std::string(line); 157 157 if (lineString.compare("") != 0) 158 158 { … … 190 190 { 191 191 file.getline(line, 1024); 192 String lineString = String(line);192 std::string lineString = std::string(line); 193 193 if (lineString.compare("") != 0) 194 194 { … … 196 196 if (pos < lineString.size() && lineString.size() >= 3) 197 197 { 198 std::map< String, LanguageEntry*>::const_iterator it = this->languageEntries_.find(lineString.substr(0, pos));198 std::map<std::string, LanguageEntry*>::const_iterator it = this->languageEntries_.find(lineString.substr(0, pos)); 199 199 if (it->second) 200 200 it->second->setTranslation(lineString.substr(pos + 1)); -
code/branches/FICN/src/orxonox/core/Language.h
r708 r715 30 30 31 31 #include <map> 32 #include <string> 32 33 33 34 #include "CorePrereqs.h" 34 35 35 #include "misc/String.h"36 36 #include "OrxonoxClass.h" 37 37 38 38 namespace orxonox 39 39 { 40 typedef String LanguageEntryName;40 typedef std::string LanguageEntryName; 41 41 42 42 class _CoreExport LanguageEntry : public OrxonoxClass 43 43 { 44 44 public: 45 explicit LanguageEntry(const String& fallbackEntry);46 void setTranslation(const String& translation);47 void setDefault(const String& fallbackEntry);45 explicit LanguageEntry(const std::string& fallbackEntry); 46 void setTranslation(const std::string& translation); 47 void setDefault(const std::string& fallbackEntry); 48 48 49 inline const String& getTranslation()49 inline const std::string& getTranslation() 50 50 { return this->translatedEntry_; } 51 51 52 inline const String& getDefault()52 inline const std::string& getDefault() 53 53 { return this->fallbackEntry_; } 54 54 55 55 private: 56 String fallbackEntry_;57 String translatedEntry_;56 std::string fallbackEntry_; 57 std::string translatedEntry_; 58 58 }; 59 59 … … 63 63 static Language& getLanguage(); 64 64 void setConfigValues(); 65 void addEntry(const LanguageEntryName& name, const String& entry);66 const String& getTranslation(const LanguageEntryName& name) const;65 void addEntry(const LanguageEntryName& name, const std::string& entry); 66 const std::string& getTranslation(const LanguageEntryName& name) const; 67 67 68 68 private: … … 74 74 void readTranslatedLanguageFile(); 75 75 void writeDefaultLanguageFile() const; 76 static const String getFileName(const String& language);77 void createEntry(const LanguageEntryName& name, const String& entry);76 static const std::string getFileName(const std::string& language); 77 void createEntry(const LanguageEntryName& name, const std::string& entry); 78 78 79 String language_;80 String defaultLanguage_;81 String defaultTranslation_;82 std::map< String, LanguageEntry*> languageEntries_;79 std::string language_; 80 std::string defaultLanguage_; 81 std::string defaultTranslation_; 82 std::map<std::string, LanguageEntry*> languageEntries_; 83 83 }; 84 84 } -
code/branches/FICN/src/orxonox/core/OrxonoxClass.h
r708 r715 37 37 #define _OrxonoxClass_H__ 38 38 39 #include <string> 40 39 41 #include "CorePrereqs.h" 40 41 #include "misc/String.h"42 42 #include "MetaObjectList.h" 43 43 #include "Identifier.h" … … 132 132 133 133 /** @brief Sets the name of the object. @param name The name */ 134 inline virtual void setName(const String& name) { this->name_ = name; }134 inline virtual void setName(const std::string& name) { this->name_ = name; } 135 135 136 136 /** @returns the name of the object. */ 137 inline const String& getName() const { return this->name_; }137 inline const std::string& getName() const { return this->name_; } 138 138 139 139 /** @brief Sets the state of the objects activity. @param bActive True = active */ … … 154 154 MetaObjectList metaList_; //!< MetaObjectList, containing all ObjectLists and ObjectListElements the object is registered in 155 155 156 String name_; //!< The name of the object156 std::string name_; //!< The name of the object 157 157 bool bActive_; //!< True = the object is active 158 158 bool bVisible_; //!< True = the object is visible -
code/branches/FICN/src/orxonox/core/OutputHandler.cc
r708 r715 35 35 @param logfilename The name of the logfile 36 36 */ 37 OutputHandler::OutputHandler(const String& logfilename)37 OutputHandler::OutputHandler(const std::string& logfilename) 38 38 { 39 39 this->logfilename_ = logfilename; -
code/branches/FICN/src/orxonox/core/OutputHandler.h
r708 r715 39 39 #include <iostream> 40 40 #include <fstream> 41 #include <string> 41 42 42 #include "misc/String.h"43 43 #include "CorePrereqs.h" 44 44 … … 108 108 109 109 private: 110 explicit OutputHandler(const String& logfilename);110 explicit OutputHandler(const std::string& logfilename); 111 111 OutputHandler(const OutputHandler& oh) {}; // don't copy 112 112 virtual ~OutputHandler(); 113 113 std::ofstream logfile_; //!< The logfile where the output is logged 114 String logfilename_; //!< The name of the logfile114 std::string logfilename_; //!< The name of the logfile 115 115 int outputLevel_; //!< The level of the incoming output 116 116 };
Note: See TracChangeset
for help on using the changeset viewer.
