feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Rename PluginSpec::isEnabled() into isEnabledInSettings

Browse Source 
This is what it actually is.

Change-Id: I2ea2e77edc3fd80eb1e25156edc7a59e86dfac9a
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
This commit is contained in:
Daniel Teske
2013-02-12 13:15:05 +01:00
parent 80263a5221
commit 89126edfab
6 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/extensionsystem/pluginmanager.cpp
View File

@@ -335,7 +335,7 @@ bool PluginManager::hasError()
{
foreach (PluginSpec *spec, plugins()) {
// only show errors on startup if plugin is enabled.
if (spec->hasError() && spec->isEnabled() && !spec->isDisabledIndirectly())
if (spec->hasError() && spec->isEnabledInSettings() && !spec->isDisabledIndirectly())
return true;
}
return false;
@@ -882,9 +882,9 @@ void PluginManagerPrivate::writeSettings()
QStringList tempDisabledPlugins;
QStringList tempForceEnabledPlugins;
foreach (PluginSpec *spec, pluginSpecs) {
if (!spec->isDisabledByDefault() && !spec->isEnabled())
if (!spec->isDisabledByDefault() && !spec->isEnabledInSettings())
tempDisabledPlugins.append(spec->name());
if (spec->isDisabledByDefault() && spec->isEnabled())
if (spec->isDisabledByDefault() && spec->isEnabledInSettings())
tempForceEnabledPlugins.append(spec->name());
}
@@ -1120,7 +1120,7 @@ void PluginManagerPrivate::loadPlugin(PluginSpec *spec, PluginSpec::State destSt
return;
// don't load disabled plugins.
if ((spec->isDisabledIndirectly() || !spec->isEnabled()) && destState == PluginSpec::Loaded)
if ((spec->isDisabledIndirectly() || !spec->isEnabledInSettings()) && destState == PluginSpec::Loaded)
return;
switch (destState) {