compiler warning fixes

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/tests/auto/qdir/tst_qdir.cpp b/tests/auto/qdir/tst_qdir.cpp
index 940a12e..a785cbf 100644 (file)
--- a/tests/auto/qdir/tst_qdir.cpp
+++ b/tests/auto/qdir/tst_qdir.cpp
@@ -769,6 +769,7 @@ void tst_QDir::cd()
 
     QDir d = startDir;
     bool notUsed = d.exists(); // make sure we cache this before so we can see if 'cd' fails to flush this
+    Q_UNUSED(notUsed);
     QCOMPARE(d.cd(cdDir), successExpected);
     if (successExpected)
         QCOMPARE(d.absolutePath(), newDir);

diff --git a/tests/auto/qtimer/tst_qtimer.cpp b/tests/auto/qtimer/tst_qtimer.cpp
index 77acfbf..420d365 100644 (file)
--- a/tests/auto/qtimer/tst_qtimer.cpp
+++ b/tests/auto/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) {

diff --git a/tests/auto/qx11info/tst_qx11info.cpp b/tests/auto/qx11info/tst_qx11info.cpp
index a9aeacd..b640fe5 100644 (file)
--- a/tests/auto/qx11info/tst_qx11info.cpp
+++ b/tests/auto/qx11info/tst_qx11info.cpp
@@ -93,14 +93,14 @@ void tst_QX11Info::staticFunctionsBeforeQApplication()
     unsigned long appTime = QX11Info::appTime();
     unsigned long appUserTime = QX11Info::appUserTime();
     QCOMPARE(appTime, 0ul);
-    QCOMPARE(appTime, 0ul);
+    QCOMPARE(appUserTime, 0ul);
     // setApp*Time do nothing without QApplication
     QX11Info::setAppTime(1234);
     QX11Info::setAppUserTime(5678);
     appTime = QX11Info::appTime();
     appUserTime = QX11Info::appUserTime();
     QCOMPARE(appTime, 0ul);
-    QCOMPARE(appTime, 0ul);
+    QCOMPARE(appUserTime, 0ul);
 }
 
 QTEST_APPLESS_MAIN(tst_QX11Info)

diff --git a/tests/benchmarks/core/io/qdir/10000/bench_qdir_10000.cpp b/tests/benchmarks/core/io/qdir/10000/bench_qdir_10000.cpp
index 899204d..04694b7 100644 (file)
--- a/tests/benchmarks/core/io/qdir/10000/bench_qdir_10000.cpp
+++ b/tests/benchmarks/core/io/qdir/10000/bench_qdir_10000.cpp
@@ -131,10 +131,7 @@ private slots:
         testdir.setSorting(QDir::Unsorted);
         testdir.setFilter(QDir::AllEntries | QDir::System | QDir::Hidden);
         QBENCHMARK {
-            QStringList fileList = testdir.entryList(QDir::NoFilter, QDir::Unsorted);
-            foreach (const QString &filename, fileList) {
-
-            }
+            testdir.entryList(QDir::NoFilter, QDir::Unsorted);
         }
     }
     void iDontWantAnyStatIterator() {

diff --git a/tests/benchmarks/core/plugin/quuid/tst_quuid.cpp b/tests/benchmarks/core/plugin/quuid/tst_quuid.cpp
index 9e68dfb..223842f 100644 (file)
--- a/tests/benchmarks/core/plugin/quuid/tst_quuid.cpp
+++ b/tests/benchmarks/core/plugin/quuid/tst_quuid.cpp
@@ -119,7 +119,7 @@ void tst_bench_QUuid::fromRfc4122()
 {
     QByteArray string = QByteArray::fromHex("67C8770B44F1410AAB9AF9B5446F13EE");
     QBENCHMARK {
-        QUuid uuid = QUuid::fromRfc4122(string);
+        QUuid::fromRfc4122(string);
     }
 }
 

diff --git a/tests/benchmarks/core/tools/containers-associative/main.cpp b/tests/benchmarks/core/tools/containers-associative/main.cpp
index 30783e9..14253c4 100644 (file)
--- a/tests/benchmarks/core/tools/containers-associative/main.cpp
+++ b/tests/benchmarks/core/tools/containers-associative/main.cpp
@@ -116,8 +116,8 @@ void testLookup(int size)
     QBENCHMARK {
         for (int i = 0; i < size; ++i)
             val = container.value(i);
-        
     }
+    Q_UNUSED(val);
 }
 
 void tst_associative_containers::lookup()

