summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2018-05-02 15:49:54 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2018-05-02 14:31:21 +0000
commitfc12d7056610895ef7c67004eaf521509208db40 (patch)
treebc7574f3c102fad1e4ec0409ddad0b5d5a373cc2
parentd9ed92790e472978e530036211f380c9d28fa1fa (diff)
Tests: Fix clang warnings about unused variables
tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp:112:warn:unused variable 'copy' [-Wunused-variable] tests/auto/xmlpatternssdk/ResultThreader.h:86:warn:private field 'm_eventLoop' is not used [-Wunused-private-field] tests/auto/xmlpatternssdk/Worker.cpp:114:warn:unused variable 'endB' [-Wunused-variable] tests/auto/xmlpatternssdk/Worker.cpp:112:warn:unused variable 'itB' [-Wunused-variable] Change-Id: Idb1d0f78233665cb64025bda90a325db4562b41a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp1
-rw-r--r--tests/auto/xmlpatternssdk/ResultThreader.cpp4
-rw-r--r--tests/auto/xmlpatternssdk/ResultThreader.h4
-rw-r--r--tests/auto/xmlpatternssdk/Worker.cpp2
-rw-r--r--tests/auto/xmlpatternsxqts/tst_suitetest.cpp2
5 files changed, 4 insertions, 9 deletions
diff --git a/tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp b/tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp
index c2e260df..0bef5bf9 100644
--- a/tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp
+++ b/tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp
@@ -110,6 +110,7 @@ void tst_QXmlNodeModelIndex::copyConstructor() const
{
/* The extra paranthesis silences a warning on win32-msvc. */
const QXmlNodeModelIndex copy((QXmlNodeModelIndex()));
+ Q_UNUSED(copy)
}
}
diff --git a/tests/auto/xmlpatternssdk/ResultThreader.cpp b/tests/auto/xmlpatternssdk/ResultThreader.cpp
index 4a91d713..749a2dde 100644
--- a/tests/auto/xmlpatternssdk/ResultThreader.cpp
+++ b/tests/auto/xmlpatternssdk/ResultThreader.cpp
@@ -32,13 +32,11 @@
using namespace QPatternistSDK;
-ResultThreader::ResultThreader(QEventLoop &ev,
- QFile *file,
+ResultThreader::ResultThreader(QFile *file,
const Type t,
QObject *p) : QThread(p)
, m_file(file)
, m_type(t)
- , m_eventLoop(ev)
{
Q_ASSERT_X(p, Q_FUNC_INFO, "Should have a parent");
Q_ASSERT_X(file, Q_FUNC_INFO, "Should have a valid file");
diff --git a/tests/auto/xmlpatternssdk/ResultThreader.h b/tests/auto/xmlpatternssdk/ResultThreader.h
index 22bde423..ee9438d1 100644
--- a/tests/auto/xmlpatternssdk/ResultThreader.h
+++ b/tests/auto/xmlpatternssdk/ResultThreader.h
@@ -61,8 +61,7 @@ namespace QPatternistSDK
/**
* Creates a ResultThreader that will read @p file when run() is called.
*/
- ResultThreader(QEventLoop &ev,
- QFile *file,
+ ResultThreader(QFile *file,
const Type type,
QObject *parent);
@@ -83,7 +82,6 @@ namespace QPatternistSDK
QFile *const m_file;
const Type m_type;
- QEventLoop & m_eventLoop;
};
}
diff --git a/tests/auto/xmlpatternssdk/Worker.cpp b/tests/auto/xmlpatternssdk/Worker.cpp
index 03bce439..01529d67 100644
--- a/tests/auto/xmlpatternssdk/Worker.cpp
+++ b/tests/auto/xmlpatternssdk/Worker.cpp
@@ -109,9 +109,7 @@ void Worker::threadFinished()
deleteLater();
ResultThreader::Hash::const_iterator itA(m_result.constBegin());
- ResultThreader::Hash::const_iterator itB(m_baseline.constBegin());
const ResultThreader::Hash::const_iterator endA(m_result.constEnd());
- const ResultThreader::Hash::const_iterator endB(m_baseline.constEnd());
const int baselineCount = m_baseline.count();
const int resultCount = m_result.count();
diff --git a/tests/auto/xmlpatternsxqts/tst_suitetest.cpp b/tests/auto/xmlpatternsxqts/tst_suitetest.cpp
index 639a71e1..832d8429 100644
--- a/tests/auto/xmlpatternsxqts/tst_suitetest.cpp
+++ b/tests/auto/xmlpatternsxqts/tst_suitetest.cpp
@@ -144,7 +144,7 @@ void tst_SuiteTest::checkTestSuiteResult() const
QVERIFY2(file->open(QIODevice::ReadOnly), qPrintable(QString::fromLatin1("Could not open file %1 for reading.")
.arg(i.fileName())));
- ResultThreader *handler = new ResultThreader(eventLoop, file, type, worker.data());
+ ResultThreader *handler = new ResultThreader(file, type, worker.data());
QObject::connect(handler, SIGNAL(finished()), worker.data(), SLOT(threadFinished()));