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

[Jens-Michael Hoffmann]

SVN commit 1106272 by jmhoffmann:

StackedTile, TextureTile: rename method expired() to isExpired() following Qt conventions.

 M  +2 -2      StackedTile.cpp  
 M  +1 -1      StackedTile.h  
 M  +1 -1      StackedTileLoader.cpp  
 M  +2 -2      TextureTile.h  
 M  +1 -1      TileLoader.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/StackedTile.cpp #1106271:1106272
@@ -261,13 +261,13 @@
 {
 }
 
-bool StackedTile::expired() const
+bool StackedTile::isExpired() const
 {
     bool result = false;
     QVector<TextureTile*>::const_iterator pos = d->m_tiles.constBegin();
     QVector<TextureTile*>::const_iterator const end = d->m_tiles.constEnd();
     for (; pos != end; ++pos )
-        result |= (*pos)->expired();
+        result |= (*pos)->isExpired();
     return result;
 }
 
--- trunk/KDE/kdeedu/marble/src/lib/StackedTile.h #1106271:1106272
@@ -43,7 +43,7 @@
 
     int depth() const;
     int numBytes() const;
-    bool expired() const;
+    bool isExpired() const;
 
     bool forMergedLayerDecorator() const;
     void setForMergedLayerDecorator();
--- trunk/KDE/kdeedu/marble/src/lib/StackedTileLoader.cpp #1106271:1106272
@@ -165,7 +165,7 @@
     tile = d->m_tileCache.take( stackedTileId );
     if ( tile ) {
         // the tile was in the cache, but is it up to date?
-        if ( !tile->expired() ) {
+        if ( !tile->isExpired() ) {
             d->m_tilesOnDisplay[ stackedTileId ] = tile;
             tile->setUsed( true );
             return tile;
--- trunk/KDE/kdeedu/marble/src/lib/TextureTile.h #1106271:1106272
@@ -53,7 +53,7 @@
     TileId const & id() const;
     TileId const & stackedTileId() const;
     QDateTime const & lastModified() const;
-    bool expired() const;
+    bool isExpired() const;
     QImage const * image() const;
     QImage * image();
     State state() const;
@@ -97,7 +97,7 @@
     return m_lastModified;
 }
 
-inline bool TextureTile::expired() const
+inline bool TextureTile::isExpired() const
 {
     return m_lastModified.secsTo( QDateTime::currentDateTime() ) >= m_expireSecs;
 }
--- trunk/KDE/kdeedu/marble/src/lib/TileLoader.cpp #1106271:1106272
@@ -55,7 +55,7 @@
         tile->setLastModified( fileInfo.lastModified() );
         tile->setExpireSecs( textureLayer->expire() );
 
-        if ( !tile->expired() ) {
+        if ( !tile->isExpired() ) {
             mDebug() << "TileLoader::loadTile" << tileId.toString() << "StateUptodate";
             tile->setState( TextureTile::StateUptodate );
         } else {