diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-11-17 15:52:53 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-21 09:58:23 +0100 |
commit | e8b4c49efddb87f4195c74668b5026119eccea56 (patch) | |
tree | 973f4539844b7ff0797bf7b7b1383c853dffda99 /tests/auto/corelib/kernel | |
parent | ed5583048ecf3d340ded7e4d5f1b926a9929eebd (diff) |
qtbase tests: Fix some warnings
- Fix warnings about QAtomicPointer/Int usage
- Fix some gcc 4.6 warnings about assigned/unused variables
Change-Id: Ib4dbf9110f0dad93ad48e97278310f05fad3a82a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/corelib/kernel')
3 files changed, 5 insertions, 10 deletions
diff --git a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp index 719b20e766..7ad020c356 100644 --- a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp +++ b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp @@ -1023,12 +1023,12 @@ void tst_QMetaObjectBuilder::removeNotifySignal() { QMetaObjectBuilder builder; - QMetaMethodBuilder method1 = builder.addSignal("foo(const QString&, int)"); - QMetaMethodBuilder method2 = builder.addSignal("bar(QString)"); + builder.addSignal("foo(const QString&, int)"); + QMetaMethodBuilder method = builder.addSignal("bar(QString)"); // Setup property QMetaPropertyBuilder prop = builder.addProperty("prop", "const QString &"); - prop.setNotifySignal(method2); + prop.setNotifySignal(method); QVERIFY(prop.hasNotifySignal()); QCOMPARE(prop.notifySignal().index(), 1); diff --git a/tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp b/tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp index a1c943e877..90c537b9fc 100644 --- a/tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp +++ b/tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp @@ -129,10 +129,8 @@ void tst_QSocketNotifier::unexpectedDisconnection() NATIVESOCKETENGINE readEnd1; readEnd1.initialize(QAbstractSocket::TcpSocket); - bool b = readEnd1.connectToHost(server.serverAddress(), server.serverPort()); + readEnd1.connectToHost(server.serverAddress(), server.serverPort()); QVERIFY(readEnd1.waitForWrite()); -// while (!b && readEnd1.state() != QAbstractSocket::ConnectedState) -// b = readEnd1.connectToHost(server.serverAddress(), server.serverPort()); QVERIFY(readEnd1.state() == QAbstractSocket::ConnectedState); QVERIFY(server.waitForNewConnection()); QTcpSocket *writeEnd1 = server.nextPendingConnection(); @@ -140,10 +138,8 @@ void tst_QSocketNotifier::unexpectedDisconnection() NATIVESOCKETENGINE readEnd2; readEnd2.initialize(QAbstractSocket::TcpSocket); - b = readEnd2.connectToHost(server.serverAddress(), server.serverPort()); + readEnd2.connectToHost(server.serverAddress(), server.serverPort()); QVERIFY(readEnd2.waitForWrite()); -// while (!b) -// b = readEnd2.connectToHost(server.serverAddress(), server.serverPort()); QVERIFY(readEnd2.state() == QAbstractSocket::ConnectedState); QVERIFY(server.waitForNewConnection()); QTcpSocket *writeEnd2 = server.nextPendingConnection(); diff --git a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp index 73330b1da2..f70c380c4a 100644 --- a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp +++ b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp @@ -430,7 +430,6 @@ public: m_timer.stop(); - QTime now = QTime::currentTime(); int elapsed = m_startedTime.elapsed(); if (elapsed < m_interval / 2) { |