diff --git a/tests/benchmarks/declarative/creation/tst_creation.cpp b/tests/benchmarks/declarative/creation/tst_creation.cpp
index f671ebc..d87423f 100644 (file)
--- a/tests/benchmarks/declarative/creation/tst_creation.cpp
+++ b/tests/benchmarks/declarative/creation/tst_creation.cpp
@@ -251,6 +251,7 @@ void tst_creation::itemtree_notree_cpp()
         QDeclarativeItem *item = new QDeclarativeItem;
         for (int i = 0; i < 30; ++i) {
             QDeclarativeItem *child = new QDeclarativeItem;
+            Q_UNUSED(child);
         }
         delete item;
     }

diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
index 98b567b..ba3fa5b 100644 (file)
--- a/tests/benchmarks/gui/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -162,7 +162,7 @@ void tst_QGraphicsItem::setPos()
     processEvents();
 
     QBENCHMARK {
-        rect->setPos(10, 10);
+        rect->setPos(pos);
     }
 }
 

diff --git a/tests/benchmarks/gui/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp b/tests/benchmarks/gui/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp
index 91fd611..ec7881e 100644 (file)
--- a/tests/benchmarks/gui/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp
@@ -119,8 +119,6 @@ void tst_QGraphicsLayout::invalidate()
 
     // ...then measure...
 
-    int pass = 1;
-
     // should be as small as possible, to reduce overhead of painting
     QSizeF size(1, 1);
     setGeometryCalls.clear();

diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
index 16f4f1e..10e6c9e 100644 (file)
--- a/tests/benchmarks/gui/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -226,6 +226,7 @@ void tst_QGraphicsScene::itemAt()
     QBENCHMARK {
         item = scene.itemAt(0, 0);
     }
+    Q_UNUSED(item);
 
     //let QGraphicsScene::_q_polishItems be called so ~QGraphicsItem doesn't spend all his time cleaning the unpolished list
     qApp->processEvents();

diff --git a/tests/benchmarks/gui/math3d/qquaternion/tst_qquaternion.cpp b/tests/benchmarks/gui/math3d/qquaternion/tst_qquaternion.cpp
index 20e604f..ec6d25f 100644 (file)
--- a/tests/benchmarks/gui/math3d/qquaternion/tst_qquaternion.cpp
+++ b/tests/benchmarks/gui/math3d/qquaternion/tst_qquaternion.cpp
@@ -109,6 +109,7 @@ void tst_QQuaternion::multiply()
 
     QBENCHMARK {
         QQuaternion q3 = q1 * q2;
+        Q_UNUSED(q3);
     }
 }
 

diff --git a/tests/benchmarks/gui/text/qfontmetrics/main.cpp b/tests/benchmarks/gui/text/qfontmetrics/main.cpp
index c0aaf61..49ee135 100644 (file)
--- a/tests/benchmarks/gui/text/qfontmetrics/main.cpp
+++ b/tests/benchmarks/gui/text/qfontmetrics/main.cpp
@@ -57,7 +57,10 @@ private:
 
 void tst_QFontMetrics::testQFontMetrics( const QFontMetrics &fm )
 {
-    int fontHeight = fm.height();
+    QBENCHMARK {
+      int fontHeight = fm.height();
+      Q_UNUSED(fontHeight);
+    }
 }
 
 void tst_QFontMetrics::fontmetrics_create()

diff --git a/tests/benchmarks/gui/text/qtext/main.cpp b/tests/benchmarks/gui/text/qtext/main.cpp
index 9d72ba5..cce9d7f 100644 (file)
--- a/tests/benchmarks/gui/text/qtext/main.cpp
+++ b/tests/benchmarks/gui/text/qtext/main.cpp
@@ -392,8 +392,6 @@ void tst_QText::paintLayoutToPixmap_painterFill()
 
 void tst_QText::document()
 {
-    QTextDocument *doc = new QTextDocument;
-
     QBENCHMARK {
         QTextDocument *doc = new QTextDocument;
         doc->setHtml(m_shortLorem);
@@ -434,8 +432,6 @@ void tst_QText::paintDocToPixmap_painterFill()
 
 void tst_QText::control()
 {
-    QTextControl *control = new QTextControl(m_shortLorem);
-
     QBENCHMARK {
         QTextControl *control = new QTextControl;
         QTextDocument *doc = control->document();