From kde-commits  Sat Jun 30 21:02:30 2012
From: Bernhard Beschow <bbeschow () cs ! tu-berlin ! de>
Date: Sat, 30 Jun 2012 21:02:30 +0000
To: kde-commits
Subject: [marble] src/lib: rename downloadTile to downloadStackedTile to reflect actual semantics
Message-Id: <20120630210230.105F3A60A6 () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=134109037825075

Git commit c09afb0aa3130c774225010c130392001e59a45b by Bernhard Beschow.
Committed on 30/06/2012 at 17:11.
Pushed by beschow into branch 'master'.

rename downloadTile to downloadStackedTile to reflect actual semantics

The semantics have been changed already in commit 40f57c99beef356a60a9525d7=
a9cbd953fee3f78 (Make "Download Region" usable on system without lots of RA=
M and fast CPU.).

M  +1    -1    src/lib/MarbleMap.cpp
M  +1    -1    src/lib/MergedLayerDecorator.cpp
M  +1    -1    src/lib/MergedLayerDecorator.h
M  +2    -2    src/lib/StackedTileLoader.cpp
M  +1    -1    src/lib/StackedTileLoader.h
M  +2    -2    src/lib/layers/TextureLayer.cpp
M  +1    -1    src/lib/layers/TextureLayer.h

http://commits.kde.org/marble/c09afb0aa3130c774225010c130392001e59a45b

diff --git a/src/lib/MarbleMap.cpp b/src/lib/MarbleMap.cpp
index 60f3e80..76b92f6 100644
--- a/src/lib/MarbleMap.cpp
+++ b/src/lib/MarbleMap.cpp
@@ -479,7 +479,7 @@ void MarbleMap::downloadRegion( const QString& sourceDi=
r, QVector<TileCoordsPyra
          while( i.hasNext() ) {
              TileId const tileId =3D i.next();
              if ( !d->m_textureLayer.isTileAvailable( tileId ) ) {
-                d->m_textureLayer.downloadTile( tileId );
+                d->m_textureLayer.downloadStackedTile( tileId );
              }
          }
          tilesCount +=3D tileIdSet.count();
diff --git a/src/lib/MergedLayerDecorator.cpp b/src/lib/MergedLayerDecorato=
r.cpp
index d1ddca4..0202722 100644
--- a/src/lib/MergedLayerDecorator.cpp
+++ b/src/lib/MergedLayerDecorator.cpp
@@ -167,7 +167,7 @@ StackedTile *MergedLayerDecorator::createTile( const St=
ackedTile &stackedTile, c
     return d->createTile( tiles );
 }
 =

-void MergedLayerDecorator::downloadTile( const TileId &id, const QVector<G=
eoSceneTexture const *> &textureLayers )
+void MergedLayerDecorator::downloadStackedTile( const TileId &id, const QV=
ector<GeoSceneTexture const *> &textureLayers )
 {
     foreach ( const GeoSceneTexture *textureLayer, textureLayers ) {
         const TileId tileId( textureLayer->sourceDir(), id.zoomLevel(), id=
.x(), id.y() );
diff --git a/src/lib/MergedLayerDecorator.h b/src/lib/MergedLayerDecorator.h
index b0f8755..c220323 100644
--- a/src/lib/MergedLayerDecorator.h
+++ b/src/lib/MergedLayerDecorator.h
@@ -41,7 +41,7 @@ class MergedLayerDecorator
 =

     StackedTile *createTile( const StackedTile &stackedTile, const TileId =
&tileId, const QImage &tileImage ) const;
 =

-    void downloadTile( const TileId &id, const QVector<GeoSceneTexture con=
st *> &textureLayers );
+    void downloadStackedTile( const TileId &id, const QVector<GeoSceneText=
ure const *> &textureLayers );
 =

     void reloadTile( const StackedTile &stackedTile );
 =

diff --git a/src/lib/StackedTileLoader.cpp b/src/lib/StackedTileLoader.cpp
index a73069e..45fe1d9 100644
--- a/src/lib/StackedTileLoader.cpp
+++ b/src/lib/StackedTileLoader.cpp
@@ -192,10 +192,10 @@ const StackedTile* StackedTileLoader::loadTile( TileI=
d const & stackedTileId )
     return stackedTile;
 }
 =

-void StackedTileLoader::downloadTile( TileId const & stackedTileId )
+void StackedTileLoader::downloadStackedTile( TileId const & stackedTileId )
 {
     QVector<GeoSceneTexture const *> const textureLayers =3D d->findReleva=
ntTextureLayers( stackedTileId );
-    d->m_layerDecorator->downloadTile( stackedTileId, textureLayers );
+    d->m_layerDecorator->downloadStackedTile( stackedTileId, textureLayers=
 );
 }
 =

 quint64 StackedTileLoader::volatileCacheLimit() const
diff --git a/src/lib/StackedTileLoader.h b/src/lib/StackedTileLoader.h
index fc63995..87dd6b6 100644
--- a/src/lib/StackedTileLoader.h
+++ b/src/lib/StackedTileLoader.h
@@ -85,7 +85,7 @@ class StackedTileLoader
          *                      and the zoom level.
          */
         const StackedTile* loadTile( TileId const &stackedTileId );
-        void downloadTile( TileId const & stackedTileId );
+        void downloadStackedTile( TileId const & stackedTileId );
 =

         /**
          * Resets the internal tile hash.
diff --git a/src/lib/layers/TextureLayer.cpp b/src/lib/layers/TextureLayer.=
cpp
index e98c728..b535a5b 100644
--- a/src/lib/layers/TextureLayer.cpp
+++ b/src/lib/layers/TextureLayer.cpp
@@ -329,9 +329,9 @@ void TextureLayer::reload()
     d->m_tileLoader.reloadVisibleTiles();
 }
 =

-void TextureLayer::downloadTile( const TileId &tileId )
+void TextureLayer::downloadStackedTile( const TileId &stackedTileId )
 {
-    d->m_tileLoader.downloadTile( tileId );
+    d->m_tileLoader.downloadStackedTile( stackedTileId );
 }
 =

 void TextureLayer::setMapTheme( const QVector<const GeoSceneTexture *> &te=
xtures, GeoSceneGroup *textureLayerSettings, const QString &seaFile, const =
QString &landFile )
diff --git a/src/lib/layers/TextureLayer.h b/src/lib/layers/TextureLayer.h
index c2fb60b..e9b10c1 100644
--- a/src/lib/layers/TextureLayer.h
+++ b/src/lib/layers/TextureLayer.h
@@ -98,7 +98,7 @@ class TextureLayer : public QObject, public LayerInterface
 =

     void reload();
 =

-    void downloadTile( const TileId &tileId );
+    void downloadStackedTile( const TileId &stackedTileId );
 =

  Q_SIGNALS:
     void tileLevelChanged( int );