Issue #1234 - Eliminate CString from PluginSettings.* and PluginUserSettings.*

src/plugin/PluginSettings.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "PluginStdAfx.h"
 
 #include "PluginSettings.h"
 #include "AdblockPlusClient.h"
 #include "PluginSystem.h"
 #include "PluginMutex.h"
 #include "../shared/Utils.h"
 
 namespace
 {
-  std::wstring CreateDomainWhitelistingFilter(const CString& domain)
+  std::wstring CreateDomainWhitelistingFilter(const std::wstring& domain)
   {
-    return L"@@||" + ToWstring(domain) + L"^$document";
+    return L"@@||" + domain + L"^$document";
   }
 }
 
 class CPluginSettingsWhitelistLock : public CPluginMutex
 {
 public:
   CPluginSettingsWhitelistLock() : CPluginMutex(L"SettingsFileWhitelist", PLUGIN_ERROR_MUTEX_SETTINGS_FILE_WHITELIST) {}
   ~CPluginSettingsWhitelistLock() {}
 };
 
@@ skipping 47 matching lines @@
 std::wstring GetDataPath(const std::wstring& filename)
 {
   return GetAppDataPath() + L"\\" + filename;
 }
 
 bool CPluginSettings::IsPluginEnabled() const
 {
   return GetPluginEnabled();
 }
 
-std::map<CString, CString> CPluginSettings::GetFilterLanguageTitleList() const
+std::map<std::wstring, std::wstring> CPluginSettings::GetFilterLanguageTitleList() const
 {
-  std::vector<SubscriptionDescription> subscriptions = CPluginClient::GetInstance()->FetchAvailableSubscriptions();
+  auto subscriptions = CPluginClient::GetInstance()->FetchAvailableSubscriptions();
 
-  std::map<CString, CString> filterList;
+  std::map<std::wstring, std::wstring> filterList;
   for (size_t i = 0; i < subscriptions.size(); i ++)
   {
-    SubscriptionDescription it = subscriptions[i];
-    filterList.insert(std::make_pair(CString(it.url.c_str()), CString(it.title.c_str())));
+    auto it = subscriptions[i];
+    filterList.insert(std::make_pair(it.url,it.title));

[sergei, 2015/11/25 09:27:08]

the space after comma is missed

[Eric, 2015/11/25 17:31:02]

Done.

   }
   return filterList;
 }
 
 bool CPluginSettings::IsWorkingThread(DWORD dwThreadId) const
 {
   if (dwThreadId == 0)
   {
     dwThreadId = ::GetCurrentThreadId();
   }
@@ skipping 12 matching lines @@
 
 void CPluginSettings::TogglePluginEnabled()
 {
   CPluginClient::GetInstance()->TogglePluginEnabled();  
 }
 bool CPluginSettings::GetPluginEnabled() const
 {
   return CPluginClient::GetInstance()->GetPref(L"enabled", true);
 }
 
-
 void CPluginSettings::AddError(const CString& error, const CString& errorCode)
 {
   DEBUG_SETTINGS(L"SettingsTab::AddError error:" + error + " code:" + errorCode)
 }
 
-
 // ============================================================================
 // Whitelist settings
 // ============================================================================
 
 void CPluginSettings::ClearWhitelist()
 {
   s_criticalSectionLocal.Lock();
   {
     m_whitelistedDomains.clear();
   }
@@ skipping 21 matching lines @@
       s_criticalSectionLocal.Unlock();
     }
     else
     {
       isRead = false;
     }
 
     return isRead;
 }
 
-void CPluginSettings::AddWhiteListedDomain(const CString& domain)
+void CPluginSettings::AddWhiteListedDomain(const std::wstring& domain)
 {
   DEBUG_SETTINGS("SettingsWhitelist::AddWhiteListedDomain domain:" + domain)
   CPluginClient::GetInstance()->AddFilter(CreateDomainWhitelistingFilter(domain));
 }
 
-void CPluginSettings::RemoveWhiteListedDomain(const CString& domain)
+void CPluginSettings::RemoveWhiteListedDomain(const std::wstring& domain)
 {
   DEBUG_SETTINGS("SettingsWhitelist::RemoveWhiteListedDomain domain:" + domain)
   CPluginClient::GetInstance()->RemoveFilter(CreateDomainWhitelistingFilter(domain));
 }
 
 int CPluginSettings::GetWhiteListedDomainCount() const
 {
   int count = 0;
 
   s_criticalSectionLocal.Lock();
@@ skipping 37 matching lines @@
 
   return m_WindowsBuildNumber;
 }
 
 void CPluginSettings::SetSubscription(const std::wstring& url)
 {
   CPluginClient::GetInstance()->SetSubscription(url);
   RefreshWhitelist();
 }
 
-CString CPluginSettings::GetSubscription()
+std::wstring CPluginSettings::GetSubscription()
 {
-  std::vector<SubscriptionDescription> subscriptions = CPluginClient::GetInstance()->GetListedSubscriptions();
+  auto subscriptions = CPluginClient::GetInstance()->GetListedSubscriptions();
   std::wstring aaUrl = CPluginClient::GetInstance()->GetPref(L"subscriptions_exceptionsurl", L"");
 
-  for (std::vector<SubscriptionDescription>::iterator subscription = subscriptions.begin(); subscription != subscriptions.end(); subscription++)
+  for (auto subscription = subscriptions.begin(); subscription != subscriptions.end(); subscription++)
   {
     if (subscription->url != aaUrl)
     {
-      return CString(subscription->url.c_str());
+      return subscription->url;
     }
   }
-  return CString(L"");
+  return std::wstring();
 }
-
-CString CPluginSettings::GetAppLocale()
-{
-  return ToCString(GetBrowserLanguage());
-}
-
-CString CPluginSettings::GetDocumentationLink()
-{
-  return CString(CPluginClient::GetInstance()->GetDocumentationLink().c_str());
-}