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

[Thibaut Gridel]

SVN commit 1213561 by tgridel:

maps: no need to drop kml extension if it needs to be there in the end

 M  +0 -3      FileLoader.cpp  
 M  +0 -2      MarbleModel.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/FileLoader.cpp #1213560:1213561
@@ -69,9 +69,6 @@
         if ( path == "." ) path.clear();
         QString name = fileinfo.completeBaseName();
         QString suffix = fileinfo.suffix();
-	if( suffix.isEmpty() ) {
-            suffix = "kml";
-	}
 
         if ( fileinfo.isAbsolute() ) {
             // We got an _absolute_ path now: e.g. "/patrick.kml"
--- trunk/KDE/kdeedu/marble/src/lib/MarbleModel.cpp #1213560:1213561
@@ -288,7 +288,6 @@
                     GeoSceneAbstractDataset* dataset = *itds;
                     if( dataset->fileFormat() == "KML" ) {
                         QString containername = reinterpret_cast<GeoSceneXmlDataSource*>(dataset)->filename();
-                        if( containername.endsWith(".kml") ) containername.remove(".kml");
                         loadedContainers <<  containername;
                     }
                 }
@@ -310,7 +309,6 @@
                 GeoSceneAbstractDataset* dataset = *itds;
                 if( dataset->fileFormat() == "KML" ) {
                     QString containername = reinterpret_cast<GeoSceneXmlDataSource*>(dataset)->filename();
-                    if( containername.endsWith(".kml") ) containername.remove(".kml");
                     loadedContainers.removeOne( containername );
                     loadList << containername;
                 }