| Index: src/plugin/PluginTabBase.cpp |
| =================================================================== |
| --- a/src/plugin/PluginTabBase.cpp |
| +++ b/src/plugin/PluginTabBase.cpp |
| @@ -86,7 +86,7 @@ |
| { |
| void FilterLoader(CPluginTabBase* tabBase) |
| { |
| - tabBase->m_filter->LoadHideFilters(CPluginClient::GetInstance()->GetElementHidingSelectors(tabBase->GetDocumentDomain().GetString())); |
| + tabBase->m_filter->LoadHideFilters(CPluginClient::GetInstance()->GetElementHidingSelectors(tabBase->GetDocumentDomain())); |
| SetEvent(tabBase->m_filter->hideFiltersLoadedEvent); |
| } |
| } |
| @@ -244,9 +244,9 @@ |
| #endif |
| } |
| -CString CPluginTabBase::GetDocumentDomain() |
| +std::wstring CPluginTabBase::GetDocumentDomain() |
| { |
| - CString domain; |
| + std::wstring domain; |
| m_criticalSection.Lock(); |
| { |
| @@ -262,7 +262,7 @@ |
| m_criticalSection.Lock(); |
| { |
| m_documentUrl = url; |
| - m_documentDomain = CString(CAdblockPlusClient::GetInstance()->GetHostFromUrl(url.GetString()).c_str()); |
| + m_documentDomain = CAdblockPlusClient::GetInstance()->GetHostFromUrl(to_wstring(url)); |
| } |
| m_criticalSection.Unlock(); |
| } |
| @@ -309,11 +309,11 @@ |
| m_criticalSectionCache.Unlock(); |
| } |
| -void CPluginTabBase::ClearFrameCache(const CString& domain) |
| +void CPluginTabBase::ClearFrameCache(const std::wstring& domain) |
| { |
| m_criticalSectionCache.Lock(); |
| { |
| - if (domain.IsEmpty() || domain != m_cacheDomain) |
| + if (domain.empty() || domain != m_cacheDomain) |
| { |
| m_cacheFrames.clear(); |
| m_cacheDomain = domain; |