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 <Friedemann.Kleint@qt.io>

24 files changed, 56 insertions, 56 deletions

diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp
index 780d54c4b7..ae545a5ce2 100644
--- a/src/widgets/accessible/qaccessiblewidget.cpp
+++ b/src/widgets/accessible/qaccessiblewidget.cpp
@@ -158,7 +158,7 @@ QString qt_accHotKey(const QString &text)
     if (ampIndex != -1)
         return QKeySequence(Qt::ALT).toString(QKeySequence::NativeText) + text.at(ampIndex + 1);
 #else
-    Q_UNUSED(text)
+    Q_UNUSED(text);
 #endif
 
     return QString();
diff --git a/src/widgets/accessible/simplewidgets.cpp b/src/widgets/accessible/simplewidgets.cpp
index 65c7375430..3ecd938039 100644
--- a/src/widgets/accessible/simplewidgets.cpp
+++ b/src/widgets/accessible/simplewidgets.cpp
@@ -365,7 +365,7 @@ QAccessibleInterface *QAccessibleToolButton::child(int index) const
         return QAccessible::queryAccessibleInterface(toolButton()->menu());
     }
 #else
-    Q_UNUSED(index)
+    Q_UNUSED(index);
 #endif
     return nullptr;
 }
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp
index f89d60ca74..587db6343f 100644
--- a/src/widgets/dialogs/qfiledialog.cpp
+++ b/src/widgets/dialogs/qfiledialog.cpp
@@ -1029,7 +1029,7 @@ QUrl QFileDialog::directoryUrl() const
 // FIXME Qt 5.4: Use upcoming QVolumeInfo class to determine this information?
 static inline bool isCaseSensitiveFileSystem(const QString &path)
 {
-    Q_UNUSED(path)
+    Q_UNUSED(path);
 #if defined(Q_OS_WIN)
     // Return case insensitive unconditionally, even if someone has a case sensitive
     // file system mounted, wrongly capitalized drive letters will cause mismatches.
@@ -1185,7 +1185,7 @@ QStringList QFileDialogPrivate::typedFiles() const
             files << qt_tildeExpansion(editText);
 #else
         files << editText;
-        Q_UNUSED(q)
+        Q_UNUSED(q);
 #endif
     } else {
         // " is used to separate files like so: "file1" "file2" "file3" ...
diff --git a/src/widgets/dialogs/qfilesystemmodel.cpp b/src/widgets/dialogs/qfilesystemmodel.cpp
index 8aefac7343..96d3f0e011 100644
--- a/src/widgets/dialogs/qfilesystemmodel.cpp
+++ b/src/widgets/dialogs/qfilesystemmodel.cpp
@@ -863,7 +863,7 @@ static void displayRenameFailedMessage(const QString &newName)
     QMessageBox::information(nullptr, QFileSystemModel::tr("Invalid filename"),
                              message, QMessageBox::Ok);
 #else
-    Q_UNUSED(newName)
+    Q_UNUSED(newName);
 #endif // QT_CONFIG(messagebox)
 }
 
@@ -1633,7 +1633,7 @@ void QFileSystemModel::setResolveSymlinks(bool enable)
     Q_D(QFileSystemModel);
     d->fileInfoGatherer.setResolveSymlinks(enable);
 #else
-    Q_UNUSED(enable)
+    Q_UNUSED(enable);
 #endif
 }
 
@@ -1721,7 +1721,7 @@ void QFileSystemModel::setNameFilters(const QStringList &filters)
     d->forceSort = true;
     d->delayedSort();
 #else
-    Q_UNUSED(filters)
+    Q_UNUSED(filters);
 #endif
 }
 
@@ -1824,7 +1824,7 @@ QFileSystemModelPrivate::QFileSystemNode* QFileSystemModelPrivate::addNode(QFile
 #if QT_CONFIG(filesystemwatcher)
     node->populate(info);
 #else
-    Q_UNUSED(info)
+    Q_UNUSED(info);
 #endif
 #if defined(Q_OS_WIN)
     //The parentNode is "" so we are listing the drives
@@ -2016,8 +2016,8 @@ void QFileSystemModelPrivate::_q_fileSystemChanged(const QString &path,
         delayedSort();
     }
 #else
-    Q_UNUSED(path)
-    Q_UNUSED(updates)
+    Q_UNUSED(path);
+    Q_UNUSED(updates);
 #endif // filesystemwatcher
 }
 
