use static locals instead of global pointers for some singletons

(proably more valgrind happyness; followup 572bda8)
qgis · Oct 17, 2013 · 60b90c7 · 60b90c7
1 parent cca5805
commit 60b90c7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/src/core/qgsnetworkaccessmanager.cpp b/src/core/qgsnetworkaccessmanager.cpp
@@ -72,16 +72,11 @@ class QgsNetworkProxyFactory : public QNetworkProxyFactory
 };
 #endif
 
-QgsNetworkAccessManager *QgsNetworkAccessManager::smNAM = 0;
-
 QgsNetworkAccessManager *QgsNetworkAccessManager::instance()
 {
-  if ( smNAM )
-    return smNAM;
-
-  smNAM = new QgsNetworkAccessManager();
+  static QgsNetworkAccessManager sInstance;
 
-  return smNAM;
+  return &sInstance;
 }
 
 QgsNetworkAccessManager::QgsNetworkAccessManager( QObject *parent )

diff --git a/src/core/qgsnetworkaccessmanager.h b/src/core/qgsnetworkaccessmanager.h
@@ -102,8 +102,6 @@ class CORE_EXPORT QgsNetworkAccessManager : public QNetworkAccessManager
     QStringList mExcludedURLs;
 
     QMap<QNetworkReply*, QTimer*> mActiveRequests;
-
-    static QgsNetworkAccessManager *smNAM;
 };
 
 #endif // QGSNETWORKACCESSMANAGER_H