From f6d1be7c66782e718b23dc0905b60a975b19e14c Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 22 Mar 2019 14:29:05 +0100 Subject: Use ranged for loops in place of foreach in QTimeZone tests This (and use of Q_SLOTS for the test slots) makes it possible to enable QT_NO_KEYWORDS and QT_NO_FOREACH in all the corelib/time/ tests. Change-Id: I85fd358f3d1a72c9269d5260d0224640c1751f2d Reviewed-by: Marc Mutz --- tests/auto/corelib/time/qdate/qdate.pro | 1 + tests/auto/corelib/time/qdate/tst_qdate.cpp | 2 +- tests/auto/corelib/time/qdatetime/qdatetime.pro | 1 + tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp | 4 ++-- tests/auto/corelib/time/qtime/qtime.pro | 1 + tests/auto/corelib/time/qtime/tst_qtime.cpp | 2 +- tests/auto/corelib/time/qtimezone/qtimezone.pro | 5 ++--- tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp | 12 ++++++------ 8 files changed, 15 insertions(+), 13 deletions(-) (limited to 'tests') diff --git a/tests/auto/corelib/time/qdate/qdate.pro b/tests/auto/corelib/time/qdate/qdate.pro index 925c3b4c78..087cf8856c 100644 --- a/tests/auto/corelib/time/qdate/qdate.pro +++ b/tests/auto/corelib/time/qdate/qdate.pro @@ -2,3 +2,4 @@ CONFIG += testcase TARGET = tst_qdate QT = core-private testlib SOURCES = tst_qdate.cpp +DEFINES += QT_NO_KEYWORDS QT_NO_FOREACH diff --git a/tests/auto/corelib/time/qdate/tst_qdate.cpp b/tests/auto/corelib/time/qdate/tst_qdate.cpp index cc0c9fb894..6c6014600d 100644 --- a/tests/auto/corelib/time/qdate/tst_qdate.cpp +++ b/tests/auto/corelib/time/qdate/tst_qdate.cpp @@ -35,7 +35,7 @@ class tst_QDate : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void isNull_data(); void isNull(); void isValid_data(); diff --git a/tests/auto/corelib/time/qdatetime/qdatetime.pro b/tests/auto/corelib/time/qdatetime/qdatetime.pro index 742eb47075..60d4d810d4 100644 --- a/tests/auto/corelib/time/qdatetime/qdatetime.pro +++ b/tests/auto/corelib/time/qdatetime/qdatetime.pro @@ -2,6 +2,7 @@ CONFIG += testcase TARGET = tst_qdatetime QT = core-private testlib SOURCES = tst_qdatetime.cpp +DEFINES += QT_NO_KEYWORDS QT_NO_FOREACH # For some reason using optimization here triggers a compiler issue, which causes an exception # However, the code is correct diff --git a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp index 7a653e16eb..ffbc839d9d 100644 --- a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp +++ b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp @@ -48,10 +48,10 @@ public: static QString str( int y, int month, int d, int h, int min, int s ); static QDateTime dt( const QString& str ); -public slots: +public Q_SLOTS: void initTestCase(); void init(); -private slots: +private Q_SLOTS: void ctor(); void operator_eq(); void isNull(); diff --git a/tests/auto/corelib/time/qtime/qtime.pro b/tests/auto/corelib/time/qtime/qtime.pro index 0973b7a9ef..7d2df93cb0 100644 --- a/tests/auto/corelib/time/qtime/qtime.pro +++ b/tests/auto/corelib/time/qtime/qtime.pro @@ -2,3 +2,4 @@ CONFIG += testcase TARGET = tst_qtime QT = core testlib SOURCES = tst_qtime.cpp +DEFINES += QT_NO_KEYWORDS QT_NO_FOREACH diff --git a/tests/auto/corelib/time/qtime/tst_qtime.cpp b/tests/auto/corelib/time/qtime/tst_qtime.cpp index 9af5fa5e8e..69da4b083f 100644 --- a/tests/auto/corelib/time/qtime/tst_qtime.cpp +++ b/tests/auto/corelib/time/qtime/tst_qtime.cpp @@ -48,7 +48,7 @@ public: } #endif // remove for ### Qt 6 -private slots: +private Q_SLOTS: void msecsTo_data(); void msecsTo(); void secsTo_data(); diff --git a/tests/auto/corelib/time/qtimezone/qtimezone.pro b/tests/auto/corelib/time/qtimezone/qtimezone.pro index 5ec8d008e7..24d4b776be 100644 --- a/tests/auto/corelib/time/qtimezone/qtimezone.pro +++ b/tests/auto/corelib/time/qtimezone/qtimezone.pro @@ -2,10 +2,9 @@ CONFIG += testcase TARGET = tst_qtimezone QT = core-private testlib SOURCES = tst_qtimezone.cpp -qtConfig(icu) { - QMAKE_USE_PRIVATE += icu -} +DEFINES += QT_NO_KEYWORDS QT_NO_FOREACH +qtConfig(icu): QMAKE_USE_PRIVATE += icu darwin { OBJECTIVE_SOURCES += tst_qtimezone_darwin.mm LIBS += -framework Foundation diff --git a/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp b/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp index 5c2af3b115..82fea3c716 100644 --- a/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp +++ b/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. @@ -42,7 +42,7 @@ class tst_QTimeZone : public QObject public: tst_QTimeZone(); -private slots: +private Q_SLOTS: // Public class default system tests void createTest(); void nullTest(); @@ -385,8 +385,8 @@ void tst_QTimeZone::dataStreamTest() void tst_QTimeZone::isTimeZoneIdAvailable() { - QList available = QTimeZone::availableTimeZoneIds(); - foreach (const QByteArray &id, available) { + const QList available = QTimeZone::availableTimeZoneIds(); + for (const QByteArray &id : available) { QVERIFY(QTimeZone::isTimeZoneIdAvailable(id)); QVERIFY(QTimeZone(id).isValid()); } @@ -701,8 +701,8 @@ void tst_QTimeZone::availableTimeZoneIds() void tst_QTimeZone::stressTest() { - QList idList = QTimeZone::availableTimeZoneIds(); - foreach (const QByteArray &id, idList) { + const QList idList = QTimeZone::availableTimeZoneIds(); + for (const QByteArray &id : idList) { QTimeZone testZone = QTimeZone(id); QCOMPARE(testZone.isValid(), true); QCOMPARE(testZone.id(), id); -- cgit v1.2.3