Changeset 9880 in orxonox.OLD for trunk/src/lib/parser/preferences

Timestamp:

Oct 10, 2006, 3:42:31 PM (18 years ago)

Author:

bensch

Message:

new implementation of the IniParser
Now it is in Full stl-style, with iterators, and it does not have a strange internal state, that makes absolutely no sense

Location:

trunk/src/lib/parser/preferences

Files:

• ini_file_prefs_reader.cc (modified) (3 diffs)
• ini_file_prefs_reader.h (modified) (1 diff)
• preferences.cc (modified) (1 diff)

trunk/src/lib/parser/preferences/ini_file_prefs_reader.cc

@@ -28 +28 @@
   IniParser iniParser;
 
-  
+
   Preferences* prefs = Preferences::getInstance();
-  
+
   prefs->setUserIni( fileName );
-  
+
   if ( !iniParser.readFile( fileName ) )
     return;
 
-  iniParser.firstSection();
-
-  do
-  {
-    do
-    {
-      prefs->setString( iniParser.getCurrentSection(), iniParser.getCurrentName(), iniParser.getCurrentValue(), true );
-    } while (iniParser.nextVar());
-  } while ( iniParser.nextSection() != "" );
+  for(IniParser::Section::iterator section = iniParser.begin();
+      section != iniParser.end();
+      ++section)
+    for (IniParser::Entry::iterator entry = (*section).begin();
+         entry != (*section).end();
+         ++entry)
+      prefs->setString( (*section).name(), (*entry).name(), (*entry).value(), true );
 
   /*iniParser.firstVar();
@@ -53 +51 @@
   {
     prefs->setString( iniParser.getCurrentSection(), iniParser.getCurrentName(), iniParser.getCurrentValue(), true );
-}*/
+  }*/
 }
 
@@ -61 +59 @@
 */
 IniFilePrefsReader::~IniFilePrefsReader ()
-{
-}
+{}
 
 

trunk/src/lib/parser/preferences/ini_file_prefs_reader.h

@@ -8 +8 @@
 
 #include "lib/parser/ini_parser/ini_parser.h"
-#include "lib/parser/preferences/preferences.h"
+#include "preferences.h"
 
 

trunk/src/lib/parser/preferences/preferences.cc

@@ -271 +271 @@
       if ( it2->modified )
       {
-        iniParser.editVar(it2->name, it2->value.getString(), it->sectionName);
+        iniParser.editEntry(it->sectionName, it2->name, it2->value.getString());
         didChanges = true;
       }