[IE] First round of ATL removal

src/plugin/PluginFilter.h

 #ifndef _PLUGIN_FILTER_H_
 #define _PLUGIN_FILTER_H_
 
 
 #include "PluginTypedef.h"
 #include <memory>
 
 enum CFilterElementHideAttrPos
 {
   POS_NONE = 0, STARTING, ENDING, ANYWHERE, EXACT
 };
 
 enum CFilterElementHideAttrType
 {
   TYPE_NONE = 0, STYLE, ID, CLASS
 };
 // ============================================================================
 // CFilterElementHideAttrSelector
 // ============================================================================
 
 class CFilterElementHideAttrSelector
 {
 
 public:
 
   CFilterElementHideAttrPos m_pos;
 
   CFilterElementHideAttrType m_type;
 
-  CComBSTR m_bstrAttr;
-  CString m_value;
+  std::wstring m_attr_name;
+  std::wstring m_value;
 
   CFilterElementHideAttrSelector();
   CFilterElementHideAttrSelector(const CFilterElementHideAttrSelector& filter);
   ~CFilterElementHideAttrSelector();
 };
 
 
 
 // ============================================================================
 // CFilterElementHide
 // ============================================================================
 class CFilterElementHide
 {
 
 public:
 
   enum ETraverserComplexType
   {
     TRAVERSER_TYPE_PARENT,
     TRAVERSER_TYPE_IMMEDIATE,
     TRAVERSER_TYPE_ERROR
   };
 
 
-  CString m_filterText;
+  std::wstring m_filterText;
 
   // For domain specific filters only
-  CString m_tagId;
-  CString m_tagClassName;
-  CString m_tag;
+  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 CString& filterText="");
+  CFilterElementHide(const std::wstring & filterText=L"");
   CFilterElementHide(const CFilterElementHide& filter);
   ETraverserComplexType m_type;
 
   bool IsMatchFilterElementHide(IHTMLElement* pEl) const;
 
 };
 
 // ============================================================================
 // CFilter
 // ============================================================================
@@ skipping 31 matching lines @@
   } filterType;
 
   int m_contentType;
   enum EFilterType m_filterType;
   bool m_isMatchCase;
   bool m_isFirstParty;
   bool m_isThirdParty;
   bool m_isFromStart;
   bool m_isFromEnd;
   int m_hitCount;
-  CString m_filterText;
+  std::wstring m_filterText;
 
   CFilter(const CFilter&);
   CFilter();
 };
 
 // ============================================================================
 // CPluginFilter
 // ============================================================================
 
 class CPluginFilter
 {
 
 private:
 
-  CString m_dataPath;
-
-  std::map<int, CString> m_contentMapText;
+  std::map< int, std::wstring > m_contentMapText;
   
   typedef std::map<DWORD, CFilter> TFilterMap;
   typedef std::vector<CFilter> TFilterMapDefault;
 
   // (Tag,Name) -> Filter
-  typedef std::multimap<std::pair<CString,CString>, CFilterElementHide> TFilterElementHideTagsNamed;
+  typedef std::multimap<std::pair< std::wstring, std::wstring >, CFilterElementHide> TFilterElementHideTagsNamed;
 
   // Tag -> Filter
-  typedef std::multimap<CString, CFilterElementHide> TFilterElementHideTags;
+  typedef std::multimap< std::wstring, CFilterElementHide> TFilterElementHideTags;
 
 
   TFilterElementHideTagsNamed m_elementHideTagsId;
   TFilterElementHideTagsNamed m_elementHideTagsClass;
   TFilterElementHideTags m_elementHideTags;
 
   TFilterMap m_filterMap[2][2];
   TFilterMapDefault m_filterMapDefault[2];
 
   void ClearFilters();
 
 public:
 
-  CPluginFilter(const CString& dataPath = "");
+  CPluginFilter();
 
   bool LoadHideFilters(std::vector<std::wstring> filters);
 
-  bool AddFilterElementHide(CString filter);
+  bool AddFilterElementHide( std::wstring filter);
 
 
-  bool IsElementHidden(const CString& tag, IHTMLElement* pEl, const CString& domain, const CString& indent) const;
+  bool IsElementHidden(const std::wstring & tag, IHTMLElement* pEl, const std::wstring & domain, const std::wstring & indent) const;
 
 
-  bool ShouldBlock(CString src, int contentType, const CString& domain, bool addDebug=false) const;
+  bool ShouldBlock( std::wstring src, int contentType, const std::wstring & domain, bool addDebug=false) const;
 
   HANDLE hideFiltersLoadedEvent;
 };
 
 
 #endif // _PLUGIN_FILTER_H_