Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: src/plugin/PluginTabBase.cpp

Issue 11013110: Cleanup (Closed)
Patch Set: Whole cleanup + comments addressed Created July 23, 2013, 11:34 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/plugin/PluginTabBase.cpp
===================================================================
--- a/src/plugin/PluginTabBase.cpp
+++ b/src/plugin/PluginTabBase.cpp
@@ -95,47 +95,6 @@
}
-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);
@@ -354,17 +313,6 @@
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
// --------------------------------------------------------------------
@@ -382,43 +330,10 @@
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();

Powered by Google App Engine
This is Rietveld