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

src/plugin/PluginClass.cpp

 #include "PluginStdAfx.h"
 
 #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"
 #include "PluginMutex.h"
 #include "sddl.h"
 #include "PluginUtil.h"
 #include "PluginUserSettings.h"
 #include "../shared/Utils.h"
 #include "../shared/Dictionary.h"
 #include <thread>
@@ skipping 18 matching lines @@
 ATOM CPluginClass::s_atomPaneClass = NULL;
 HINSTANCE CPluginClass::s_hUxtheme = NULL;
 std::set<CPluginClass*> CPluginClass::s_instances;
 std::map<DWORD, CPluginClass*> CPluginClass::s_threadInstances;
 
 CComAutoCriticalSection CPluginClass::s_criticalSectionLocal;
 CComAutoCriticalSection CPluginClass::s_criticalSectionBrowser;
 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
  * See http://msdn.microsoft.com/en-us/library/windows/desktop/dd162898(v=vs.85).aspx
  */
 namespace AdblockPlus
 {
   /**
     * Replacement for ATL type CRect.
     */
@@ skipping 521 matching lines @@
 
 #ifdef ENABLE_DEBUG_RESULT
       CPluginDebug::DebugResultDomain(url);
 #endif
 
     UpdateStatusBar();
   }
   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)
 {
   DEBUG_GENERAL("Tab changed");
   bool newtabshown = pDispParams->rgvarg[1].intVal==3;
   if (newtabshown)
   {
     std::map<DWORD,CPluginClass*>::const_iterator it = s_threadInstances.find(GetCurrentThreadId());
     if (it == s_threadInstances.end())
@@ skipping 764 matching lines @@
 
 
 bool CPluginClass::SetMenuBar(HMENU hMenu, const CString& url)
 {
   DEBUG_GENERAL("SetMenuBar");
 
   std::wstring ctext;
 
   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;
   memset(&fmii, 0, sizeof(MENUITEMINFO));
   fmii.cbSize = sizeof(MENUITEMINFO);
 
   MENUITEMINFOW miiSep;
   memset(&miiSep, 0, sizeof(MENUITEMINFO));
   miiSep.cbSize = sizeof(MENUITEMINFO);
   miiSep.fMask = MIIM_TYPE | MIIM_FTYPE;
   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?
     ReplaceString(ctext, L"?1?", client->GetHostFromUrl(url.GetString()));
     if (client->IsWhitelistedUrl(std::wstring(GetTab()->GetDocumentUrl())))
     {
       fmii.fState = MFS_CHECKED | MFS_ENABLED;
     }
     else
     {
       fmii.fState = MFS_UNCHECKED | MFS_ENABLED;
     }
     fmii.fMask = MIIM_STRING | MIIM_STATE;
     fmii.dwTypeData = const_cast<LPWSTR>(ctext.c_str());
     fmii.cch = static_cast<UINT>(ctext.size());
 
     ::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");
   fmii.fMask  = MIIM_STATE | MIIM_STRING;
   fmii.fState = client ? MFS_ENABLED : MFS_DISABLED;
   fmii.dwTypeData = const_cast<LPWSTR>(ctext.c_str());
   fmii.cch = static_cast<UINT>(ctext.size());
   ::SetMenuItemInfoW(hMenu, ID_MENU_UPDATE, FALSE, &fmii);
 
 
@@ skipping 190 matching lines @@
 
 HICON CPluginClass::GetStatusBarIcon(const CString& url)
 {
   // use the disable icon as defualt, if the client doesn't exists
   HICON hIcon = GetIcon(ICON_PLUGIN_DEACTIVATED);
 
   CPluginTab* tab = GetTab(::GetCurrentThreadId());
   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;
 }
 
 
 LRESULT CALLBACK CPluginClass::PaneWindowProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
   // Find tab
   CPluginClass *pClass = FindInstance(GetParent(hWnd));
   if (!pClass)
   {
@@ skipping 318 matching lines @@
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
 
   return hTabWnd;
 
 }