From 2dd83a0778f9e648135cbb787232334d82768b99 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Thu, 1 Dec 2022 17:54:37 +0100 Subject: [PATCH] tst_QDateTime: Inline some trivial delegations by _data() functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib174a3ef1e4e913c6dc433b17854295cf529ad8f Reviewed-by: MÃ¥rten Nordheim Reviewed-by: Thiago Macieira --- .../corelib/time/qdatetime/tst_qdatetime.cpp | 28 +++---------------- 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp index 1762a33500..b1f71d84b8 100644 --- a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp +++ b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp @@ -46,7 +46,7 @@ private Q_SLOTS: void setMSecsSinceEpoch_data(); void setMSecsSinceEpoch(); void fromSecsSinceEpoch(); - void fromMSecsSinceEpoch_data(); + void fromMSecsSinceEpoch_data() { setMSecsSinceEpoch_data(); } void fromMSecsSinceEpoch(); #if QT_CONFIG(datestring) void toString_isoDate_data(); @@ -72,15 +72,15 @@ private Q_SLOTS: void addMSecs(); void toTimeSpec_data(); void toTimeSpec(); - void toLocalTime_data(); + void toLocalTime_data() { toTimeSpec_data(); } void toLocalTime(); - void toUTC_data(); + void toUTC_data() { toTimeSpec_data(); } void toUTC(); void toUTC_extra(); void daysTo(); void secsTo_data(); void secsTo(); - void msecsTo_data(); + void msecsTo_data() { addMSecs_data(); } void msecsTo(); void operator_eqeq_data(); void operator_eqeq(); @@ -768,11 +768,6 @@ void tst_QDateTime::setMSecsSinceEpoch() } } -void tst_QDateTime::fromMSecsSinceEpoch_data() -{ - setMSecsSinceEpoch_data(); -} - void tst_QDateTime::fromMSecsSinceEpoch() { QFETCH(qint64, msecs); @@ -1640,11 +1635,6 @@ void tst_QDateTime::toTimeSpec() QCOMPARE(localToOffset.toTimeSpec(Qt::LocalTime), fromLocal); } -void tst_QDateTime::toLocalTime_data() -{ - toTimeSpec_data(); -} - void tst_QDateTime::toLocalTime() { QFETCH(QDateTime, fromUtc); @@ -1655,11 +1645,6 @@ void tst_QDateTime::toLocalTime() QCOMPARE(fromUtc.toLocalTime(), fromLocal.toLocalTime()); } -void tst_QDateTime::toUTC_data() -{ - toTimeSpec_data(); -} - void tst_QDateTime::toUTC() { QFETCH(QDateTime, fromUtc); @@ -1739,11 +1724,6 @@ void tst_QDateTime::secsTo() } } -void tst_QDateTime::msecsTo_data() -{ - addMSecs_data(); -} - void tst_QDateTime::msecsTo() { QFETCH(const QDateTime, dt);