Support Acceptable Ads

src/plugin/AdblockPlusClient.cpp

 #include "PluginStdAfx.h"
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #include "PluginFilter.h"
 #include "PluginClientFactory.h"
 #include "PluginMutex.h"
 #include "PluginClass.h"
 
 #include "AdblockPlusClient.h"
 
@@ skipping 326 matching lines @@
 
 std::vector<SubscriptionDescription> CAdblockPlusClient::GetListedSubscriptions()
 {
   Communication::InputBuffer response;
   if (!CallEngine(Communication::PROC_LISTED_SUBSCRIPTIONS, response)) 
     return std::vector<SubscriptionDescription>();
   return ReadSubscriptions(response);
 }
 
 // Returns true if Acceptable Ads are enabled, false otherwise.
-bool CAdblockPlusClient::AcceptableAdsStatus()

[Felix Dahlke, 2014/06/30 17:24:04]

How about IsAcceptableAdsEnabled()? That'd make the comment redundant.

+bool CAdblockPlusClient::IsAcceptableAdsEnabled()
 {
   std::vector<SubscriptionDescription> subscriptions = GetListedSubscriptions();
   std::wstring aaUrl = GetPref(L"subscriptions_exceptionsurl", L"");
-  for (std::vector<SubscriptionDescription>::iterator subscription = subscriptions.begin(); subscription < subscriptions.end(); subscription ++)

[Felix Dahlke, 2014/06/30 17:24:04]

!= for iterators, not <

Also no whitespace before "++"

+  for (std::vector<SubscriptionDescription>::iterator subscription = subscriptions.begin(); subscription != subscriptions.end(); subscription++)
   {
     if (subscription->url == aaUrl)
     {
       return true;
     }
   }
   return false;
 }
 
 void CAdblockPlusClient::SetSubscription(const std::wstring& url)
@@ skipping 174 matching lines @@
 bool CAdblockPlusClient::TogglePluginEnabled()
 {
   DEBUG_GENERAL("TogglePluginEnabled");
   Communication::InputBuffer response;
   if (!CallEngine(Communication::PROC_TOGGLE_PLUGIN_ENABLED, response)) 
     return false;
   bool currentEnabledState;
   response >> currentEnabledState;
   return currentEnabledState;
 }