[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeedu/marble/src/lib
From: Bernhard Beschow <bbeschow () cs ! tu-berlin ! de>
Date: 2011-03-31 15:31:00
Message-ID: 20110331153100.A0B88AC8CF () svn ! kde ! org
[Download RAW message or body]
SVN commit 1226642 by beschow:
move StackedTileLoader::findRelevantTextureLayers() into private class
M +8 -6 StackedTileLoader.cpp
M +0 -2 StackedTileLoader.h
--- trunk/KDE/kdeedu/marble/src/lib/StackedTileLoader.cpp #1226641:1226642
@@ -68,6 +68,8 @@
}
void detectMaxTileLevel();
+ QVector<GeoSceneTexture const *>
+ findRelevantTextureLayers( TileId const & stackedTileId ) const;
MergedLayerDecorator m_layerDecorator;
TileLoader *m_tileLoader;
@@ -213,7 +215,7 @@
// mDebug() << "load Tile from Disk: " << stackedTileId.toString();
QVector<QSharedPointer<TextureTile> > tiles;
- QVector<GeoSceneTexture const *> const textureLayers = \
findRelevantTextureLayers( stackedTileId ); + QVector<GeoSceneTexture const *> \
const textureLayers = d->findRelevantTextureLayers( stackedTileId );
QVector<GeoSceneTexture const *>::const_iterator pos = \
textureLayers.constBegin();
QVector<GeoSceneTexture const *>::const_iterator const end = \
textureLayers.constEnd(); for (; pos != end; ++pos ) {
@@ -265,7 +267,7 @@
}
QVector<QSharedPointer<TextureTile> > tiles;
- QVector<GeoSceneTexture const *> const textureLayers = \
findRelevantTextureLayers( stackedTileId ); + QVector<GeoSceneTexture const *> \
const textureLayers = d->findRelevantTextureLayers( stackedTileId );
QVector<GeoSceneTexture const *>::const_iterator pos = \
textureLayers.constBegin();
QVector<GeoSceneTexture const *>::const_iterator const end = \
textureLayers.constEnd(); for (; pos != end; ++pos ) {
@@ -290,7 +292,7 @@
void StackedTileLoader::downloadTile( TileId const & stackedTileId )
{
- QVector<GeoSceneTexture const *> const textureLayers = \
findRelevantTextureLayers( stackedTileId ); + QVector<GeoSceneTexture const *> \
const textureLayers = d->findRelevantTextureLayers( stackedTileId );
QVector<GeoSceneTexture const *>::const_iterator pos = \
textureLayers.constBegin();
QVector<GeoSceneTexture const *>::const_iterator const end = \
textureLayers.constEnd(); for (; pos != end; ++pos ) {
@@ -423,11 +425,11 @@
//
QVector<GeoSceneTexture const *>
-StackedTileLoader::findRelevantTextureLayers( TileId const & stackedTileId ) const
+StackedTileLoaderPrivate::findRelevantTextureLayers( TileId const & stackedTileId ) \
const {
QVector<GeoSceneTexture const *> result;
- QVector<GeoSceneTexture const *>::const_iterator pos = \
d->m_textureLayers.constBegin();
- QVector<GeoSceneTexture const *>::const_iterator const end = \
d->m_textureLayers.constEnd(); + QVector<GeoSceneTexture const *>::const_iterator \
pos = m_textureLayers.constBegin(); + QVector<GeoSceneTexture const \
*>::const_iterator const end = m_textureLayers.constEnd(); for (; pos != end; ++pos \
) {
GeoSceneTexture const * const candidate = dynamic_cast<GeoSceneTexture const \
*>( *pos );
// check if layer is enabled. A layer is considered to be enabled if one of \
the
--- trunk/KDE/kdeedu/marble/src/lib/StackedTileLoader.h #1226641:1226642
@@ -167,8 +167,6 @@
private:
Q_DISABLE_COPY( StackedTileLoader )
- QVector<GeoSceneTexture const *>
- findRelevantTextureLayers( TileId const & stackedTileId ) const;
void mergeDecorations( StackedTile * const ) const;
void reloadCachedTile( StackedTile * const cachedTile, DownloadUsage const \
);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic