Changeset 1025 for code/branches/core2/src

Timestamp:

Apr 10, 2008, 5:53:20 PM (17 years ago)

Author:

landauf

Message:

fixed another bug.
always remember: no matter how cool your feature is, it won't work as long as you execute it after a 'return' statement…

Location:

code/branches/core2/src/orxonox/core

Files:

• ConfigFileManager.cc (modified) (2 diffs)
• ConfigFileManager.h (modified) (1 diff)

code/branches/core2/src/orxonox/core/ConfigFileManager.cc

@@ -104 +104 @@
     {
         if (this->additionalComment_ == "" || this->additionalComment_.size() == 0)
-            return (this->name_);
+            return ("[" + this->name_ + "]");
         else
-            return (this->name_ + " " + this->additionalComment_);
+            return ("[" + this->name_ + "] " + this->additionalComment_);
     }
 
@@ -183 +183 @@
                     std::string comment = temp.substr(pos2 + 1);
                     if (isComment(comment))
-                        newsection = new ConfigFileSection(line.substr(pos1, pos2 - pos1 + 1), comment);
+                        newsection = new ConfigFileSection(line.substr(pos1 + 1, pos2 - pos1 - 1), comment);
                     else
-                        newsection = new ConfigFileSection(line.substr(pos1, pos2 - pos1 + 1));
+                        newsection = new ConfigFileSection(line.substr(pos1 + 1, pos2 - pos1 - 1));
                     this->sections_.insert(this->sections_.end(), newsection);
                     continue;

code/branches/core2/src/orxonox/core/ConfigFileManager.h

@@ -211 +211 @@
                 { this->getSection(section)->setValue(name, value); this->save(); }
             inline const std::string& getValue(const std::string& section, const std::string& name, const std::string& fallback)
-                { return this->getSection(section)->getValue(name, fallback); this->saveIfUpdated(); }
+                { const std::string& output = this->getSection(section)->getValue(name, fallback); this->saveIfUpdated(); return output; }
 
             inline void setValue(const std::string& section, const std::string& name, unsigned int index, const std::string& value)
                 { this->getSection(section)->setValue(name, index, value); this->save(); }
             inline const std::string& getValue(const std::string& section, const std::string& name, unsigned int index, const std::string& fallback)
-                { return this->getSection(section)->getValue(name, index, fallback); this->saveIfUpdated(); }
+                { const std::string& output = this->getSection(section)->getValue(name, index, fallback); this->saveIfUpdated(); return output; }
 
         private: