Changeset 177

Timestamp:

10/08/2008 03:50:42 PM (4 years ago)

Author:

guyru

Message:

resolve some compiler warnings

Location:

trunk/src

Files:

• MainFrame.cpp (modified) (1 diff)
• ScoreDice.cpp (modified) (2 diffs)
• configuration.cpp (modified) (3 diffs)
• configuration.h (modified) (1 diff)

trunk/src/MainFrame.cpp

@@ -830 +830 @@
 {
         wxString out;
-        int temp = 0;
         if(m_rolls < 3){
                 YahtzeeBonus();

trunk/src/ScoreDice.cpp

@@ -141 +141 @@
 {
         bool three = false;
-        short int temp = 0;
         
         for (int i=0; i<6; i++)
@@ -158 +157 @@
 {
         bool four = false;
-        short int temp = 0;
         
         for (int i=0; i<6; i++)

trunk/src/configuration.cpp

@@ -275 +275 @@
 
 bool Configuration::isHighscore(int score) {
-        const int highscore_list_size = atoi(m_settings["highscore-list-size"].c_str());
+        const unsigned int highscore_list_size = atoi(m_settings["highscore-list-size"].c_str());
         if (m_highscores.size()<highscore_list_size) {
                 // we have extra room in the highscore list
@@ -290 +290 @@
 
 int Configuration::submitHighscore(int score, string name, string date) {
-        const int highscore_list_size = atoi(m_settings["highscore-list-size"].c_str());
-        int place = 1;
+        const unsigned int highscore_list_size = atoi(m_settings["highscore-list-size"].c_str());
+        unsigned int place = 1;
         HighscoreItem temp_item;
 
@@ -336 +336 @@
 }
 
-void Configuration::setHighscoresSize(int size)
+void Configuration::setHighscoresSize(size_t size)
 {
 

trunk/src/configuration.h

@@ -78 +78 @@
         void clearHighscores();
 
-        void setHighscoresSize(int size);
+        void setHighscoresSize(size_t size);
 private:
         /**