Changeset 7661 in orxonox.OLD for trunk/src/lib/util/preferences.cc

Timestamp:

May 18, 2006, 12:55:34 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the QT_GUI back to the trunk
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/qt_gui . -r7607:HEAD

absolutely no conflicts

File:

• trunk/src/lib/util/preferences.cc (modified) (5 diffs)

trunk/src/lib/util/preferences.cc

@@ -17 +17 @@
 
 #include "preferences.h"
-
-using namespace std;
+#include "lib/parser/ini_parser/ini_parser.h"
 
 
@@ -137 +136 @@
  * @return value of the item if found. defaultValue else
  */
-const std::string Preferences::getString(const std::string& section, const std::string& name, const std::string& defaultValue)
+std::string Preferences::getString(const std::string& section, const std::string& name, const std::string& defaultValue)
 {
   return getMultiType(section, name, MultiType(defaultValue)).getString();
@@ -260 +259 @@
   IniParser iniParser(this->fileName);
 
-  if ( !iniParser.isOpen() )
-    return false;
-
   std::list<prefSection>::iterator it = data.begin();
   bool didChanges = false;
@@ -278 +274 @@
     }
   }
-
-  if ( didChanges )
+  /// HACK DO WE HAVE TO CHECK THIS??
+  //if ( didChanges )
   {
     iniParser.writeFile( this->fileName );
@@ -314 +310 @@
 {
   std::list<std::string> lst;
-  
+
   std::list<prefSection>::const_iterator it = data.begin();