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

[Bernhard Beschow]

SVN commit 1174216 by beschow:

remove some dependencies on MarbleMap

 M  +3 -3      ControlView.cpp  
 M  +4 -5      QtMainWindow.cpp  
 M  +0 -1      lib/routing/RoutingLayer.cpp  
 M  +0 -1      lib/routing/RoutingModel.cpp  
 M  +0 -1      plugins/render/navigation/NavigationFloatItem.cpp  
 M  +0 -1      plugins/render/routing/RoutingPlugin.cpp  


--- trunk/KDE/kdeedu/marble/src/ControlView.cpp #1174215:1174216
@@ -26,10 +26,10 @@
 #include "GeoSceneDocument.h"
 #include "GeoSceneHead.h"
 #include "MarbleWidget.h"
-#include "MarbleMap.h"
 #include "MarbleModel.h"
 #include "MapThemeManager.h"
 #include "PrintOptionsWidget.h"
+#include "ViewportParams.h"
 #include "routing/RoutingManager.h"
 #include "routing/RoutingModel.h"
 #include "routing/RouteRequest.h"
@@ -167,7 +167,7 @@
 {
 #ifndef QT_NO_PRINTER
         PrintOptionsWidget* printOptions = new PrintOptionsWidget( this );
-        bool const mapCoversViewport = m_marbleWidget->map()->mapCoversViewport();
+        bool const mapCoversViewport = m_marbleWidget->viewport()->mapCoversViewport();
         printOptions->setBackgroundControlsEnabled( !mapCoversViewport );
         bool hasLegend = m_marbleWidget->model()->legend() != 0;
         printOptions->setLegendControlsEnabled( hasLegend );
@@ -264,7 +264,7 @@
 #ifndef QT_NO_PRINTER
     QPixmap image = mapScreenShot();
 
-    if ( m_marbleWidget->map()->mapCoversViewport() ) {
+    if ( m_marbleWidget->viewport()->mapCoversViewport() ) {
         // Paint a black frame. Looks better.
         QPainter painter(&image);
         painter.setPen( Qt::black );
--- trunk/KDE/kdeedu/marble/src/QtMainWindow.cpp #1174215:1174216
@@ -50,7 +50,6 @@
 #include "ViewportParams.h"
 #include "AbstractDataPlugin.h"
 #include "AbstractFloatItem.h"
-#include "MarbleMap.h"
 #include "MarbleModel.h"
 #include "MarbleClock.h"
 #include "SunLocator.h"
@@ -679,7 +678,7 @@
 
 void MainWindow::reload()
 {
-    m_controlView->marbleWidget()->map()->reload();
+    m_controlView->marbleWidget()->reloadMap();
 }
 
 void MainWindow::enterWhatsThis()
@@ -998,7 +997,7 @@
 
 void MainWindow::showDownloadRegionDialog()
 {
-    MarbleModel *const model = m_controlView->marbleWidget()->map()->model();
+    MarbleModel *const model = m_controlView->marbleWidget()->model();
     if ( !m_downloadRegionDialog ) {
         m_downloadRegionDialog = new DownloadRegionDialog( model, m_controlView );
         // it might be tempting to move the connects to DownloadRegionDialog's "accepted" and
@@ -1014,7 +1013,7 @@
     m_downloadRegionDialog->setAllowedTileLevelRange( 0, 18 );
     m_downloadRegionDialog->setSelectionMethod( DownloadRegionDialog::VisibleRegionMethod );
     ViewportParams const * const viewport =
-        m_controlView->marbleWidget()->map()->viewport();
+        m_controlView->marbleWidget()->viewport();
     m_downloadRegionDialog->setSpecifiedLatLonAltBox( viewport->viewLatLonAltBox() );
     m_downloadRegionDialog->setVisibleLatLonAltBox( viewport->viewLatLonAltBox() );
 
@@ -1048,7 +1047,7 @@
     QString const sourceDir = mapThemeId.left( mapThemeId.lastIndexOf( '/' ));
     mDebug() << "downloadRegion mapThemeId:" << mapThemeId << sourceDir;
     QVector<TileCoordsPyramid> const pyramid = m_downloadRegionDialog->region();
-    m_controlView->marbleWidget()->map()->model()->downloadRegion( sourceDir, pyramid );
+    m_controlView->marbleWidget()->model()->downloadRegion( sourceDir, pyramid );
 }
 
 void MainWindow::printMapScreenShot()
--- trunk/KDE/kdeedu/marble/src/lib/routing/RoutingLayer.cpp #1174215:1174216
@@ -20,7 +20,6 @@
 #include "MarbleWidgetPopupMenu.h"
 #include "RoutingModel.h"
 #include "RouteRequest.h"
-#include "MarbleMap.h"
 #include "MarbleModel.h"
 #include "AlternativeRoutesModel.h"
 
--- trunk/KDE/kdeedu/marble/src/lib/routing/RoutingModel.cpp #1174215:1174216
@@ -21,7 +21,6 @@
 #include "GeoDataPlacemark.h"
 #include "RouteRequest.h"
 #include "PositionTracking.h"
-#include "MarbleMap.h"
 #include "MarbleModel.h"
 #include "MarbleWidget.h"
 #include "global.h"
--- trunk/KDE/kdeedu/marble/src/plugins/render/navigation/NavigationFloatItem.cpp #1174215:1174216
@@ -22,7 +22,6 @@
 #include "ViewportParams.h"
 #include "MarbleDebug.h"
 #include "MarbleWidget.h"
-#include "MarbleMap.h"
 #include "WidgetGraphicsItem.h"
 #include "MarbleGraphicsGridLayout.h"
 
--- trunk/KDE/kdeedu/marble/src/plugins/render/routing/RoutingPlugin.cpp #1174215:1174216
@@ -24,7 +24,6 @@
 #include "MarbleDirs.h"
 #include "MarbleWidget.h"
 #include "MarbleModel.h"
-#include "MarbleMap.h"
 #include "MarbleDataFacade.h"
 #include "PositionTracking.h"
 #include "GeoPainter.h"