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

List:       kde-commits
Subject:    kdetoys
From:       Dirk Mueller <mueller () kde ! org>
Date:       2003-04-30 21:18:56
[Download RAW message or body]

CVS commit by mueller: 

fix compile


  M +2 -2      kmoon/kmoon.cpp   1.39
  M +5 -5      kworldwatch/cities.cpp   1.8


--- kdetoys/kworldwatch/cities.cpp  #1.7:1.8
@@ -82,5 +82,5 @@ void CityList::readCityList(QString fnam
       QRegExp coord("[+-]\\d+[+-]\\d+");
       QRegExp name("[^\\s]+/[^\\s]+");
-      int len, pos;
+      int pos;
       while (!is.eof())
         {
@@ -91,11 +91,11 @@ void CityList::readCityList(QString fnam
           QString c, n;
           
-          pos = coord.match(line, 0, &len);
+          pos = coord.search(line, 0);
           if (pos >= 0)
-            c = line.mid(pos, len);
+            c = line.mid(pos, coord.matchedLength());
           
-          pos = name.match(line, pos, &len);
+          pos = name.search(line, pos);
           if (pos > 0)
-            n = line.mid(pos, len).stripWhiteSpace();
+            n = line.mid(pos, coord.matchedLength()).stripWhiteSpace();
 
           if (!c.isEmpty() && !n.isEmpty())

--- kdetoys/kmoon/kmoon.cpp  #1.38:1.39
@@ -350,5 +350,5 @@ void MoonWidget::renderGraphic()
     rotated = pixmap;
     rotated.setMask( mask );
-    pixmap.fill(QApplication::palette().normal().background());
+    pixmap.fill(QApplication::palette().active().background());
     p.begin(&pixmap);
     p.drawPixmap(0, 0, rotated);


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