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

[Bernhard Beschow]

SVN commit 1207516 by beschow:

move StackedTileLoader::m_parent into private class

 M  +6 -5      StackedTileLoader.cpp  
 M  +0 -1      StackedTileLoader.h  


--- trunk/KDE/kdeedu/marble/src/lib/StackedTileLoader.cpp #1207515:1207516
@@ -59,8 +59,9 @@
 class StackedTileLoaderPrivate
 {
 public:
-    StackedTileLoaderPrivate( TileLoader *tileLoader )
-        : m_datasetProvider( 0 ),
+    StackedTileLoaderPrivate( TileLoader *tileLoader, TextureLayer *textureLayer )
+        : m_parent( textureLayer ),
+          m_datasetProvider( 0 ),
           m_mapThemeManager( 0 ),
           m_tileLoader( tileLoader ),
           m_textureLayerSettings( 0 )
@@ -70,6 +71,7 @@
 
     bool isTextureLayerEnabled( QString const & name ) const;
 
+    TextureLayer *const m_parent;
     DatasetProvider *m_datasetProvider;
     MapThemeManager const *m_mapThemeManager;
     // TODO: comment about uint hash key
@@ -94,8 +96,7 @@
 StackedTileLoader::StackedTileLoader( MapThemeManager const * const mapThemeManager,
                                       TileLoader * const tileLoader,
                                       TextureLayer * const parent )
-    : d( new StackedTileLoaderPrivate( tileLoader ) ),
-      m_parent( parent )
+    : d( new StackedTileLoaderPrivate( tileLoader, parent ) )
 {
     d->m_mapThemeManager = mapThemeManager;
     connect( d->m_mapThemeManager, SIGNAL( themesChanged() ),
@@ -491,7 +492,7 @@
 {
     Q_ASSERT( !tile->resultTile()->isNull() );
     if ( !tile->forMergedLayerDecorator() )
-        m_parent->paintTile( tile );
+        d->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 #1207515:1207516
@@ -167,7 +167,6 @@
         void reloadCachedTile( StackedTile * const cachedTile, DownloadUsage const );
 
         StackedTileLoaderPrivate* const d;
-        TextureLayer* m_parent;
 };
 
 }