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

ExtensionSystem: Avoid using iterators from temporaries

Browse Source 
Doing it can lead to unexpected results

Change-Id: I602cf6a4692c9e0c0adb4564679478ea25bf8829
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Eike Ziller
2017-10-19 13:34:41 +02:00
parent 56366cfd72
commit 30f0b6857a
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -442,7 +442,7 @@ QString PluginManager::systemInformation() const
if (response.result == SynchronousProcessResponse::Finished) if (response.result == SynchronousProcessResponse::Finished)
result += response.allOutput() + "\n"; result += response.allOutput() + "\n";
result += "Plugin information:\n\n"; result += "Plugin information:\n\n";
auto longestSpec = std::max_element(plugins().cbegin(), plugins().cend(), auto longestSpec = std::max_element(d->pluginSpecs.cbegin(), d->pluginSpecs.cend(),
[](const PluginSpec *left, const PluginSpec *right) { [](const PluginSpec *left, const PluginSpec *right) {
return left->name().size() < right->name().size(); return left->name().size() < right->name().size();
}); });

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

@@ -421,8 +421,9 @@ void PluginView::updatePlugins()
QList<CollectionItem *> collections; QList<CollectionItem *> collections;
auto end = PluginManager::pluginCollections().cend(); const QHash<QString, QList<PluginSpec *>> pluginCollections = PluginManager::pluginCollections();
for (auto it = PluginManager::pluginCollections().cbegin(); it != end; ++it) { const auto end = pluginCollections.cend();
for (auto it = pluginCollections.cbegin(); it != end; ++it) {
const QString name = it.key().isEmpty() ? tr("Utilities") : it.key(); const QString name = it.key().isEmpty() ? tr("Utilities") : it.key();
collections.append(new CollectionItem(name, it.value(), this)); collections.append(new CollectionItem(name, it.value(), this));
} }