Unified Diff: src/plugin/PluginDomTraverserBase.h
Issue 4895405913407488:
Issue #1234 - remove CString from declarations representing domains. (Closed)
Patch Set:
Created Aug. 7, 2014, 7:46 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« src/plugin/PluginDebug.cpp ('k')
|
src/plugin/PluginFilter.cpp » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: src/plugin/PluginDomTraverserBase.h |
| =================================================================== |
| --- a/src/plugin/PluginDomTraverserBase.h |
| +++ b/src/plugin/PluginDomTraverserBase.h |
| @@ -27,8 +27,8 @@ |
| 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(); |
| @@ -48,7 +48,7 @@ |
| CComAutoCriticalSection m_criticalSection; |
| - CString m_domain; |
| + std::wstring m_domain; |
| CString m_documentName; |
| bool m_isHeaderTraversed; |
| @@ -88,7 +88,7 @@ |
| } |
| 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; |
| @@ -97,7 +97,7 @@ |
| 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; |
| @@ -278,7 +278,7 @@ |
| // 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); |
« no previous file with comments
|
« src/plugin/PluginDebug.cpp ('k')
|
src/plugin/PluginFilter.cpp » ('j')
|
no next file with comments »
