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

ExtensionSystem: Fix some clazy warnings

Browse Source 
Fix use multi-arg.
Add a context object to lambda connections.

Change-Id: I02711c9ecc55188fb174895f7df59f25effd0834
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Jarek Kobus
2022-12-07 01:01:14 +01:00
parent 0b9711b9c5
commit 36ffacabe7
3 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1419,11 +1419,12 @@ bool PluginManagerPrivate::loadQueue(PluginSpec *spec,
spec->d->errorString += QLatin1Char('\n'); spec->d->errorString += QLatin1Char('\n');
int index = circularityCheckQueue.indexOf(spec); int index = circularityCheckQueue.indexOf(spec);
for (int i = index; i < circularityCheckQueue.size(); ++i) { for (int i = index; i < circularityCheckQueue.size(); ++i) {
const PluginSpec *depSpec = circularityCheckQueue.at(i);
spec->d->errorString.append(PluginManager::tr("%1 (%2) depends on") spec->d->errorString.append(PluginManager::tr("%1 (%2) depends on")
.arg(circularityCheckQueue.at(i)->name()).arg(circularityCheckQueue.at(i)->version())); .arg(depSpec->name(), depSpec->version()));
spec->d->errorString += QLatin1Char('\n'); spec->d->errorString += QLatin1Char('\n');
} }
spec->d->errorString.append(PluginManager::tr("%1 (%2)").arg(spec->name()).arg(spec->version())); spec->d->errorString.append(PluginManager::tr("%1 (%2)").arg(spec->name(), spec->version()));
return false; return false;
} }
circularityCheckQueue.append(spec); circularityCheckQueue.append(spec);
@@ -1445,7 +1446,7 @@ bool PluginManagerPrivate::loadQueue(PluginSpec *spec,
spec->d->hasError = true; spec->d->hasError = true;
spec->d->errorString = spec->d->errorString =
PluginManager::tr("Cannot load plugin because dependency failed to load: %1 (%2)\nReason: %3") PluginManager::tr("Cannot load plugin because dependency failed to load: %1 (%2)\nReason: %3")
.arg(depSpec->name()).arg(depSpec->version()).arg(depSpec->errorString()); .arg(depSpec->name(), depSpec->version(), depSpec->errorString());
return false; return false;
} }
} }
@@ -1593,7 +1594,7 @@ void PluginManagerPrivate::loadPlugin(PluginSpec *spec, PluginSpec::State destSt
spec->d->hasError = true; spec->d->hasError = true;
spec->d->errorString = spec->d->errorString =
PluginManager::tr("Cannot load plugin because dependency failed to load: %1(%2)\nReason: %3") PluginManager::tr("Cannot load plugin because dependency failed to load: %1(%2)\nReason: %3")
.arg(depSpec->name()).arg(depSpec->version()).arg(depSpec->errorString()); .arg(depSpec->name(), depSpec->version(), depSpec->errorString());
return; return;
} }
} }

2
src/libs/extensionsystem/pluginspec.cpp
View File

@@ -1008,7 +1008,7 @@ bool PluginSpecPrivate::resolveDependencies(const QVector<PluginSpec *> &specs)
if (!errorString.isEmpty()) if (!errorString.isEmpty())
errorString.append(QLatin1Char('\n')); errorString.append(QLatin1Char('\n'));
errorString.append(QCoreApplication::translate("PluginSpec", "Could not resolve dependency '%1(%2)'") errorString.append(QCoreApplication::translate("PluginSpec", "Could not resolve dependency '%1(%2)'")
.arg(dependency.name).arg(dependency.version)); .arg(dependency.name, dependency.version));
} }
continue; continue;
} }

16
src/libs/extensionsystem/pluginview.cpp
View File

@@ -303,10 +303,10 @@ PluginView::PluginView(QWidget *parent)
connect(PluginManager::instance(), &PluginManager::pluginsChanged, connect(PluginManager::instance(), &PluginManager::pluginsChanged,
this, &PluginView::updatePlugins); this, &PluginView::updatePlugins);
connect(m_categoryView, &QAbstractItemView::activated, connect(m_categoryView, &QAbstractItemView::activated, this,
[this](const QModelIndex &idx) { emit pluginActivated(pluginForIndex(idx)); }); [this](const QModelIndex &idx) { emit pluginActivated(pluginForIndex(idx)); });
connect(m_categoryView->selectionModel(), &QItemSelectionModel::currentChanged, connect(m_categoryView->selectionModel(), &QItemSelectionModel::currentChanged, this,
[this](const QModelIndex &idx) { emit currentPluginChanged(pluginForIndex(idx)); }); [this](const QModelIndex &idx) { emit currentPluginChanged(pluginForIndex(idx)); });
updatePlugins(); updatePlugins();
@@ -386,12 +386,12 @@ bool PluginView::setPluginsEnabled(const QSet<PluginSpec *> &plugins, bool enabl
if (!additionalPlugins.isEmpty()) { if (!additionalPlugins.isEmpty()) {
if (QMessageBox::question(this, tr("Enabling Plugins"), if (QMessageBox::question(this, tr("Enabling Plugins"),
tr("Enabling\n%1\nwill also enable the following plugins:\n\n%2") tr("Enabling\n%1\nwill also enable the following plugins:\n\n%2")
.arg(pluginListString(plugins)) .arg(pluginListString(plugins), pluginListString(additionalPlugins)),
.arg(pluginListString(additionalPlugins)),
QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok | QMessageBox::Cancel,
QMessageBox::Ok) != QMessageBox::Ok) QMessageBox::Ok) != QMessageBox::Ok) {
return false; return false;
} }
}
} else { } else {
for (PluginSpec *spec : plugins) { for (PluginSpec *spec : plugins) {
for (PluginSpec *other : PluginManager::pluginsRequiringPlugin(spec)) { for (PluginSpec *other : PluginManager::pluginsRequiringPlugin(spec)) {
@@ -403,13 +403,13 @@ bool PluginView::setPluginsEnabled(const QSet<PluginSpec *> &plugins, bool enabl
if (!additionalPlugins.isEmpty()) { if (!additionalPlugins.isEmpty()) {
if (QMessageBox::question(this, tr("Disabling Plugins"), if (QMessageBox::question(this, tr("Disabling Plugins"),
tr("Disabling\n%1\nwill also disable the following plugins:\n\n%2") tr("Disabling\n%1\nwill also disable the following plugins:\n\n%2")
.arg(pluginListString(plugins)) .arg(pluginListString(plugins), pluginListString(additionalPlugins)),
.arg(pluginListString(additionalPlugins)),
QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok | QMessageBox::Cancel,
QMessageBox::Ok) != QMessageBox::Ok) QMessageBox::Ok) != QMessageBox::Ok) {
return false; return false;
} }
} }
}
const QSet<PluginSpec *> affectedPlugins = plugins + additionalPlugins; const QSet<PluginSpec *> affectedPlugins = plugins + additionalPlugins;
for (PluginSpec *spec : affectedPlugins) { for (PluginSpec *spec : affectedPlugins) {