[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/marble/marble-1.1/src/lib
From:       Bernhard Beschow <bbeschow () cs ! tu-berlin ! de>
Date:       2010-12-29 21:09:29
Message-ID: 20101229210929.62703AC8AD () svn ! kde ! org
[Download RAW message or body]

SVN commit 1210154 by beschow:

backport from trunk-r1209645: only pass the stacked TileId in \
TileLoader::tileCompleted(), since the second TileId was unused in the receiver

 M  +3 -5      StackedTileLoader.cpp  
 M  +5 -4      StackedTileLoader.h  
 M  +1 -1      TileLoader.cpp  
 M  +1 -1      TileLoader.h  


--- branches/marble/marble-1.1/src/lib/StackedTileLoader.cpp #1210153:1210154
@@ -84,8 +84,8 @@
                                       SunLocator * const sunLocator )
     : d( new StackedTileLoaderPrivate( tileLoader, sunLocator ) )
 {
-    connect( d->m_tileLoader, SIGNAL( tileCompleted( TileId, TileId )),
-             SLOT( updateTile( TileId, TileId )));
+    connect( d->m_tileLoader, SIGNAL( tileCompleted( TileId )),
+             SLOT( updateTile( TileId )));
 }
 
 StackedTileLoader::~StackedTileLoader()
@@ -396,10 +396,8 @@
     d->m_tileCache.setMaxCost( kiloBytes * 1024 );
 }
 
-void StackedTileLoader::updateTile( TileId const & stackedTileId, TileId const & \
tileId ) +void StackedTileLoader::updateTile( TileId const & stackedTileId )
 {
-    Q_UNUSED(tileId);
-
     d->detectMaxTileLevel();
 
     StackedTile * const displayedTile = d->m_tilesOnDisplay.value( stackedTileId, 0 \
                );
--- branches/marble/marble-1.1/src/lib/StackedTileLoader.h #1210153:1210154
@@ -147,10 +147,6 @@
         void setVolatileCacheLimit( quint64 kiloBytes );
 
         /**
-         */
-        void updateTile( TileId const & stackedTileId, TileId const & tileId );
-
-        /**
          * Effectively triggers a reload of all tiles that are currently in use
          * and clears the tile cache in physical memory.
          */
@@ -163,6 +159,11 @@
          */
         void tileUpdateAvailable();
 
+    private Q_SLOTS:
+        /**
+         */
+        void updateTile( TileId const & stackedTileId );
+
     private:
         Q_DISABLE_COPY( StackedTileLoader )
         QVector<GeoSceneTexture const *>
--- branches/marble/marble-1.1/src/lib/TileLoader.cpp #1210153:1210154
@@ -163,7 +163,7 @@
 
     tile->setImage( image );
     tile->setLastModified( QDateTime::currentDateTime() );
-    emit tileCompleted( tile->stackedTileId(), id );
+    emit tileCompleted( tile->stackedTileId() );
 }
 
 void TileLoader::updateTextureLayers()
--- branches/marble/marble-1.1/src/lib/TileLoader.h #1210153:1210154
@@ -60,7 +60,7 @@
 
     // when this signal is emitted, the TileLoader gives up ownership of
     // the corrsponding tile. Might be better to explicitly transfer...
-    void tileCompleted( TileId const & composedTileId, TileId const & baseTileId );
+    void tileCompleted( TileId const & stackedTileId );
 
  private:
     GeoSceneTexture const * findTextureLayer( TileId const & ) const;


[prev in list] [next in list] [prev in thread] [next in thread]