[Marble-commits] KDE/kdeedu/marble/src/lib
Bernhard Beschow
bbeschow at cs.tu-berlin.de
Tue Jul 27 23:59:00 CEST 2010
SVN commit 1155695 by beschow:
dead code--: remove tile states
TextureTiles are never empty because they always hold a valid QImage (see the Q_ASSERTions in TextureTile).
Although the tile state can also be scaled or expired, the tile states are only checked for being empty.
Hence, these comparisons are needless.
Similar to the above reasoning, StackedTile::deriveCompletionState() will always result in the TileComplete state.
That way, checking for the state of a StackedTile is equivalent to checking whether it contains tiles.
M +1 -8 AbstractTile.cpp
M +0 -15 AbstractTile.h
M +0 -1 AbstractTile_p.h
M +1 -1 MergedLayerDecorator.cpp
M +1 -19 StackedTile.cpp
M +1 -2 StackedTile.h
M +4 -6 StackedTileLoader.cpp
M +0 -1 TextureTile.cpp
M +0 -20 TextureTile.h
M +0 -5 TileLoader.cpp
--- trunk/KDE/kdeedu/marble/src/lib/AbstractTile.cpp #1155694:1155695
@@ -20,8 +20,7 @@
AbstractTilePrivate::AbstractTilePrivate( const TileId& id )
: m_id( id ),
- m_used( false ),
- m_state( AbstractTile::TileEmpty )
+ m_used( false )
{
}
@@ -63,12 +62,6 @@
d->m_used = used;
}
-AbstractTile::TileState AbstractTile::state() const
-{
- Q_D( const AbstractTile );
- return d->m_state;
}
-}
-
#include "AbstractTile.moc"
--- trunk/KDE/kdeedu/marble/src/lib/AbstractTile.h #1155694:1155695
@@ -33,27 +33,12 @@
explicit AbstractTile( TileId const& tid, QObject * parent = 0 );
virtual ~AbstractTile();
- enum TileState {
- TileEmpty,
- TilePartial,
- TileComplete
- };
-
- enum DatasetState {
- DatasetEmpty,
- DatasetZeroLevel,
- DatasetScaled,
- DatasetComplete
- };
-
public:
TileId const& id() const;
bool used() const;
void setUsed( bool used );
- TileState state() const;
-
protected:
AbstractTilePrivate * const d_ptr;
AbstractTile(AbstractTilePrivate &dd, QObject *parent);
--- trunk/KDE/kdeedu/marble/src/lib/AbstractTile_p.h #1155694:1155695
@@ -28,7 +28,6 @@
TileId m_id;
bool m_used;
- AbstractTile::TileState m_state;
AbstractTile * q_ptr;
};
--- trunk/KDE/kdeedu/marble/src/lib/MergedLayerDecorator.cpp #1155694:1155695
@@ -131,7 +131,7 @@
if ( m_sunLocator->getCitylights() && m_sunLocator->planet()->id() == "earth" ) {
StackedTile * tile = loadDataset( m_cityLightsTextureLayer );
- if ( tile->state() == StackedTile::TileEmpty )
+ if ( !tile->hasTiles() )
return;
QImage * nighttile = tile->resultTile();
--- trunk/KDE/kdeedu/marble/src/lib/StackedTile.cpp #1155694:1155695
@@ -270,25 +270,8 @@
void StackedTile::addTile( QSharedPointer<TextureTile> const & tile )
{
d->m_tiles.append( tile );
- deriveCompletionState();
}
-void StackedTile::deriveCompletionState()
-{
- QMap<TextureTile::State, int> count;
- QVector<QSharedPointer<TextureTile> >::const_iterator pos = d->m_tiles.constBegin();
- QVector<QSharedPointer<TextureTile> >::const_iterator const end = d->m_tiles.constEnd();
- for (; pos != end; ++pos )
- ++count[ (*pos)->state() ];
-
- if ( count[ TextureTile::StateUptodate ] == d->m_tiles.size() )
- d->m_state = TileComplete;
- else if ( count[ TextureTile::StateEmpty ] == d->m_tiles.size() )
- d->m_state = TileEmpty;
- else
- d->m_state = TilePartial;
-}
-
void StackedTile::initJumpTables()
{
// mDebug() << "Entered initJumpTables( bool ) of Tile" << d->m_id;
@@ -374,8 +357,7 @@
const bool withConversion = d->m_tiles.count() > 1;
QVector<QSharedPointer<TextureTile> >::const_iterator pos = d->m_tiles.constBegin();
QVector<QSharedPointer<TextureTile> >::const_iterator const end = d->m_tiles.constEnd();
- for (; pos != end; ++pos )
- if ( (*pos)->state() != TextureTile::StateEmpty ) {
+ for (; pos != end; ++pos ) {
Blending const * const blending = (*pos)->blending();
if ( blending ) {
mDebug() << "StackedTile::initResultTile: blending";
--- trunk/KDE/kdeedu/marble/src/lib/StackedTile.h #1155694:1155695
@@ -45,6 +45,7 @@
int depth() const;
int numBytes() const;
bool isExpired() const;
+ bool hasTiles() const;
bool forMergedLayerDecorator() const;
void setForMergedLayerDecorator();
@@ -75,9 +76,7 @@
Q_DISABLE_COPY( StackedTile )
void addTile( QSharedPointer<TextureTile> const & );
- void deriveCompletionState();
void initJumpTables();
- bool hasTiles() const;
void initResultTile();
StackedTilePrivate *d;
--- trunk/KDE/kdeedu/marble/src/lib/StackedTileLoader.cpp #1155694:1155695
@@ -223,7 +223,7 @@
}
Q_ASSERT( stackedTile->hasTiles() );
- if ( stackedTile->state() != StackedTile::TileEmpty ) {
+ if ( stackedTile->hasTiles() ) {
stackedTile->initResultTile();
mergeDecorations( stackedTile );
}
@@ -274,7 +274,7 @@
}
Q_ASSERT( stackedTile->hasTiles() );
- if ( stackedTile->state() != StackedTile::TileEmpty ) {
+ if ( stackedTile->hasTiles() ) {
stackedTile->initResultTile();
}
return stackedTile;
@@ -385,7 +385,6 @@
Q_UNUSED(tileId);
StackedTile * const displayedTile = d->m_tilesOnDisplay.value( stackedTileId, 0 );
if ( displayedTile ) {
- displayedTile->deriveCompletionState();
displayedTile->initResultTile();
mergeDecorations( displayedTile );
emit tileUpdateAvailable();
@@ -393,7 +392,6 @@
else {
StackedTile * const cachedTile = d->m_tileCache.object( stackedTileId );
if ( cachedTile ) {
- cachedTile->deriveCompletionState();
cachedTile->initResultTile();
mergeDecorations( cachedTile );
}
@@ -500,7 +498,8 @@
void StackedTileLoader::mergeDecorations( StackedTile * const tile ) const
{
- Q_ASSERT( tile->state() != StackedTile::TileEmpty );
+ Q_ASSERT( tile->hasTiles() );
+ Q_ASSERT( !tile->resultTile()->isNull() );
if ( !tile->forMergedLayerDecorator() )
m_parent->paintTile( tile, findTextureLayer( tile->id() ) );
}
@@ -518,7 +517,6 @@
for (; pos != end; ++pos ) {
d->m_tileLoader->reloadTile( *pos, usage );
}
- cachedTile->deriveCompletionState();
cachedTile->initResultTile();
mergeDecorations( cachedTile );
emit tileUpdateAvailable();
--- trunk/KDE/kdeedu/marble/src/lib/TextureTile.cpp #1155694:1155695
@@ -24,7 +24,6 @@
TextureTile::TextureTile( TileId const & tileId, QImage const * image )
: m_id( tileId ),
- m_state( StateExpired ),
m_blending( 0 ),
m_expireSecs( std::numeric_limits<int>::max() ),
m_image( image )
--- trunk/KDE/kdeedu/marble/src/lib/TextureTile.h #1155694:1155695
@@ -36,13 +36,6 @@
friend class StackedTileLoader;
public:
- enum State {
- StateEmpty,
- StateScaled,
- StateExpired,
- StateUptodate
- };
-
TextureTile( TileId const & tileId, QImage const * image );
~TextureTile();
@@ -51,14 +44,12 @@
QDateTime const & lastModified() const;
bool isExpired() const;
QImage const * image() const;
- State state() const;
Blending const * blending() const;
int byteCount() const;
private:
Q_DISABLE_COPY( TextureTile )
- void setState( State const );
void setImage( QImage * const );
void setBlending( Blending const * const );
void setStackedTileId( TileId const & );
@@ -67,7 +58,6 @@
TileId const m_id;
TileId m_stackedTileId;
- State m_state;
Blending const * m_blending;
QDateTime m_lastModified;
int m_expireSecs;
@@ -102,11 +92,6 @@
return m_image;
}
-inline TextureTile::State TextureTile::state() const
-{
- return m_state;
-}
-
inline Blending const * TextureTile::blending() const
{
return m_blending;
@@ -120,11 +105,6 @@
return m_image->numBytes();
}
-inline void TextureTile::setState( State const state )
-{
- m_state = state;
-}
-
inline void TextureTile::setImage( QImage * const image )
{
Q_ASSERT( image );
--- trunk/KDE/kdeedu/marble/src/lib/TileLoader.cpp #1155694:1155695
@@ -58,7 +58,6 @@
if ( !tile->isExpired() ) {
mDebug() << "TileLoader::loadTile" << tileId.toString() << "StateUptodate";
- tile->setState( TextureTile::StateUptodate );
} else {
mDebug() << "TileLoader::loadTile" << tileId.toString() << "StateExpired";
m_waitingForUpdate.insert( tileId, tile );
@@ -72,7 +71,6 @@
QImage * replacementTile = scaledLowerLevelTile( tileId );
QSharedPointer<TextureTile> const tile( new TextureTile( tileId, replacementTile ));
tile->setStackedTileId( stackedTileId );
- tile->setState( TextureTile::StateScaled );
m_waitingForUpdate.insert( tileId, tile );
triggerDownload( tileId, usage );
@@ -110,7 +108,6 @@
else {
QImage * const replacementTile = scaledLowerLevelTile( tileId );
tile = QSharedPointer<TextureTile>( new TextureTile( tileId, replacementTile ));
- tile->setState( TextureTile::StateScaled );
}
GeoSceneTexture const * const textureLayer = findTextureLayer( tileId );
@@ -132,7 +129,6 @@
{
if ( m_waitingForUpdate.contains( tile->id() ))
return;
- tile->setState( TextureTile::StateExpired );
m_waitingForUpdate.insert( tile->id(), tile );
triggerDownload( tile->id(), usage );
}
@@ -158,7 +154,6 @@
return;
tile->setImage( image );
- tile->setState( TextureTile::StateUptodate );
tile->setLastModified( QDateTime::currentDateTime() );
emit tileCompleted( tile->stackedTileId(), id );
}
More information about the Marble-commits
mailing list