Issue 2005 - Refactor working with strings in InputBuffer and OutputBuffer

src/plugin/AdblockPlusClient.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
@@ skipping 116 matching lines @@
 
   std::vector<SubscriptionDescription> ReadSubscriptions(Communication::InputBuffer& message)
   {
     int32_t count;
     message >> count;
 
     std::vector<SubscriptionDescription> result;
     for (int32_t i = 0; i < count; i++)
     {
       SubscriptionDescription description;
-      std::string url;
-      message >> url;
-      description.url = ToUtf16String(url);
-      std::string title;
-      message >> title;
-      description.title = ToUtf16String(title);
-      std::string specialization;
-      message >> specialization;
-      description.specialization = ToUtf16String(specialization);
+      message >> description.url;
+      message >> description.title;
+      message >> description.specialization;
       message >> description.listed;
       result.push_back(description);
     }
     return result;
   }
 }
 
 CAdblockPlusClient* CAdblockPlusClient::s_instance = NULL;
 CComAutoCriticalSection CAdblockPlusClient::s_criticalSectionLocal;
 
@@ skipping 103 matching lines @@
   return isHidden;
 }
 
 bool CAdblockPlusClient::IsWhitelistedUrl(const std::wstring& url)
 {
   return !GetWhitelistingFilter(url).empty();
 }
 
 std::string CAdblockPlusClient::GetWhitelistingFilter(const std::wstring& url)
 {
-  DEBUG_GENERAL((L"IsWhitelistedUrl: " + url + L" start").c_str());
+  DEBUG_GENERAL((L"GetWhitelistingFilter: " + url + L" start").c_str());
   Communication::OutputBuffer request;
-  request << Communication::PROC_GET_WHITELISTING_FITER << ToUtf8String(url);
+  request << Communication::PROC_GET_WHITELISTING_FITER << url;
 
   Communication::InputBuffer response;
   if (!CallEngine(request, response)) 
     return "";
 
   std::string filterText;
   response >> filterText;
 
-  DEBUG_GENERAL((L"IsWhitelistedUrl: " + url + L" end").c_str());
+  DEBUG_GENERAL((L"GetWhitelistingFilter: " + url + L" end").c_str());
   return filterText;
 }
 
 bool CAdblockPlusClient::IsElemhideWhitelistedOnDomain(const std::wstring& url)
 {
   Communication::OutputBuffer request;
-  request << Communication::PROC_IS_ELEMHIDE_WHITELISTED_ON_URL << ToUtf8String(url);
+  request << Communication::PROC_IS_ELEMHIDE_WHITELISTED_ON_URL << url;
 
   Communication::InputBuffer response;
   if (!CallEngine(request, response)) 
     return false;
 
   bool isWhitelisted;
   response >> isWhitelisted;
   return isWhitelisted;
 }
 
 bool CAdblockPlusClient::Matches(const std::wstring& url, AdblockPlus::FilterEngine::ContentType contentType, const std::wstring& domain)
 {
   Communication::OutputBuffer request;
-  request << Communication::PROC_MATCHES << ToUtf8String(url) << static_cast<int32_t>(contentType) << ToUtf8String(domain);
+  request << Communication::PROC_MATCHES << url << contentType << domain;
 
   Communication::InputBuffer response;
   if (!CallEngine(request, response)) 
     return false;
 
   bool match;
   response >> match;
   return match;
 }
 
 std::vector<std::wstring> CAdblockPlusClient::GetElementHidingSelectors(const std::wstring& domain)
 {
   Communication::OutputBuffer request;
-  request << Communication::PROC_GET_ELEMHIDE_SELECTORS << ToUtf8String(domain);
+  request << Communication::PROC_GET_ELEMHIDE_SELECTORS << domain;
 
   Communication::InputBuffer response;
   if (!CallEngine(request, response)) 
     return std::vector<std::wstring>();
 
-  std::vector<std::string> selectors;
+  std::vector<std::wstring> selectors;
   response >> selectors;
-  return ToUtf16Strings(selectors);
+  return selectors;
 }
 
 std::vector<SubscriptionDescription> CAdblockPlusClient::FetchAvailableSubscriptions()
 {
   Communication::InputBuffer response;
   if (!CallEngine(Communication::PROC_AVAILABLE_SUBSCRIPTIONS, response)) 
     return std::vector<SubscriptionDescription>();
   return ReadSubscriptions(response);
 }
 
