Noissue - Dead code removal

src/plugin/PluginClass.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginClass.h"
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #include "PluginFilter.h"
 #include "PluginMimeFilterClient.h"
 #include "PluginClient.h"
 #include "PluginClientFactory.h"
 #include "PluginMutex.h"
@@ skipping 1339 matching lines @@
             DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION_SETTINGS, "Navigation::Failed")
           }
         }
       }
       break;
     }
   case ID_MENU_DISABLE_ON_SITE:
     {
       CPluginSettings* settings = CPluginSettings::GetInstance();
       CString urlString = GetTab()->GetDocumentUrl();
-      if (client->IsWhitelistedUrl(std::wstring(urlString)))
-      {
-        settings->RemoveWhiteListedDomain(client->GetHostFromUrl(urlString.GetString()).c_str());
+      if (client->IsWhitelistedUrl(to_wstring(urlString)))
+      {
+        settings->RemoveWhiteListedDomain(to_CString(client->GetHostFromUrl(to_wstring(urlString))));
       }
       else
       {
-        settings->AddWhiteListedDomain(client->GetHostFromUrl(urlString.GetString()).c_str());
+        settings->AddWhiteListedDomain(to_CString(client->GetHostFromUrl(to_wstring(urlString))));
       }
       GetBrowser()->Refresh();
     }
   default:
     break;
   }
 
   // Invalidate and redraw the control
   UpdateStatusBar();
 }
@@ skipping 14 matching lines @@
   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();
   {
     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())))
+    ReplaceString(ctext, L"?1?", client->GetHostFromUrl(to_wstring(url)));
+    if (client->IsWhitelistedUrl(to_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());
@@ skipping 203 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();
-    if (client->IsWhitelistedUrl(std::wstring(url)))

[Oleksandr, 2014/10/03 08:19:59]

This should still run only if plugin is enabled. I must've miss communicated
what can be removed. Only the empty 'if' block is weird here. Should be 
if (CPluginSettings::GetInstance()->IsPluginEnabled())
{
  if (client->IsWhitelistedUrl(...))
  {
  }
  else
   ...
}

[Eric, 2014/10/07 15:57:49]

Done.

-    {
-      hIcon = GetIcon(ICON_PLUGIN_DISABLED);
-    }
-    else
-    {
-      CPluginSettings* settings = CPluginSettings::GetInstance();
-      hIcon = GetIcon(ICON_PLUGIN_ENABLED);
+    if (CPluginSettings::GetInstance()->IsPluginEnabled())
+    {
+      if (client->IsWhitelistedUrl(to_wstring(url)))
+      {
+        hIcon = GetIcon(ICON_PLUGIN_DISABLED);
+      }
+      else
+      {
+        CPluginSettings* settings = CPluginSettings::GetInstance();
+        hIcon = GetIcon(ICON_PLUGIN_ENABLED);
+      }
     }
   }
   return hIcon;
 }
 
 
 LRESULT CALLBACK CPluginClass::PaneWindowProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
   // Find tab
   CPluginClass *pClass = FindInstance(GetParent(hWnd));
@@ skipping 320 matching lines @@
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
 
   return hTabWnd;
 
 }