Changeset 6425 for code/trunk/src/libraries/core/ConfigFileManager.cc

Timestamp:

Dec 27, 2009, 2:30:06 AM (15 years ago)

Author:

rgrieder

Message:

Replaced "=" with " = " in our ini files for the config value.
Also made some changes to have const std::string& forwarding with getValue().

File:

• code/trunk/src/libraries/core/ConfigFileManager.cc (modified) (3 diffs)

code/trunk/src/libraries/core/ConfigFileManager.cc

@@ -58 +58 @@
     }
 
-    std::string getConfig(const std::string& classname, const std::string& varname)
+    const std::string& getConfig(const std::string& classname, const std::string& varname)
     {
         return ConfigFileManager::getInstance().getValue(ConfigFileType::Settings, classname, varname, "", true);
@@ -94 +94 @@
     //////////////////////////
 
-    void ConfigFileEntryValue::setValue(const std::string& value)
-    {
-        if (!this->bString_)
-            this->value_ = value;
+    void ConfigFileEntryValue::update()
+    {
+        // Make sure we remove the quotes when bString changes
+        if (this->bString_)
+            this->value_ = stripEnclosingQuotes(this->value_);
+        // Assemble the entry line
+        this->fileEntry_ = this->getKeyString() + " = ";
+        if (this->bString_)
+            this->fileEntry_ += '"' + addSlashes(this->value_) + '"';
         else
-            this->value_ = '"' + addSlashes(stripEnclosingQuotes(value)) + '"';
-    }
-
-    std::string ConfigFileEntryValue::getValue() const
-    {
-        if (!this->bString_)
-            return this->value_;
-        else
-            return removeSlashes(stripEnclosingQuotes(this->value_));
-    }
-
-    std::string ConfigFileEntryValue::getFileEntry() const
-    {
-        if (this->additionalComment_.empty())
-            return (this->name_ + '=' + this->value_);
-        else
-            return (this->name_ + '=' + this->value_ + " " + this->additionalComment_);
+            this->fileEntry_ += this->value_;
+        if (!this->additionalComment_.empty())
+            this->fileEntry_ += ' ' + this->additionalComment_;
     }
 
@@ -122 +113 @@
     // ConfigFileEntryVectorValue //
     ////////////////////////////////
-    std::string ConfigFileEntryVectorValue::getFileEntry() const
-    {
-        if (this->additionalComment_.empty())
-            return (this->name_ + '[' + multi_cast<std::string>(this->index_) + ']' + '=' + this->value_);
-        else
-            return (this->name_ + '[' + multi_cast<std::string>(this->index_) + "]=" + this->value_ + ' ' + this->additionalComment_);
+    void ConfigFileEntryVectorValue::update()
+    {
+        this->keyString_ = this->name_ + '[' + multi_cast<std::string>(this->index_) + ']';
+        ConfigFileEntryValue::update();
     }