Issue #1158 - removed unnecessary definitions and #ifdef/#else/#endif sections

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(const CString domain)
   {
     return std::wstring(L"@@||") + domain.GetString() + std::wstring(L"^$document");
   }
 }
 
 class TSettings
 {
   DWORD processorId;
 
   char sPluginId[44];
 };
 
-#ifdef SUPPORT_WHITELIST
-
 class CPluginSettingsWhitelistLock : public CPluginMutex
 {
 public:
   CPluginSettingsWhitelistLock() : CPluginMutex(L"SettingsFileWhitelist", PLUGIN_ERROR_MUTEX_SETTINGS_FILE_WHITELIST) {}
   ~CPluginSettingsWhitelistLock() {}
 };
 
-#endif
-
 CPluginSettings* CPluginSettings::s_instance = NULL;
-
 CComAutoCriticalSection CPluginSettings::s_criticalSectionLocal;
 
-
 CPluginSettings::CPluginSettings() : m_dwWorkingThreadId(0)
 {
   s_instance = NULL;
-
   m_WindowsBuildNumber = 0;
-
-#ifdef SUPPORT_WHITELIST
   ClearWhitelist();
-#endif
 }
 
-
 CPluginSettings::~CPluginSettings()
 {
   s_instance = NULL;
 }
 
-
 CPluginSettings* CPluginSettings::GetInstance()
 {
   CPluginSettings* instance = NULL;
 
   s_criticalSectionLocal.Lock();
   {
     if (!s_instance)
     {
       s_instance = new CPluginSettings();
     }
@@ skipping 74 matching lines @@
 void CPluginSettings::AddError(const CString& error, const CString& errorCode)
 {
   DEBUG_SETTINGS(L"SettingsTab::AddError error:" + error + " code:" + errorCode)
 }
 
 
 // ============================================================================
 // Whitelist settings
 // ============================================================================
 
-#ifdef SUPPORT_WHITELIST
-
 void CPluginSettings::ClearWhitelist()
 {
   s_criticalSectionLocal.Lock();
   {
     m_whitelistedDomains.clear();
   }
   s_criticalSectionLocal.Unlock();
 }
 
-
 bool CPluginSettings::ReadWhitelist(bool isDebug)
 {
   bool isRead = true;
 
   DEBUG_SETTINGS("SettingsWhitelist::Read")
 
     if (isDebug)
     {
       DEBUG_GENERAL("*** Loading whitelist settings");
     }
 
     CPluginSettingsWhitelistLock lock;
     if (lock.IsLocked())
     {
       ClearWhitelist();
 
       s_criticalSectionLocal.Lock();
       m_whitelistedDomains = CPluginClient::GetInstance()->GetExceptionDomains();
       s_criticalSectionLocal.Unlock();
     }
     else
     {
       isRead = false;
     }
 
     return isRead;
 }
 
-
 void CPluginSettings::AddWhiteListedDomain(const CString& domain)
 {
   DEBUG_SETTINGS("SettingsWhitelist::AddWhiteListedDomain domain:" + domain)
   CPluginClient::GetInstance()->AddFilter(CreateDomainWhitelistingFilter(domain));
 }
 
 void CPluginSettings::RemoveWhiteListedDomain(const CString& domain)
 {
   DEBUG_SETTINGS("SettingsWhitelist::RemoveWhiteListedDomain domain:" + domain)
   CPluginClient::GetInstance()->RemoveFilter(CreateDomainWhitelistingFilter(domain));
 }
 
 int CPluginSettings::GetWhiteListedDomainCount() const
 {
   int count = 0;
 
   s_criticalSectionLocal.Lock();
   {
     count = (int)m_whitelistedDomains.size();
   }
   s_criticalSectionLocal.Unlock();
 
   return count;
 }
 
-
 std::vector<std::wstring> CPluginSettings::GetWhiteListedDomainList()
 {
   bool r = ReadWhitelist(false);
   return m_whitelistedDomains;
 }
 
 
 bool CPluginSettings::RefreshWhitelist()
 {
   CPluginSettingsWhitelistLock lock;
@@ skipping 48 matching lines @@
 
 CString CPluginSettings::GetAppLocale()
 {
   return to_CString(GetBrowserLanguage());
 }
 
 CString CPluginSettings::GetDocumentationLink()
 {
   return CString(CPluginClient::GetInstance()->GetDocumentationLink().c_str());
 }
-
-
-
-#endif // SUPPORT_WHITELIST