diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-10-17 16:38:12 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-10-25 09:27:12 +0000 |
| commit | 779002b14dc2e9e4eb22f2c2c243f3da12fa4c72 (patch) | |
| tree | e9f638f4d0ee4730ce9d916a754c48737b155c00 | |
| parent | d05880e92fbc54618265877c00618f1394d29d47 (diff) | |
| download | qttools-779002b14dc2e9e4eb22f2c2c243f3da12fa4c72.tar.gz | |
Qt Designer: Fix clazy-strict-iterators
Change-Id: I6a75c9e29e2c789ac12d9d7b065ec502a322683c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| -rw-r--r-- | src/designer/src/lib/shared/qtresourcemodel.cpp | 4 | ||||
| -rw-r--r-- | src/designer/src/lib/shared/qtresourceview.cpp | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/designer/src/lib/shared/qtresourcemodel.cpp b/src/designer/src/lib/shared/qtresourcemodel.cpp index 92c15cd36..4b08f3670 100644 --- a/src/designer/src/lib/shared/qtresourcemodel.cpp +++ b/src/designer/src/lib/shared/qtresourcemodel.cpp @@ -473,7 +473,7 @@ QStringList QtResourceModel::loadedQrcFiles() const bool QtResourceModel::isModified(const QString &path) const { - QMap<QString, bool>::const_iterator it = d_ptr->m_pathToModified.find(path); + QMap<QString, bool>::const_iterator it = d_ptr->m_pathToModified.constFind(path); if (it != d_ptr->m_pathToModified.constEnd()) return it.value(); return true; @@ -481,7 +481,7 @@ bool QtResourceModel::isModified(const QString &path) const void QtResourceModel::setModified(const QString &path) { - QMap<QString, bool>::const_iterator itMod = d_ptr->m_pathToModified.find(path); + QMap<QString, bool>::const_iterator itMod = d_ptr->m_pathToModified.constFind(path); if (itMod == d_ptr->m_pathToModified.constEnd()) return; diff --git a/src/designer/src/lib/shared/qtresourceview.cpp b/src/designer/src/lib/shared/qtresourceview.cpp index a64b99000..00a656410 100644 --- a/src/designer/src/lib/shared/qtresourceview.cpp +++ b/src/designer/src/lib/shared/qtresourceview.cpp @@ -658,13 +658,14 @@ void QtResourceView::selectResource(const QString &resource) if (fi.isDir()) dir = QDir(resource); QString dirPath = dir.absolutePath(); - QMap<QString, QTreeWidgetItem *>::const_iterator it; - while ((it = d_ptr->m_pathToItem.find(dirPath)) == d_ptr->m_pathToItem.constEnd()) { + const auto cend = d_ptr->m_pathToItem.constEnd(); + auto it = cend; + while ((it = d_ptr->m_pathToItem.constFind(dirPath)) == cend) { if (!dir.cdUp()) break; dirPath = dir.absolutePath(); } - if (it != d_ptr->m_pathToItem.constEnd()) { + if (it != cend) { QTreeWidgetItem *treeItem = it.value(); d_ptr->m_treeWidget->setCurrentItem(treeItem); d_ptr->m_treeWidget->scrollToItem(treeItem); |