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

PluginSpec: Naming and encapsulation improvements

Browse Source 
Prefer enabled state as a property as opposed to disabled state, and
make setter correspond to getter. Also move setters into private.

Change-Id: I5d002a12f4e540d5b38cc5865490d056ec75f296
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Eike Ziller
2015-03-31 09:55:50 +02:00
parent fcc6b11230
commit d456fd0b8a
7 changed files with 72 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -376,7 +376,7 @@ bool PluginManager::hasError()
{
foreach (PluginSpec *spec, plugins()) {
// only show errors on startup if plugin is enabled.
if (spec->hasError() && spec->isEnabledInSettings() && !spec->isDisabledIndirectly())
if (spec->hasError() && spec->isEnabledBySettings() && !spec->isDisabledIndirectly())
return true;
}
return false;
@@ -820,9 +820,9 @@ void PluginManagerPrivate::writeSettings()
QStringList tempDisabledPlugins;
QStringList tempForceEnabledPlugins;
foreach (PluginSpec *spec, pluginSpecs) {
if (!spec->isDisabledByDefault() && !spec->isEnabledInSettings())
if (spec->isEnabledByDefault() && !spec->isEnabledBySettings())
tempDisabledPlugins.append(spec->name());
if (spec->isDisabledByDefault() && spec->isEnabledInSettings())
if (!spec->isEnabledByDefault() && spec->isEnabledBySettings())
tempForceEnabledPlugins.append(spec->name());
}
@@ -1398,17 +1398,17 @@ void PluginManagerPrivate::readPluginPaths()
}
// defaultDisabledPlugins and defaultEnabledPlugins from install settings
// is used to override the defaults read from the plugin spec
if (!spec->isDisabledByDefault() && defaultDisabledPlugins.contains(spec->name())) {
spec->setDisabledByDefault(true);
spec->setEnabled(false);
} else if (spec->isDisabledByDefault() && defaultEnabledPlugins.contains(spec->name())) {
spec->setDisabledByDefault(false);
spec->setEnabled(true);
if (spec->isEnabledByDefault() && defaultDisabledPlugins.contains(spec->name())) {
spec->d->setEnabledByDefault(false);
spec->d->setEnabledBySettings(false);
} else if (!spec->isEnabledByDefault() && defaultEnabledPlugins.contains(spec->name())) {
spec->d->setEnabledByDefault(true);
spec->d->setEnabledBySettings(true);
}
if (spec->isDisabledByDefault() && forceEnabledPlugins.contains(spec->name()))
spec->setEnabled(true);
if (!spec->isDisabledByDefault() && disabledPlugins.contains(spec->name()))
spec->setEnabled(false);
if (!spec->isEnabledByDefault() && forceEnabledPlugins.contains(spec->name()))
spec->d->setEnabledBySettings(true);
if (spec->isEnabledByDefault() && disabledPlugins.contains(spec->name()))
spec->d->setEnabledBySettings(false);
collection->addPlugin(spec);
pluginSpecs.append(spec);
@@ -1452,10 +1452,10 @@ void PluginManagerPrivate::enableOnlyTestedSpecs()
}
}
foreach (PluginSpec *spec, pluginSpecs)
spec->setForceDisabled(true);
spec->d->setForceDisabled(true);
foreach (PluginSpec *spec, specsForTests) {
spec->setForceDisabled(false);
spec->setForceEnabled(true);
spec->d->setForceDisabled(false);
spec->d->setForceEnabled(true);
}
}