Issue #35: use Q_GLOBAL_STATIC for EvernoteProxySettingsHolder

d1vanov · Mar 31, 2020 · 6edd3ef · 6edd3ef
1 parent d19004e
commit 6edd3ef
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/QEverCloud/src/Globals.cpp b/QEverCloud/src/Globals.cpp
@@ -12,6 +12,7 @@
 #include <AsyncResult.h>
 #include <RequestContext.h>
 
+#include <QGlobalStatic>
 #include <QMetaType>
 #include <QReadLocker>
 #include <QReadWriteLock>
@@ -25,16 +26,8 @@ namespace {
 
 class EvernoteProxySettingsHolder
 {
-private:
-    EvernoteProxySettingsHolder() = default;
-    Q_DISABLE_COPY(EvernoteProxySettingsHolder)
-
 public:
-    static EvernoteProxySettingsHolder & instance()
-    {
-        static EvernoteProxySettingsHolder holder;
-        return holder;
-    }
+    EvernoteProxySettingsHolder() = default;
 
     QNetworkProxy proxy()
     {
@@ -65,11 +58,16 @@ class EvernoteProxySettingsHolder
         m_pProxy.reset();
     }
 
+private:
+    Q_DISABLE_COPY(EvernoteProxySettingsHolder)
+
 private:
     QReadWriteLock  m_lock;
     std::shared_ptr<QNetworkProxy>  m_pProxy;
 };
 
+Q_GLOBAL_STATIC(EvernoteProxySettingsHolder, evernoteProxySettingsHolder)
+
 ////////////////////////////////////////////////////////////////////////////////
 
 void registerMetatypes()
@@ -84,17 +82,17 @@ void registerMetatypes()
 
 QNetworkProxy evernoteNetworkProxy()
 {
-    return EvernoteProxySettingsHolder::instance().proxy();
+    return evernoteProxySettingsHolder->proxy();
 }
 
 void setEvernoteNetworkProxy(QNetworkProxy proxy)
 {
-    EvernoteProxySettingsHolder::instance().setProxy(std::move(proxy));
+    evernoteProxySettingsHolder->setProxy(std::move(proxy));
 }
 
 void resetEvernoteNetworkProxy()
 {
-    EvernoteProxySettingsHolder::instance().resetProxy();
+    evernoteProxySettingsHolder->resetProxy();
 }
 
 ////////////////////////////////////////////////////////////////////////////////