From kde-commits  Tue Nov 30 15:00:16 2010
From: Bernhard Beschow <bbeschow () cs ! tu-berlin ! de>
Date: Tue, 30 Nov 2010 15:00:16 +0000
To: kde-commits
Subject: KDE/kdeedu/marble
Message-Id: <20101130150016.0BC16AC8A4 () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=129112925422435

SVN commit 1202357 by beschow:

don't expose AbstractScanlineTextureMapper in MarbleModel

* AbstractScanlineTextureMapper isn't exported, so there shouldn't have been any usages outside libmarblewidget

CCMAIL: kde-bindings@kde.org

 M  +5 -0      docs/release_notes/APIChanges-0.11.txt  
 M  +0 -6      src/lib/AbstractScanlineTextureMapper.h  
 M  +3 -13     src/lib/DownloadRegionDialog.cpp  
 M  +0 -5      src/lib/MarbleModel.cpp  
 M  +1 -3      src/lib/MarbleModel.h  


--- trunk/KDE/kdeedu/marble/docs/release_notes/APIChanges-0.11.txt #1202356:1202357
@@ -56,3 +56,8 @@
 * Remove ViewParams::set{Canvas, Coast}Image. Introduce ViewParams::setSize().
   Instead of manually setting the canvas and coast images to the same size already specified in ViewParams::ViewportParams (using setCanvasImage and setCoastImage),
   calling setSize will update the viewportParam's and the images sizes and keep them synchronized.
+
+2010-11-29  Bernhard Beschow <bbeschow@cs.tu-berlin.de>
+
+* Remove MarbleModel::textureMapper().
+  AbstractScanlineTextureMapper isn't exported, so there shouldn't have been any usages outside libmarblewidget.
--- trunk/KDE/kdeedu/marble/src/lib/AbstractScanlineTextureMapper.h #1202356:1202357
@@ -45,7 +45,6 @@
     bool interlaced() const;
     void setInterlaced( const bool enabled );
     int tileZoomLevel() const;
-    GeoSceneTexture const * textureLayer() const;
 
  Q_SIGNALS:
     void mapChanged();
@@ -151,11 +150,6 @@
     m_interlaced = enabled;
 }
 
-inline GeoSceneTexture const * AbstractScanlineTextureMapper::textureLayer() const
-{
-    return m_textureLayer;
-}
-
 inline int AbstractScanlineTextureMapper::globalWidth() const
 {
     return m_globalWidth;
--- trunk/KDE/kdeedu/marble/src/lib/DownloadRegionDialog.cpp #1202356:1202357
@@ -28,7 +28,6 @@
 #include <QtGui/QScrollArea>
 #include <QtCore/QSet>
 
-#include "AbstractScanlineTextureMapper.h"
 #include "GeoDataLatLonAltBox.h"
 #include "GeoSceneTexture.h"
 #include "MarbleDebug.h"
@@ -61,7 +60,6 @@
 
     int rad2PixelX( qreal const lon ) const;
     int rad2PixelY( qreal const lat ) const;
-    AbstractScanlineTextureMapper const * textureMapper() const;
     bool hasRoute() const;
     QDialog * m_dialog;
     QRadioButton * m_visibleRegionMethodButton;
@@ -97,9 +95,9 @@
       m_tileSizeInfo( 0 ),
       m_okButton( 0 ),
       m_applyButton( 0 ),
-      m_visibleTileLevel( model->textureMapper()->tileZoomLevel() ),
+      m_visibleTileLevel( model->tileZoomLevel() ),
       m_model( model ),
-      m_textureLayer( model->textureMapper()->textureLayer() ),
+      m_textureLayer( model->textureLayer() ),
       m_selectionMethod( VisibleRegionMethod ),
       m_visibleRegion(),
       m_routingModel( model->routingManager()->routingModel() )
@@ -236,13 +234,6 @@
     return 0;
 }
 
-AbstractScanlineTextureMapper const * DownloadRegionDialog::Private::textureMapper() const
-{
-    AbstractScanlineTextureMapper const * const result = m_model->textureMapper();
-    Q_ASSERT( result );
-    return result;
-}
-
 bool DownloadRegionDialog::Private::hasRoute() const
 {
     GeoDataLineString waypoints;
@@ -458,8 +449,7 @@
 void DownloadRegionDialog::updateTextureLayer()
 {
     mDebug() << "DownloadRegionDialog::updateTextureLayer";
-    AbstractScanlineTextureMapper const * const textureMapper = d->m_model->textureMapper();
-    d->m_textureLayer = textureMapper ? textureMapper->textureLayer() : 0;
+    d->m_textureLayer = d->m_model->textureLayer();
     updateTilesCount();
 }
 
--- trunk/KDE/kdeedu/marble/src/lib/MarbleModel.cpp #1202356:1202357
@@ -736,11 +736,6 @@
     return &d->m_placemarkselectionmodel;
 }
 
-AbstractScanlineTextureMapper *MarbleModel::textureMapper() const
-{
-    return d->m_texmapper;
-}
-
 PlacemarkLayout *MarbleModel::placemarkLayout() const
 {
     return d->m_placemarkLayout;
--- trunk/KDE/kdeedu/marble/src/lib/MarbleModel.h #1202356:1202357
@@ -48,7 +48,6 @@
 
 class AbstractDataPlugin;
 class AbstractDataPluginItem;
-class AbstractScanlineTextureMapper;
 class GeoPainter;
 class MeasureTool;
 class TileCoordsPyramid;
@@ -243,8 +242,6 @@
 
     PlacemarkLayout    *placemarkLayout()   const;
 
-    AbstractScanlineTextureMapper  *textureMapper() const;
-
     FileViewModel      *fileViewModel()   const;
     PositionTracking   *positionTracking() const;
 
@@ -413,6 +410,7 @@
     Q_PRIVATE_SLOT( d, void notifyModelChanged() )
 
     void addDownloadPolicies( GeoSceneDocument *mapTheme );
+    friend class DownloadRegionDialog;
     GeoSceneTexture * textureLayer() const;
 
     MarbleModelPrivate  * const d;