Changeset 7283 for code/branches/consolecommands3

Timestamp:

Aug 31, 2010, 3:03:06 AM (14 years ago)

Author:

landauf

Message:

ConfigFileManager added backslashes to strings with special chars when saving them into the config file, but didn't remove them while loading. fixed this issue.

Location:

code/branches/consolecommands3/src/libraries/core

Files:

• ConfigFileManager.cc (modified) (1 diff)
• command/Executor.cc (modified) (1 diff)

code/branches/consolecommands3/src/libraries/core/ConfigFileManager.cc

@@ -277 +277 @@
                             if (commentposition == std::string::npos)
                             {
-                                value = removeTrailingWhitespaces(line.substr(pos1 + 1));
+                                value = line.substr(pos1 + 1);
                             }
                             else
                             {
-                                value = removeTrailingWhitespaces(line.substr(pos1 + 1, commentposition - pos1 - 1));
+                                value = line.substr(pos1 + 1, commentposition - pos1 - 1);
                                 comment = removeTrailingWhitespaces(line.substr(commentposition));
                             }
+
+                            value = removeTrailingWhitespaces(value);
+                            value = removeSlashes(value);
 
                             if (pos2 != std::string::npos && pos3 != std::string::npos && pos3 > pos2 + 1)

code/branches/consolecommands3/src/libraries/core/command/Executor.cc

@@ -48 +48 @@
     Executor::Executor(const Executor& other) : name_(other.name_)
     {
-        for (int i = 0; i < MAX_FUNCTOR_ARGUMENTS; ++i)
+        for (size_t i = 0; i < MAX_FUNCTOR_ARGUMENTS; ++i)
             defaultValue_[i] = other.defaultValue_[i];
         this->functor_ = other.functor_->clone();