Changeset 6383 in orxonox.OLD for branches/preferences

Timestamp:

Jan 2, 2006, 1:09:56 AM (19 years ago)

Author:

rennerc

Message:

added CmdLinePrefsReader and IniFilePrefsReader

Location:

branches/preferences

Files:

• configure.ac (modified) (2 diffs)
• src/Makefile.am (modified) (1 diff)
• src/lib/Makefile.am (modified) (1 diff)
• src/lib/parser/Makefile.am (modified) (1 diff)
• src/lib/parser/preferences (added)
• src/lib/parser/preferences/Makefile.am (added)
• src/lib/parser/preferences/cmd_line_prefs_reader.cc (added)
• src/lib/parser/preferences/cmd_line_prefs_reader.h (added)
• src/lib/parser/preferences/ini_file_prefs_reader.cc (added)
• src/lib/parser/preferences/ini_file_prefs_reader.h (added)
• src/lib/util/preferences.cc (modified) (4 diffs)

branches/preferences/configure.ac

@@ -603 +603 @@
                  src/lib/particles/Makefile
                  src/lib/collision_detection/Makefile
-                 src/lib/network/Makefile
+     src/lib/network/Makefile
                  src/lib/shell/Makefile
                  src/lib/gui/Makefile
@@ -611 +611 @@
                  src/lib/parser/tinyxml/Makefile
                  src/lib/parser/ini_parser/Makefile
+                 src/lib/parser/preferences/Makefile
                  src/util/Makefile
                  src/subprojects/Makefile

branches/preferences/src/Makefile.am

@@ -40 +40 @@
                 lib/parser/tinyxml/libtinyxml.a \
                 lib/parser/ini_parser/libIniParser.a \
+                lib/parser/preferences/libPrefsParser.a \
                 lib/gui/gl_gui/libORXglgui.a \
                 lib/shell/libORXshell.a \

branches/preferences/src/lib/Makefile.am

@@ -72 +72 @@
           particles \
           collision_detection \
-          network \
+                                network \
           parser \
           shell \

branches/preferences/src/lib/parser/Makefile.am

@@ -1 +1 @@
 SUBDIRS = \
           tinyxml \
-          ini_parser
+                                ini_parser \
+                                preferences
 
 

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

@@ -59 +59 @@
       std::list<prefItem>::const_iterator it2 = it->items.begin();
 
-      for ( ; it2!=it->items.begin(); it2++)
+      for ( ; it2!=it->items.end(); it2++)
       {
         if ( strcmp(it2->name, name) == 0 )
@@ -157 +157 @@
       std::list<prefItem>::iterator it2 = it->items.begin();
 
-      for ( ; it2!=it->items.begin(); it2++)
+      for ( ; it2!=it->items.end(); it2++)
       {
         if ( strcmp(it2->name, name) == 0 )
@@ -203 +203 @@
       std::list<prefItem>::const_iterator it2 = it->items.begin();
 
-      for ( ; it2!=it->items.begin(); it2++)
+      for ( ; it2!=it->items.end(); it2++)
       {
         if ( strcmp(it2->name, name) == 0 )
@@ -230 +230 @@
     std::list<prefItem>::iterator it2 = it->items.begin();
 
-    for ( ; it2!=it->items.begin(); it2++)
+    for ( ; it2!=it->items.end(); it2++)
     {
       PRINTF(0)("--> %s = '%s'\n", it2->name, it2->value.getString());