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

src/plugin/AdblockPlusClient.h

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 53 matching lines @@
 
   ~CAdblockPlusClient();
 
   static CAdblockPlusClient* GetInstance();
 
   // Removes the url from the list of whitelisted urls if present
   // Only called from ui thread
   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);
   std::vector<std::wstring> GetElementHidingSelectors(const std::wstring& domain);
   std::vector<SubscriptionDescription> FetchAvailableSubscriptions();
   std::vector<SubscriptionDescription> GetListedSubscriptions();
   bool IsAcceptableAdsEnabled();
   void SetSubscription(const std::wstring& url);
   void AddSubscription(const std::wstring& url);
   void RemoveSubscription(const std::wstring& url);
   void UpdateAllSubscriptions();
   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);
   std::wstring GetPref(const std::wstring& name, const std::wstring& defaultValue = L"");
   std::wstring GetPref(const std::wstring& name, const wchar_t* defaultValue);
   bool GetPref(const std::wstring& name, bool defaultValue = false);
   int64_t GetPref(const std::wstring& name, int64_t defaultValue = 0);
   void CheckForUpdates(HWND callbackWindow);
   std::wstring GetAppLocale();
   std::wstring GetDocumentationLink();
   bool TogglePluginEnabled();
   std::wstring GetHostFromUrl(const std::wstring& url);
   int CompareVersions(const std::wstring& v1, const std::wstring& v2);
 
   bool IsFirstRun();
 };
 
 #endif // _ADBLOCK_PLUS_CLIENT_H_