adblock work

readded an icon in the urlbar when adblock is active, BUT with
different features: you can now disable adblock "per-site", in a
similar way chromium does.
cleaned up adblock manager code, removing some old no more used code
fragments

1 files changed, 3 insertions, 5 deletions

diff --git a/src/adblock/adblockmanager.h b/src/adblock/adblockmanager.h
index 1946d4ad..7e93a379 100644
--- a/src/adblock/adblockmanager.h
+++ b/src/adblock/adblockmanager.h
@@ -165,8 +165,10 @@ public:
     bool blockRequest(const QNetworkRequest &request);
 
     void addCustomRule(const QString &, bool reloadPage = true);
-    void clearElementsLists();
+    void removeCustomHostRule(const QString &, bool reloadPage = true);
 
+    bool isAdblockEnabledForHost(const QString &host);
+    
 private:
     AdBlockManager(QObject *parent = 0);
 
@@ -182,7 +184,6 @@ private:
 private Q_SLOTS:
     void loadSettings();
     void showSettings();
-    void showBlockedItemDialog();
 
     void slotFinished(KJob *);
 
@@ -199,9 +200,6 @@ private:
     AdBlockRuleList _whiteList;
     QStringList _hideList;
 
-    QStringList _blockedElements;
-    int _hidedElements;
-
     KSharedConfig::Ptr _adblockConfig;
 
     static QWeakPointer<AdBlockManager> s_adBlockManager;