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

[Bernhard Beschow]

SVN commit 1207514 by beschow:

remove redundant GeoSceneTexture parameter from TextureLayer::paintTile()

* StackedTileLoader::findTextureLayer() isn't needed any longer -> rmeove it

 M  +1 -8      StackedTileLoader.cpp  
 M  +0 -1      StackedTileLoader.h  
 M  +2 -2      TextureLayer.cpp  
 M  +1 -1      TextureLayer.h  


--- trunk/KDE/kdeedu/marble/src/lib/StackedTileLoader.cpp #1207513:1207514
@@ -411,13 +411,6 @@
     return result;
 }
 
-inline GeoSceneTexture const * StackedTileLoader::findTextureLayer( TileId const & id ) const
-{
-    GeoSceneTexture const * const textureLayer = d->m_textureLayers.value( id.mapThemeIdHash(), 0 );
-    Q_ASSERT( textureLayer );
-    return textureLayer;
-}
-
 // 
 QVector<GeoSceneTexture const *>
 StackedTileLoader::findRelevantTextureLayers( TileId const & stackedTileId ) const
@@ -500,7 +493,7 @@
 {
     Q_ASSERT( !tile->resultTile()->isNull() );
     if ( !tile->forMergedLayerDecorator() )
-        m_parent->paintTile( tile, findTextureLayer( tile->id() ) );
+        m_parent->paintTile( tile );
 }
 
 // This method should not alter m_tileCache, as the given tile is managed
--- trunk/KDE/kdeedu/marble/src/lib/StackedTileLoader.h #1207513:1207514
@@ -161,7 +161,6 @@
     private:
         Q_DISABLE_COPY( StackedTileLoader )
         GeoSceneLayer const * findSceneLayer( TileId const & ) const;
-        GeoSceneTexture const * findTextureLayer( TileId const & ) const;
         QVector<GeoSceneTexture const *>
             findRelevantTextureLayers( TileId const & stackedTileId ) const;
         void mergeDecorations( StackedTile * const ) const;
--- trunk/KDE/kdeedu/marble/src/lib/TextureLayer.cpp #1207513:1207514
@@ -317,7 +317,7 @@
     return d->m_tileLoader.volatileCacheLimit();
 }
 
-void TextureLayer::paintTile( StackedTile* tile, const GeoSceneTexture *textureLayer )
+void TextureLayer::paintTile( StackedTile* tile )
 {
 //    mDebug() << "MarbleModel::paintTile: " << "x: " << x << "y:" << y << "level: " << level
 //             << "requestTileUpdate" << requestTileUpdate;
@@ -325,7 +325,7 @@
     d->m_layerDecorator.setInfo( tile->id() );
     d->m_layerDecorator.setTile( tile->resultTile() );
 
-    d->m_layerDecorator.paint( "maps/" + textureLayer->sourceDir(), d->m_mapTheme );
+    d->m_layerDecorator.paint( "maps/" + d->textureLayer()->sourceDir(), d->m_mapTheme );
 }
 
 }
--- trunk/KDE/kdeedu/marble/src/lib/TextureLayer.h #1207513:1207514
@@ -88,7 +88,7 @@
 
  private:
     friend class StackedTileLoader;
-    void paintTile( StackedTile *tile, const GeoSceneTexture *textureLayer );
+    void paintTile( StackedTile *tile );
 
     Q_PRIVATE_SLOT( d, void mapChanged() )