diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-11-07 19:19:27 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-10 04:42:45 +0100 |
commit | 8e11f7c93a1f7df0d10e2f851283c825ca39b75b (patch) | |
tree | 6f02b39217acd9fb9c033fbe908b8ebb1859896a /tests/auto/corelib/kernel | |
parent | 2cd47107155fc251747028b9b0ae6d2c9e69e06c (diff) |
Cleanup corelib autotests
Remove literal tabs.
Change-Id: I210a0259773cceb20d35ebc80b889e3ebb88b540
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/corelib/kernel')
-rw-r--r-- | tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp | 4 | ||||
-rw-r--r-- | tests/auto/corelib/kernel/qobject/signalbug.cpp | 115 | ||||
-rw-r--r-- | tests/auto/corelib/kernel/qobject/signalbug.h | 31 | ||||
-rw-r--r-- | tests/auto/corelib/kernel/qobject/tst_qobject.cpp | 32 | ||||
-rw-r--r-- | tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp | 8 |
5 files changed, 92 insertions, 98 deletions
diff --git a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp index 4bf597a9c0..2831d9fc34 100644 --- a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp +++ b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp @@ -450,7 +450,7 @@ void tst_QMetaObject::invokeMetaMember() QCOMPARE(obj.slotResult, QString("testReference:whatever")); QCOMPARE(refStr, QString("gotcha")); - qint64 ll1 = -1; + qint64 ll1 = -1; quint64 ll2 = 0; QVERIFY(QMetaObject::invokeMethod(&obj, "testLongLong", @@ -559,7 +559,7 @@ void tst_QMetaObject::invokeQueuedMetaMember() QVERIFY(!QMetaObject::invokeMethod(&obj, "sig1", Qt::QueuedConnection, Q_RETURN_ARG(QString, exp), Q_ARG(QString, "nono"))); - qint64 ll1 = -1; + qint64 ll1 = -1; quint64 ll2 = 0; QVERIFY(QMetaObject::invokeMethod(&obj, "testLongLong", diff --git a/tests/auto/corelib/kernel/qobject/signalbug.cpp b/tests/auto/corelib/kernel/qobject/signalbug.cpp index f81de47e2d..0465373e40 100644 --- a/tests/auto/corelib/kernel/qobject/signalbug.cpp +++ b/tests/auto/corelib/kernel/qobject/signalbug.cpp @@ -49,106 +49,99 @@ static int Step = 0; Sender RandomSender (0, 0); - void TRACE (int step, const char *name) { - for (int t = 0; t < step - 1; t++) - fprintf (stderr, "\t"); - fprintf (stderr, "Step %d: %s\n", step, name); - return; + for (int t = 0; t < step - 1; t++) + fprintf (stderr, "\t"); + fprintf (stderr, "Step %d: %s\n", step, name); + return; } - Receiver::Receiver () - : QObject () + : QObject () { } void Receiver::received () { - ::Step++; - const int stepCopy = ::Step; - TRACE (stepCopy, "Receiver::received()"); - if (::Step != 2 && ::Step != 4) - qFatal("%s: Incorrect Step: %d (should be 2 or 4)", Q_FUNC_INFO, ::Step); + ::Step++; + const int stepCopy = ::Step; + TRACE (stepCopy, "Receiver::received()"); + if (::Step != 2 && ::Step != 4) + qFatal("%s: Incorrect Step: %d (should be 2 or 4)", Q_FUNC_INFO, ::Step); - if (::Step == 2) - s->fire (); + if (::Step == 2) + s->fire (); - fprintf (stderr, "Receiver<%s>::received() sender=%s\n", - (const char *) objectName ().toAscii (), sender ()->metaObject()->className()); + fprintf (stderr, "Receiver<%s>::received() sender=%s\n", + (const char *) objectName ().toAscii (), sender ()->metaObject()->className()); - TRACE (stepCopy, "ends Receiver::received()"); + TRACE (stepCopy, "ends Receiver::received()"); } - Disconnector::Disconnector () - : QObject () + : QObject () { } void Disconnector::received () { - ::Step++; - const int stepCopy = ::Step; - TRACE (stepCopy, "Disconnector::received()"); - if (::Step != 5 && ::Step != 6) - qFatal("%s: Incorrect Step: %d (should be 5 or 6)", Q_FUNC_INFO, ::Step); + ::Step++; + const int stepCopy = ::Step; + TRACE (stepCopy, "Disconnector::received()"); + if (::Step != 5 && ::Step != 6) + qFatal("%s: Incorrect Step: %d (should be 5 or 6)", Q_FUNC_INFO, ::Step); - fprintf (stderr, "Disconnector<%s>::received() sender=%s\n", - (const char *) objectName ().toAscii (), sender ()->metaObject()->className()); - if (sender () == 0) - fprintf (stderr, "WE SHOULD NOT BE RECEIVING THIS SIGNAL\n"); + fprintf (stderr, "Disconnector<%s>::received() sender=%s\n", + (const char *) objectName ().toAscii (), sender ()->metaObject()->className()); + if (sender () == 0) + fprintf (stderr, "WE SHOULD NOT BE RECEIVING THIS SIGNAL\n"); - if (::Step == 5) - { - disconnect (s, SIGNAL (fired ()), s->d, SLOT (received ())); + if (::Step == 5) + { + disconnect (s, SIGNAL (fired ()), s->d, SLOT (received ())); - connect (&RandomSender, SIGNAL (fired ()), s->d, SLOT (received ())); - } + connect (&RandomSender, SIGNAL (fired ()), s->d, SLOT (received ())); + } - TRACE (stepCopy, "ends Disconnector::received()"); + TRACE (stepCopy, "ends Disconnector::received()"); } Sender::Sender (Receiver *r, Disconnector *d) - : QObject () + : QObject () { - this->r = r; this->d = d; - if (r) - connect (this, SIGNAL (fired ()), r, SLOT (received ())); - if (d) - connect (this, SIGNAL (fired ()), d, SLOT (received ())); + this->r = r; this->d = d; + if (r) + connect (this, SIGNAL (fired ()), r, SLOT (received ())); + if (d) + connect (this, SIGNAL (fired ()), d, SLOT (received ())); }; void Sender::fire () { - ::Step++; - const int stepCopy = ::Step; - TRACE (stepCopy, "Sender::fire()"); - if (::Step != 1 && ::Step != 3) - qFatal("%s: Incorrect Step: %d (should be 1 or 3)", Q_FUNC_INFO, ::Step); - - emit fired (); - TRACE (stepCopy, "ends Sender::fire()"); + ::Step++; + const int stepCopy = ::Step; + TRACE (stepCopy, "Sender::fire()"); + if (::Step != 1 && ::Step != 3) + qFatal("%s: Incorrect Step: %d (should be 1 or 3)", Q_FUNC_INFO, ::Step); + + emit fired (); + TRACE (stepCopy, "ends Sender::fire()"); } - int main (int argc, char *argv []) { - QCoreApplication app (argc, argv); + QCoreApplication app (argc, argv); - Receiver r; - Disconnector d; - Sender s (&r, &d); + Receiver r; + Disconnector d; + Sender s (&r, &d); - r.s = &s; - d.s = &s; + r.s = &s; + d.s = &s; - - ::Step = 0; - s.fire (); - return 0; + ::Step = 0; + s.fire (); + return 0; } - - diff --git a/tests/auto/corelib/kernel/qobject/signalbug.h b/tests/auto/corelib/kernel/qobject/signalbug.h index 1d332239b3..4292d70063 100644 --- a/tests/auto/corelib/kernel/qobject/signalbug.h +++ b/tests/auto/corelib/kernel/qobject/signalbug.h @@ -54,50 +54,47 @@ class Receiver : public QObject Q_OBJECT public: - Receiver (); - virtual ~Receiver () {} + Receiver (); + virtual ~Receiver () {} protected slots: - void received (); + void received (); public: - Sender *s; + Sender *s; }; - class Disconnector : public QObject { Q_OBJECT public: - Disconnector (); - virtual ~Disconnector () {} + Disconnector (); + virtual ~Disconnector () {} protected slots: - void received (); + void received (); public: - Sender *s; + Sender *s; }; - class Sender : public QObject { Q_OBJECT public: - Sender (Receiver *r, Disconnector *d); - virtual ~Sender () {} + Sender (Receiver *r, Disconnector *d); + virtual ~Sender () {} - void fire (); + void fire (); signals: - void fired (); + void fired (); public: - Receiver *r; - Disconnector *d; + Receiver *r; + Disconnector *d; }; - #endif // SIGNAL_BUG_H diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp index 7bab96a188..e938d7e89d 100644 --- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp +++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp @@ -173,16 +173,19 @@ class ReceiverObject : public QObject Q_OBJECT public: - ReceiverObject() : sequence_slot1( 0 ), - sequence_slot2( 0 ), - sequence_slot3( 0 ), - sequence_slot4( 0 ) {} + ReceiverObject() + : sequence_slot1( 0 ) + , sequence_slot2( 0 ) + , sequence_slot3( 0 ) + , sequence_slot4( 0 ) + {} - void reset() { - sequence_slot4 = 0; - sequence_slot3 = 0; - sequence_slot2 = 0; - sequence_slot1 = 0; + void reset() + { + sequence_slot4 = 0; + sequence_slot3 = 0; + sequence_slot2 = 0; + sequence_slot1 = 0; count_slot1 = 0; count_slot2 = 0; count_slot3 = 0; @@ -198,7 +201,8 @@ public: int count_slot3; int count_slot4; - bool called(int slot) { + bool called(int slot) + { switch (slot) { case 1: return sequence_slot1; case 2: return sequence_slot2; @@ -759,13 +763,13 @@ public: protected: void connectNotify( const char *signal ) { - org_signal = signal; - nw_signal = QMetaObject::normalizedSignature(signal); + org_signal = signal; + nw_signal = QMetaObject::normalizedSignature(signal); }; void disconnectNotify( const char *signal ) { - org_signal = signal; - nw_signal = QMetaObject::normalizedSignature(signal); + org_signal = signal; + nw_signal = QMetaObject::normalizedSignature(signal); }; }; diff --git a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp index c29ad8e44f..db796832bf 100644 --- a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp +++ b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp @@ -189,7 +189,7 @@ public: if (++timeoutsForFirst == 1) { killTimer(extraTimerId); extraTimerId = -1; - QCoreApplication::postEvent(this, new QEvent(static_cast<QEvent::Type>(4002))); + QCoreApplication::postEvent(this, new QEvent(static_cast<QEvent::Type>(4002))); secondTimerId = startTimer(interval); } } else if (te->timerId() == secondTimerId) { @@ -229,10 +229,10 @@ void tst_QTimer::livelock() QCOMPARE(tester.timeoutsForExtra, 0); QTRY_COMPARE(tester.timeoutsForSecond, 1); #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) - if (QSysInfo::WindowsVersion < QSysInfo::WV_XP) - QEXPECT_FAIL("non-zero timer", "Multimedia timers are not available on Windows 2000", Continue); + if (QSysInfo::WindowsVersion < QSysInfo::WV_XP) + QEXPECT_FAIL("non-zero timer", "Multimedia timers are not available on Windows 2000", Continue); #elif defined(Q_OS_WINCE) - QEXPECT_FAIL("non-zero timer", "Windows CE devices often too slow", Continue); + QEXPECT_FAIL("non-zero timer", "Windows CE devices often too slow", Continue); #endif QVERIFY(tester.postEventAtRightTime); } |