@@ skipping 16 matching lines @@
     {
       return true;
     }
   }
   return false;
 }
 
 void CAdblockPlusClient::SetSubscription(const std::wstring& url)
 {
   Communication::OutputBuffer request;
-  request << Communication::PROC_SET_SUBSCRIPTION << ToUtf8String(url);
+  request << Communication::PROC_SET_SUBSCRIPTION << url;
   CallEngine(request);
 }
 
 void CAdblockPlusClient::AddSubscription(const std::wstring& url)
 {
   Communication::OutputBuffer request;
-  request << Communication::PROC_ADD_SUBSCRIPTION << ToUtf8String(url);
+  request << Communication::PROC_ADD_SUBSCRIPTION << url;
   CallEngine(request);
 }
 
 void CAdblockPlusClient::RemoveSubscription(const std::wstring& url)
 {
   Communication::OutputBuffer request;
-  request << Communication::PROC_REMOVE_SUBSCRIPTION << ToUtf8String(url);
+  request << Communication::PROC_REMOVE_SUBSCRIPTION << url;
   CallEngine(request);
 }
 
 
 void CAdblockPlusClient::UpdateAllSubscriptions()
 {
   CallEngine(Communication::PROC_UPDATE_ALL_SUBSCRIPTIONS);
 }
 
 std::vector<std::wstring> CAdblockPlusClient::GetExceptionDomains()
 {
   Communication::InputBuffer response;
   if (!CallEngine(Communication::PROC_GET_EXCEPTION_DOMAINS, response)) 
     return std::vector<std::wstring>();
 
-  std::vector<std::string> domains;
+  std::vector<std::wstring> domains;
   response >> domains;
-  return ToUtf16Strings(domains);
+  return domains;
 }
 
 bool CAdblockPlusClient::IsFirstRun()
 {
   DEBUG_GENERAL("IsFirstRun");
   Communication::InputBuffer response;
   if (!CallEngine(Communication::PROC_IS_FIRST_RUN_ACTION_NEEDED, response)) return false;
   bool res;
   response >> res;
   return res;
 }
 
 void CAdblockPlusClient::AddFilter(const std::wstring& text)
 {
   Communication::OutputBuffer request;
-  request << Communication::PROC_ADD_FILTER << ToUtf8String(text);
+  request << Communication::PROC_ADD_FILTER << text;
   CallEngine(request);
 }
 
 void CAdblockPlusClient::RemoveFilter(const std::wstring& text)
 {
   RemoveFilter(ToUtf8String(text));
 }
 
 void CAdblockPlusClient::RemoveFilter(const std::string& text)
 {
   Communication::OutputBuffer request;
   request << Communication::PROC_REMOVE_FILTER << text;
   CallEngine(request);
 }
 
 void CAdblockPlusClient::SetPref(const std::wstring& name, const std::wstring& value)
 {
   Communication::OutputBuffer request;
-  request << Communication::PROC_SET_PREF << ToUtf8String(name) << ToUtf8String(value);
+  request << Communication::PROC_SET_PREF << name << value;
   CallEngine(request);
 }
 
 void CAdblockPlusClient::SetPref(const std::wstring& name, const int64_t & value)
 {
   Communication::OutputBuffer request;
-  request << Communication::PROC_SET_PREF << ToUtf8String(name) << value;
+  request << Communication::PROC_SET_PREF << name << value;
   CallEngine(request);
 }
 
 void CAdblockPlusClient::SetPref(const std::wstring& name, bool value)
 {
   Communication::OutputBuffer request;
-  request << Communication::PROC_SET_PREF << ToUtf8String(name) << value;
+  request << Communication::PROC_SET_PREF << name << value;
   CallEngine(request);
 }
 
 std::wstring CAdblockPlusClient::GetPref(const std::wstring& name, const wchar_t* defaultValue)
 {
   return GetPref(name, std::wstring(defaultValue));
 }
 std::wstring CAdblockPlusClient::GetPref(const std::wstring& name, const std::wstring& defaultValue)
 {
   DEBUG_GENERAL((L"GetPref: " + name + L" start").c_str());
   Communication::OutputBuffer request;
-  request << Communication::PROC_GET_PREF << ToUtf8String(name);
+  request << Communication::PROC_GET_PREF << name;
 
   Communication::InputBuffer response;
   if (!CallEngine(request, response)) 
     return defaultValue;
   bool success;
   response >> success;
   if (success)
   {
-    std::string value;
+    std::wstring value;
     response >> value;
     DEBUG_GENERAL((L"GetPref: " + name + L" end").c_str());
-    return ToUtf16String(value);
+    return value;
   }
   else
   {
     DEBUG_GENERAL((L"GetPref: " + name + L" end").c_str());
     return defaultValue;
   }
 }
 
 bool CAdblockPlusClient::GetPref(const std::wstring& name, bool defaultValue)
 {
   DEBUG_GENERAL((L"GetPref: " + name + L" start").c_str());
   Communication::OutputBuffer request;
-  request << Communication::PROC_GET_PREF << ToUtf8String(name);
+  request << Communication::PROC_GET_PREF << name;
 
   Communication::InputBuffer response;
   if (!CallEngine(request, response)) 
     return defaultValue;
   bool success;
   response >> success;
   if (success)
   {
     bool value;
     response >> value;
     DEBUG_GENERAL((L"GetPref: " + name + L" end").c_str());
     return value;
   }
   else
   {
     DEBUG_GENERAL((L"GetPref: " + name + L" end").c_str());
     return defaultValue;
   }
 }
 int64_t CAdblockPlusClient::GetPref(const std::wstring& name, int64_t defaultValue)
 {
   DEBUG_GENERAL((L"GetPref: " + name + L" start").c_str());
   Communication::OutputBuffer request;
-  request << Communication::PROC_GET_PREF << ToUtf8String(name);
+  request << Communication::PROC_GET_PREF << name;
 
   Communication::InputBuffer response;
   if (!CallEngine(request, response)) 
     return defaultValue;
   bool success;
   response >> success;
   if (success)
   {
     int64_t value;
     response >> value;
@@ skipping 13 matching lines @@
   request << Communication::PROC_CHECK_FOR_UPDATES << reinterpret_cast<int32_t>(callbackWindow);
   CallEngine(request);
 }
 
 std::wstring CAdblockPlusClient::GetDocumentationLink()
 {
   DEBUG_GENERAL("GetDocumentationLink");
   Communication::InputBuffer response;
   if (!CallEngine(Communication::PROC_GET_DOCUMENTATION_LINK, response)) 
     return L"";
-  std::string docLink;
+  std::wstring docLink;
   response >> docLink;
-  return ToUtf16String(docLink);
+  return docLink;
 }
 
 bool CAdblockPlusClient::TogglePluginEnabled()
 {
   DEBUG_GENERAL("TogglePluginEnabled");
   Communication::InputBuffer response;
   if (!CallEngine(Communication::PROC_TOGGLE_PLUGIN_ENABLED, response)) 
     return false;
   bool currentEnabledState;
   response >> currentEnabledState;
   return currentEnabledState;
 }
 
 std::wstring CAdblockPlusClient::GetHostFromUrl(const std::wstring& url)
 {
   DEBUG_GENERAL("GetHostFromUrl");
   Communication::OutputBuffer request;
-  request << Communication::PROC_GET_HOST << ToUtf8String(url);
+  request << Communication::PROC_GET_HOST << url;
 
   Communication::InputBuffer response;
   if (!CallEngine(request, response)) 
     return L"";
-  std::string host;
+  std::wstring host;
   response >> host;
-  return ToUtf16String(host);
+  return host;
 }
 
 int CAdblockPlusClient::CompareVersions(const std::wstring& v1, const std::wstring& v2)
 {
   DEBUG_GENERAL("CompareVersions");
   Communication::OutputBuffer request;
-  request << Communication::PROC_COMPARE_VERSIONS << ToUtf8String(v1) << ToUtf8String(v2);
+  request << Communication::PROC_COMPARE_VERSIONS << v1 << v2;
   Communication::InputBuffer response;
   if (!CallEngine(request, response))
     return 0;
   int result;
   response >> result;
   return result;
 }