Avoid warning on empty expressions

For some reason, Q_UNUSED includes already a semicolon, adding one
on the user side creates an additional empty statement.

Change-Id: I9c5e8fac381345a60792cb75e2938fd53958d3b0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

10 files changed, 30 insertions, 30 deletions

diff --git a/src/libs/utils/basetreeview.cpp b/src/libs/utils/basetreeview.cpp
index 352b17bb4b..00b73002f8 100644
--- a/src/libs/utils/basetreeview.cpp
+++ b/src/libs/utils/basetreeview.cpp
@@ -345,7 +345,7 @@ public:
     QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option,
                           const QModelIndex &index) const override
     {
-        Q_UNUSED(option);
+        Q_UNUSED(option)
         QLabel *label = new QLabel(parent);
         label->setAutoFillBackground(true);
         label->setTextInteractionFlags(Qt::TextSelectableByMouse
diff --git a/src/libs/utils/delegates.cpp b/src/libs/utils/delegates.cpp
index 2240e8a6a4..1eb281e3af 100644
--- a/src/libs/utils/delegates.cpp
+++ b/src/libs/utils/delegates.cpp
@@ -131,8 +131,8 @@ void PathChooserDelegate::setPromptDialogFilter(const QString &filter)
 
 QWidget *PathChooserDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
-    Q_UNUSED(option);
-    Q_UNUSED(index);
+    Q_UNUSED(option)
+    Q_UNUSED(index)
 
     auto editor = new Utils::PathChooser(parent);
 
@@ -167,7 +167,7 @@ void PathChooserDelegate::setModelData(QWidget *editor, QAbstractItemModel *mode
 
 void PathChooserDelegate::updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
-    Q_UNUSED(index);
+    Q_UNUSED(index)
 
     editor->setGeometry(option.rect);
 }
@@ -200,8 +200,8 @@ QWidget *CompleterDelegate::createEditor(QWidget *parent,
                                          const QStyleOptionViewItem &option,
                                          const QModelIndex &index) const
 {
-    Q_UNUSED(option);
-    Q_UNUSED(index);
+    Q_UNUSED(option)
+    Q_UNUSED(index)
 
     auto edit = new CompletingLineEdit(parent);
 
@@ -229,7 +229,7 @@ void CompleterDelegate::updateEditorGeometry(QWidget *editor,
                                              const QStyleOptionViewItem &option,
                                              const QModelIndex &index) const
 {
-    Q_UNUSED(index);
+    Q_UNUSED(index)
 
     editor->setGeometry(option.rect);
 }
diff --git a/src/libs/utils/fancylineedit.cpp b/src/libs/utils/fancylineedit.cpp
index 6b5b11995c..205de0dcc9 100644
--- a/src/libs/utils/fancylineedit.cpp
+++ b/src/libs/utils/fancylineedit.cpp
@@ -416,7 +416,7 @@ FancyLineEdit::ValidationFunction FancyLineEdit::defaultValidationFunction()
 
 bool FancyLineEdit::validateWithValidator(FancyLineEdit *edit, QString *errorMessage)
 {
-    Q_UNUSED(errorMessage);
+    Q_UNUSED(errorMessage)
     if (const QValidator *v = edit->validator()) {
         QString tmp = edit->text();
         int pos = edit->cursorPosition();
diff --git a/src/libs/utils/outputformatter.cpp b/src/libs/utils/outputformatter.cpp
index 7926422da6..475d8596e6 100644
--- a/src/libs/utils/outputformatter.cpp
+++ b/src/libs/utils/outputformatter.cpp
@@ -151,7 +151,7 @@ void OutputFormatter::initFormats()
 
 void OutputFormatter::handleLink(const QString &href)
 {
-    Q_UNUSED(href);
+    Q_UNUSED(href)
 }
 
 void OutputFormatter::setBoldFontEnabled(bool enabled)
diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp
index 992e1817c0..7080d218a5 100644
--- a/src/libs/utils/qtcprocess.cpp
+++ b/src/libs/utils/qtcprocess.cpp
@@ -672,8 +672,8 @@ QtcProcess::QtcProcess(QObject *parent)
 {
     static int qProcessExitStatusMeta = qRegisterMetaType<QProcess::ExitStatus>();
     static int qProcessProcessErrorMeta = qRegisterMetaType<QProcess::ProcessError>();
-    Q_UNUSED(qProcessExitStatusMeta);
-    Q_UNUSED(qProcessProcessErrorMeta);
+    Q_UNUSED(qProcessExitStatusMeta)
+    Q_UNUSED(qProcessProcessErrorMeta)
 }
 
 void QtcProcess::setUseCtrlCStub(bool enabled)
diff --git a/src/libs/utils/settingsaccessor.cpp b/src/libs/utils/settingsaccessor.cpp
index 881652f5ea..bc34ec7f93 100644
--- a/src/libs/utils/settingsaccessor.cpp
+++ b/src/libs/utils/settingsaccessor.cpp
@@ -100,7 +100,7 @@ bool SettingsAccessor::saveSettings(const QVariantMap &data, QWidget *parent) co
  */
 SettingsAccessor::RestoreData SettingsAccessor::readData(const FilePath &path, QWidget *parent) const
 {
-    Q_UNUSED(parent);
+    Q_UNUSED(parent)
     RestoreData result = readFile(path);
     if (!result.data.isEmpty())
         result.data = preprocessReadSettings(result.data);
@@ -113,7 +113,7 @@ SettingsAccessor::RestoreData SettingsAccessor::readData(const FilePath &path, Q
 optional<SettingsAccessor::Issue>
 SettingsAccessor::writeData(const FilePath &path, const QVariantMap &data, QWidget *parent) const
 {
-    Q_UNUSED(parent);
+    Q_UNUSED(parent)
     return writeFile(path, prepareToWriteSettings(data));
 }
 
@@ -365,7 +365,7 @@ int VersionedBackUpStrategy::compare(const SettingsAccessor::RestoreData &data1,
 optional<FilePath>
 VersionedBackUpStrategy::backupName(const QVariantMap &oldData, const FilePath &path, const QVariantMap &data) const
 {
-    Q_UNUSED(data);
+    Q_UNUSED(data)
     FilePath backupName = path;
     const QByteArray oldEnvironmentId = settingsIdFromMap(oldData);
     const int oldVersion = versionFromMap(oldData);
@@ -707,8 +707,8 @@ QVariantMap MergingSettingsAccessor::postprocessMerge(const QVariantMap &main,
                                                       const QVariantMap &secondary,
                                                       const QVariantMap &result) const
 {
-    Q_UNUSED(main);
-    Q_UNUSED(secondary);
+    Q_UNUSED(main)
+    Q_UNUSED(secondary)
     return result;
 }
 
diff --git a/src/libs/utils/shellcommand.cpp b/src/libs/utils/shellcommand.cpp
index 99b0b0ace6..060c4003fa 100644
--- a/src/libs/utils/shellcommand.cpp
+++ b/src/libs/utils/shellcommand.cpp
@@ -238,7 +238,7 @@ unsigned ShellCommand::processFlags() const
 
 void ShellCommand::addTask(QFuture<void> &future)
 {
-    Q_UNUSED(future);
+    Q_UNUSED(future)
 }
 
 int ShellCommand::timeoutS() const
diff --git a/src/libs/utils/tooltip/tips.cpp b/src/libs/utils/tooltip/tips.cpp
index f6927efef5..116b0832ad 100644
--- a/src/libs/utils/tooltip/tips.cpp
+++ b/src/libs/utils/tooltip/tips.cpp
@@ -283,7 +283,7 @@ void WidgetTip::pinToolTipWidget(QWidget *parent)
 bool WidgetTip::canHandleContentReplacement(int typeId) const
 {
     // Always create a new widget.
-    Q_UNUSED(typeId);
+    Q_UNUSED(typeId)
     return false;
 }
 
diff --git a/src/libs/utils/treemodel.cpp b/src/libs/utils/treemodel.cpp
index 1f8fbd5756..89c8d5aa4c 100644
--- a/src/libs/utils/treemodel.cpp
+++ b/src/libs/utils/treemodel.cpp
@@ -521,7 +521,7 @@ void ModelTest::data()
  */
 void ModelTest::rowsAboutToBeInserted(const QModelIndex &parent, int start, int end)
 {
-    Q_UNUSED(end);
+    Q_UNUSED(end)
     Changing c;
     c.parent = parent;
     c.oldSize = model->rowCount(parent);
@@ -628,22 +628,22 @@ int TreeItem::indexOf(const TreeItem *item) const
 
 QVariant TreeItem::data(int column, int role) const
 {
-    Q_UNUSED(column);
-    Q_UNUSED(role);
+    Q_UNUSED(column)
+    Q_UNUSED(role)
     return QVariant();
 }
 
 bool TreeItem::setData(int column, const QVariant &data, int role)
 {
-    Q_UNUSED(column);
-    Q_UNUSED(data);
-    Q_UNUSED(role);
+    Q_UNUSED(column)
+    Q_UNUSED(data)
+    Q_UNUSED(role)
     return false;
 }
 
 Qt::ItemFlags TreeItem::flags(int column) const
 {
-    Q_UNUSED(column);
+    Q_UNUSED(column)
     return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
 }
 
@@ -1195,7 +1195,7 @@ QVariant StaticTreeItem::data(int column, int role) const
 
 Qt::ItemFlags StaticTreeItem::flags(int column) const
 {
-    Q_UNUSED(column);
+    Q_UNUSED(column)
     return Qt::ItemIsEnabled;
 }
 
diff --git a/src/libs/utils/winutils.cpp b/src/libs/utils/winutils.cpp
index 5190e11fca..69eb0d11e8 100644
--- a/src/libs/utils/winutils.cpp
+++ b/src/libs/utils/winutils.cpp
@@ -131,9 +131,9 @@ QTCREATOR_UTILS_EXPORT QString winGetDLLVersion(WinDLLVersionType t,
     }
     return rc;
 #endif
-    Q_UNUSED(t);
-    Q_UNUSED(name);
-    Q_UNUSED(errorMessage);
+    Q_UNUSED(t)
+    Q_UNUSED(name)
+    Q_UNUSED(errorMessage)
     return QString();
 }
 
@@ -182,7 +182,7 @@ QTCREATOR_UTILS_EXPORT QString imageName(quint32 processId)
         result = QString::fromUtf16(reinterpret_cast<const ushort*>(path));
     CloseHandle(handle);
 #else
-    Q_UNUSED(processId);
+    Q_UNUSED(processId)
 #endif
     return result;
 }