diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-29 11:32:47 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-02-01 10:42:38 +0100 |
commit | e421f4b54d37ca6f685ba6ecbf89bd6f3fa53131 (patch) | |
tree | b36fc92e1b964cbdca8c8143b00a62689b279cd4 /src/webchannel/qmetaobjectpublisher.cpp | |
parent | ae4103a722b991c08932ca2df279d52f8eb56c42 (diff) |
Stop using foreach
Change-Id: I46f916ad88ef7cf66d27d0549d9a66cf0e03eddc
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
Diffstat (limited to 'src/webchannel/qmetaobjectpublisher.cpp')
-rw-r--r-- | src/webchannel/qmetaobjectpublisher.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/webchannel/qmetaobjectpublisher.cpp b/src/webchannel/qmetaobjectpublisher.cpp index 2bc9c3e..6cf9487 100644 --- a/src/webchannel/qmetaobjectpublisher.cpp +++ b/src/webchannel/qmetaobjectpublisher.cpp @@ -333,7 +333,7 @@ QJsonObject QMetaObjectPublisher::initializeClient(QWebChannelAbstractTransport void QMetaObjectPublisher::initializePropertyUpdates(const QObject *const object, const QJsonObject &objectInfo) { - foreach (const QJsonValue &propertyInfoVar, objectInfo[KEY_PROPERTIES].toArray()) { + for (const QJsonValue &propertyInfoVar : objectInfo[KEY_PROPERTIES].toArray()) { const QJsonArray &propertyInfo = propertyInfoVar.toArray(); if (propertyInfo.size() < 2) { qWarning() << "Invalid property info encountered:" << propertyInfoVar; @@ -386,7 +386,7 @@ void QMetaObjectPublisher::sendPendingPropertyUpdates() const SignalToArgumentsMap::const_iterator sigEnd = it.value().constEnd(); for (SignalToArgumentsMap::const_iterator sigIt = it.value().constBegin(); sigIt != sigEnd; ++sigIt) { // TODO: can we get rid of the int <-> string conversions here? - foreach (const int propertyIndex, objectsSignalToPropertyMap.value(sigIt.key())) { + for (const int propertyIndex : objectsSignalToPropertyMap.value(sigIt.key())) { const QMetaProperty &property = metaObject->property(propertyIndex); Q_ASSERT(property.isValid()); properties[QString::number(propertyIndex)] = wrapResult(property.read(object), Q_NULLPTR, objectId); @@ -400,7 +400,7 @@ void QMetaObjectPublisher::sendPendingPropertyUpdates() // if the object is auto registered, just send the update only to clients which know this object if (wrappedObjects.contains(objectId)) { - foreach (QWebChannelAbstractTransport *transport, wrappedObjects.value(objectId).transports) { + for (QWebChannelAbstractTransport *transport : wrappedObjects.value(objectId).transports) { QJsonArray &arr = specificUpdates[transport]; arr.push_back(obj); } @@ -561,7 +561,7 @@ void QMetaObjectPublisher::signalEmitted(const QObject *object, const int signal // if the object is wrapped, just send the response to clients which know this object if (wrappedObjects.contains(objectName)) { - foreach (QWebChannelAbstractTransport *transport, wrappedObjects.value(objectName).transports) { + for (QWebChannelAbstractTransport *transport : wrappedObjects.value(objectName).transports) { transport->sendMessage(message); } } else { @@ -753,7 +753,7 @@ void QMetaObjectPublisher::transportRemoved(QWebChannelAbstractTransport *transp transportedWrappedObjects.remove(transport); - foreach (QObject *obj, objectsForDeletion) + for (QObject *obj : std::as_const(objectsForDeletion)) objectDestroyed(obj); } @@ -860,7 +860,7 @@ QJsonValue QMetaObjectPublisher::wrapResult(const QVariant &result, QWebChannelA QJsonArray QMetaObjectPublisher::wrapList(const QVariantList &list, QWebChannelAbstractTransport *transport, const QString &parentObjectId) { QJsonArray array; - foreach (const QVariant &arg, list) { + for (const QVariant &arg : list) { array.append(wrapResult(arg, transport, parentObjectId)); } return array; @@ -891,7 +891,7 @@ void QMetaObjectPublisher::broadcastMessage(const QJsonObject &message) const return; } - foreach (QWebChannelAbstractTransport *transport, webChannel->d_func()->transports) { + for (QWebChannelAbstractTransport *transport : webChannel->d_func()->transports) { transport->sendMessage(message); } } |