@@ -2165,7 +2165,7 @@ bool QFileSystemModelPrivate::passNameFilters(const QFileSystemNode *node) const
         return false;
     }
 #else
-    Q_UNUSED(node)
+    Q_UNUSED(node);
 #endif
     return true;
 }
diff --git a/src/widgets/graphicsview/qgraphicsview.cpp b/src/widgets/graphicsview/qgraphicsview.cpp
index d3d49f4395..4119fd4851 100644
--- a/src/widgets/graphicsview/qgraphicsview.cpp
+++ b/src/widgets/graphicsview/qgraphicsview.cpp
@@ -903,8 +903,8 @@ void QGraphicsViewPrivate::populateSceneDragDropEvent(QGraphicsSceneDragDropEven
     dest->setWidget(viewport);
     dest->setSource(qobject_cast<QWidget *>(source->source()));
 #else
-    Q_UNUSED(dest)
-    Q_UNUSED(source)
+    Q_UNUSED(dest);
+    Q_UNUSED(source);
 #endif
 }
 
diff --git a/src/widgets/itemviews/qabstractitemdelegate.cpp b/src/widgets/itemviews/qabstractitemdelegate.cpp
index a39da69ffd..3b2d1a80ff 100644
--- a/src/widgets/itemviews/qabstractitemdelegate.cpp
+++ b/src/widgets/itemviews/qabstractitemdelegate.cpp
@@ -551,7 +551,7 @@ bool QAbstractItemDelegatePrivate::tryFixup(QWidget *editor)
         }
     }
 #else
-    Q_UNUSED(editor)
+    Q_UNUSED(editor);
 #endif // QT_CONFIG(lineedit)
 
     return true;
diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp
index dcc1e615a7..bc35679492 100644
--- a/src/widgets/itemviews/qabstractitemview.cpp
+++ b/src/widgets/itemviews/qabstractitemview.cpp
@@ -3397,9 +3397,9 @@ void QAbstractItemView::rowsAboutToBeRemoved(const QModelIndex &parent, int star
 */
 void QAbstractItemViewPrivate::_q_rowsRemoved(const QModelIndex &index, int start, int end)
 {
-    Q_UNUSED(index)
-    Q_UNUSED(start)
-    Q_UNUSED(end)
+    Q_UNUSED(index);
+    Q_UNUSED(start);
+    Q_UNUSED(end);
 
     Q_Q(QAbstractItemView);
     if (q->isVisible())
@@ -3478,9 +3478,9 @@ void QAbstractItemViewPrivate::_q_columnsAboutToBeRemoved(const QModelIndex &par
 */
 void QAbstractItemViewPrivate::_q_columnsRemoved(const QModelIndex &index, int start, int end)
 {
-    Q_UNUSED(index)
-    Q_UNUSED(start)
-    Q_UNUSED(end)
+    Q_UNUSED(index);
+    Q_UNUSED(start);
+    Q_UNUSED(end);
 
     Q_Q(QAbstractItemView);
     if (q->isVisible())
@@ -3505,9 +3505,9 @@ void QAbstractItemViewPrivate::_q_columnsRemoved(const QModelIndex &index, int s
 */
 void QAbstractItemViewPrivate::_q_rowsInserted(const QModelIndex &index, int start, int end)
 {
-    Q_UNUSED(index)
-    Q_UNUSED(start)
-    Q_UNUSED(end)
+    Q_UNUSED(index);
+    Q_UNUSED(start);
+    Q_UNUSED(end);
 
 #ifndef QT_NO_ACCESSIBILITY
     Q_Q(QAbstractItemView);
@@ -3528,9 +3528,9 @@ void QAbstractItemViewPrivate::_q_rowsInserted(const QModelIndex &index, int sta
 */
 void QAbstractItemViewPrivate::_q_columnsInserted(const QModelIndex &index, int start, int end)
 {
-    Q_UNUSED(index)
-    Q_UNUSED(start)
-    Q_UNUSED(end)
+    Q_UNUSED(index);
+    Q_UNUSED(start);
+    Q_UNUSED(end);
 
     Q_Q(QAbstractItemView);
     if (q->isVisible())
@@ -3955,7 +3955,7 @@ QItemSelectionModel::SelectionFlags QAbstractItemView::selectionCommand(const QM
 QItemSelectionModel::SelectionFlags QAbstractItemViewPrivate::multiSelectionCommand(
     const QModelIndex &index, const QEvent *event) const
 {
-    Q_UNUSED(index)
+    Q_UNUSED(index);
 
     if (event) {
         switch (event->type()) {
diff --git a/src/widgets/itemviews/qtableview.cpp b/src/widgets/itemviews/qtableview.cpp
index 4afcc3ef6a..091e998036 100644
--- a/src/widgets/itemviews/qtableview.cpp
+++ b/src/widgets/itemviews/qtableview.cpp
@@ -975,7 +975,7 @@ void QTableViewPrivate::drawAndClipSpans(const QRegion &area, QPainter *painter,
 */
 void QTableViewPrivate::_q_updateSpanInsertedRows(const QModelIndex &parent, int start, int end)
 {
-    Q_UNUSED(parent)
+    Q_UNUSED(parent);
     spans.updateInsertedRows(start, end);
 }
 
@@ -985,7 +985,7 @@ void QTableViewPrivate::_q_updateSpanInsertedRows(const QModelIndex &parent, int
 */
 void QTableViewPrivate::_q_updateSpanInsertedColumns(const QModelIndex &parent, int start, int end)
 {
-    Q_UNUSED(parent)
+    Q_UNUSED(parent);
     spans.updateInsertedColumns(start, end);
 }
 
@@ -995,7 +995,7 @@ void QTableViewPrivate::_q_updateSpanInsertedColumns(const QModelIndex &parent,
 */
 void QTableViewPrivate::_q_updateSpanRemovedRows(const QModelIndex &parent, int start, int end)
 {
-    Q_UNUSED(parent)
+    Q_UNUSED(parent);
     spans.updateRemovedRows(start, end);
 }
 
@@ -1005,7 +1005,7 @@ void QTableViewPrivate::_q_updateSpanRemovedRows(const QModelIndex &parent, int
 */
 void QTableViewPrivate::_q_updateSpanRemovedColumns(const QModelIndex &parent, int start, int end)
 {
-    Q_UNUSED(parent)
+    Q_UNUSED(parent);
     spans.updateRemovedColumns(start, end);
 }
 
@@ -3451,7 +3451,7 @@ void QTableView::selectionChanged(const QItemSelection &selected,
                                   const QItemSelection &deselected)
 {
     Q_D(QTableView);
-    Q_UNUSED(d)
+    Q_UNUSED(d);
 #ifndef QT_NO_ACCESSIBILITY
     if (QAccessible::isActive()) {
         // ### does not work properly for selection ranges.
diff --git a/src/widgets/kernel/qwidgetaction.cpp b/src/widgets/kernel/qwidgetaction.cpp
index 88e71fd800..f9cd82f788 100644
--- a/src/widgets/kernel/qwidgetaction.cpp
+++ b/src/widgets/kernel/qwidgetaction.cpp
@@ -250,7 +250,7 @@ bool QWidgetAction::eventFilter(QObject *obj, QEvent *event)
 */
 QWidget *QWidgetAction::createWidget(QWidget *parent)
 {
-    Q_UNUSED(parent)
+    Q_UNUSED(parent);
     return nullptr;
 }
 
diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp
index d6817caf96..a3befc4f0a 100644
--- a/src/widgets/kernel/qwidgetwindow.cpp
+++ b/src/widgets/kernel/qwidgetwindow.cpp
@@ -632,8 +632,8 @@ void QWidgetWindow::handleMouseEvent(QMouseEvent *event)
             QApplication::forwardEvent(receiver, &e, event);
         }
 #else
-            Q_UNUSED(contextMenuTrigger)
-            Q_UNUSED(oldOpenPopupCount)
+            Q_UNUSED(contextMenuTrigger);
+            Q_UNUSED(oldOpenPopupCount);
         }
 #endif
 
diff --git a/src/widgets/util/qcompleter.cpp b/src/widgets/util/qcompleter.cpp
index cdd06f4790..7febc23b2d 100644
--- a/src/widgets/util/qcompleter.cpp
+++ b/src/widgets/util/qcompleter.cpp
@@ -474,7 +474,7 @@ QMatchData QCompletionEngine::filterHistory()
 #else
     const bool isFsModel = false;
 #endif
-    Q_UNUSED(isFsModel)
+    Q_UNUSED(isFsModel);
     QList<int> v;
     QIndexMapper im(v);
     QMatchData m(im, -1, true);
diff --git a/src/widgets/util/qsystemtrayicon.cpp b/src/widgets/util/qsystemtrayicon.cpp
index 556427387f..abd49237a6 100644
--- a/src/widgets/util/qsystemtrayicon.cpp
+++ b/src/widgets/util/qsystemtrayicon.cpp
@@ -748,7 +748,7 @@ void QSystemTrayIconPrivate::addPlatformMenu(QMenu *menu) const
     if (platformMenu)
         menu->setPlatformMenu(platformMenu);
 #else
-    Q_UNUSED(menu)
+    Q_UNUSED(menu);
 #endif // QT_CONFIG(menu)
 }
 
diff --git a/src/widgets/util/qsystemtrayicon_x11.cpp b/src/widgets/util/qsystemtrayicon_x11.cpp
index 5d446cf22a..dfe60319e8 100644
--- a/src/widgets/util/qsystemtrayicon_x11.cpp
+++ b/src/widgets/util/qsystemtrayicon_x11.cpp
@@ -125,7 +125,7 @@ void QSystemTrayIconSys::mousePressEvent(QMouseEvent *ev)
     if (ev->button() == Qt::RightButton && q->contextMenu())
         q->contextMenu()->popup(globalPos);
 #else
-    Q_UNUSED(globalPos)
+    Q_UNUSED(globalPos);
 #endif // QT_NO_CONTEXTMENU
 
     if (QBalloonTip::isBalloonVisible()) {
diff --git a/src/widgets/widgets/qabstractspinbox.cpp b/src/widgets/widgets/qabstractspinbox.cpp
index f87e4d1a2a..c9753f5f51 100644
--- a/src/widgets/widgets/qabstractspinbox.cpp
+++ b/src/widgets/widgets/qabstractspinbox.cpp
@@ -1952,7 +1952,7 @@ void QAbstractSpinBoxPrivate::clearCache() const
 
 QVariant QAbstractSpinBoxPrivate::calculateAdaptiveDecimalStep(int steps) const
 {
-    Q_UNUSED(steps)
+    Q_UNUSED(steps);
     return singleStep;
 }
 
diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp
index b77b92f8a5..830216ef72 100644
--- a/src/widgets/widgets/qcalendarwidget.cpp
+++ b/src/widgets/widgets/qcalendarwidget.cpp
@@ -1621,7 +1621,7 @@ public:
 protected:
     void paintEvent(QPaintEvent *e) override
     {
-        Q_UNUSED(e)
+        Q_UNUSED(e);
 
         QStyleOptionToolButton opt;
         initStyleOption(&opt);
diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp
index 41c57eebc1..cdf5574eca 100644
--- a/src/widgets/widgets/qdockwidget.cpp
+++ b/src/widgets/widgets/qdockwidget.cpp
@@ -1466,7 +1466,7 @@ void QDockWidget::closeEvent(QCloseEvent *event)
 /*! \reimp */
 void QDockWidget::paintEvent(QPaintEvent *event)
 {
-    Q_UNUSED(event)
+    Q_UNUSED(event);
     Q_D(QDockWidget);
 
     QDockWidgetLayout *layout
diff --git a/src/widgets/widgets/qmainwindow.cpp b/src/widgets/widgets/qmainwindow.cpp
index 9379fb04ef..9ba7260072 100644
--- a/src/widgets/widgets/qmainwindow.cpp
+++ b/src/widgets/widgets/qmainwindow.cpp
@@ -1365,7 +1365,7 @@ void QMainWindow::setUnifiedTitleAndToolBarOnMac(bool enabled)
 
     update();
 #else
-    Q_UNUSED(enabled)
+    Q_UNUSED(enabled);
 #endif
 }
 
diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp
index 858ec9c03c..68ac7c3c59 100644
--- a/src/widgets/widgets/qtabbar.cpp
+++ b/src/widgets/widgets/qtabbar.cpp
@@ -1632,7 +1632,7 @@ QSize QTabBar::tabSizeHint(int index) const
  */
 void QTabBar::tabInserted(int index)
 {
-    Q_UNUSED(index)
+    Q_UNUSED(index);
 }
 
 /*!
@@ -1643,7 +1643,7 @@ void QTabBar::tabInserted(int index)
  */
 void QTabBar::tabRemoved(int index)
 {
-    Q_UNUSED(index)
+    Q_UNUSED(index);
 }
 
 /*!
@@ -2364,7 +2364,7 @@ void QTabBar::wheelEvent(QWheelEvent *event)
     d->setCurrentNextEnabledIndex(offset);
     QWidget::wheelEvent(event);
 #else
-    Q_UNUSED(event)
+    Q_UNUSED(event);
 #endif
 }
 #endif // QT_CONFIG(wheelevent)
diff --git a/src/widgets/widgets/qtabwidget.cpp b/src/widgets/widgets/qtabwidget.cpp
index 710d5a42a7..35b097b0c7 100644
--- a/src/widgets/widgets/qtabwidget.cpp
+++ b/src/widgets/widgets/qtabwidget.cpp
@@ -1266,7 +1266,7 @@ QString QTabWidget::tabWhatsThis(int index) const
  */
 void QTabWidget::tabInserted(int index)
 {
-    Q_UNUSED(index)
+    Q_UNUSED(index);
 }
 
 /*!
@@ -1277,7 +1277,7 @@ void QTabWidget::tabInserted(int index)
  */
 void QTabWidget::tabRemoved(int index)
 {
-    Q_UNUSED(index)
+    Q_UNUSED(index);
 }
 
 /*!
diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp
index f98c99c72b..111493904f 100644
--- a/src/widgets/widgets/qtextedit.cpp
+++ b/src/widgets/widgets/qtextedit.cpp
@@ -1111,7 +1111,7 @@ bool QTextEdit::event(QEvent *e)
         d->sendControlEvent(e);
     }
 #else
-    Q_UNUSED(d)
+    Q_UNUSED(d);
 #endif // QT_NO_CONTEXTMENU
 #ifdef QT_KEYPAD_NAVIGATION
     if (e->type() == QEvent::EnterEditFocus || e->type() == QEvent::LeaveEditFocus) {
diff --git a/src/widgets/widgets/qtoolbox.cpp b/src/widgets/widgets/qtoolbox.cpp
index 57d26bb6ee..9adf8fcd05 100644
--- a/src/widgets/widgets/qtoolbox.cpp
+++ b/src/widgets/widgets/qtoolbox.cpp
@@ -726,7 +726,7 @@ void QToolBox::changeEvent(QEvent *ev)
  */
 void QToolBox::itemInserted(int index)
 {
-    Q_UNUSED(index)
+    Q_UNUSED(index);
 }
 
 /*!
@@ -737,7 +737,7 @@ void QToolBox::itemInserted(int index)
  */
 void QToolBox::itemRemoved(int index)
 {
-    Q_UNUSED(index)
+    Q_UNUSED(index);
 }
 
 /*! \reimp */
diff --git a/src/widgets/widgets/qwidgetanimator.cpp b/src/widgets/widgets/qwidgetanimator.cpp
index cec6ba1dea..9a4045196c 100644
--- a/src/widgets/widgets/qwidgetanimator.cpp
+++ b/src/widgets/widgets/qwidgetanimator.cpp
@@ -55,7 +55,7 @@ QWidgetAnimator::QWidgetAnimator(QMainWindowLayout *layout)
 : m_mainWindowLayout(layout)
 #endif
 {
-    Q_UNUSED(layout)
+    Q_UNUSED(layout);
 }
 
 void QWidgetAnimator::abort(QWidget *w)
diff --git a/src/widgets/widgets/qwidgetlinecontrol.cpp b/src/widgets/widgets/qwidgetlinecontrol.cpp
index 3fb419c7a5..08f3133b96 100644
--- a/src/widgets/widgets/qwidgetlinecontrol.cpp
+++ b/src/widgets/widgets/qwidgetlinecontrol.cpp
@@ -694,7 +694,7 @@ void QWidgetLineControl::selectWordAtPos(int cursor)
 */
 bool QWidgetLineControl::finishChange(int validateFromState, bool update, bool edited)
 {
-    Q_UNUSED(update)
+    Q_UNUSED(update);
 
     if (m_textDirty) {
         // do validation
@@ -788,7 +788,7 @@ void QWidgetLineControl::internalSetText(const QString &txt, int pos, bool edite
         }
     }
 #else
-    Q_UNUSED(changed)
+    Q_UNUSED(changed);
 #endif
 }
 
diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp
index 7a175b4b06..67bfffebaa 100644
--- a/src/widgets/widgets/qwidgettextcontrol.cpp
+++ b/src/widgets/widgets/qwidgettextcontrol.cpp
@@ -697,9 +697,9 @@ void QWidgetTextControlPrivate::_q_contentsChanged(int from, int charsRemoved, i
         delete ev;
     }
 #else
-    Q_UNUSED(from)
-    Q_UNUSED(charsRemoved)
-    Q_UNUSED(charsAdded)
+    Q_UNUSED(from);
+    Q_UNUSED(charsRemoved);
+    Q_UNUSED(charsAdded);
 #endif
 }