From kde-commits  Sat Mar 26 09:37:35 2011
From: Bernhard Beschow <bbeschow () cs ! tu-berlin ! de>
Date: Sat, 26 Mar 2011 09:37:35 +0000
To: kde-commits
Subject: KDE/kdeedu/marble
Message-Id: <20110326093735.24583AC8CA () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=130113229602780

SVN commit 1226027 by beschow:

remove persistentTileCacheLimit() from MarbleMap and MarbleWidget, use the respective method of MarbleModel

 M  +1 -0      docs/release_notes/APIChanges-0.12.txt  
 M  +0 -5      src/lib/MarbleMap.cpp  
 M  +0 -6      src/lib/MarbleMap.h  
 M  +0 -5      src/lib/MarbleWidget.cpp  
 M  +0 -6      src/lib/MarbleWidget.h  
 M  +1 -1      src/marble_part.cpp  


--- trunk/KDE/kdeedu/marble/docs/release_notes/APIChanges-0.12.txt #1226026:1226027
@@ -34,6 +34,7 @@
 * Remove the following methods from MarbleMap and MarbleWidget, use the respective methods of MarbleModel:
     void clearPersistentTileCache();
     void setPersistentTileCacheLimit( quint64 kiloBytes );
+    quint64 persistentTileCacheLimit() const;
 
 
 2011-03-25  Bernhard Beschow <bbeschow@cs.tu-berlin.de>
--- trunk/KDE/kdeedu/marble/src/lib/MarbleMap.cpp #1226026:1226027
@@ -640,11 +640,6 @@
     return d->m_backgroundVisible;
 }
 
-quint64 MarbleMap::persistentTileCacheLimit() const
-{
-    return d->m_model->persistentTileCacheLimit();
-}
-
 quint64 MarbleMap::volatileTileCacheLimit() const
 {
     return d->m_textureLayer.volatileCacheLimit();
--- trunk/KDE/kdeedu/marble/src/lib/MarbleMap.h #1226026:1226027
@@ -357,12 +357,6 @@
     bool showBackground() const;
 
     /**
-     * @brief  Returns the limit in kilobytes of the persistent (on hard disc) tile cache.
-     * @return the limit of persistent tile cache in kilobytes.
-     */
-    quint64 persistentTileCacheLimit() const;
-
-    /**
      * @brief  Returns the limit in kilobytes of the volatile (in RAM) tile cache.
      * @return the limit of volatile tile cache in kilobytes.
      */
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidget.cpp #1226026:1226027
@@ -491,11 +491,6 @@
     return d->m_map->showFrameRate();
 }
 
-quint64 MarbleWidget::persistentTileCacheLimit() const
-{
-    return d->m_map->persistentTileCacheLimit();
-}
-
 quint64 MarbleWidget::volatileTileCacheLimit() const
 {
     return d->m_map->volatileTileCacheLimit();
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidget.h #1226026:1226027
@@ -535,12 +535,6 @@
     //@{
 
     /**
-     * @brief  Returns the limit in kilobytes of the persistent (on hard disc) tile cache.
-     * @return the limit of persistent tile cache
-     */
-    quint64 persistentTileCacheLimit() const;
-
-    /**
      * @brief  Returns the limit in kilobytes of the volatile (in RAM) tile cache.
      * @return the limit of volatile tile cache
      */
--- trunk/KDE/kdeedu/marble/src/marble_part.cpp #1226026:1226027
@@ -613,7 +613,7 @@
     // Caches
     MarbleSettings::setVolatileTileCacheLimit( m_controlView->marbleWidget()->
                                                volatileTileCacheLimit() / 1024 );
-    MarbleSettings::setPersistentTileCacheLimit( m_controlView->marbleWidget()->
+    MarbleSettings::setPersistentTileCacheLimit( m_controlView->marbleWidget()->model()->
                                                  persistentTileCacheLimit() / 1024 );
     
     // Time