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

[Jens-Michael Hoffmann]

SVN commit 1106266 by jmhoffmann:

Rename parameter baseTileId -> tileId as the term "base tile" in Marble is
reserved for "level zero" tiles.

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


--- trunk/KDE/kdeedu/marble/src/lib/StackedTile.cpp #1106265:1106266
@@ -13,19 +13,14 @@
 #include "StackedTile.h"
 #include "StackedTile_p.h"
 
-#include <QtCore/QFileInfo>
 #include <QtGui/QImage>
 
 #include <cmath>
 
 #include "GeoSceneTexture.h"
 #include "MarbleDebug.h"
-#include "MarbleDirs.h"
 #include "TextureTile.h"
-#include "TileLoaderHelper.h"
-#include "global.h"
 
-
 using namespace Marble;
 
 static uint **jumpTableFromQImage32( QImage &img )
--- trunk/KDE/kdeedu/marble/src/lib/StackedTile.h #1106265:1106266
@@ -14,21 +14,15 @@
 // and jumptables for faster access to the pixel data
 //
 
-
 #ifndef MARBLE_STACKED_TILE_H
 #define MARBLE_STACKED_TILE_H
 
-
-#include <QtCore/QCache>
-#include <QtCore/QObject>
 #include <QtGui/QColor>
 
 #include "AbstractTile.h"
 #include "global.h"
 
 class QImage;
-class QString;
-class QUrl;
 
 namespace Marble
 {
--- trunk/KDE/kdeedu/marble/src/lib/StackedTileLoader.cpp #1106265:1106266
@@ -293,7 +293,7 @@
     d->m_tileCache.setMaxCost( kiloBytes * 1024 );
 }
 
-void StackedTileLoader::updateTile( TileId const & stackedTileId, TileId const & baseTileId )
+void StackedTileLoader::updateTile( TileId const & stackedTileId, TileId const & tileId )
 {
     StackedTile * const tile = d->m_tilesOnDisplay.value( stackedTileId, 0 );
     if ( tile ) {
--- trunk/KDE/kdeedu/marble/src/lib/StackedTileLoader.h #1106265:1106266
@@ -138,7 +138,7 @@
 
         /**
          */
-        void updateTile( TileId const & stackedTileId, TileId const & baseTileId );
+        void updateTile( TileId const & stackedTileId, TileId const & tileId );
 
         /**
          * Effectively triggers a reload of all tiles that are currently in use