Don't use std::string in the plugin, convert when communicating with the engine

src/plugin/PluginSettings.cpp

 #include "PluginStdAfx.h"
 
 #include <Wbemidl.h>
 #include <time.h>
 #include "PluginIniFileW.h"
 #include "PluginIniFile.h"
 #include "PluginSettings.h"
 #include "PluginClient.h"
 #include "PluginChecksum.h"
 #include "PluginSystem.h"
 #ifdef SUPPORT_FILTER
 #include "PluginFilter.h"
 #endif
 #include "PluginMutex.h"
 #include "PluginHttpRequest.h"
 #include "../shared/Utils.h"
 #include <memory>
 
 
 // IE functions
 #pragma comment(lib, "iepmapi.lib")
 
 #include <knownfolders.h>
 
 namespace
 {
-  std::string CreateDomainWhitelistingFilter(CString domain)
+  std::wstring CreateDomainWhitelistingFilter(CString domain)
   {
-    return std::string("@@||").append(CW2A(domain)).append("^$document");
+    return L"@@||" + domain + L"^$document";
   }
 }
 
 class TSettings
 {
   DWORD processorId;
 
   char sPluginId[44];
 };
 
@@ skipping 475 matching lines @@
   return m_isPluginEnabledTab;
 }
 
 
 std::map<CString, CString> CPluginSettings::GetFilterLanguageTitleList() const
 {
   std::map<CString, CString> filterList;
   for (size_t i = 0; i < m_subscriptions.size(); i ++)
   {
     SubscriptionDescription it = m_subscriptions[i];
-    filterList.insert(std::make_pair(CString(CA2T(it.url.c_str(), CP_UTF8)), CString(CA2T(it.title.c_str(), CP_UTF8))));
+    filterList.insert(std::make_pair(CString(it.url.c_str()), CString(it.title.c_str())));
   }
   return filterList;
 }
 
 
 bool CPluginSettings::Write(bool isDebug)
 {
   bool isWritten = true;
 
   if (!m_isDirty)
@@ skipping 757 matching lines @@
   s_criticalSectionLocal.Lock();
   {
     count = (int)m_whitelistedDomains.size();
   }
   s_criticalSectionLocal.Unlock();
 
   return count;
 }
 
 
-std::vector<std::string> CPluginSettings::GetWhiteListedDomainList()
+std::vector<std::wstring> CPluginSettings::GetWhiteListedDomainList()
 {
   bool r = ReadWhitelist(false);
   return m_whitelistedDomains;
 }
 
 
 bool CPluginSettings::RefreshWhitelist()
 {
   CPluginSettingsWhitelistLock lock;
   if (lock.IsLocked())
@@ skipping 17 matching lines @@
 
     osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
     bOsVersionInfoEx = GetVersionEx((OSVERSIONINFO*) &osvi);
 
     m_WindowsBuildNumber = osvi.dwBuildNumber;
   }
 
   return m_WindowsBuildNumber;
 }
 
-void CPluginSettings::SetSubscription(BSTR url)
-{
-  std::string urlConverted = CT2A(url, CP_UTF8);
-  SetSubscription(urlConverted);
-}
-
-void CPluginSettings::SetSubscription(std::string url)
+void CPluginSettings::SetSubscription(const std::wstring& url)
 {
   CPluginClient::GetInstance()->SetSubscription(url);
   RefreshFilterlist();
   RefreshWhitelist();
 }
 
-std::vector<std::string> split(const std::string& s, char delim) {
-    std::vector<std::string> retTokens;
-    std::stringstream ss(s);
-    std::string item;
-    while (std::getline(ss, item, delim)) {
-        retTokens.push_back(item);
-    }
-    return retTokens;
-}
-
-
 CString CPluginSettings::GetSubscription()
 {
   std::vector<SubscriptionDescription> subscriptions = CPluginClient::GetInstance()->GetListedSubscriptions();
   if (subscriptions.size() > 0)
-    return CString(CA2T(subscriptions.front().url.c_str(), CP_UTF8));
+    return CString(subscriptions.front().url.c_str());
   else
     return CString(L"");
 }
 
 
 void CPluginSettings::RefreshFilterlist()
 {
   CPluginClient::GetInstance()->UpdateAllSubscriptions();
 }
 
 #endif // SUPPORT_WHITELIST