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

[Bernhard Beschow]

SVN commit 1210166 by beschow:

backport of trunk-r1208782: remove GeoSceneDocument parameter from MergedLayerDecorator::paint()

* This parameter was introduced in r822370 to query the GeoSceneDocument for the "clouds" property.
  Since the GeoSceneDocument parameter isn't queried any longer since r998435, it can be removed.

 M  +2 -2      MergedLayerDecorator.cpp  
 M  +2 -2      MergedLayerDecorator.h  
 M  +1 -1      TextureLayer.cpp  


--- branches/KDE/4.6/kdeedu/marble/src/lib/MergedLayerDecorator.cpp #1210165:1210166
@@ -92,12 +92,12 @@
     delete m_cityLightsTheme;
 }
 
-void MergedLayerDecorator::paint( const QString& themeId, GeoSceneDocument *mapTheme )
+void MergedLayerDecorator::paint( const QString& themeId )
 {
 //     QTime time;
 //     time.start();
     
-    if ( m_sunLocator->getShow() && mapTheme ) {
+    if ( m_sunLocator->getShow() ) {
 
         // Initialize citylights layer if it hasn't happened already
         if ( !m_cityLightsTheme ) {
--- branches/KDE/4.6/kdeedu/marble/src/lib/MergedLayerDecorator.h #1210165:1210166
@@ -43,8 +43,7 @@
 
     // The Parameter themeId is only used for displaying the TileId,
     // which is a debugging feature, therefore at this point QString remains.
-    void paint( const QString& themeId, GeoSceneDocument *mapTheme = 0 );
-    void paintTileId(const QString& themeId);
+    void paint( const QString& themeId );
 
     void setShowTileId(bool show);
     bool showTileId() const;
@@ -62,6 +61,7 @@
     void initCityLights();
 
     void paintSunShading();
+    void paintTileId(const QString& themeId);
 
  protected:
     Q_DISABLE_COPY( MergedLayerDecorator )
--- branches/KDE/4.6/kdeedu/marble/src/lib/TextureLayer.cpp #1210165:1210166
@@ -378,7 +378,7 @@
     d->m_layerDecorator.setInfo( tile->id() );
     d->m_layerDecorator.setTile( tile->resultTile() );
 
-    d->m_layerDecorator.paint( "maps/" + d->textureLayer()->sourceDir(), d->m_mapTheme );
+    d->m_layerDecorator.paint( "maps/" + d->textureLayer()->sourceDir() );
 }
 
 }