diff options
Diffstat (limited to 'src/location/declarativeplaces')
-rw-r--r-- | src/location/declarativeplaces/qdeclarativeplace.cpp | 32 | ||||
-rw-r--r-- | src/location/declarativeplaces/qdeclarativeplaceicon.cpp | 6 |
2 files changed, 19 insertions, 19 deletions
diff --git a/src/location/declarativeplaces/qdeclarativeplace.cpp b/src/location/declarativeplaces/qdeclarativeplace.cpp index 75d23119..54473d13 100644 --- a/src/location/declarativeplaces/qdeclarativeplace.cpp +++ b/src/location/declarativeplaces/qdeclarativeplace.cpp @@ -400,7 +400,7 @@ QPlace QDeclarativePlace::place() // Categories QList<QPlaceCategory> categories; - foreach (QDeclarativeCategory *value, m_categories) + for (QDeclarativeCategory *value : qAsConst(m_categories)) categories.append(value->category()); result.setCategories(categories); @@ -419,11 +419,11 @@ QPlace QDeclarativePlace::place() //contact details QList<QPlaceContactDetail> cppDetails; - foreach (const QString &key, m_contactDetails->keys()) { + for (const QString &key : m_contactDetails->keys()) { cppDetails.clear(); if (m_contactDetails->value(key).typeId() == QMetaType::QVariantList) { - QVariantList detailsVarList = m_contactDetails->value(key).toList(); - foreach (const QVariant &detailVar, detailsVarList) { + const QVariantList detailsVarList = m_contactDetails->value(key).toList(); + for (const QVariant &detailVar : detailsVarList) { QDeclarativeContactDetail *detail = qobject_cast<QDeclarativeContactDetail *>(detailVar.value<QObject *>()); if (detail) cppDetails.append(detail->contactDetail()); @@ -724,7 +724,7 @@ void QDeclarativePlace::contactsModified(const QString &key, const QVariant &) */ void QDeclarativePlace::cleanupDeletedCategories() { - foreach (QDeclarativeCategory * category, m_categoriesToBeDeleted) { + for (QDeclarativeCategory * category : m_categoriesToBeDeleted) { if (category->parent() == this) delete category; } @@ -974,7 +974,7 @@ void QDeclarativePlace::synchronizeCategories() { qDeleteAll(m_categories); m_categories.clear(); - foreach (const QPlaceCategory &value, m_src.categories()) { + for (const QPlaceCategory &value : m_src.categories()) { QDeclarativeCategory *declarativeValue = new QDeclarativeCategory(value, m_plugin, this); m_categories.append(declarativeValue); } @@ -1081,12 +1081,12 @@ void QDeclarativePlace::initializeFavorite(QDeclarativeGeoServiceProvider *plugi */ void QDeclarativePlace::pullExtendedAttributes() { - QStringList keys = m_extendedAttributes->keys(); - foreach (const QString &key, keys) + const QStringList keys = m_extendedAttributes->keys(); + for (const QString &key : keys) m_extendedAttributes->clear(key); - QStringList attributeTypes = m_src.extendedAttributeTypes(); - foreach (const QString &attributeType, attributeTypes) { + const QStringList attributeTypes = m_src.extendedAttributeTypes(); + for (const QString &attributeType : attributeTypes) { m_extendedAttributes->insert(attributeType, QVariant::fromValue(new QDeclarativePlaceAttribute(m_src.extendedAttribute(attributeType)))); } @@ -1100,9 +1100,9 @@ void QDeclarativePlace::pullExtendedAttributes() void QDeclarativePlace::synchronizeContacts() { //clear out contact data - foreach (const QString &contactType, m_contactDetails->keys()) { - QList<QVariant> contacts = m_contactDetails->value(contactType).toList(); - foreach (const QVariant &var, contacts) { + for (const QString &contactType : m_contactDetails->keys()) { + const QList<QVariant> contacts = m_contactDetails->value(contactType).toList(); + for (const QVariant &var : contacts) { QObject *obj = var.value<QObject *>(); if (obj->parent() == this) delete obj; @@ -1111,10 +1111,10 @@ void QDeclarativePlace::synchronizeContacts() } //insert new contact data from source place - foreach (const QString &contactType, m_src.contactTypes()) { - QList<QPlaceContactDetail> sourceContacts = m_src.contactDetails(contactType); + for (const QString &contactType : m_src.contactTypes()) { + const QList<QPlaceContactDetail> sourceContacts = m_src.contactDetails(contactType); QVariantList declContacts; - foreach (const QPlaceContactDetail &sourceContact, sourceContacts) { + for (const QPlaceContactDetail &sourceContact : sourceContacts) { QDeclarativeContactDetail *declContact = new QDeclarativeContactDetail(this); declContact->setContactDetail(sourceContact); declContacts.append(QVariant::fromValue(qobject_cast<QObject *>(declContact))); diff --git a/src/location/declarativeplaces/qdeclarativeplaceicon.cpp b/src/location/declarativeplaces/qdeclarativeplaceicon.cpp index fa5b9df1..6df29671 100644 --- a/src/location/declarativeplaces/qdeclarativeplaceicon.cpp +++ b/src/location/declarativeplaces/qdeclarativeplaceicon.cpp @@ -118,7 +118,7 @@ QPlaceIcon QDeclarativePlaceIcon::icon() const result.setManager(0); QVariantMap params; - foreach (const QString &key, m_parameters->keys()) { + for (const QString &key : m_parameters->keys()) { const QVariant value = m_parameters->value(key); if (value.isValid()) { params.insert(key, value); @@ -241,10 +241,10 @@ QPlaceManager *QDeclarativePlaceIcon::manager() const void QDeclarativePlaceIcon::initParameters(const QVariantMap ¶meterMap) { //clear out old parameters - foreach (const QString &key, m_parameters->keys()) + for (const QString &key : m_parameters->keys()) m_parameters->clear(key); - foreach (const QString &key, parameterMap.keys()) { + for (const QString &key : parameterMap.keys()) { QVariant value = parameterMap.value(key); m_parameters->insert(key, value); } |