Cleanup

src/plugin/PluginTabBase.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginClient.h"
 #include "PluginSettings.h"
 #ifdef SUPPORT_CONFIG
 #include "PluginConfig.h"
 #endif
 #include "PluginTab.h"
 #include "PluginDomTraverser.h"
 #include "PluginClass.h"
@@ skipping 77 matching lines @@
   m_isActivated = true;
 }
 
 
 void CPluginTabBase::OnUpdate()
 {
   m_isActivated = true;
 }
 
 
-bool CPluginTabBase::OnUpdateSettings(bool forceUpdate)
-{
-  bool isUpdated = false;
-
-  CPluginSettings* settings = CPluginSettings::GetInstance();
-
-  int newSettingsVersion = settings->GetTabVersion(SETTING_TAB_SETTINGS_VERSION);
-  if ((s_settingsVersion != newSettingsVersion) || (forceUpdate))
-  {
-    s_settingsVersion = newSettingsVersion;
-    if (!settings->IsMainProcess())
-    {
-      settings->Read();
-
-      isUpdated = true;
-    }
-  }
-
-  return isUpdated;
-}
-
-bool CPluginTabBase::OnUpdateConfig()
-{
-  bool isUpdated = false;
-
-#ifdef SUPPORT_CONFIG
-  CPluginSettings* settings = CPluginSettings::GetInstance();
-
-  int newConfigVersion = settings->GetTabVersion(SETTING_TAB_CONFIG_VERSION);
-  if (s_configVersion != newConfigVersion)
-  {
-    s_configVersion = newConfigVersion;
-    isUpdated = true;
-  }
-
-#endif // SUPPORT_CONFIG
-
-  return isUpdated;
-}
-
-
 void CPluginTabBase::OnNavigate(const CString& url)
 {
   SetDocumentUrl(url);
 
 
 #ifdef SUPPORT_FRAME_CACHING
   ClearFrameCache(GetDocumentDomain());
 #endif
 
   std::wstring domainString = GetDocumentDomain();
@@ skipping 198 matching lines @@
   threadInfo.Format(L"%d.%d", ::GetCurrentProcessId(), ::GetCurrentThreadId());
 
   CString debugText;
 
   debugText += L"================================================================================";
   debugText += L"\nTAB THREAD " + threadInfo;
   debugText += L"\n================================================================================";
 
   DEBUG_GENERAL(debugText)
 
-  CPluginClient* client = CPluginClient::GetInstance();
-
-  client->SetLocalization();
-
-  // Force loading/creation of config
-#ifdef SUPPORT_CONFIG
-  CPluginConfig* config = CPluginConfig::GetInstance();
-
-
-#endif // SUPPORT_CONFIG
-
   // --------------------------------------------------------------------
   // Tab loop
   // --------------------------------------------------------------------
 
   DWORD loopCount = 0;
   DWORD tabLoopIteration = 1;
 
   while (!tab->m_isThreadDone)
   {
 #ifdef ENABLE_DEBUG_THREAD
     CStringA sTabLoopIteration;
     sTabLoopIteration.Format("%u", tabLoopIteration);
 
     DEBUG_THREAD("--------------------------------------------------------------------------------")
       DEBUG_THREAD("Loop iteration " + sTabLoopIteration);
     DEBUG_THREAD("--------------------------------------------------------------------------------")
 #endif
-      // Update settings from file
       if (tab->m_isActivated)
       {
         bool isChanged = false;
 
-        settings->RefreshTab();
-
-        tab->OnUpdateSettings(false);
-
-        int newDictionaryVersion = settings->GetTabVersion(SETTING_TAB_DICTIONARY_VERSION);
-        if (s_dictionaryVersion != newDictionaryVersion)
-        {
-          s_dictionaryVersion = newDictionaryVersion;
-          client->SetLocalization();
-          isChanged = true;
-        }
-
-        isChanged = tab->OnUpdateConfig() ? true : isChanged;
-
-#ifdef SUPPORT_WHITELIST
-        int newWhitelistVersion = settings->GetTabVersion(SETTING_TAB_WHITELIST_VERSION);
-        if (s_whitelistVersion != newWhitelistVersion)
-        {
-          s_whitelistVersion = newWhitelistVersion;
-          settings->RefreshWhitelist();
-          isChanged = true;
-        }
-#endif // SUPPORT_WHITELIST
-
-#ifdef SUPPORT_FILTER
-        int newFilterVersion = settings->GetTabVersion(SETTING_TAB_FILTER_VERSION);
-        if (s_filterVersion != newFilterVersion)
-        {
-          s_filterVersion = newFilterVersion;
-          isChanged = true;
-        }
-#endif
         if (isChanged)
         {
           tab->m_plugin->UpdateStatusBar();
         }
 
         tab->m_isActivated = false;
       }
 
       // --------------------------------------------------------------------
       // End loop
@@ skipping 11 matching lines @@
 
         // Non-hanging sleep
         Sleep(50);
       }
 
       tabLoopIteration++;
   }
 
   return 0;
 }