From 6ce2f3f26bf08b4c6952f492a3731eb4fe5a42bc Mon Sep 17 00:00:00 2001 From: Lars Schmertmann Date: Sat, 27 Jun 2020 14:18:09 +0200 Subject: Add ; to Q_UNUSED This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I3f0b6717956ca8fa486bed9817b89dfa19f5e0e1 Reviewed-by: Friedemann Kleint --- .../qanimationgroup/tst_qanimationgroup.cpp | 4 ++-- .../tst_qparallelanimationgroup.cpp | 8 ++++---- .../tst_qsequentialanimationgroup.cpp | 4 ++-- .../tst_qabstractfileengine.cpp | 16 ++++++++-------- .../tst_qsortfilterproxymodel.cpp | 22 +++++++++++----------- .../tst_qtransposeproxymodel.cpp | 2 +- .../plugin/quuid/testProcessUniqueness/main.cpp | 4 ++-- .../serialization/qtextstream/tst_qtextstream.cpp | 8 ++++---- tests/auto/corelib/text/qchar/tst_qchar.cpp | 2 +- .../corelib/tools/collections/tst_collections.cpp | 10 +++++----- .../corelib/tools/qarraydata/tst_qarraydata.cpp | 4 ++-- 11 files changed, 42 insertions(+), 42 deletions(-) (limited to 'tests/auto/corelib') diff --git a/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp b/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp index 2b7de50971..8fc6d1ac61 100644 --- a/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp +++ b/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp @@ -83,8 +83,8 @@ public: virtual void updateState(QAbstractAnimation::State oldState, QAbstractAnimation::State newState) { - Q_UNUSED(oldState) - Q_UNUSED(newState) + Q_UNUSED(oldState); + Q_UNUSED(newState); }; }; diff --git a/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp b/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp index 18a6268ec0..8b36a7a246 100644 --- a/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp +++ b/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp @@ -96,8 +96,8 @@ public: virtual void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) { - Q_UNUSED(oldState) - Q_UNUSED(newState) + Q_UNUSED(oldState); + Q_UNUSED(newState); }; }; @@ -112,8 +112,8 @@ public: virtual void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) { - Q_UNUSED(oldState) - Q_UNUSED(newState) + Q_UNUSED(oldState); + Q_UNUSED(newState); }; virtual int duration() const { diff --git a/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp b/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp index aae2d1b7d0..63a254c26a 100644 --- a/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp +++ b/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp @@ -100,8 +100,8 @@ public: virtual void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) { - Q_UNUSED(oldState) - Q_UNUSED(newState) + Q_UNUSED(oldState); + Q_UNUSED(newState); }; }; diff --git a/tests/auto/corelib/io/qabstractfileengine/tst_qabstractfileengine.cpp b/tests/auto/corelib/io/qabstractfileengine/tst_qabstractfileengine.cpp index 1072cb44f9..1671e9d98b 100644 --- a/tests/auto/corelib/io/qabstractfileengine/tst_qabstractfileengine.cpp +++ b/tests/auto/corelib/io/qabstractfileengine/tst_qabstractfileengine.cpp @@ -195,22 +195,22 @@ public: // bool link(const QString &newName) // { - // Q_UNUSED(newName) + // Q_UNUSED(newName); // return false; // } // bool mkdir(const QString &dirName, bool createParentDirectories) const // { - // Q_UNUSED(dirName) - // Q_UNUSED(createParentDirectories) + // Q_UNUSED(dirName); + // Q_UNUSED(createParentDirectories); // return false; // } // bool rmdir(const QString &dirName, bool recurseParentDirectories) const // { - // Q_UNUSED(dirName) - // Q_UNUSED(recurseParentDirectories) + // Q_UNUSED(dirName); + // Q_UNUSED(recurseParentDirectories); // return false; // } @@ -247,7 +247,7 @@ public: // bool setPermissions(uint perms) // { - // Q_UNUSED(perms) + // Q_UNUSED(perms); // return false; // } @@ -373,8 +373,8 @@ public: // typedef QAbstractFileEngineIterator Iterator; // Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) // { - // Q_UNUSED(filters) - // Q_UNUSED(filterNames) + // Q_UNUSED(filters); + // Q_UNUSED(filterNames); // return 0; // } diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp index 66a9e85dff..fc0f847dc0 100644 --- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp +++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp @@ -2823,7 +2823,7 @@ public: bool hasChildren(const QModelIndex &parent = QModelIndex()) const override { - Q_UNUSED(parent) + Q_UNUSED(parent); return true; } @@ -2834,7 +2834,7 @@ public: int columnCount(const QModelIndex& parent = QModelIndex()) const override { - Q_UNUSED(parent) + Q_UNUSED(parent); return cols; } @@ -3986,14 +3986,14 @@ public: using QAbstractListModel::QAbstractListModel; QVariant data(const QModelIndex &index, int role) const override { - Q_UNUSED(index) - Q_UNUSED(role) + Q_UNUSED(index); + Q_UNUSED(role); return QVariant(); } int rowCount(const QModelIndex &parent = QModelIndex()) const override { - Q_UNUSED(parent) + Q_UNUSED(parent); return 0; } @@ -4034,15 +4034,15 @@ public: int rowCount(const QModelIndex &parent = QModelIndex()) const override { - Q_UNUSED(parent) + Q_UNUSED(parent); return 10; } bool canDropMimeData(const QMimeData *, Qt::DropAction, int row, int column, const QModelIndex &parent) const override { - Q_UNUSED(row) - Q_UNUSED(column) + Q_UNUSED(row); + Q_UNUSED(column); return parent.row() % 2 == 0; } }; @@ -4771,7 +4771,7 @@ void tst_QSortFilterProxyModel::filterAndInsertColumn() {} bool filterAcceptsColumn(int source_column, const QModelIndex &source_parent) const override { - Q_UNUSED(source_parent) + Q_UNUSED(source_parent); switch (filerMode){ case FilterAll: return true; @@ -5030,8 +5030,8 @@ void tst_QSortFilterProxyModel::invalidateColumnsOrRowsFilter() } bool filterAcceptsColumn(int source_column, const QModelIndex &source_parent) const override { - Q_UNUSED(source_column) - Q_UNUSED(source_parent) + Q_UNUSED(source_column); + Q_UNUSED(source_parent); columnFiltered++; return true; diff --git a/tests/auto/corelib/itemmodels/qtransposeproxymodel/tst_qtransposeproxymodel.cpp b/tests/auto/corelib/itemmodels/qtransposeproxymodel/tst_qtransposeproxymodel.cpp index ea44980657..a5043b956a 100644 --- a/tests/auto/corelib/itemmodels/qtransposeproxymodel/tst_qtransposeproxymodel.cpp +++ b/tests/auto/corelib/itemmodels/qtransposeproxymodel/tst_qtransposeproxymodel.cpp @@ -713,7 +713,7 @@ void tst_QTransposeProxyModel::span() {} QSize span(const QModelIndex &index) const override { - Q_UNUSED(index) + Q_UNUSED(index); return QSize(2, 1); } }; diff --git a/tests/auto/corelib/plugin/quuid/testProcessUniqueness/main.cpp b/tests/auto/corelib/plugin/quuid/testProcessUniqueness/main.cpp index d1e138d8eb..126d2bb435 100644 --- a/tests/auto/corelib/plugin/quuid/testProcessUniqueness/main.cpp +++ b/tests/auto/corelib/plugin/quuid/testProcessUniqueness/main.cpp @@ -32,8 +32,8 @@ // This is a testcase for QTBUG-11213 int main(int argc, char **argv) { - Q_UNUSED(argc) - Q_UNUSED(argv) + Q_UNUSED(argc); + Q_UNUSED(argv); // Now print a few uuids. printf("%s", qPrintable(QUuid::createUuid().toString())); diff --git a/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp b/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp index cef67d680b..6a09512235 100644 --- a/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp +++ b/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp @@ -609,15 +609,15 @@ class ErrorDevice : public QIODevice protected: qint64 readData(char *data, qint64 maxlen) override { - Q_UNUSED(data) - Q_UNUSED(maxlen) + Q_UNUSED(data); + Q_UNUSED(maxlen); return -1; } qint64 writeData(const char *data, qint64 len) override { - Q_UNUSED(data) - Q_UNUSED(len) + Q_UNUSED(data); + Q_UNUSED(len); return -1; } }; diff --git a/tests/auto/corelib/text/qchar/tst_qchar.cpp b/tests/auto/corelib/text/qchar/tst_qchar.cpp index 83a6765f2e..bad8665d90 100644 --- a/tests/auto/corelib/text/qchar/tst_qchar.cpp +++ b/tests/auto/corelib/text/qchar/tst_qchar.cpp @@ -881,7 +881,7 @@ void tst_QChar::normalization() QFETCH(QStringList, columns); QFETCH(int, part); - Q_UNUSED(part) + Q_UNUSED(part); // CONFORMANCE: // 1. The following invariants must be true for all conformant implementations diff --git a/tests/auto/corelib/tools/collections/tst_collections.cpp b/tests/auto/corelib/tools/collections/tst_collections.cpp index 61a0db26de..23a734f428 100644 --- a/tests/auto/corelib/tools/collections/tst_collections.cpp +++ b/tests/auto/corelib/tools/collections/tst_collections.cpp @@ -2640,7 +2640,7 @@ void instantiateContainer() constIt = constContainer.end(); constIt = constContainer.cend(); container.constEnd(); - Q_UNUSED(constIt) + Q_UNUSED(constIt); container.clear(); container.contains(value); @@ -2663,7 +2663,7 @@ void instantiateMutableIterationContainer() typename ContainerType::iterator it; it = container.begin(); it = container.end(); - Q_UNUSED(it) + Q_UNUSED(it); } template @@ -2824,7 +2824,7 @@ void tst_Collections::qtimerList() template void testContainerTypedefs(Container container) { - Q_UNUSED(container) + Q_UNUSED(container); { QVERIFY_TYPE(typename Container::value_type); } { QVERIFY_TYPE(typename Container::iterator); } { QVERIFY_TYPE(typename Container::const_iterator); } @@ -2838,7 +2838,7 @@ void testContainerTypedefs(Container container) template void testPairAssociativeContainerTypedefs(Container container) { - Q_UNUSED(container) + Q_UNUSED(container); // TODO: Not sure how to define value_type for our associative containers // { QVERIFY_TYPE(typename Container::value_type); } @@ -2860,7 +2860,7 @@ void testPairAssociativeContainerTypedefs(Container container) template void testSetContainerTypedefs(Container container) { - Q_UNUSED(container) + Q_UNUSED(container); { QVERIFY_TYPE(typename Container::iterator); } { QVERIFY_TYPE(typename Container::const_iterator); } { QVERIFY_TYPE(typename Container::reference); } diff --git a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp index c7f20ec6a4..ccba312807 100644 --- a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp +++ b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp @@ -736,7 +736,7 @@ size_t CountedObject::liveCount = 0; void tst_QArrayData::arrayOps() { - CountedObject::LeakChecker leakChecker; Q_UNUSED(leakChecker) + CountedObject::LeakChecker leakChecker; Q_UNUSED(leakChecker); const int intArray[5] = { 80, 101, 100, 114, 111 }; const QString stringArray[5] = { @@ -901,7 +901,7 @@ void tst_QArrayData::arrayOps() void tst_QArrayData::arrayOps2() { - CountedObject::LeakChecker leakChecker; Q_UNUSED(leakChecker) + CountedObject::LeakChecker leakChecker; Q_UNUSED(leakChecker); //////////////////////////////////////////////////////////////////////////// // appendInitialize -- cgit v1.2.3