[Marble-commits] KDE/kdeedu/marble
Thibaut Gridel
tgridel at free.fr
Wed Aug 4 20:17:11 CEST 2010
SVN commit 1159201 by tgridel:
drop gps/ and AbstractLayer/ completely!
M +0 -1 CMakeLists.txt
D src/lib/AbstractLayer/AbstractLayerContainer.cpp
D src/lib/AbstractLayer/AbstractLayerContainer.h
D src/lib/AbstractLayer/AbstractLayerData.cpp
D src/lib/AbstractLayer/AbstractLayerData.h
D src/lib/AbstractLayer/AbstractLayerInterface.cpp
D src/lib/AbstractLayer/AbstractLayerInterface.h
M +0 -16 src/lib/CMakeLists.txt
M +0 -7 src/lib/MarbleControlBox.cpp
M +0 -5 src/lib/MarbleMap.cpp
M +0 -6 src/lib/MarbleMap.h
M +0 -20 src/lib/MarbleModel.cpp
M +0 -2 src/lib/MarbleModel.h
M +0 -5 src/lib/MarbleWidget.cpp
M +0 -6 src/lib/MarbleWidget.h
D src/lib/gps/GpsElement.cpp
D src/lib/gps/GpsElement.h
D src/lib/gps/GpxFile.cpp
D src/lib/gps/GpxFile.h
D src/lib/gps/GpxFileModel.cpp
D src/lib/gps/GpxFileModel.h
D src/lib/gps/GpxSax.cpp
D src/lib/gps/GpxSax.h
D src/lib/gps/Route.cpp
D src/lib/gps/Route.h
D src/lib/gps/RouteContainer.cpp
D src/lib/gps/RouteContainer.h
D src/lib/gps/Track.cpp
D src/lib/gps/Track.h
D src/lib/gps/TrackContainer.cpp
D src/lib/gps/TrackContainer.h
D src/lib/gps/TrackPoint.cpp
D src/lib/gps/TrackPoint.h
D src/lib/gps/TrackSegment.cpp
D src/lib/gps/TrackSegment.h
D src/lib/gps/Waypoint.cpp
D src/lib/gps/Waypoint.h
D src/lib/gps/WaypointContainer.cpp
D src/lib/gps/WaypointContainer.h
--- trunk/KDE/kdeedu/marble/CMakeLists.txt #1159200:1159201
@@ -265,7 +265,6 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/src/lib
- ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/AbstractLayer
${CMAKE_CURRENT_SOURCE_DIR}/src/lib/Projections
${CMAKE_CURRENT_SOURCE_DIR}/src/lib/geodata
${CMAKE_CURRENT_SOURCE_DIR}/src/lib/geodata/data
--- trunk/KDE/kdeedu/marble/src/lib/CMakeLists.txt #1159200:1159201
@@ -8,7 +8,6 @@
INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/lib
${CMAKE_BINARY_DIR}/src/lib
- ${CMAKE_CURRENT_SOURCE_DIR}/AbstractLayer
${CMAKE_CURRENT_SOURCE_DIR}/Projections
${CMAKE_CURRENT_SOURCE_DIR}/routing
${CMAKE_CURRENT_SOURCE_DIR}/geodata
@@ -143,21 +142,6 @@
FileViewModel.cpp
KmlFileViewItem.cpp
gps/PositionTracking.cpp
- gps/GpsElement.cpp
- gps/Waypoint.cpp
- gps/TrackPoint.cpp
- gps/Route.cpp
- gps/Track.cpp
- gps/TrackSegment.cpp
- gps/WaypointContainer.cpp
- gps/TrackContainer.cpp
- gps/RouteContainer.cpp
- gps/GpxSax.cpp
- gps/GpxFile.cpp
- gps/GpxFileModel.cpp
- AbstractLayer/AbstractLayerInterface.cpp
- AbstractLayer/AbstractLayerContainer.cpp
- AbstractLayer/AbstractLayerData.cpp
DataMigration.cpp
AbstractDataPlugin.cpp
--- trunk/KDE/kdeedu/marble/src/lib/MarbleControlBox.cpp #1159200:1159201
@@ -33,7 +33,6 @@
#include "MarbleMap.h"
#include "MarbleModel.h"
#include "FileViewModel.h"
-#include "gps/GpxFileModel.h"
#include "gps/PositionTracking.h"
#include "MarbleLocale.h"
#include "MarblePlacemarkModel.h"
@@ -525,13 +524,7 @@
->selectedIndexes().count() ==1;
d->m_fileViewUi.m_saveButton->setEnabled( tmp );
d->m_fileViewUi.m_closeButton->setEnabled( tmp );
-
- if ( tmp ) {
- QModelIndex tmpIndex =
- d->m_fileViewUi.m_fileView->selectionModel()->currentIndex();
- d->m_widget->gpxFileModel()->setSelectedIndex( tmpIndex );
}
-}
void MarbleControlBox::setNavigationTabShown( bool show )
{
--- trunk/KDE/kdeedu/marble/src/lib/MarbleMap.cpp #1159200:1159201
@@ -1103,11 +1103,6 @@
d->m_model->openGpxFile( filename );
}
-GpxFileModel *MarbleMap::gpxFileModel()
-{
- return d->m_model->gpxFileModel();
-}
-
FileViewModel* MarbleMap::fileViewModel() const
{
return d->m_model->fileViewModel();
--- trunk/KDE/kdeedu/marble/src/lib/MarbleMap.h #1159200:1159201
@@ -53,7 +53,6 @@
class ViewParams;
class MeasureTool;
class SunLocator;
-class GpxFileModel;
class FileViewModel;
class GeoPainter;
class RenderPlugin;
@@ -767,11 +766,6 @@
void openGpxFile( const QString &filename );
/**
- * @brief Return a QAbstractItemModel containing GPX files.
- */
- GpxFileModel *gpxFileModel();
-
- /**
* @brief Return a QAbstractItemModel containing files.
*/
FileViewModel* fileViewModel() const;
--- trunk/KDE/kdeedu/marble/src/lib/MarbleModel.cpp #1159200:1159201
@@ -50,8 +50,6 @@
#include "SphericalScanlineTextureMapper.h"
#include "EquirectScanlineTextureMapper.h"
#include "MercatorScanlineTextureMapper.h"
-#include "gps/GpxFileModel.h"
-#include "gps/GpxFile.h"
#include "gps/PositionTracking.h"
#include "HttpDownloadManager.h"
#include "KmlFileViewItem.h"
@@ -105,7 +103,6 @@
m_sunLocator( 0 ),
m_layerDecorator( 0 ),
m_positionTracking( 0 ),
- m_gpxFileModel( 0 ),
m_planet( 0 ),
m_routingManager( 0 )
{
@@ -157,7 +154,6 @@
//Gps Stuff
PositionTracking *m_positionTracking;
- GpxFileModel *m_gpxFileModel;
Planet *m_planet;
@@ -226,7 +222,6 @@
connect( d->m_dataFacade->fileViewModel(), SIGNAL( modelChanged() ),
this, SIGNAL( modelChanged() ) );
- d->m_gpxFileModel = new GpxFileModel( this );
d->m_positionTracking = new PositionTracking( d->m_fileManager, this );
d->m_layerManager = new LayerManager( d->m_dataFacade, d->m_pluginManager, this );
@@ -651,14 +646,6 @@
// Paint the Gps Layer
painter->save();
QSize canvasSize = viewParams->canvasImage()->size();
- if ( viewParams->showGps() ) {
- const QVector<GpxFile*> * const allFiles = d->m_gpxFileModel->allFiles();
- QVector<GpxFile*>::const_iterator it;
- for( it = allFiles->constBegin();
- it != allFiles->constEnd(); ++it ) {
- (*it)->draw( painter, canvasSize, viewParams );
- }
- }
painter->restore();
@@ -717,11 +704,6 @@
return d->m_placemarkLayout;
}
-GpxFileModel *MarbleModel::gpxFileModel() const
-{
- return d->m_gpxFileModel;
-}
-
PositionTracking *MarbleModel::positionTracking() const
{
return d->m_positionTracking;
@@ -734,9 +716,7 @@
void MarbleModel::openGpxFile( const QString& filename )
{
- GpxFile* gpxFile = new GpxFile( filename );
d->m_fileManager->addFile( filename );
- d->m_gpxFileModel->addFile( gpxFile );
}
void MarbleModel::addPlacemarkFile( const QString& filename )
--- trunk/KDE/kdeedu/marble/src/lib/MarbleModel.h #1159200:1159201
@@ -51,7 +51,6 @@
class GeoPainter;
class TileCoordsPyramid;
class FileViewModel;
-class GpxFileModel;
class PositionTracking;
class HttpDownloadManager;
class MarbleModelPrivate;
@@ -219,7 +218,6 @@
AbstractScanlineTextureMapper *textureMapper() const;
- GpxFileModel *gpxFileModel() const;
FileViewModel *fileViewModel() const;
PositionTracking *positionTracking() const;
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidget.cpp #1159200:1159201
@@ -1071,11 +1071,6 @@
d->m_map->openGpxFile( filename );
}
-GpxFileModel *MarbleWidget::gpxFileModel()
-{
- return d->m_model->gpxFileModel();
-}
-
FileViewModel* MarbleWidget::fileViewModel() const
{
return d->m_model->fileViewModel();
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidget.h #1159200:1159201
@@ -44,7 +44,6 @@
class GeoDataLatLonBox;
class GeoPainter;
class GeoSceneDocument;
-class GpxFileModel;
class MarbleMap;
class MarbleModel;
class MarbleWidgetInputHandler;
@@ -540,11 +539,6 @@
GeoSceneDocument * mapTheme() const;
/**
- * @brief Return a QAbstractItemModel containing GPX files.
- */
- GpxFileModel * gpxFileModel();
-
- /**
* @brief Return a QAbstractItemModel containing files.
*/
FileViewModel * fileViewModel() const;
More information about the Marble-commits
mailing list