summaryrefslogtreecommitdiffstats
path: root/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp
diff options
context:
space:
mode:
authorAhmad Samir <a.samirh78@gmail.com>2023-08-11 17:20:24 +0300
committerAhmad Samir <a.samirh78@gmail.com>2023-08-19 16:29:25 +0300
commit8e0281a8becc699ece53527c647b1ee72e50c3bd (patch)
treeec1ac57e37431ea2b46384c6834fa0057ced62e8 /tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp
parente7b07b64c7b0536eccba6ff25e23badb88226813 (diff)
tests/auto/: port Q_FOREACH to ranged-for, local const containers
These are local containers that are either: - Already const and didn't need Q_FOREACH to begin with - Can be simply made const, just by adding const keyword In one case the unittest checked that the container's size is 1, so use list.first() instead of a for-loop. In files where Q_FOREACH isn't used any more, remove "#undef QT_NO_FOREACH". Also remove those files from NO_PCH_SOURCES. Drive-by changes: - Remove parenthesis from one-line for-loops - Make the for-loop variable a const& where a copy isn't needed Task-number: QTBUG-115839 Change-Id: Ide34122b9cda798b80c4ca9d2d5af76024bc7a92 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp')
-rw-r--r--tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp b/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp
index e41ac792c5..d6bd517fc4 100644
--- a/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp
+++ b/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp
@@ -1,8 +1,6 @@
// Copyright (C) 2016 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses
-
#include <QCoreApplication>
#include <QDomDocument>
#include <QMetaType>
@@ -110,7 +108,7 @@ void tst_QDBusXmlParser::parsing_data()
void tst_QDBusXmlParser::parsing_common(const QString &xmlData)
{
- QDBusIntrospection::Object obj =
+ const QDBusIntrospection::Object obj =
QDBusIntrospection::parseObject(xmlData, "local.testing", "/");
QFETCH(int, interfaceCount);
QFETCH(int, objectCount);
@@ -124,7 +122,7 @@ void tst_QDBusXmlParser::parsing_common(const QString &xmlData)
// also verify the naming
int i = 0;
- foreach (QString name, obj.interfaces) {
+ for (const QString &name : obj.interfaces) {
const QString expectedName = QString("iface.iface%1").arg(i+1);
QCOMPARE(name, expectedName);
@@ -134,7 +132,7 @@ void tst_QDBusXmlParser::parsing_common(const QString &xmlData)
}
i = 0;
- foreach (QString name, obj.childObjects)
+ for (const QString &name : obj.childObjects)
QCOMPARE(name, QString("obj%1").arg(++i));
}