From c01ea84e7bc44c8611175c4401759cddcda46e0f Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter@praktik.cz>
Date: Fri, 21 Jul 2017 09:44:48 +0200
Subject: [PATCH] Use static-global macro.

---
 src/miscellaneous/application.h                | 2 +-
 src/network-web/silentnetworkaccessmanager.cpp | 8 ++------
 src/network-web/silentnetworkaccessmanager.h   | 5 +----
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/miscellaneous/application.h b/src/miscellaneous/application.h
index 47ecde42a..0836dfca9 100755
--- a/src/miscellaneous/application.h
+++ b/src/miscellaneous/application.h
@@ -120,7 +120,7 @@ class Application : public QtSingleApplication {
 
 		// Returns pointer to "GOD" application singleton.
 		inline static Application* instance() {
-			return static_cast<Application*>(QCoreApplication::instance());
+      return static_cast<Application*>(QCoreApplication::instance());
 		}
 
 	public slots:
diff --git a/src/network-web/silentnetworkaccessmanager.cpp b/src/network-web/silentnetworkaccessmanager.cpp
index 59fdd2c0d..4af3d0f4e 100755
--- a/src/network-web/silentnetworkaccessmanager.cpp
+++ b/src/network-web/silentnetworkaccessmanager.cpp
@@ -22,8 +22,8 @@
 #include <QNetworkReply>
 #include <QAuthenticator>
 
+Q_GLOBAL_STATIC(SilentNetworkAccessManager, qz_silent_acmanager)
 
-QPointer<SilentNetworkAccessManager> SilentNetworkAccessManager::s_instance;
 
 SilentNetworkAccessManager::SilentNetworkAccessManager(QObject* parent)
 	: BaseNetworkAccessManager(parent) {
@@ -36,11 +36,7 @@ SilentNetworkAccessManager::~SilentNetworkAccessManager() {
 }
 
 SilentNetworkAccessManager* SilentNetworkAccessManager::instance() {
-	if (s_instance.isNull()) {
-		s_instance = new SilentNetworkAccessManager(qApp);
-	}
-
-	return s_instance;
+  return qz_silent_acmanager();
 }
 
 void SilentNetworkAccessManager::onAuthenticationRequired(QNetworkReply* reply, QAuthenticator* authenticator) {
diff --git a/src/network-web/silentnetworkaccessmanager.h b/src/network-web/silentnetworkaccessmanager.h
index 6fb512aaa..0d1a362ee 100755
--- a/src/network-web/silentnetworkaccessmanager.h
+++ b/src/network-web/silentnetworkaccessmanager.h
@@ -38,10 +38,7 @@ class SilentNetworkAccessManager : public BaseNetworkAccessManager {
 
 	public slots:
 		// This cannot do any GUI stuff.
-		void onAuthenticationRequired(QNetworkReply* reply, QAuthenticator* authenticator);
-
-	private:
-		static QPointer<SilentNetworkAccessManager> s_instance;
+    void onAuthenticationRequired(QNetworkReply* reply, QAuthenticator* authenticator);
 };
 
 #endif // SILENTNETWORKACCESSMANAGER_H