Issue #1234 - Remove CString from ShouldBlock(), IsElementHidden() declarations

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 190 matching lines @@
       s_instance = client;
     }
 
     instance = s_instance;
   }
   s_criticalSectionLocal.Unlock();
 
   return instance;
 }
 
-
-bool CAdblockPlusClient::ShouldBlock(CString src, int contentType, const CString& domain, bool addDebug)
+bool CAdblockPlusClient::ShouldBlock(const std::wstring& src, int contentType, const std::wstring& domain, bool addDebug)
 {
   bool isBlocked = false;
-
   bool isCached = false;
-
-  CPluginSettings* settings = CPluginSettings::GetInstance();
-
   m_criticalSectionCache.Lock();
   {
-    std::map<CString,bool>::iterator it = m_cacheBlockedSources.find(src);
+    auto it = m_cacheBlockedSources.find(src);
 
     isCached = it != m_cacheBlockedSources.end();
     if (isCached)
     {
       isBlocked = it->second;
     }
   }
   m_criticalSectionCache.Unlock();
 
   if (!isCached)
   {
     m_criticalSectionFilter.Lock();
     {
       isBlocked = m_filter->ShouldBlock(src, contentType, domain, addDebug);
     }
     m_criticalSectionFilter.Unlock();
 
-
     // Cache result, if content type is defined
     if (contentType != CFilter::contentTypeAny)
     {
       m_criticalSectionCache.Lock();
       {
         m_cacheBlockedSources[src] = isBlocked;
       }
       m_criticalSectionCache.Unlock();
     }
   }
-
-
   return isBlocked;
 }
 
-bool CAdblockPlusClient::IsElementHidden(const CString& tag, IHTMLElement* pEl, const CString& domain, const CString& indent, CPluginFilter* filter)
+bool CAdblockPlusClient::IsElementHidden(const std::wstring& tag, IHTMLElement* pEl, const std::wstring& domain, const std::wstring& indent, CPluginFilter* filter)
 {
   bool isHidden;
   m_criticalSectionFilter.Lock();
   {
     isHidden = filter && filter->IsElementHidden(tag, pEl, domain, indent);
   }
   m_criticalSectionFilter.Unlock();
   return isHidden;
 }
 
@@ skipping 311 matching lines @@
   DEBUG_GENERAL("CompareVersions");
   Communication::OutputBuffer request;
   request << Communication::PROC_COMPARE_VERSIONS << ToUtf8String(v1) << ToUtf8String(v2);
   Communication::InputBuffer response;
   if (!CallEngine(request, response))
     return 0;
   int result;
   response >> result;
   return result;
 }