Issue 1104 - Cannot uncheck Disable on website option in tool bar

src/plugin/AdblockPlusClient.h

Index: src/plugin/AdblockPlusClient.h
diff --git a/src/plugin/AdblockPlusClient.h b/src/plugin/AdblockPlusClient.h
index cbb384bacb1de3fe654df9d4e42f974b8811ec69..b4da3a0c27e2ffab960cadbd303657770852c979 100644
--- a/src/plugin/AdblockPlusClient.h
+++ b/src/plugin/AdblockPlusClient.h
@@ -71,7 +71,15 @@ public:
   bool ShouldBlock(const std::wstring& src, AdblockPlus::FilterEngine::ContentType contentType, const std::wstring& domain, bool addDebug=false);
 
   bool IsElementHidden(const std::wstring& tag, IHTMLElement* pEl, const std::wstring& domain, const std::wstring& indent, CPluginFilter* filter);
-  bool IsWhitelistedUrl(const std::wstring& url);
+  struct ExceptionFilter

[Eric, 2015/03/04 13:55:39]

I am generally in favor of adding simple classes like this one to promote good
type usage, both for type safety and implicit documentation.

When I first saw this class, though, I wasn't sure we needed it. In the present
change set, it would be simpler just to use a string. What I saw is that we need
an implicit conversion to 'bool' to satisfy the many places in the code where
this function is called. (That there are so many locations seems itself like the
symptom of a design problem, but that's for another discussion elsewhere.) Since
this is not obvious, I'd say that 'operator bool' deserves a short comment to
that effect.

The class name is also slightly off. This class isn't for any exception filter,
but just those for white listing. I think the name 'WhitelistFilter' would work
better.

+  {
+    operator bool() const
+    {
+      return !filterText.empty();
+    }
+    std::string filterText;
+  };
+  ExceptionFilter IsWhitelistedUrl(const std::wstring& url);

[Oleksandr, 2015/03/05 07:35:27]

How about:

bool IsWhitelistedUrl(const std::wstring& url, std::wstring& filter)

but also keeping the old overload:

bool IsWhitelistedUrl(const std::wstring& url)

No need for a highly specialized ExceptionFilter class then.

   bool IsElemhideWhitelistedOnDomain(const std::wstring& url);
 
   bool Matches(const std::wstring& url, AdblockPlus::FilterEngine::ContentType contentType, const std::wstring& domain);
@@ -86,6 +94,7 @@ public:
   std::vector<std::wstring> GetExceptionDomains();
   void AddFilter(const std::wstring& text);
   void RemoveFilter(const std::wstring& text);
+  void RemoveFilter(const std::string& text);
   void SetPref(const std::wstring& name, const std::wstring& value);
   void SetPref(const std::wstring& name, const int64_t& value);
   void SetPref(const std::wstring& name, bool value);