aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2020-11-18 12:25:51 +0100
committerJarek Kobus <jaroslaw.kobus@qt.io>2020-11-20 12:25:31 +0000
commitc9f5ce51e0d21d428054a5e7a792f2f1a3435325 (patch)
treedaa610d40a76b61e1c7d5350677414a135813416 /src
parentf7fa53d29bc7b496b9f27d74a637248d0aa828b4 (diff)
Don't use iterators to temporary containers
Fix a clazy warning, like: Don't call QVector::begin() on temporary [clazy-temporary-iterator] Indeed, we may pass begin and end iterators for 2 different instances of temporary vector (shared though). In addition: use const iterators. Change-Id: Iac1055d9fc226f1b48ca72ee4f3aab433addfe7f Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.cpp8
-rw-r--r--src/plugins/qmlpreview/qmldebugtranslationwidget.cpp6
-rw-r--r--src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp13
3 files changed, 12 insertions, 15 deletions
diff --git a/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.cpp b/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.cpp
index e0d55eb21a..95440ae077 100644
--- a/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.cpp
+++ b/src/plugins/qmldesigner/qmlpreviewplugin/qmlpreviewplugin.cpp
@@ -166,15 +166,13 @@ void QmlPreviewPlugin::setLanguageLocale(const QString &locale)
QObject *QmlPreviewPlugin::getPreviewPlugin()
{
- const QVector<ExtensionSystem::PluginSpec *> specs = ExtensionSystem::PluginManager::plugins();
-
- auto pluginIt = std::find_if(specs.begin(),
- specs.end(),
+ const QVector<ExtensionSystem::PluginSpec *> &specs = ExtensionSystem::PluginManager::plugins();
+ const auto pluginIt = std::find_if(specs.cbegin(), specs.cend(),
[](const ExtensionSystem::PluginSpec *p) {
return p->name() == "QmlPreview";
});
- if (pluginIt != specs.end())
+ if (pluginIt != specs.cend())
return (*pluginIt)->plugin();
return nullptr;
diff --git a/src/plugins/qmlpreview/qmldebugtranslationwidget.cpp b/src/plugins/qmlpreview/qmldebugtranslationwidget.cpp
index 2b5f7512c9..47bc6ec4b8 100644
--- a/src/plugins/qmlpreview/qmldebugtranslationwidget.cpp
+++ b/src/plugins/qmlpreview/qmldebugtranslationwidget.cpp
@@ -76,13 +76,13 @@
namespace {
QObject *getPreviewPlugin()
{
- auto pluginIt = std::find_if(ExtensionSystem::PluginManager::plugins().begin(),
- ExtensionSystem::PluginManager::plugins().end(),
+ const QVector<ExtensionSystem::PluginSpec *> &specs = ExtensionSystem::PluginManager::plugins();
+ const auto pluginIt = std::find_if(specs.cbegin(), specs.cend(),
[](const ExtensionSystem::PluginSpec *p) {
return p->name() == "QmlPreview";
});
- if (pluginIt != ExtensionSystem::PluginManager::plugins().constEnd())
+ if (pluginIt != specs.cend())
return (*pluginIt)->plugin();
return nullptr;
diff --git a/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp b/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp
index 997850f152..7905893271 100644
--- a/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp
+++ b/src/plugins/qmlprojectmanager/qmlmultilanguageaspect.cpp
@@ -35,13 +35,12 @@
static bool isMultilanguagePresent()
{
- const QVector<ExtensionSystem::PluginSpec *> specs = ExtensionSystem::PluginManager::plugins();
- return std::find_if(specs.begin(),
- specs.end(),
+ const QVector<ExtensionSystem::PluginSpec *> &specs = ExtensionSystem::PluginManager::plugins();
+ return std::find_if(specs.cbegin(), specs.cend(),
[](ExtensionSystem::PluginSpec *spec) {
return spec->name() == "MultiLanguage";
})
- != specs.end();
+ != specs.cend();
}
static Utils::FilePath getMultilanguageDatabaseFilePath(ProjectExplorer::Target *target)
@@ -57,13 +56,13 @@ static Utils::FilePath getMultilanguageDatabaseFilePath(ProjectExplorer::Target
static QObject *getPreviewPlugin()
{
- auto pluginIt = std::find_if(ExtensionSystem::PluginManager::plugins().begin(),
- ExtensionSystem::PluginManager::plugins().end(),
+ const QVector<ExtensionSystem::PluginSpec *> &specs = ExtensionSystem::PluginManager::plugins();
+ const auto pluginIt = std::find_if(specs.cbegin(), specs.cend(),
[](const ExtensionSystem::PluginSpec *p) {
return p->name() == "QmlPreview";
});
- if (pluginIt != ExtensionSystem::PluginManager::plugins().constEnd())
+ if (pluginIt != specs.cend())
return (*pluginIt)->plugin();
return nullptr;