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

[Jens-Michael Hoffmann]

SVN commit 1092331 by jmhoffmann:

TextureTile: rename data member m_composedTileId to m_stackedTileId (and corresponding getter/setter respectively) to be consistent with "StackedTile".

 M  +7 -7      TextureTile.h  
 M  +3 -3      TileLoader.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/TextureTile.h #1092330:1092331
@@ -51,7 +51,7 @@
     ~TextureTile();
 
     TileId const & id() const;
-    TileId const & composedTileId() const;
+    TileId const & stackedTileId() const;
     QDateTime const & lastModified() const;
     bool expired() const;
     QImage const * image() const;
@@ -66,12 +66,12 @@
     void setImage( QByteArray const & data );
     void setImage( QImage * const );
     void setMergeRule( MergeRule const );
-    void setComposedTileId( TileId const & );
+    void setStackedTileId( TileId const & );
     void setLastModified( QDateTime const & );
     void setExpireSecs( int const );
 
     TileId const m_id;
-    TileId m_composedTileId;
+    TileId m_stackedTileId;
     State m_state;
     MergeRule m_mergeRule;
     QDateTime m_lastModified;
@@ -87,9 +87,9 @@
     return m_id;
 }
 
-inline TileId const & TextureTile::composedTileId() const
+inline TileId const & TextureTile::stackedTileId() const
 {
-    return m_composedTileId;
+    return m_stackedTileId;
 }
 
 inline QDateTime const & TextureTile::lastModified() const
@@ -137,9 +137,9 @@
     m_mergeRule = mergeRule;
 }
 
-inline void TextureTile::setComposedTileId( TileId const & id )
+inline void TextureTile::setStackedTileId( TileId const & id )
 {
-    m_composedTileId = id;
+    m_stackedTileId = id;
 }
 
 inline void TextureTile::setLastModified( QDateTime const & lastModified )
--- trunk/KDE/kdeedu/marble/src/lib/TileLoader.cpp #1092330:1092331
@@ -51,7 +51,7 @@
         // but check if an update should be triggered
         GeoSceneTexture const * const textureLayer = findTextureLayer( tileId );
         TextureTile * const tile = new TextureTile( tileId, fileName );
-        tile->setComposedTileId( stackedTileId );
+        tile->setStackedTileId( stackedTileId );
         tile->setLastModified( fileInfo.lastModified() );
         tile->setExpireSecs( textureLayer->expire() );
 
@@ -69,7 +69,7 @@
     // tile was not locally available => trigger download and look for tiles in other levels
     // for scaling
     TextureTile * const tile = new TextureTile( tileId );
-    tile->setComposedTileId( stackedTileId );
+    tile->setStackedTileId( stackedTileId );
     m_waitingForUpdate.insert( tileId, tile );
     triggerDownload( tileId );
     QImage * const replacementTile = scaledLowerLevelTile( tileId );
@@ -92,7 +92,7 @@
     tile->setImage( data );
     tile->setState( TextureTile::StateUptodate );
     tile->setLastModified( QDateTime::currentDateTime() );
-    emit tileCompleted( tile->composedTileId(), id );
+    emit tileCompleted( tile->stackedTileId(), id );
 }
 
 inline GeoSceneTexture const * TileLoader::findTextureLayer( TileId const & id ) const