Cleanup

src/plugin/PluginSettings.cpp

 #include "PluginStdAfx.h"
 
 #include <Wbemidl.h>
 #include <time.h>
 #include "PluginSettings.h"
 #include "PluginClient.h"
 #include "PluginSystem.h"
 #ifdef SUPPORT_FILTER
 #include "PluginFilter.h"
 #endif
 #include "PluginMutex.h"
 #include "../shared/Utils.h"
 #include <memory>
 
 
 // IE functions
 #pragma comment(lib, "iepmapi.lib")
 
 #include <knownfolders.h>
 
 namespace
 {
-  std::wstring CreateDomainWhitelistingFilter(CString domain)
-  {
-    return std::wstring(L"@@||" + domain + L"^$document");

[Wladimir Palant, 2013/07/11 12:53:10]

What's wrong with the implicit conversion? Instead I would change the type of
the domain parameter into |const std::wstring&| here to make it cleaner
(shouldn't require changing any callers I think).

+  std::wstring CreateDomainWhitelistingFilter(const CString domain)
+  {
+    return std::wstring(L"@@||") + domain.GetString() + std::wstring(L"^$document");
   }
 }
 
 class TSettings
 {
   DWORD processorId;
 
   char sPluginId[44];
 };
 
@@ skipping 23 matching lines @@
   ~CPluginSettingsWhitelistLock() {}
 };
 
 #endif
 
 CPluginSettings* CPluginSettings::s_instance = NULL;
 
 CComAutoCriticalSection CPluginSettings::s_criticalSectionLocal;
 
 
-CPluginSettings::CPluginSettings() :
-  m_settingsVersion("1"), m_isFirstRun(false), m_dwWorkingThreadId(0), m_isPluginEnabledTab(true)

[Wladimir Palant, 2013/07/11 12:53:10]

m_settingsVersion property can be removed as well.

+CPluginSettings::CPluginSettings() : m_dwWorkingThreadId(0), m_isPluginEnabledTab(true)
 {
   s_instance = NULL;
 
   m_WindowsBuildNumber = 0;
 
 #ifdef SUPPORT_WHITELIST
   ClearWhitelist();
 #endif
 }
 
@@ skipping 158 matching lines @@
   }
 }
 bool CPluginSettings::GetPluginEnabled() const
 {
   //TODO: Query AdblockPlusEngine
   return m_isPluginEnabledTab;
 }
 
 bool CPluginSettings::GetStatusBarAsked()
 {
-  std::wstring res = CPluginClient::GetInstance()->GetPref(L"statusbarasked");
-  return res == L"true";

[Wladimir Palant, 2013/07/11 12:53:10]

As mentioned before, the lack of type safety here is saddening - particularly
considering that both the prefs API and the engine communication protocol are
type-safe.

+  return CPluginClient::GetInstance()->GetPref(L"statusbarasked", false);
 }
 
 void CPluginSettings::SetStatusBarAsked()
 {
-  CPluginClient::GetInstance()->SetPref(L"statusbarasked", L"true");
+  CPluginClient::GetInstance()->SetPref(L"statusbarasked", true);
 }
 
 
 void CPluginSettings::AddError(const CString& error, const CString& errorCode)
 {
   DEBUG_SETTINGS(L"SettingsTab::AddError error:" + error + " code:" + errorCode)
 }
 
 
 // ============================================================================
@@ skipping 116 matching lines @@
   std::vector<SubscriptionDescription> subscriptions = CPluginClient::GetInstance()->GetListedSubscriptions();
   if (subscriptions.size() > 0)
     return CString(subscriptions.front().url.c_str());
   else
     return CString(L"");
 }
 
 
 
 #endif // SUPPORT_WHITELIST