From kde-commits  Thu Aug 25 21:21:14 2005
From: Nicolas Hadacek <hadacek () kde ! org>
Date: Thu, 25 Aug 2005 21:21:14 +0000
To: kde-commits
Subject: branches/KDE/3.4/kdegames/kmines
Message-Id: <1125004874.723037.28027.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=112500490311992

SVN commit 453331 by hadacek:

backport fixes for bug #111304 and #100163


 M  +7 -1      CHANGELOG  
 M  +3 -4      solver/adviseFast.cpp  
 M  +2 -2      status.cpp  
 M  +3 -3      version.h  


--- branches/KDE/3.4/kdegames/kmines/CHANGELOG #453330:453331
@@ -1,4 +1,10 @@
-2.1.9 (27 Jun 2004) [KDE 3.3 devel]
+2.1.10 (25 Aug 2005) [KDE 3.5 devel]
+
+2.1.9a (25 Aug 2005) [KDE 3.4.3 stable]
+ * fix constness in solver [reported by Garrett Kajmowicz]
+ * fix bug: cannot load log [reported by Tobias Meyer]
+
+2.1.9 (27 Jun 2004) [KDE 3.3 stable]
  * fix compilation of solver debugging code.
  * add missing events
  * replace case size option by zoom in/zoom out actions
--- branches/KDE/3.4/kdegames/kmines/solver/adviseFast.cpp #453330:453331
@@ -124,7 +124,7 @@
 	autorevealed.insert(point);
 	affectedFacts->insert(autorevealed.begin(), autorevealed.end());
 
-	CoordSet::iterator i, j;
+	CoordSet::const_iterator i;
 	for(i=autorevealed.begin(); i!=autorevealed.end(); ++i)
 	{
 		// I still think that each poing will belong to
@@ -134,7 +134,7 @@
 			CoordSet const &affF = _containingFacts[*i];
 			affectedFacts->insert(
 				affF.begin(), affF.end());
-			for(	j=affF.begin();
+			for(CoordSet::const_iterator j=affF.begin();
 				j!=affF.end();
 				++j)
 			{
@@ -165,8 +165,7 @@
 	if(_containingFacts.count(point)){
 		CoordSet const &affF = _containingFacts[point];
 		affectedFacts->insert(affF.begin(), affF.end());
-		CoordSet::iterator i;
-		for(i=affF.begin(); i!=affF.end(); ++i){
+		for(CoordSet::const_iterator i=affF.begin(); i!=affF.end(); ++i){
 			(*this)[*i].pointSet.erase(point);
 			(*this)[*i].mines--;
 			if((*this)[*i].pointSet.empty())
--- branches/KDE/3.4/kdegames/kmines/status.cpp #453330:453331
@@ -421,9 +421,9 @@
         QDomElement a = actions.item(i).toElement();
         if ( a.isNull() ) return false;
         uint i0 = a.attribute("line").toUInt(&ok);
-        if ( !ok || i0>=w ) return false;
+        if ( !ok || i0>=h ) return false;
         uint j = a.attribute("column").toUInt(&ok);
-        if ( !ok || j>=h ) return false;
+        if ( !ok || j>=w ) return false;
         QString type = a.attribute("type");
         uint k = 0;
         for (; k<Field::Nb_Actions; k++)
--- branches/KDE/3.4/kdegames/kmines/version.h #453330:453331
@@ -1,5 +1,5 @@
-#define VERSION	     "2.1.9"
-#define LONG_VERSION "2.1.9 (5 Aug 2004)"
-#define COPYLEFT     "(c) 1996-2004, Nicolas Hadacek\n(c) 2001, Mikhail Kourinny"
+#define VERSION	     "2.1.9a"
+#define LONG_VERSION "2.1.9a (25 Aug 2005)"
+#define COPYLEFT     "(c) 1996-2005, Nicolas Hadacek\n(c) 2001, Mikhail Kourinny"
 #define EMAIL        "hadacek@kde.org"
 #define HOMEPAGE     "http://kmines.sourceforge.net/"