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

src/plugin/PluginFilter.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginFilter.h"
 
 #if (defined PRODUCT_ADBLOCKPLUS)
 #include "PluginSettings.h"
 #include "PluginClient.h"
 #include "PluginClientFactory.h"
 #endif
 
@@ skipping 486 matching lines @@
           std::pair<CString, CFilterElementHide> pair = std::make_pair(filter->m_tag, *filter);
           m_elementHideTags.insert(pair);
         }
       }
     } while (separatorChar != '\0');
   }
 
   return true;
 }
 
-bool CPluginFilter::IsElementHidden(const CString& tag, IHTMLElement* pEl, const CString& domain, const CString& indent) const
+bool CPluginFilter::IsElementHidden(const std::wstring& tag_wstring, IHTMLElement* pEl, const std::wstring& domain, const std::wstring& indent) const

[Felix Dahlke, 2014/09/30 13:30:15]

Since "CString tag" is temporary and "const std::wstring& tag" is not, we should
IMO give the CString tag a different name rather than change the parameter name.
Same below.

[Eric, 2014/09/30 17:56:40]

I was trying to minimize the number of changed lines, but what it really does is
to require changing all those lines at the end of the process rather than the
beginning.

Done.

 {
+  CString tag = to_CString(tag_wstring);
+
   CString id;
   CComBSTR bstrId;
   if (SUCCEEDED(pEl->get_id(&bstrId)) && bstrId)
   {
     id = bstrId;
   }
 
   CString classNames;
   CComBSTR bstrClassNames;
   if (SUCCEEDED(pEl->get_className(&bstrClassNames)) && bstrClassNames)
   {
     classNames = bstrClassNames;
   }
 
   CriticalSection::Lock filterEngineLock(s_criticalSectionFilterMap);    
   {
-    CString domainTest = domain;
+    CString domainTest = to_CString(domain);
 
     // Search tag/id filters
     if (!id.IsEmpty())
     {
       std::pair<TFilterElementHideTagsNamed::const_iterator, TFilterElementHideTagsNamed::const_iterator> idItEnum =
         m_elementHideTagsId.equal_range(std::make_pair(tag, id));
       for (TFilterElementHideTagsNamed::const_iterator idIt = idItEnum.first; idIt != idItEnum.second; idIt ++)
       {
         if (idIt->second.IsMatchFilterElementHide(pEl))
         {
@@ skipping 136 matching lines @@
       }
       m_filterMapDefault[i].clear();
     }
 
     m_elementHideTags.clear();
     m_elementHideTagsId.clear();
     m_elementHideTagsClass.clear();
   }
 }
 
-bool CPluginFilter::ShouldBlock(CString src, int contentType, const CString& domain, bool addDebug) const
+bool CPluginFilter::ShouldBlock(const std::wstring& src_wstring, int contentType, const std::wstring& domain_wstring, bool addDebug) const
 {
+  CString src = to_CString(src_wstring);
+  CString domain = to_CString(domain_wstring);
+
   // We should not block the empty string, so all filtering does not make sense
   // Therefore we just return
   if (src.Trim().IsEmpty())
   {
     return false;
   }
 
   CPluginSettings* settings = CPluginSettings::GetInstance();
 
   CString type;
@@ skipping 16 matching lines @@
       DEBUG_FILTER("Filter::ShouldBlock " + type + " YES")
 
 #ifdef ENABLE_DEBUG_RESULT
         CPluginDebug::DebugResultBlocking(type, src, domain);
 #endif
     }
     return true;
   }
   return false;
 }