Changeset 170 for trunk/src

Timestamp:

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

Author:

guyru

Message:

code cleanup

Location:

trunk/src

Files:

• MainFrame.cpp (modified) (4 diffs)
• Makefile.am (modified) (2 diffs)
• UtilityFunctions.cpp (deleted)
• UtilityFunctions.h (deleted)
• configuration.cpp (modified) (8 diffs)

trunk/src/MainFrame.cpp

@@ -33 +33 @@
 #include "highscores_dialog.h"
 #include "About.h"
-#include "UtilityFunctions.h"
 #include "configuration.h"
 #include "settings_dialog.h"
+#include "../config.h"
 #include <iostream>
 #include <sstream>
@@ -68 +68 @@
 #endif
 #define VER_DICE_SPACER 10
-
-//default values - settings
-#define DEF_HIGHSCORESIZE 20
-#define OY_VERSION "1.8.0"
 
 const wxEventType wxEVT_ENABLE_ROLL = wxNewEventType();
@@ -413 +409 @@
         wxString link = wxT("http://openyahtzee.sourceforge.net/download/check-for-updates/");
         
-        link += wxT(OY_VERSION);
+        link += wxT(VERSION);
 
         wxLaunchDefaultBrowser(link);
@@ -1332 +1328 @@
         delete m_config;
         delete m_evt_handler;
-}
+
+        for (int i = 0; i<6; i++) {
+                delete bitmap_dice[i];
+        }
+}

trunk/src/Makefile.am

@@ -14 +14 @@
         settings_dialog.h \
         ScoreDice.cpp \
-        UtilityFunctions.cpp \
         wxDynamicBitmap.cpp \
         one.xpm \
@@ -36 +35 @@
         ObjectsID.h \
         ScoreDice.h \
-        UtilityFunctions.h \
         wxDynamicBitmap.h
 

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;