From 3dfb402706198b059a6e853dcb767bfd400d492f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Wed, 11 May 2011 19:48:58 +0200
Subject: [PATCH] Avoid using values() to iterate over QMap/QHash containers
It's more performant to iterate over the values directly than to first
stick them into a new container.
Reviewed-by: Thomas Hartmann
---
.../components/itemlibrary/itemlibrarymodel.cpp | 2 +-
.../designercore/instances/nodeinstanceserver.cpp | 7 +++----
.../qmldesigner/designercore/metainfo/itemlibraryinfo.cpp | 2 +-
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
index 8175c7f8b88..2402aa5020d 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
@@ -301,7 +301,7 @@ bool ItemLibrarySectionModel::updateSectionVisibility(const QString &searchText,
void ItemLibrarySectionModel::updateItemIconSize(const QSize &itemIconSize)
{
- foreach (ItemLibraryItemModel *item, m_sectionEntries.elements().values()) {
+ foreach (ItemLibraryItemModel *item, m_sectionEntries.elements()) {
item->setItemIconSize(itemIconSize);
}
}
diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserver.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserver.cpp
index b80c9dc16ab..2d353955881 100644
--- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserver.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserver.cpp
@@ -535,7 +535,7 @@ void NodeInstanceServer::removeAllInstanceRelationships()
{
// prevent destroyed() signals calling back
- foreach (ServerNodeInstance instance, m_objectInstanceHash.values()) {
+ foreach (ServerNodeInstance instance, m_objectInstanceHash) {
if (instance.isValid())
instance.setId(QString());
}
@@ -547,7 +547,7 @@ void NodeInstanceServer::removeAllInstanceRelationships()
rootNodeInstance().makeInvalid();
- foreach (ServerNodeInstance instance, m_objectInstanceHash.values()) {
+ foreach (ServerNodeInstance instance, m_objectInstanceHash) {
if (instance.internalObject())
instance.internalObject()->disconnect();
instance.makeInvalid();
@@ -601,8 +601,7 @@ void NodeInstanceServer::removeFilePropertyFromFileSystemWatcher(QObject *object
void NodeInstanceServer::refreshLocalFileProperty(const QString &path)
{
if (m_fileSystemWatcherHash.contains(path)) {
- QList<ObjectPropertyPair> objectPropertyPairList = m_fileSystemWatcherHash.values();
- foreach(const ObjectPropertyPair &objectPropertyPair, objectPropertyPairList) {
+ foreach(const ObjectPropertyPair &objectPropertyPair, m_fileSystemWatcherHash) {
QObject *object = objectPropertyPair.first.data();
QString propertyName = objectPropertyPair.second;
diff --git a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp
index 3dee90ae683..f9ab9eb9971 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp
@@ -254,7 +254,7 @@ QList<ItemLibraryEntry> ItemLibraryInfo::entriesForType(const QString &typeName,
{
QList<ItemLibraryEntry> entries;
- foreach (const ItemLibraryEntry &entry, m_d->nameToEntryHash.values()) {
+ foreach (const ItemLibraryEntry &entry, m_d->nameToEntryHash) {
if (entry.typeName() == typeName
&& entry.majorVersion() >= majorVersion
&& entry.minorVersion() >= minorVersion)
--
GitLab