Changeset 7629 in orxonox.OLD

Timestamp:

May 16, 2006, 11:36:56 PM (18 years ago)

Author:

bensch

Message:

minor ini-parser-stuff

Location:

branches/qt_gui/src/lib

Files:

• parser/ini_parser/ini_parser.cc (modified) (6 diffs)
• parser/ini_parser/ini_parser.h (modified) (1 diff)
• util/preferences.cc (modified) (2 diffs)
• util/preferences.h (modified) (1 diff)

branches/qt_gui/src/lib/parser/ini_parser/ini_parser.cc

@@ -401 +401 @@
  * @return true if everything is ok false on error
  */
-bool IniParser::editVar(const std::string& entryName, const std::string& value, const std::string& sectionName)
+bool IniParser::editVar(const std::string& entryName, const std::string& value, const std::string& sectionName, bool createMissing)
 {
   std::list<IniSection>::iterator section;
@@ -416 +416 @@
   if (section == this->sections.end())
   {
-    IniSection sec;
-    sec.comment = "";
-    sec.name = sectionName;
-    section = this->sections.insert(this->sections.end(), sec);
-  }
-
-  if (section == this->sections.end())
-  {
-    PRINTF(2)("section '%s' not found for value '%s'\n", sectionName.c_str(), entryName.c_str());
-    return false;
-  }
-  else
-  {
-    //try find item
-    std::list<IniEntry>::iterator entry;
-    for (entry = section->entries.begin(); entry!=section->entries.end(); entry++)
-      if (entry->name == entryName )
+    this->addSection(sectionName);
+    for (section = this->sections.begin(); section != this->sections.end(); section++)
+      if ((*section).name == sectionName)
         break;
-
-    //found it?
-    if ( entry != section->entries.end() )
-    {
-      entry->value = value;
-
-      return true;
-    }
-
+  }
+
+  //try find item
+  std::list<IniEntry>::iterator entry;
+  for (entry = section->entries.begin(); entry!=section->entries.end(); entry++)
+    if (entry->name == entryName )
+      break;
+
+  //found it?
+  if ( entry != section->entries.end() )
+  {
+    entry->value = value;
+
+    return true;
+  }
+  else
+  {
     //not found -> create it
     (*section).entries.push_back(IniEntry());
@@ -448 +442 @@
     (*section).entries.back().name = entryName;
     (*section).entries.back().value = value;
-    PRINTF(5)("Added Entry %s with Value '%s' to Section %s\n",
-    (*section).entries.back().name.c_str(),
-    (*section).entries.back().value.c_str(),
-    (*section).name);
+    PRINTF(5)("Added Entry '%s' with Value '%s' to Section '%s'\n",
+              (*section).entries.back().name.c_str(),
+              (*section).entries.back().value.c_str(),
+              (*section).name);
     this->currentEntry = --(*section).entries.end();
     return true;
   }
+  return false;
 }
 
@@ -725 +720 @@
 void IniParser::debug() const
 {
-  PRINTF(0)("Iniparser %s - debug\n", this->fileName.c_str());
+  PRINT(0)("Iniparser '%s' - debug\n", this->fileName.c_str());
   if (!this->comment.empty())
-    PRINTF(0)("FileComment:\n %s\n\n", this->comment.c_str());
+    PRINT(0)("FileComment:\n '%s'\n\n", this->comment.c_str());
 
   if (!this->fileName.empty())
   {
+    if (sections.empty())
+      PRINT(0)("No Sections defined\n");
     std::list<IniSection>::const_iterator section;
     for (section = this->sections.begin(); section != this->sections.end(); section++)
@@ -737 +734 @@
         PRINTF(0)(" %s\n", (*section).comment.c_str());
       PRINTF(0)(" [%s]\n", (*section).name.c_str());
+
+      if ((*section).entries.empty())
+        PRINT(0)("No Entries defined within Section '%s'\n", (*section).name.c_str());
 
       std::list<IniEntry>::const_iterator entry;
@@ -748 +748 @@
   }
   else
-    PRINTF(1)("no opened ini-file.\n");
-}
-
+    PRINTF(0)("no opened ini-file.\n");
+}
+

branches/qt_gui/src/lib/parser/ini_parser/ini_parser.h

@@ -66 +66 @@
     bool addVar(const std::string& entryName, const std::string& value, const std::string& sectionName = "" );
     const std::string& getVar(const std::string& entryName, const std::string& sectionName, const std::string& defaultValue = "") const;
-    bool IniParser::editVar(const std::string& entryName, const std::string& value, const std::string& sectionName = "");
+    bool IniParser::editVar(const std::string& entryName, const std::string& value, const std::string& sectionName = "", bool createMissing = true);
     void setEntryComment(const std::string& comment, const std::string& entryName, const std::string& sectionName);
     const std::string& getEntryComment(const std::string& entryName, const std::string& sectionName) const;

branches/qt_gui/src/lib/util/preferences.cc

@@ -17 +17 @@
 
 #include "preferences.h"
-
-using namespace std;
+#include "lib/parser/ini_parser/ini_parser.h"
 
 
@@ -281 +280 @@
   //if ( didChanges )
   {
+    iniParser.debug();
     iniParser.writeFile( this->fileName );
   }

branches/qt_gui/src/lib/util/preferences.h

@@ -9 +9 @@
 #include "base_object.h"
 #include "multi_type.h"
-#include "lib/parser/ini_parser/ini_parser.h"
 
 // FORWARD DECLARATION