[Marble-devel] [PATCH 09/13] Remove "for merged layer decorator" hack in StackedTile/StackedTileLoader.

[Jens-Michael Hoffmann]

Remove "for merged layer decorator" hack in StackedTile/StackedTileLoader.

After the citylights theme for suncontrol is handled by SunLightBlending
this code is now dead and can be removed.
---
 marble/src/lib/StackedTile.cpp       |   13 +------------
 marble/src/lib/StackedTile.h         |    3 ---
 marble/src/lib/StackedTileLoader.cpp |    8 ++------
 marble/src/lib/StackedTileLoader.h   |    3 +--
 marble/src/lib/StackedTile_p.h       |    1 -
 5 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/marble/src/lib/StackedTile.cpp b/marble/src/lib/StackedTile.cpp
index 0c2778e..075c1e2 100644
--- a/marble/src/lib/StackedTile.cpp
+++ b/marble/src/lib/StackedTile.cpp
@@ -63,8 +63,7 @@ StackedTilePrivate::StackedTilePrivate( const TileId& id ) :
       m_resultTile(),
       m_byteCount(0),
       m_depth(0),
-      m_isGrayscale( false ),
-      m_forMergedLayerDecorator( false )
+      m_isGrayscale( false )
 {
 }
 
@@ -252,16 +251,6 @@ bool StackedTile::isExpired() const
     return result;
 }
 
-bool StackedTile::forMergedLayerDecorator() const
-{
-    return d->m_forMergedLayerDecorator;
-}
-
-void StackedTile::setForMergedLayerDecorator()
-{
-    d->m_forMergedLayerDecorator = true;
-}
-
 void StackedTile::addTile( QSharedPointer<TextureTile> const & tile )
 {
     d->m_tiles.append( tile );
diff --git a/marble/src/lib/StackedTile.h b/marble/src/lib/StackedTile.h
index 18b1464..2e63eb7 100644
--- a/marble/src/lib/StackedTile.h
+++ b/marble/src/lib/StackedTile.h
@@ -46,9 +46,6 @@ class StackedTile : public AbstractTile
     int numBytes() const;
     bool isExpired() const;
 
-    bool forMergedLayerDecorator() const;
-    void setForMergedLayerDecorator();
-
     QVector<QSharedPointer<TextureTile> > * tiles();
     QImage const * resultTile() const;
     QImage * resultTile();
diff --git a/marble/src/lib/StackedTileLoader.cpp b/marble/src/lib/StackedTileLoader.cpp
index 1df1a53..0452f59 100644
--- a/marble/src/lib/StackedTileLoader.cpp
+++ b/marble/src/lib/StackedTileLoader.cpp
@@ -145,8 +145,7 @@ void StackedTileLoader::flush()
     d->m_tilesOnDisplay.clear();
 }
 
-StackedTile* StackedTileLoader::loadTile( TileId const & stackedTileId,
-                                          bool const forMergedLayerDecorator )
+StackedTile* StackedTileLoader::loadTile( TileId const & stackedTileId )
 {
     // check if the tile is in the hash
     StackedTile * stackedTile = d->m_tilesOnDisplay.value( stackedTileId, 0 );
@@ -178,8 +177,6 @@ StackedTile* StackedTileLoader::loadTile( TileId const & stackedTileId,
 
     // mDebug() << "load Tile from Disk: " << stackedTileId.toString();
     stackedTile = new StackedTile( stackedTileId );
-    if ( forMergedLayerDecorator )
-        stackedTile->setForMergedLayerDecorator();
     d->m_tilesOnDisplay[ stackedTileId ] = stackedTile;
 
     QVector<GeoSceneTexture const *> const textureLayers = findRelevantTextureLayers( stackedTileId );
@@ -444,8 +441,7 @@ void StackedTileLoader::mergeDecorations( StackedTile * const tile,
                                           GeoSceneTexture * const textureLayer ) const
 {
     Q_ASSERT( tile->state() != StackedTile::TileEmpty );
-    if ( !tile->forMergedLayerDecorator() )
-        m_parent->paintTile( tile, textureLayer );
+    m_parent->paintTile( tile, textureLayer );
 }
 
 // This method should not alter m_tileCache, as the given tile is managed
diff --git a/marble/src/lib/StackedTileLoader.h b/marble/src/lib/StackedTileLoader.h
index 37a6dc3..335816c 100644
--- a/marble/src/lib/StackedTileLoader.h
+++ b/marble/src/lib/StackedTileLoader.h
@@ -82,8 +82,7 @@ class StackedTileLoader : public QObject
          * @param stackedTileId The Id of the requested tile, containing the x and y coordinate
          *                      and the zoom level.
          */
-        StackedTile* loadTile( TileId const &stackedTileId,
-                               bool const forMergedLayerDecorator = false );
+        StackedTile* loadTile( TileId const &stackedTileId );
 
         StackedTile* reloadTile( TileId const & stackedTileId );
 
diff --git a/marble/src/lib/StackedTile_p.h b/marble/src/lib/StackedTile_p.h
index d17d5a2..94c6b6e 100644
--- a/marble/src/lib/StackedTile_p.h
+++ b/marble/src/lib/StackedTile_p.h
@@ -42,7 +42,6 @@ class StackedTilePrivate : AbstractTilePrivate
 
     int       m_depth;
     bool      m_isGrayscale;
-    bool      m_forMergedLayerDecorator;
 
     explicit StackedTilePrivate( const TileId& id );
     virtual ~StackedTilePrivate();
-- 
1.7.0.3