[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdegames/ktuberling
From:       Dominik Seichter <domseichter () web ! de>
Date:       2003-03-03 10:19:14
[Download RAW message or body]

CVS commit by domseichter: 

fixed compiler warnings


  M +2 -2      playground.cpp   1.21
  M +17 -25    toplevel.cpp   1.57
  M +0 -3      toplevel.h   1.23


--- kdegames/ktuberling/playground.cpp  #1.20:1.21
@@ -429,5 +429,5 @@ bool PlayGround::loadPlayGround(QDomDocu
     return false;
 
-  for (uint text = 0; text < texts; text++)
+  for (int text = 0; text < texts; text++)
   {
     categoryElement = (const QDomElement &) categoriesList.item(text).toElement();
@@ -468,5 +468,5 @@ bool PlayGround::loadPlayGround(QDomDocu
     return false;
 
-  for (uint decoration = 0; decoration < decorations; decoration++)
+  for (int decoration = 0; decoration < decorations; decoration++)
   {
     objectElement = (const QDomElement &) objectsList.item(decoration).toElement();

--- kdegames/ktuberling/toplevel.cpp  #1.56:1.57
@@ -46,18 +46,4 @@ TopLevel::~TopLevel()
 }
 
-// Session management - read properties
-void TopLevel::readProperties(KConfig *config)
-{
-  // Nothing to do, the settings have already been restored,
-  // even when there is no session management
-}
-
-// Session management - write properties
-void TopLevel::saveProperties(KConfig *config)
-{
-  // Nothing to do, the setting have already been saved
-  // each time the user changed them
-}
-
 // Enable or disable "undo" button and menu item
 void TopLevel::enableUndo(bool enable) const
@@ -75,5 +61,5 @@ void TopLevel::enableRedo(bool enable) c
 void TopLevel::registerGameboard(const QString &menuItem, const char *actionId)
 {
-  KToggleAction *t;
+  KToggleAction *t = 0;
 
   switch (gameboards)
@@ -96,7 +82,10 @@ void TopLevel::registerGameboard(const Q
                 break;
   }
+
+  if( t ) {
   if (gameboards == selectedGameboard) t->setChecked(true);
   gameboardActions[gameboards] = actionId;
   gameboards++;
+  }
 }
 
@@ -104,5 +93,5 @@ void TopLevel::registerGameboard(const Q
 void TopLevel::registerLanguage(const QString &menuItem, const char *actionId, bool enabled)
 {
-  KToggleAction *t;
+  KToggleAction *t = 0;
 
   switch (languages)
@@ -141,8 +130,11 @@ void TopLevel::registerLanguage(const QS
                 break;
   }
+
+  if( t ) {
   if (languages == selectedLanguage) t->setChecked(true);
   t->setEnabled(enabled);
   languageActions[languages] = actionId;
   languages++;
+  }
 }
 
@@ -231,10 +223,10 @@ void TopLevel::readOptions()
   option = config->readEntry("GameboardNumber", "0");
   selectedGameboard = option.toInt();
-  if (selectedGameboard < 0) selectedGameboard = 0;
+  if (selectedGameboard <= 0) selectedGameboard = 0;
   if (selectedGameboard > 7) selectedGameboard = 7;
 
   option = config->readEntry("LanguageNumber", "2");
   selectedLanguage = option.toInt();
-  if (selectedLanguage < 0) selectedLanguage = 0;
+  if (selectedLanguage <= 0) selectedLanguage = 0;
   if (selectedLanguage > 15) selectedLanguage = 15;
 

--- kdegames/ktuberling/toplevel.h  #1.22:1.23
@@ -24,7 +24,4 @@ public:
   ~TopLevel();
 
-  void readProperties(KConfig *config);
-  void saveProperties(KConfig *config);
-
   void enableUndo(bool enable) const;
   void enableRedo(bool enable) const;


[prev in list] [next in list] [prev in thread] [next in thread]