Changeset 170 for trunk/src/configuration.cpp

Timestamp:

10/03/2008 08:17:22 PM (4 years ago)

Author:

guyru

Message:

code cleanup

File:

• trunk/src/configuration.cpp (modified) (8 diffs)

trunk/src/configuration.cpp

@@ -19 +19 @@
  ***************************************************************************/
 
-#include <iostream>
 #include <cstdlib> // used in the back-compatibility code
 #include <sstream>
@@ -37 +36 @@
         m_file = file;
 
-        cerr<<"loading file: "<<file<<endl;
         ifstream conf_file (file.c_str());
         if (!conf_file.is_open()) {
                 // file couldn't be opened, this is due to missing file or
                 // permission error.
-                cerr<<"Error openning configuration file for reading: "<<m_file<<endl;
+                loadDefaultSettings();
+                save();
+                return;
         }
         
@@ -49 +49 @@
         string header;
         getline(conf_file,header);
-        cerr<<"line: "<<header.substr(0,11)<<endl;
         if (header.substr(0,11) != "openyahtzee") {
                 // this is probably an old sqllite file import it.
@@ -59 +58 @@
         while(!conf_file.eof()) {
                 getline(conf_file,header);
-                cerr<<"line: "<<header<<endl;
                 if (header == "[settings]") {
                         parseSettings(&conf_file);
@@ -73 +71 @@
 {
         loadDefaultSettings();
-        cerr<<"parsing settings"<<endl;
         string temp_line;
         size_t pos; // used to loacate the '=' sign
@@ -91 +88 @@
                         return;
                 }
-                cerr<<"key: "<<temp_line.substr(0,pos)<<endl;
-                cerr<<"value: "<<temp_line.substr(pos+1)<<endl;
                 m_settings[temp_line.substr(0,pos)] = temp_line.substr(pos+1);
         }
@@ -124 +119 @@
                 temp_item.date = date+" "+hour;
                 m_highscores.push_back(temp_item);
-                cerr<<score<<" "<<name<<" "<<temp_item.date<<endl;
 
                 // The following two lines read one character forword and
@@ -139 +133 @@
         ofstream conf_file (m_file.c_str());
         if (!conf_file.is_open()) {
-                // file couldn't be opened, this is due to missing file or
-                // permission error.
-                cerr<<"Error openning configuration file for writing: "<<m_file<<endl;
+                // file couldn't be opened, probably due to permission error
+                return;
         }
         conf_file<<"openyahtzee="<<VERSION<<endl;