diff options
| author | Linus Jahn <lnj@kaidan.im> | 2019-05-14 17:15:11 +0200 |
|---|---|---|
| committer | LNJ <lnj@kaidan.im> | 2019-10-23 18:09:17 +0200 |
| commit | 4172b33b1222a586d95dbc7e69dad7a19a307ea1 (patch) | |
| tree | 830008c8dd42d257c8aba3080e35813d37383eb2 /src/base/QXmppDataForm.cpp | |
| parent | b34ceca75db2791f00d9fa12b8714739bd19eade (diff) | |
| download | qxmpp-4172b33b1222a586d95dbc7e69dad7a19a307ea1.tar.gz | |
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.
Diffstat (limited to 'src/base/QXmppDataForm.cpp')
| -rw-r--r-- | src/base/QXmppDataForm.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
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<QPair<QString, QString>> pairUris; pairUris.reserve(d->mediaSources.size()); - // TODO: use qAsConst() - for (const auto &source : d->mediaSources) { + for (const auto &source : qAsConst(d->mediaSources)) { pairUris << qMakePair<QString, QString>( 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<QString, QString> option; - foreach (option, field.options()) - { + for (const auto &option : field.options()) { writer->writeStartElement("option"); helperToXmlAddAttribute(writer, "label", option.first); helperToXmlAddTextElement(writer, "value", option.second); |