diff options
13 files changed, 32 insertions, 37 deletions
diff --git a/src/concurrent/qtconcurrentiteratekernel.h b/src/concurrent/qtconcurrentiteratekernel.h index 985b03ee79..2a7aba3911 100644 --- a/src/concurrent/qtconcurrentiteratekernel.h +++ b/src/concurrent/qtconcurrentiteratekernel.h @@ -168,10 +168,8 @@ public: virtual ~IterateKernel() { } - virtual bool runIteration(Iterator it, int index , T *result) - { Q_UNUSED(it); Q_UNUSED(index); Q_UNUSED(result); return false; } - virtual bool runIterations(Iterator _begin, int beginIndex, int endIndex, T *results) - { Q_UNUSED(_begin); Q_UNUSED(beginIndex); Q_UNUSED(endIndex); Q_UNUSED(results); return false; } + virtual bool runIteration(Iterator, int , T *) { return false; } + virtual bool runIterations(Iterator, int, int, T *) { return false; } void start() override { diff --git a/src/corelib/io/qfilesystemengine_p.h b/src/corelib/io/qfilesystemengine_p.h index 555483a972..dffd304282 100644 --- a/src/corelib/io/qfilesystemengine_p.h +++ b/src/corelib/io/qfilesystemengine_p.h @@ -115,7 +115,7 @@ public: #if defined(Q_OS_DARWIN) static QString bundleName(const QFileSystemEntry &entry); #else - static QString bundleName(const QFileSystemEntry &entry) { Q_UNUSED(entry) return QString(); } + static QString bundleName(const QFileSystemEntry &) { return QString(); } #endif static bool fillMetaData(const QFileSystemEntry &entry, QFileSystemMetaData &data, diff --git a/src/plugins/platforms/android/qandroidplatformfiledialoghelper.h b/src/plugins/platforms/android/qandroidplatformfiledialoghelper.h index 5a7a28a8a0..e19686828b 100644 --- a/src/plugins/platforms/android/qandroidplatformfiledialoghelper.h +++ b/src/plugins/platforms/android/qandroidplatformfiledialoghelper.h @@ -63,12 +63,12 @@ public: void hide() override; QString selectedNameFilter() const override { return QString(); }; - void selectNameFilter(const QString &filter) override { Q_UNUSED(filter) }; + void selectNameFilter(const QString &) override {}; void setFilter() override {}; QList<QUrl> selectedFiles() const override { return m_selectedFile; }; - void selectFile(const QUrl &file) override { Q_UNUSED(file) }; + void selectFile(const QUrl &) override {}; QUrl directory() const override { return QUrl(); }; - void setDirectory(const QUrl &directory) override { Q_UNUSED(directory) }; + void setDirectory(const QUrl &) override {}; bool defaultNameFilterDisables() const override { return false; }; bool handleActivityResult(jint requestCode, jint resultCode, jobject data) override; diff --git a/src/plugins/platforms/cocoa/qcocoamenu.h b/src/plugins/platforms/cocoa/qcocoamenu.h index 32f9c0820f..852642498b 100644 --- a/src/plugins/platforms/cocoa/qcocoamenu.h +++ b/src/plugins/platforms/cocoa/qcocoamenu.h @@ -70,7 +70,7 @@ public: void propagateEnabledState(bool enabled); - void setIcon(const QIcon &icon) override { Q_UNUSED(icon) } + void setIcon(const QIcon &) override {} void setText(const QString &text) override; void setMinimumWidth(int width) override; diff --git a/src/plugins/platforms/cocoa/qcocoamenuitem.h b/src/plugins/platforms/cocoa/qcocoamenuitem.h index 029d29be9d..ca0340e76c 100644 --- a/src/plugins/platforms/cocoa/qcocoamenuitem.h +++ b/src/plugins/platforms/cocoa/qcocoamenuitem.h @@ -100,7 +100,7 @@ public: #ifndef QT_NO_SHORTCUT void setShortcut(const QKeySequence& shortcut) override; #endif - void setCheckable(bool checkable) override { Q_UNUSED(checkable) } + void setCheckable(bool) override {} void setChecked(bool isChecked) override; void setEnabled(bool isEnabled) override; void setIconSize(int size) override; diff --git a/src/widgets/kernel/qlayout_p.h b/src/widgets/kernel/qlayout_p.h index 2b19af48be..437ab84fc3 100644 --- a/src/widgets/kernel/qlayout_p.h +++ b/src/widgets/kernel/qlayout_p.h @@ -80,7 +80,7 @@ public: static QWidgetItem *createWidgetItem(const QLayout *layout, QWidget *widget); static QSpacerItem *createSpacerItem(const QLayout *layout, int w, int h, QSizePolicy::Policy hPolicy = QSizePolicy::Minimum, QSizePolicy::Policy vPolicy = QSizePolicy::Minimum); - virtual QLayoutItem* replaceAt(int index, QLayoutItem *newitem) { Q_UNUSED(index); Q_UNUSED(newitem); return nullptr; } + virtual QLayoutItem* replaceAt(int, QLayoutItem *) { return nullptr; } static QWidgetItemFactoryMethod widgetItemFactoryMethod; static QSpacerItemFactoryMethod spacerItemFactoryMethod; diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp index 331f1bc979..b77b92f8a5 100644 --- a/src/widgets/widgets/qcalendarwidget.cpp +++ b/src/widgets/widgets/qcalendarwidget.cpp @@ -955,7 +955,7 @@ public: void internalUpdate() { updateGeometries(); } void setReadOnly(bool enable); - virtual void keyboardSearch(const QString & search) override { Q_UNUSED(search) } + virtual void keyboardSearch(const QString &) override {} signals: void showDate(QDate date); diff --git a/tests/auto/corelib/io/qfile/tst_qfile.cpp b/tests/auto/corelib/io/qfile/tst_qfile.cpp index 9416796c6c..b81ed67764 100644 --- a/tests/auto/corelib/io/qfile/tst_qfile.cpp +++ b/tests/auto/corelib/io/qfile/tst_qfile.cpp @@ -2207,8 +2207,7 @@ public: uint ownerId(FileOwner) const { return 0; } QString owner(FileOwner) const { return QString(); } QDateTime fileTime(FileTime) const { return QDateTime(); } - bool setFileTime(const QDateTime &newDate, FileTime time) - { Q_UNUSED(newDate) Q_UNUSED(time) return false; } + bool setFileTime(const QDateTime &, FileTime) { return false; } private: int number; diff --git a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp index 893479843f..a3dd5e05e1 100644 --- a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp +++ b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp @@ -121,7 +121,7 @@ private slots: protected slots: Q_SCRIPTABLE void slot4(int) {} - void slot5(int a, const QString& b) { Q_UNUSED(a); Q_UNUSED(b); } + void slot5(int, const QString &) {} signals: void sig1(); diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp index 74725c8f18..231cccc38d 100644 --- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp +++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp @@ -207,7 +207,11 @@ protected: Q_INVOKABLE QT_MOC_COMPAT void invoke2(int){} Q_SCRIPTABLE QT_MOC_COMPAT void sinvoke2(){} private: - Q_INVOKABLE void invoke3(int hinz = 0, int kunz = 0){Q_UNUSED(hinz) Q_UNUSED(kunz)} + Q_INVOKABLE void invoke3(int hinz = 0, int kunz = 0) + { + Q_UNUSED(hinz); + Q_UNUSED(kunz); + } Q_SCRIPTABLE void sinvoke3(){} int recursionCount; @@ -426,15 +430,12 @@ public: public slots: void on_Sender_signalNoParams() { called_slots << 1; } - void on_Sender_signalWithParams(int i = 0) { called_slots << 2; Q_UNUSED(i); } - void on_Sender_signalWithParams(int i, QString string) { called_slots << 3; Q_UNUSED(i);Q_UNUSED(string); } + void on_Sender_signalWithParams(int = 0) { called_slots << 2; } + void on_Sender_signalWithParams(int, QString) { called_slots << 3; } void on_Sender_signalManyParams() { called_slots << 4; } - void on_Sender_signalManyParams(int i1, int i2, int i3, QString string, bool onoff) - { called_slots << 5; Q_UNUSED(i1);Q_UNUSED(i2);Q_UNUSED(i3);Q_UNUSED(string);Q_UNUSED(onoff); } - void on_Sender_signalManyParams(int i1, int i2, int i3, QString string, bool onoff, bool dummy) - { called_slots << 6; Q_UNUSED(i1);Q_UNUSED(i2);Q_UNUSED(i3);Q_UNUSED(string);Q_UNUSED(onoff); Q_UNUSED(dummy);} - void on_Sender_signalManyParams2(int i1, int i2, int i3, QString string, bool onoff) - { called_slots << 7; Q_UNUSED(i1);Q_UNUSED(i2);Q_UNUSED(i3);Q_UNUSED(string);Q_UNUSED(onoff); } + void on_Sender_signalManyParams(int, int, int, QString, bool) { called_slots << 5; } + void on_Sender_signalManyParams(int, int, int, QString, bool, bool) { called_slots << 6; } + void on_Sender_signalManyParams2(int, int, int, QString, bool) { called_slots << 7; } void slotLoopBack() { called_slots << 8; } void on_Receiver_signalNoParams() { called_slots << 9; } void on_Receiver_signal_with_underscore() { called_slots << 10; } diff --git a/tests/auto/testlib/selftests/signaldumper/tst_signaldumper.cpp b/tests/auto/testlib/selftests/signaldumper/tst_signaldumper.cpp index c90fc28bcb..8ed9858087 100644 --- a/tests/auto/testlib/selftests/signaldumper/tst_signaldumper.cpp +++ b/tests/auto/testlib/selftests/signaldumper/tst_signaldumper.cpp @@ -79,7 +79,7 @@ public: public slots: void slotWithoutParameters() {} - void slotWithParameters(int i, char c) { Q_UNUSED(i); Q_UNUSED(c); } + void slotWithParameters(int, char) {} void emitSecondSignal() { emit nestedSignal(); } signals: diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp index 2bc0cf1800..01d207b080 100644 --- a/tests/auto/tools/moc/tst_moc.cpp +++ b/tests/auto/tools/moc/tst_moc.cpp @@ -1804,16 +1804,14 @@ signals: class QTBUG12260_defaultTemplate_Object : public QObject { Q_OBJECT public slots: - void doSomething(QHash<QString, QVariant> values = QHash<QString, QVariant>() ) { Q_UNUSED(values); } - void doSomethingElse(QSharedPointer<QVarLengthArray<QString, (16 >> 2)> > val - = QSharedPointer<QVarLengthArray<QString, (16 >> 2)> >() ) - { Q_UNUSED(val); } + void doSomething(QHash<QString, QVariant> = QHash<QString, QVariant>() ) {} + void doSomethingElse(QSharedPointer<QVarLengthArray<QString, (16 >> 2)> > + = QSharedPointer<QVarLengthArray<QString, (16 >> 2)> >() ) {} - void doAnotherThing(bool a = (1 < 3), bool b = (1 > 4)) { Q_UNUSED(a); Q_UNUSED(b); } + void doAnotherThing(bool = (1 < 3), bool = (1 > 4)) {} - void performSomething(QList<QList<QString>> e = QList<QList<QString>>(8 < 1), - QHash<int, QList<QString>> h = QHash<int, QList<QString>>()) - { Q_UNUSED(e); Q_UNUSED(h); } + void performSomething(QList<QList<QString>> = QList<QList<QString>>(8 < 1), + QHash<int, QList<QString>> = QHash<int, QList<QString>>()) {} }; diff --git a/tests/auto/widgets/graphicsview/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp index 5b0ceabe62..af21b9f391 100644 --- a/tests/auto/widgets/graphicsview/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp @@ -72,12 +72,11 @@ public: { return QRectF(); } // QGraphicsLayoutItem::setGeometry is a pure virtual function - void setGeometry(QRectF const& rect) - { Q_UNUSED(rect); } + void setGeometry(QRectF const&) {} // QGraphicsLayoutItem::sizeHint is a pure virtual function - QSizeF sizeHint(Qt::SizeHint which, QSizeF const& constraint = QSizeF()) const - { Q_UNUSED(which); Q_UNUSED(constraint); return QSizeF(); } + QSizeF sizeHint(Qt::SizeHint, QSizeF const& = QSizeF()) const + { return QSizeF(); } void updateGeometry() { updateGeometryCalled++; QGraphicsLayoutItem::updateGeometry(); } |