Issue 1103 - Migrate Simple Adblock users

src/plugin/PluginUserSettings.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 "PluginUserSettings.h"
-#include <algorithm>
+#include "AdblockPlusClient.h"
 #include "PluginSettings.h"
-#include "PluginClient.h"
 #include "../shared/Dictionary.h"
 #include <unordered_map>
 
 namespace
 {
   enum UserSettingsMethods
   {
     dispatchID_GetMessage = 0,
     dispatchID_GetLanguageCount,
     dispatchID_GetLanguageByIndex,
@@ skipping 387 matching lines @@
           return DISP_E_TYPEMISMATCH;
         }
         if (pDispparams->rgvarg[0].boolVal != VARIANT_FALSE)
         {
           CPluginClient* client = CPluginClient::GetInstance();
           client->AddSubscription(client->GetPref(L"subscriptions_exceptionsurl", L""));
         }
         else
         {
           CPluginClient* client = CPluginClient::GetInstance();
           client->RemoveSubscription(client->GetPref(L"subscriptions_exceptionsurl", L""));

[Eric, 2015/05/17 00:29:25]

See here, for example, of why explicit conversions to 'std::wstring' aren't
necessary.

         }
       }
       break;
     case dispatchID_IsUpdate:
       {
         if (pDispparams->cArgs != 0)
         {
           return DISP_E_BADPARAMCOUNT;
         }
         if (pVarResult)
         {
           pVarResult->vt = VT_BOOL;
           pVarResult->boolVal = CPluginClient::GetInstance()->GetPref(L"displayUpdatePage", false) ? VARIANT_TRUE : VARIANT_FALSE;
         }
       }
       break;
     case dispatchID_GetConversion:
       {
         if (pDispparams->cArgs != 0)
         {
           return DISP_E_BADPARAMCOUNT;
         }
         if (pVarResult)
         {
           pVarResult->vt = VT_BSTR;
-          pVarResult->bstrVal = CComBSTR(CPluginClient::GetInstance()->GetPref(std::wstring(L"convertedFrom"), std::wstring(L"")).c_str());

[sergei, 2015/04/28 14:41:15]

Is it necessary to explicitly construct std::wstring here?

[Eric, 2015/05/17 00:29:25]

It's not. There's an explicit pass through function for second argument
'wchar_t*' that invokes the 'std::wstring' version.

+          pVarResult->bstrVal = CComBSTR(CPluginClient::GetInstance()->GetConvertedFrom().c_str());
         }
       }
       break;
     default:
       return DISP_E_MEMBERNOTFOUND;
       break;
     }
   }
   catch (...)
   {
     return E_FAIL;
   }
   return S_OK;
 }