Issue #1234 - Remove 'CString' from PluginFilter.*

src/plugin/PluginFilter.h

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
- * Copyright (C) 2006-2015 Eyeo GmbH
+ * Copyright (C) 2006-2016 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
@@ skipping 53 matching lines @@
   std::wstring m_filterText;
 
   // For domain specific filters only
   std::wstring m_tagId;
   std::wstring m_tagClassName;
   std::wstring m_tag;
 
   std::vector<CFilterElementHideAttrSelector> m_attributeSelectors;
   std::shared_ptr<CFilterElementHide> m_predecessor;
 
-  CFilterElementHide(const std::wstring& filterText=L"");

[sergei, 2015/11/30 12:37:53]

spaces around '=' are missed

[Eric, 2015/11/30 15:54:07]

Done.

I wasn't really looking for existing style problems, but I don't mind rolling
them into the present change set. Strictly speaking, they're unrelated, but
there's no good occasion to fix them unless they tag along with changes to
related code.

+  CFilterElementHide(const std::wstring& filterText = L"");
   CFilterElementHide(const CFilterElementHide& filter);
   ETraverserComplexType m_type;
 
   bool IsMatchFilterElementHide(IHTMLElement* pEl) const;
 
 };
 
 // ============================================================================
 // CFilter
 // ============================================================================
@@ skipping 30 matching lines @@
 // ============================================================================
 
 class CPluginFilter
 {
 
 private:
 
   std::wstring m_dataPath;
 
   // (Tag,Name) -> Filter
-  typedef std::multimap<std::pair<std::wstring,std::wstring>, CFilterElementHide> TFilterElementHideTagsNamed;

[sergei, 2015/11/30 12:37:54]

space after comma is missed

[Eric, 2015/11/30 15:54:07]

Done.

+  typedef std::multimap<std::pair<std::wstring, std::wstring>, CFilterElementHide> TFilterElementHideTagsNamed;
 
   // Tag -> Filter
   typedef std::multimap<std::wstring, CFilterElementHide> TFilterElementHideTags;
 
 
   TFilterElementHideTagsNamed m_elementHideTagsId;
   TFilterElementHideTagsNamed m_elementHideTagsClass;
   TFilterElementHideTags m_elementHideTags;
 
   void ClearFilters();
 
 public:
-
   CPluginFilter(const std::wstring& dataPath = L"");
-
   bool LoadHideFilters(std::vector<std::wstring> filters);
-
   bool AddFilterElementHide(std::wstring filter);
-
-
   bool IsElementHidden(const std::wstring& tag, IHTMLElement* pEl, const std::wstring& domain, const std::wstring& indent) const;
-
-
-  bool ShouldBlock(const std::wstring& src, AdblockPlus::FilterEngine::ContentType contentType, const std::wstring& domain, bool addDebug=false) const;
-
   HANDLE hideFiltersLoadedEvent;
 };
 
 
 #endif // _PLUGIN_FILTER_H_