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

[Jens-Michael Hoffmann]

SVN commit 1081985 by jmhoffmann:

TileLoader::maximumTileLevel, make it non-static.

It does not make much sense to have this method static, as
it was necessary to pass the layer member as argument.

 M  +1 -1      AbstractScanlineTextureMapper.cpp  
 M  +3 -3      TileLoader.cpp  
 M  +1 -1      TileLoader.h  


--- trunk/KDE/kdeedu/marble/src/lib/AbstractScanlineTextureMapper.cpp #1081984:1081985
@@ -592,7 +592,7 @@
 
 void AbstractScanlineTextureMapper::detectMaxTileLevel()
 {
-    m_maxTileLevel = TileLoader::maximumTileLevel( m_tileLoader->layer() );
+    m_maxTileLevel = m_tileLoader->maximumTileLevel();
 //    mDebug() << "MaxTileLevel: " << m_maxTileLevel;
 }
 
--- trunk/KDE/kdeedu/marble/src/lib/TileLoader.cpp #1081984:1081985
@@ -281,12 +281,12 @@
     return result;
 }
 
-int TileLoader::maximumTileLevel( GeoSceneLayer * layer )
+int TileLoader::maximumTileLevel() const
 {
-    if ( !layer )
+    if ( !d->m_layer )
         return -1;
 
-    GeoSceneTexture * texture = static_cast<GeoSceneTexture *>( layer->groundDataset() );
+    GeoSceneTexture * texture = static_cast<GeoSceneTexture *>( d->m_layer->groundDataset() );
     if ( !texture )
         return -1;
 
--- trunk/KDE/kdeedu/marble/src/lib/TileLoader.h #1081984:1081985
@@ -150,7 +150,7 @@
          * Returns the highest level in which some tiles are theoretically
          * available for the given @p texture layer.
          */
-        static int maximumTileLevel( GeoSceneLayer * layer );
+        int maximumTileLevel() const;
 
         /**
          * Returns whether the mandatory most basic tile level is fully available for