From 4172b33b1222a586d95dbc7e69dad7a19a307ea1 Mon Sep 17 00:00:00 2001 From: Linus Jahn Date: Tue, 14 May 2019 17:15:11 +0200 Subject: Replace Q_FOREACH (foreach) by C++11 ranged for-loops Q_FOREACH is bad and will be deprecated in the future: https://www.kdab.com/goodbye-q_foreach/ This also disables Q_FOREACH by defining QT_NO_FOREACH. --- src/base/QXmppDataForm.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/base/QXmppDataForm.cpp') diff --git a/src/base/QXmppDataForm.cpp b/src/base/QXmppDataForm.cpp index 4e588a3e..e83abc0a 100644 --- a/src/base/QXmppDataForm.cpp +++ b/src/base/QXmppDataForm.cpp @@ -326,8 +326,7 @@ QXmppDataForm::Media QXmppDataForm::Field::media() const QList> pairUris; pairUris.reserve(d->mediaSources.size()); - // TODO: use qAsConst() - for (const auto &source : d->mediaSources) { + for (const auto &source : qAsConst(d->mediaSources)) { pairUris << qMakePair( source.contentType().name(), source.uri().toString() @@ -771,7 +770,7 @@ void QXmppDataForm::toXml(QXmlStreamWriter *writer) const if (!d->instructions.isEmpty()) writer->writeTextElement("instructions", d->instructions); - foreach (const QXmppDataForm::Field &field, d->fields) { + for (const QXmppDataForm::Field &field : d->fields) { writer->writeStartElement("field"); /* field type */ @@ -801,7 +800,7 @@ void QXmppDataForm::toXml(QXmlStreamWriter *writer) const type == QXmppDataForm::Field::JidMultiField || type == QXmppDataForm::Field::TextMultiField) { - foreach (const QString &value, field.value().toStringList()) + for (const QString &value : field.value().toStringList()) helperToXmlAddTextElement(writer, "value", value); } else if (!field.value().isNull()) @@ -844,8 +843,7 @@ void QXmppDataForm::toXml(QXmlStreamWriter *writer) const type == QXmppDataForm::Field::ListSingleField) { QPair option; - foreach (option, field.options()) - { + for (const auto &option : field.options()) { writer->writeStartElement("option"); helperToXmlAddAttribute(writer, "label", option.first); helperToXmlAddTextElement(writer, "value", option.second); -- cgit v1.2.3