From 985db8a35d354c8eb9a23191702ce18de2f0f7fb Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Sun, 9 Mar 2014 12:54:23 +0100
Subject: [PATCH] [AdBlockManager] Use Q_GLOBAL_STATIC for AdBlockManager

---
 src/lib/adblock/adblockmanager.cpp | 18 +++++++-----------
 src/lib/adblock/adblockmanager.h   |  5 ++---
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/lib/adblock/adblockmanager.cpp b/src/lib/adblock/adblockmanager.cpp
index b08cf952e..a41b514be 100644
--- a/src/lib/adblock/adblockmanager.cpp
+++ b/src/lib/adblock/adblockmanager.cpp
@@ -38,7 +38,7 @@
 #include <QElapsedTimer>
 #endif
 
-AdBlockManager* AdBlockManager::s_adBlockManager = 0;
+Q_GLOBAL_STATIC(AdBlockManager, qz_adblock_manager)
 
 AdBlockManager::AdBlockManager(QObject* parent)
     : QObject(parent)
@@ -49,13 +49,14 @@ AdBlockManager::AdBlockManager(QObject* parent)
     load();
 }
 
-AdBlockManager* AdBlockManager::instance()
+AdBlockManager::~AdBlockManager()
 {
-    if (!s_adBlockManager) {
-        s_adBlockManager = new AdBlockManager(mApp->networkManager());
-    }
+    qDeleteAll(m_subscriptions);
+}
 
-    return s_adBlockManager;
+AdBlockManager* AdBlockManager::instance()
+{
+    return qz_adblock_manager();
 }
 
 void AdBlockManager::setEnabled(bool enabled)
@@ -433,8 +434,3 @@ void AdBlockManager::showRule()
         }
     }
 }
-
-AdBlockManager::~AdBlockManager()
-{
-    qDeleteAll(m_subscriptions);
-}
diff --git a/src/lib/adblock/adblockmanager.h b/src/lib/adblock/adblockmanager.h
index 48af593e8..46fb41903 100644
--- a/src/lib/adblock/adblockmanager.h
+++ b/src/lib/adblock/adblockmanager.h
@@ -40,8 +40,6 @@ public:
     AdBlockManager(QObject* parent = 0);
     ~AdBlockManager();
 
-    static AdBlockManager* instance();
-
     void load();
     void save();
 
@@ -68,6 +66,8 @@ public:
 
     AdBlockCustomList* customList() const;
 
+    static AdBlockManager* instance();
+
 signals:
     void enabledChanged(bool enabled);
 
@@ -81,7 +81,6 @@ public slots:
 
 private:
     inline bool canBeBlocked(const QUrl &url) const;
-    static AdBlockManager* s_adBlockManager;
 
     bool m_loaded;
     bool m_enabled;