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/QXmppRpcIq.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/base/QXmppRpcIq.cpp') diff --git a/src/base/QXmppRpcIq.cpp b/src/base/QXmppRpcIq.cpp index 813e0dfa..4e8bd189 100644 --- a/src/base/QXmppRpcIq.cpp +++ b/src/base/QXmppRpcIq.cpp @@ -63,7 +63,7 @@ void QXmppRpcMarshaller::marshall(QXmlStreamWriter *writer, const QVariant &valu { writer->writeStartElement("array"); writer->writeStartElement("data"); - foreach(const QVariant &item, value.toList()) + for (const auto &item : value.toList()) marshall(writer, item); writer->writeEndElement(); writer->writeEndElement(); @@ -337,8 +337,7 @@ void QXmppRpcResponseIq::toXmlElementFromChild(QXmlStreamWriter *writer) const else if (!m_values.isEmpty()) { writer->writeStartElement("params"); - foreach (const QVariant &arg, m_values) - { + for (const auto &arg : m_values) { writer->writeStartElement("param"); QXmppRpcMarshaller::marshall(writer, arg); writer->writeEndElement(); @@ -433,8 +432,7 @@ void QXmppRpcInvokeIq::toXmlElementFromChild(QXmlStreamWriter *writer) const if (!m_arguments.isEmpty()) { writer->writeStartElement("params"); - foreach(const QVariant &arg, m_arguments) - { + for (const auto &arg : m_arguments) { writer->writeStartElement("param"); QXmppRpcMarshaller::marshall(writer, arg); writer->writeEndElement(); -- cgit v1.2.3