Fix network cache configuration

m-kuhn · m-kuhn · commit 6e1108428f7b · 2016-07-11T15:20:50.000+02:00
Fix #14990
diff --git a/python/core/qgsnetworkaccessmanager.sip b/python/core/qgsnetworkaccessmanager.sip
@@ -61,7 +61,7 @@ class QgsNetworkAccessManager : QNetworkAccessManager
     void setupDefaultProxyAndCache();
 
     //! return whether the system proxy should be used
-    bool useSystemProxy();
+    bool useSystemProxy() const;
 
   public slots:
     /** Send GET request, calls get().
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -10880,8 +10880,6 @@ void QgisApp::namSetup()
 {
   QgsNetworkAccessManager *nam = QgsNetworkAccessManager::instance();
 
-  namUpdate();
-
   connect( nam, SIGNAL( authenticationRequired( QNetworkReply *, QAuthenticator * ) ),
            this, SLOT( namAuthenticationRequired( QNetworkReply *, QAuthenticator * ) ) );
 
diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
@@ -311,16 +311,11 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl ) :
   }
 
   // cache settings
-  QNetworkDiskCache *cache = qobject_cast<QNetworkDiskCache*>( QgsNetworkAccessManager::instance()->cache() );
-  if ( cache )
-  {
-    mCacheDirectory->setText( cache->cacheDirectory() );
-    mCacheSize->setMinimum( 0 );
-    mCacheSize->setMaximum( std::numeric_limits<int>::max() );
-    mCacheSize->setSingleStep( 1024 );
-    QgsDebugMsg( QString( "set cacheSize: %1" ).arg( cache->maximumCacheSize() ) );
-    mCacheSize->setValue( cache->maximumCacheSize() / 1024 );
-  }
+  mCacheDirectory->setText( mSettings->value( "cache/directory" ).toString() );
+  mCacheSize->setMinimum( 0 );
+  mCacheSize->setMaximum( std::numeric_limits<int>::max() );
+  mCacheSize->setSingleStep( 1024 );
+  mCacheSize->setValue( mSettings->value( "cache/size" ).toInt() / 1024 );
 
   //wms search server
   leWmsSearch->setText( mSettings->value( "/qgis/WMSSearchUrl", "http://geopole.org/wms/search?search=%1&type=rss" ).toString() );
diff --git a/src/core/qgsnetworkaccessmanager.cpp b/src/core/qgsnetworkaccessmanager.cpp
@@ -372,10 +372,10 @@ void QgsNetworkAccessManager::setupDefaultProxyAndCache()
   if ( !newcache )
     newcache = new QgsNetworkDiskCache( this );
 
-  QString cacheDirectory = settings.value( "cache/directory", QgsApplication::qgisSettingsDirPath() + "cache" ).toString();
+  QString cacheDirectory = settings.value( "cache/directory" ).toString();
+  if ( cacheDirectory.isEmpty() )
+    cacheDirectory = QgsApplication::qgisSettingsDirPath() + "cache";
   qint64 cacheSize = settings.value( "cache/size", 50 * 1024 * 1024 ).toULongLong();
-  QgsDebugMsg( QString( "setCacheDirectory: %1" ).arg( cacheDirectory ) );
-  QgsDebugMsg( QString( "setMaximumCacheSize: %1" ).arg( cacheSize ) );
   newcache->setCacheDirectory( cacheDirectory );
   newcache->setMaximumCacheSize( cacheSize );
   QgsDebugMsg( QString( "cacheDirectory: %1" ).arg( newcache->cacheDirectory() ) );
diff --git a/src/core/qgsnetworkaccessmanager.h b/src/core/qgsnetworkaccessmanager.h
@@ -83,7 +83,7 @@ class CORE_EXPORT QgsNetworkAccessManager : public QNetworkAccessManager
     void setupDefaultProxyAndCache();
 
     //! return whether the system proxy should be used
-    bool useSystemProxy() { return mUseSystemProxy; }
+    bool useSystemProxy() const { return mUseSystemProxy; }
 
   public slots:
     /** Send GET request, calls get().

Original file line number	Diff line number	Diff line change
`@@ -10880,8 +10880,6 @@ void QgisApp::namSetup()`
`10880`	`10880`	`{`
`10881`	`10881`	`QgsNetworkAccessManager *nam = QgsNetworkAccessManager::instance();`
`10882`	`10882`
`10883`		`- namUpdate();`
`10884`		`-`
`10885`	`10883`	`connect( nam, SIGNAL( authenticationRequired( QNetworkReply , QAuthenticator ) ),`
`10886`	`10884`	`this, SLOT( namAuthenticationRequired( QNetworkReply , QAuthenticator ) ) );`
`10887`	`10885`