Issue #1234 - remove CString from declarations representing domains.

src/plugin/PluginDomTraverserBase.h

 #ifndef _PLUGIN_DOM_TRAVERSER_BASE_H_
 #define _PLUGIN_DOM_TRAVERSER_BASE_H_
 
 
 #include "PluginTypedef.h"
 #include "PluginTab.h"
 
 
 class CPluginDomTraverserCacheBase
 {
 public:
 
   long m_elements;
 
   CPluginDomTraverserCacheBase() : m_elements(0) {};
   void Init() { m_elements=0; }
 };
 
 template <class T>
 class CPluginDomTraverserBase
 {
 
 public:
 
   CPluginDomTraverserBase(CPluginTab* tab);
   ~CPluginDomTraverserBase();
 
   void TraverseHeader(bool isHeaderTraversed);
 
-  void TraverseDocument(IWebBrowser2* pBrowser, const CString& domain, const CString& documentName);
-  void TraverseSubdocument(IWebBrowser2* pBrowser, const CString& domain, const CString& documentName);
+  void TraverseDocument(IWebBrowser2* pBrowser, const std::wstring& domain, const CString& documentName);
+  void TraverseSubdocument(IWebBrowser2* pBrowser, const std::wstring& domain, const CString& documentName);
 
   virtual void ClearCache();
 
   void ShowNotification(CPluginTab* tab);
 
 protected:
 
   virtual bool OnIFrame(IHTMLElement* pEl, const CString& url, CString& indent) { return true; }
   virtual bool OnElement(IHTMLElement* pEl, const CString& tag, T* cache, bool isDebug, CString& indent) { return true; }
 
   virtual bool IsEnabled();
 
 protected:
 
   void TraverseDocument(IWebBrowser2* pBrowser, bool isMainDoc, CString indent);
   void TraverseChild(IHTMLElement* pEl, IWebBrowser2* pBrowser, CString& indent, bool isCached=true);
 
   CComAutoCriticalSection m_criticalSection;
 
-  CString m_domain;
+  std::wstring m_domain;
   CString m_documentName;
 
   bool m_isHeaderTraversed;
 
   // Caching    
   long m_cacheDomElementCount;
 
   int m_cacheIndexLast;
   int m_cacheElementsMax;
   std::set<CString> m_cacheDocumentHasFrames;
@@ skipping 19 matching lines @@
   delete [] m_cacheElements;
 }
 
 template <class T>
 void CPluginDomTraverserBase<T>::TraverseHeader(bool isHeaderTraversed)
 {
   m_isHeaderTraversed = isHeaderTraversed;
 }
 
 template <class T>
-void CPluginDomTraverserBase<T>::TraverseDocument(IWebBrowser2* pBrowser, const CString& domain, const CString& documentName)
+void CPluginDomTraverserBase<T>::TraverseDocument(IWebBrowser2* pBrowser, const std::wstring& domain, const CString& documentName)
 {
   m_domain = domain;
 
   TraverseDocument(pBrowser, true, "");
 }
 
 
 template <class T>
-void CPluginDomTraverserBase<T>::TraverseSubdocument(IWebBrowser2* pBrowser, const CString& domain, const CString& documentName)
+void CPluginDomTraverserBase<T>::TraverseSubdocument(IWebBrowser2* pBrowser, const std::wstring& domain, const CString& documentName)
 {
   m_domain = domain;
 
   TraverseDocument(pBrowser, false, "");
 }
 
 
 template <class T>
 bool CPluginDomTraverserBase<T>::IsEnabled()
 {
@@ skipping 160 matching lines @@
             // Some times, domain is missing. Should this be added on image src's as well?''
 
             // eg. gadgetzone.com.au
             if (src.Left(2) == L"//")
             {
               src = L"http:" + src;
             }
             // eg. http://w3schools.com/html/html_examples.asp
             else if (src.Left(4) != L"http" && src.Left(6) != L"res://")
             {
-              src = L"http://" + m_domain + src;
+              src = L"http://" + to_CString(m_domain) + src;
             }
 
             CPluginClient::UnescapeUrl(src);
 
             // Check if Iframe should be traversed
             if (OnIFrame(pFrameEl, src, indent))
             {
               CComQIPtr<IWebBrowser2> pFrameBrowser = pFrameDispatch;
               if (pFrameBrowser)
               {
@@ skipping 168 matching lines @@
   if (tab->m_plugin->GetTabHWND() == NULL)
   {
     return;
   }
 
 
 }
 
 
 #endif // _PLUGIN_DOM_TRAVERSER_BASE_H_