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

List:       kde-commits
Subject:    branches/KDE/4.2/kdeedu/marble/src/lib
From:       Torsten Rahn <tackat () kde ! org>
Date:       2009-02-04 18:23:53
Message-ID: 1233771833.432234.16201.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 921298 by rahn:


- First Make-Marble-work-on-Qt4.3-again patch by Matias Kallio.

-This line, and those below, will be ignored--

M    MarbleModel.cpp


 M  +11 -2     MarbleModel.cpp  


--- branches/KDE/4.2/kdeedu/marble/src/lib/MarbleModel.cpp #921297:921298
@@ -408,8 +408,17 @@
             for (; itds != endds; ++itds) {
                 GeoSceneAbstractDataset* dataset = *itds;
                 if( dataset->fileFormat() == "KML" ) {
-                    loadedContainers.removeOne( \
                reinterpret_cast<GeoSceneXmlDataSource*>(dataset)->filename() );
-                    loadList << \
reinterpret_cast<GeoSceneXmlDataSource*>(dataset)->filename(); +#if QT_VERSION >= \
0x040400 +                    loadedContainers.removeOne(
+reinterpret_cast<GeoSceneXmlDataSource*>(dataset)->filename() );
+#else
+                    int index = loadedContainers.indexOf(
+reinterpret_cast<GeoSceneXmlDataSource*>(dataset)->filename() );
+                    if (index != -1) {
+                        loadedContainers.removeAt(index);
+                    }
+#endif
+                    loadList << \
reinterpret_cast<GeoSceneXmlDataSource*>(dataset)->filename();            }
             }
         }


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