[Marble-commits] KDE/kdeedu/marble

[Bernhard Beschow]

SVN commit 1225970 by beschow:

provide data via MarbleModel only; do not forward in MarbleWidget and MarbleMap (patch 2 of 5)

* Remove the following methods from MarbleMap and MarbleWidget, use the respective methods of
MarbleModel:
    void clearPersistentTileCache();
    void setPersistentTileCacheLimit( quint64 kiloBytes );

 M  +7 -0      docs/release_notes/APIChanges-0.12.txt  
 M  +2 -2      src/QtMainWindow.cpp  
 M  +0 -10     src/lib/MarbleMap.cpp  
 M  +0 -7      src/lib/MarbleMap.h  
 M  +0 -10     src/lib/MarbleWidget.cpp  
 M  +0 -8      src/lib/MarbleWidget.h  
 M  +2 -2      src/marble_part.cpp  


--- trunk/KDE/kdeedu/marble/docs/release_notes/APIChanges-0.12.txt #1225969:1225970
@@ -27,3 +27,10 @@
    MARBLE_DEPRECATED( void addPlacemarkData( const QString& data, const QString& key = "data" ) );
    MARBLE_DEPRECATED( void removePlacemarkKey( const QString& key ) );
     -> use addGeoDataFile, addGeoDataString, removeGeoData of MarbleModel
+
+
+2011-03-25  Bernhard Beschow <bbeschow at cs.tu-berlin.de>
+
+* Remove the following methods from MarbleMap and MarbleWidget, use the respective methods of MarbleModel:
+    void clearPersistentTileCache();
+    void setPersistentTileCacheLimit( quint64 kiloBytes );
--- trunk/KDE/kdeedu/marble/src/QtMainWindow.cpp #1225969:1225970
@@ -121,7 +121,7 @@
     connect( m_configDialog, SIGNAL( clearVolatileCacheClicked() ),
              m_controlView->marbleWidget(), SLOT( clearVolatileTileCache() ) );
     connect( m_configDialog, SIGNAL( clearPersistentCacheClicked() ),
-             m_controlView->marbleWidget(), SLOT( clearPersistentTileCache() ) );
+             m_controlView->marbleWidget()->model(), SLOT( clearPersistentTileCache() ) );
 
     // Load bookmark file. If it does not exist, a default one will be used.
     m_controlView->marbleWidget()->loadBookmarkFile( "bookmarks/bookmarks.kml" );
@@ -1158,7 +1158,7 @@
     m_controlView->setExternalMapEditor( m_configDialog->externalMapEditor() );
 
     // Cache
-    m_controlView->marbleWidget()->setPersistentTileCacheLimit( m_configDialog->persistentTileCacheLimit() * 1024 );
+    m_controlView->marbleWidget()->model()->setPersistentTileCacheLimit( m_configDialog->persistentTileCacheLimit() * 1024 );
     m_controlView->marbleWidget()->setVolatileTileCacheLimit( m_configDialog->volatileTileCacheLimit() * 1024 );
 
     /*
--- trunk/KDE/kdeedu/marble/src/lib/MarbleMap.cpp #1225969:1225970
@@ -1054,16 +1054,6 @@
     return d->m_model->fileViewModel();
 }
 
-void MarbleMap::clearPersistentTileCache()
-{
-    d->m_model->clearPersistentTileCache();
-}
-
-void MarbleMap::setPersistentTileCacheLimit( quint64 kiloBytes )
-{
-    d->m_model->setPersistentTileCacheLimit( kiloBytes );
-}
-
 void MarbleMap::clearVolatileTileCache()
 {
     d->m_textureLayer.update();
--- trunk/KDE/kdeedu/marble/src/lib/MarbleMap.h #1225969:1225970
@@ -697,13 +697,6 @@
      */
     FileViewModel* fileViewModel() const;
 
-    void clearPersistentTileCache();
-    /**
-     * @brief  Set the limit of the persistent (on hard disc) tile cache.
-     * @param  bytes The limit in kilobytes, 0 means no limit.
-     */
-    void setPersistentTileCacheLimit( quint64 kiloBytes );
-
     void clearVolatileTileCache();
     /**
      * @brief  Set the limit of the volatile (in RAM) tile cache.
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidget.cpp #1225969:1225970
@@ -1003,16 +1003,6 @@
     return d->m_model->fileViewModel();
 }
 
-void MarbleWidget::clearPersistentTileCache()
-{
-    d->m_map->clearPersistentTileCache();
-}
-
-void MarbleWidget::setPersistentTileCacheLimit( quint64 kiloBytes )
-{
-    d->m_map->setPersistentTileCacheLimit( kiloBytes );
-}
-
 void MarbleWidget::clearVolatileTileCache()
 {
     mDebug() << "About to clear VolatileTileCache";
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidget.h #1225969:1225970
@@ -145,7 +145,6 @@
     Q_PROPERTY(bool showRivers   READ showRivers      WRITE setShowRivers)
     Q_PROPERTY(bool showLakes    READ showLakes       WRITE setShowLakes)
 
-    Q_PROPERTY(quint64 persistentTileCacheLimit  READ persistentTileCacheLimit  WRITE setPersistentTileCacheLimit)
     Q_PROPERTY(quint64 volatileTileCacheLimit    READ volatileTileCacheLimit    WRITE setVolatileTileCacheLimit)
 
  public:
@@ -927,13 +926,6 @@
     /// @name Tile management slots
     //@{
 
-    void clearPersistentTileCache();
-    /**
-     * @brief  Set the limit of the persistent (on hard disc) tile cache.
-     * @param  kilobytes The limit in kilobytes, 0 means no limit.
-     */
-    void setPersistentTileCacheLimit( quint64 kiloBytes );
-
     void clearVolatileTileCache();
     /**
      * @brief  Set the limit of the volatile (in RAM) tile cache.
--- trunk/KDE/kdeedu/marble/src/marble_part.cpp #1225969:1225970
@@ -1282,7 +1282,7 @@
     connect( w_cacheSettings,               SIGNAL( clearVolatileCache() ),
 	     m_controlView->marbleWidget(), SLOT( clearVolatileTileCache() ) );
     connect( w_cacheSettings,               SIGNAL( clearPersistentCache() ),
-	     m_controlView->marbleWidget(), SLOT( clearPersistentTileCache() ) );
+	     m_controlView->marbleWidget()->model(), SLOT( clearPersistentTileCache() ) );
 
     // time page
     Ui_MarbleTimeSettingsWidget ui_timeSettings;
@@ -1408,7 +1408,7 @@
     m_controlView->marbleWidget()->setAnimationsEnabled( MarbleSettings::animateTargetVoyage() );
 
     // Cache
-    m_controlView->marbleWidget()->
+    m_controlView->marbleWidget()->model()->
         setPersistentTileCacheLimit( MarbleSettings::persistentTileCacheLimit() * 1024 );
     m_controlView->marbleWidget()->
         setVolatileTileCacheLimit( MarbleSettings::volatileTileCacheLimit() * 1024 );