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

[Bernhard Beschow]

SVN commit 1193820 by beschow:

don't expose MergedLayerDecorator in MarbleModel

 M  +1 -1      MarbleMap.cpp  
 M  +2 -2      MarbleModel.cpp  
 M  +1 -2      MarbleModel.h  
 M  +1 -1      MarbleWidget.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/MarbleMap.cpp #1193819:1193820
@@ -797,7 +797,7 @@
 
 void MarbleMap::setShowTileId( bool visible )
 {
-    d->m_model->layerDecorator()->setShowTileId( visible );
+    d->m_model->setShowTileId( visible );
 }
 
 void MarbleMap::setShowGrid( bool visible )
--- trunk/KDE/kdeedu/marble/src/lib/MarbleModel.cpp #1193819:1193820
@@ -818,9 +818,9 @@
     return d->m_sunLocator;
 }
 
-MergedLayerDecorator* MarbleModel::layerDecorator() const
+void MarbleModel::setShowTileId( bool show )
 {
-    return d->m_layerDecorator;
+    d->m_layerDecorator->setShowTileId( show );
 }
 
 quint64 MarbleModel::persistentTileCacheLimit() const
--- trunk/KDE/kdeedu/marble/src/lib/MarbleModel.h #1193819:1193820
@@ -62,7 +62,6 @@
 class TileCreator;
 class ViewParams;
 class StackedTile;
-class MergedLayerDecorator;
 class RenderPlugin;
 class PluginManager;
 class AbstractFloatItem;
@@ -254,8 +253,8 @@
 
     MarbleClock*          clock()       const;
     SunLocator*           sunLocator()     const;
-    MergedLayerDecorator* layerDecorator() const;
 
+    void setShowTileId( bool show );
 
     /**
      * @brief  Returns the limit in kilobytes of the persistent (on hard disc) tile cache.
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidget.cpp #1193819:1193820
@@ -990,7 +990,7 @@
 
 void MarbleWidget::setShowTileId( bool visible )
 {
-    d->m_model->layerDecorator()->setShowTileId( visible );
+    d->m_map->setShowTileId( visible );
 }
 
 void MarbleWidget::notifyMouseClick( int x, int y)