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

[Thibaut Gridel]

SVN commit 1043508 by tgridel:

Gpx: OpenGpx now uses FileManager to parse file into GeoDataDocument

The file is still rendered with gpxFileModel.

 M  +0 -1      CMakeLists.txt  
 M  +1 -1      FileLoader.cpp  
 D             GpxFileViewItem.cpp  
 D             GpxFileViewItem.h  
 M  +1 -4      MarbleModel.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/CMakeLists.txt #1043507:1043508
@@ -133,7 +133,6 @@
     FileLoader.cpp
     FileManager.cpp
     FileViewModel.cpp
-    GpxFileViewItem.cpp
     KmlFileViewItem.cpp
     gps/PositionTracking.cpp
     gps/GpsElement.cpp
--- trunk/KDE/kdeedu/marble/src/lib/FileLoader.cpp #1043507:1043508
@@ -138,7 +138,7 @@
 
 void FileLoader::importKml( const QString& filename )
 {
-    GeoDataParser parser( GeoData_KML );
+    GeoDataParser parser( GeoData_UNKNOWN );
 
     QFile file( filename );
     if ( !file.exists() ) {
--- trunk/KDE/kdeedu/marble/src/lib/MarbleModel.cpp #1043507:1043508
@@ -49,7 +49,6 @@
 #include "MercatorScanlineTextureMapper.h"
 #include "gps/GpxFileModel.h"
 #include "gps/GpxFile.h"
-#include "GpxFileViewItem.h"
 #include "HttpDownloadManager.h"
 #include "KmlFileViewItem.h"
 #include "LayerManager.h"
@@ -709,9 +708,7 @@
 void MarbleModel::openGpxFile( const QString& filename )
 {
     GpxFile* gpxFile = new GpxFile( filename );
-    GpxFileViewItem* item = new GpxFileViewItem( gpxFile );
-
-    d->m_fileManager->addFile( item );
+    d->m_fileManager->addFile( filename );
     d->m_gpxFileModel->addFile( gpxFile );
 }