[Marble-commits] KDE/kdeedu/marble/src/lib

David Faure faure at kde.org
Thu Nov 12 20:54:53 CET 2009


SVN commit 1048139 by dfaure:

Fix compilation with strict iterators (also removes unnecessary casts)


 M  +1 -1      FileLoader.cpp  
 M  +1 -2      PlacemarkManager.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/FileLoader.cpp #1048138:1048139
@@ -308,7 +308,7 @@
     {
         if (GeoDataFolderId == cont->featureId() )
         {
-            const GeoDataContainer *subcontainer = static_cast<const GeoDataContainer*>(cont);
+            const GeoDataContainer *subcontainer = & (*cont);
             savePlacemarks(out, subcontainer);
         }
     }
--- trunk/KDE/kdeedu/marble/src/lib/PlacemarkManager.cpp #1048138:1048139
@@ -139,8 +139,7 @@
     results += container.placemarks();
     for (; it != end; ++it) {
         if ( GeoDataFolderId == it->featureId() ) {
-            const GeoDataContainer *cont = static_cast<const GeoDataContainer*>(it);
-            results += recurseContainer(*cont);
+            results += recurseContainer(*it);
         }
     }
     return results;


More information about the Marble-commits mailing list