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

src/plugin/PluginClass.cpp

Index: src/plugin/PluginClass.cpp
===================================================================
--- a/src/plugin/PluginClass.cpp
+++ b/src/plugin/PluginClass.cpp
@@ -3,9 +3,7 @@
 #include "PluginClass.h"
 #include "PluginSettings.h"
 #include "PluginSystem.h"
-#ifdef SUPPORT_FILTER
 #include "PluginFilter.h"
-#endif
 #include "PluginMimeFilterClient.h"
 #include "PluginClient.h"
 #include "PluginClientFactory.h"
@@ -44,10 +42,7 @@
 CComAutoCriticalSection CPluginClass::s_criticalSectionWindow;
 
 CComQIPtr<IWebBrowser2> CPluginClass::s_asyncWebBrowser2;
-
-#ifdef SUPPORT_WHITELIST
 std::map<UINT,CString> CPluginClass::s_menuDomains;

[Oleksandr, 2014/10/02 21:24:02]

This line can go as well

-#endif
 
 /*
  * Without namespace declaration, the identifier "Rectangle" is ambiguous
@@ -589,10 +584,7 @@
   else
   {
     DEBUG_NAVI(L"Navi::Begin navigation url:" + url)
-
-#ifdef SUPPORT_FRAME_CACHING
-      m_tab->CacheFrame(url);
-#endif
+    m_tab->CacheFrame(url);
   }
 }
 STDMETHODIMP CPluginClass::OnTabChanged(DISPPARAMS* pDispParams, WORD wFlags)
@@ -1377,13 +1369,10 @@
 
   s_criticalSectionLocal.Lock();
   {
-#ifdef SUPPORT_WHITELIST
     s_menuDomains.clear();

[Oleksandr, 2014/10/02 21:24:02]

The whole critical section lock is dummy here. s_menuDomains isn't used anywhere
now

-#endif
   }
   s_criticalSectionLocal.Unlock();
 
-
   Dictionary* dictionary = Dictionary::GetInstance();
 
   MENUITEMINFOW fmii;
@@ -1397,10 +1386,7 @@
   miiSep.fType = MFT_SEPARATOR;
 
   CPluginClient* client = CPluginClient::GetInstance();
-
   CPluginSettings* settings = CPluginSettings::GetInstance();
-
-#ifdef SUPPORT_WHITELIST
   {
     ctext = dictionary->Lookup("menu", "menu-disable-on-site");
     // Is domain in white list?
@@ -1419,11 +1405,6 @@
 
     ::SetMenuItemInfoW(hMenu, ID_MENU_DISABLE_ON_SITE, FALSE, &fmii);
   }
-#else
-  {
-    ::DeleteMenu(hMenu, ID_MENU_DISABLE_ON_SITE, FALSE);
-  }
-#endif // SUPPORT_WHITELIST
 
   // Plugin update
   ctext = dictionary->Lookup("menu", "menu-update");
@@ -1634,26 +1615,19 @@
   if (tab)
   {
     CPluginClient* client = CPluginClient::GetInstance();
-
-#ifdef PRODUCT_ADBLOCKPLUS
     if (!CPluginSettings::GetInstance()->IsPluginEnabled())
     {

[Oleksandr, 2014/10/02 21:24:02]

This is clearly a dummy 'if'. Can we remove it?

     }
-#ifdef SUPPORT_WHITELIST
     else if (client->IsWhitelistedUrl(std::wstring(url)))
     {
       hIcon = GetIcon(ICON_PLUGIN_DISABLED);
     }
-#endif // SUPPORT_WHITELIST
     else
     {
       CPluginSettings* settings = CPluginSettings::GetInstance();
       hIcon = GetIcon(ICON_PLUGIN_ENABLED);
     }
-
-#endif // PRODUCT_ADBLOCKPLUS
   }
-
   return hIcon;
 }