Issues #1163, #1173 - refactor CPluginUserSettings

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
@@ skipping 70 matching lines @@
 
 // ENTRY POINT
 STDMETHODIMP CPluginUserSettings::QueryInterface(REFIID riid, void **ppvObj)
 {
   if (!ppvObj)
   {
     return E_POINTER;
   }
   if (riid == IID_IUnknown || riid == IID_IDispatch) // GUID comparison does not throw
   {
-    *ppvObj = static_cast<void *>(this);
+    *ppvObj = static_cast<void*>(this);
     return S_OK;
   }
   return E_NOINTERFACE;
 }
 
 /**
  * \par Limitation
  *   CPluginUserSettings is not allocated on the heap.
  *   It appears only as a member variable in CPluginTabBase.
  *   'AddRef' and 'Release' don't need reference counting because they don't present COM factories.
@@ skipping 29 matching lines @@
   {
     if (!name || !id)
     {
       return E_POINTER;
     }
     if (count != 1)
     {
       return E_FAIL;
     }
     auto item = methodIndex.find(*name); // unordered_map::find is not declared noexcept
-    if (item==methodIndex.end())
+    if (item == methodIndex.end())
     {
       return DISP_E_UNKNOWNNAME;
     }
     *id = item->second;
   }
   catch (...)
   {
     return E_FAIL;
   }
   return S_OK;
@@ skipping 62 matching lines @@
         if (pDispparams->cArgs != 1)
         {
           return DISP_E_BADPARAMCOUNT;
         }
         if (pDispparams->rgvarg[0].vt != VT_I4)
         {
           return DISP_E_TYPEMISMATCH;
         }
         if (pVarResult)
         {
-          int indx = pDispparams->rgvarg[0].lVal;
+          int index = pDispparams->rgvarg[0].lVal;
 
           std::map<CString, CString> languageTitleList = settings->GetFilterLanguageTitleList();
 
-          if (indx < 0  ||  indx >= (int)languageTitleList.size())
+          if (index < 0  ||  index >= static_cast<int>(languageTitleList.size()))
             return DISP_E_EXCEPTION;
 
           CString language;
 
-          int curIndx = 0;
-          for(std::map<CString, CString>::const_iterator it = languageTitleList.begin(); it != languageTitleList.end(); ++it)
+          int loopIndex = 0;
+          for (std::map<CString, CString>::const_iterator it = languageTitleList.begin(); it != languageTitleList.end(); ++it)
           {
-            if (curIndx == indx)
+            if (loopIndex == index)
             {
               language = it->first;
               break;
             }
-            curIndx++;
+            ++loopIndex;
           }
 
           pVarResult->vt = VT_BSTR;
           pVarResult->bstrVal = SysAllocString(language);
         }
       }
       break;
     case dispatchID_GetLanguageTitleByIndex:
       {
         if (pDispparams->cArgs != 1)
         {
           return DISP_E_BADPARAMCOUNT;
         }
         if (pDispparams->rgvarg[0].vt != VT_I4)
         {
           return DISP_E_TYPEMISMATCH;
         }
         if (pVarResult)
         {
-          int indx = pDispparams->rgvarg[0].lVal;
+          int index = pDispparams->rgvarg[0].lVal;
 
           std::map<CString, CString> languageTitleList = settings->GetFilterLanguageTitleList();
 
-          if (indx < 0  ||  indx >= (int)languageTitleList.size())
+          if (index < 0  ||  index >= static_cast<int>(languageTitleList.size()))
             return DISP_E_EXCEPTION;
 
           CString languageTitle;
 
-          int curIndx = 0;
-          for(std::map<CString, CString>::const_iterator it = languageTitleList.begin(); it != languageTitleList.end(); ++it)
+          int loopIndex = 0;
+          for (std::map<CString, CString>::const_iterator it = languageTitleList.begin(); it != languageTitleList.end(); ++it)
           {
-            if (curIndx == indx)
+            if (loopIndex == index)
             {
               languageTitle = it->second;
               break;
             }
-            curIndx++;
+            loopIndex++;
           }
 
           pVarResult->vt = VT_BSTR;
           pVarResult->bstrVal = SysAllocString(languageTitle);
         }
       }
       break;
     case dispatchID_SetLanguage:
       {
         if (pDispparams->cArgs != 1)
@@ skipping 78 matching lines @@
           settings->RemoveWhiteListedDomain((BSTR)domain);
         }
       }
       break;
     case dispatchID_GetAppLocale:
       {
         if (pDispparams->cArgs != 0)
         {
           return DISP_E_BADPARAMCOUNT;
         }
-        pVarResult->vt = VT_BSTR;
-        pVarResult->bstrVal = SysAllocString(settings->GetAppLocale());
+        if (pVarResult)
+        {
+          pVarResult->vt = VT_BSTR;
+          pVarResult->bstrVal = SysAllocString(settings->GetAppLocale());
+        }
       }
       break;
     case dispatchID_GetDocumentationLink:
       {
         if (pDispparams->cArgs != 0)
         {
           return DISP_E_BADPARAMCOUNT;
         }
-        pVarResult->vt = VT_BSTR;
-        pVarResult->bstrVal = SysAllocString(settings->GetDocumentationLink());
+        if (pVarResult)
+        {
+          pVarResult->vt = VT_BSTR;
+          pVarResult->bstrVal = SysAllocString(settings->GetDocumentationLink());
+        }
       }
       break;
     case dispatchID_IsAcceptableAdsEnabled:
       {
         if (pDispparams->cArgs != 0)
         {
           return DISP_E_BADPARAMCOUNT;
         }
-        pVarResult->vt = VT_BOOL;
-        pVarResult->boolVal = CPluginClient::GetInstance()->IsAcceptableAdsEnabled() ? VARIANT_TRUE : VARIANT_FALSE;
+        if (pVarResult)
+        {
+          pVarResult->vt = VT_BOOL;
+          pVarResult->boolVal = CPluginClient::GetInstance()->IsAcceptableAdsEnabled() ? VARIANT_TRUE : VARIANT_FALSE;
+        }
       }
       break;
     case dispatchID_SetAcceptableAdsEnabled:
       {
         if (pDispparams->cArgs != 1)
         {
           return DISP_E_BADPARAMCOUNT;
         }
         if (pDispparams->rgvarg[0].vt != VT_BOOL)
         {
@@ skipping 10 matching lines @@
           client->RemoveSubscription(client->GetPref(L"subscriptions_exceptionsurl", L""));
         }
       }
       break;
     case dispatchID_IsUpdate:
       {
         if (pDispparams->cArgs != 0)
         {
           return DISP_E_BADPARAMCOUNT;
         }
-        pVarResult->vt = VT_BOOL;
-        pVarResult->boolVal = CPluginClient::GetInstance()->GetPref(L"displayUpdatePage", false) ? VARIANT_TRUE : VARIANT_FALSE;
+        if (pVarResult)
+        {
+          pVarResult->vt = VT_BOOL;
+          pVarResult->boolVal = CPluginClient::GetInstance()->GetPref(L"displayUpdatePage", false) ? VARIANT_TRUE : VARIANT_FALSE;
+        }
       }
       break;
     default:
       return DISP_E_MEMBERNOTFOUND;
       break;
     }
   }
-  catch(...)
+  catch (...)
   {
     return E_FAIL;
   }
   return S_OK;
 }
-