proxies

mhugent · mhugent · commit acdaaa4302ff · 2020-05-25T10:55:54.000+02:00
diff --git a/src/core/qgsgdalutils.cpp b/src/core/qgsgdalutils.cpp
@@ -503,10 +503,10 @@ void QgsGdalUtils::setupProxy()
   if ( settings.value( QStringLiteral( "proxy/proxyEnabled" ), false ).toBool() )
   {
     // Get the first configured proxy
-    QList<QNetworkProxy> proxyes( QgsNetworkAccessManager::instance()->proxyFactory()->queryProxy( ) );
-    if ( ! proxyes.isEmpty() )
+    QList<QNetworkProxy> proxies( QgsNetworkAccessManager::instance()->proxyFactory()->queryProxy( ) );
+    if ( ! proxies.isEmpty() )
     {
-      QNetworkProxy proxy( proxyes.first() );
+      QNetworkProxy proxy( proxies.first() );
       // TODO/FIXME: check excludes (the GDAL config options are global, we need a per-connection config option)
       //QStringList excludes;
       //excludes = settings.value( QStringLiteral( "proxy/proxyExcludedUrls" ), "" ).toStringList();

Original file line number	Diff line number	Diff line change
`@@ -503,10 +503,10 @@ void QgsGdalUtils::setupProxy()`
`503`	`503`	`if ( settings.value( QStringLiteral( "proxy/proxyEnabled" ), false ).toBool() )`
`504`	`504`	`{`
`505`	`505`	`// Get the first configured proxy`
`506`		`- QList<QNetworkProxy> proxyes( QgsNetworkAccessManager::instance()->proxyFactory()->queryProxy( ) );`
`507`		`- if ( ! proxyes.isEmpty() )`
	`506`	`+ QList<QNetworkProxy> proxies( QgsNetworkAccessManager::instance()->proxyFactory()->queryProxy( ) );`
	`507`	`+ if ( ! proxies.isEmpty() )`
`508`	`508`	`{`
`509`		`- QNetworkProxy proxy( proxyes.first() );`
	`509`	`+ QNetworkProxy proxy( proxies.first() );`
`510`	`510`	`// TODO/FIXME: check excludes (the GDAL config options are global, we need a per-connection config option)`
`511`	`511`	`//QStringList excludes;`
`512`	`512`	`//excludes = settings.value( QStringLiteral( "proxy/proxyExcludedUrls" ), "" ).toStringList();`