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>

5 files changed, 18 insertions, 18 deletions

diff --git a/src/plugins/ios/iosdeploystep.cpp b/src/plugins/ios/iosdeploystep.cpp
index 2a0da618afe..ba18d7eb7f3 100644
--- a/src/plugins/ios/iosdeploystep.cpp
+++ b/src/plugins/ios/iosdeploystep.cpp
@@ -145,7 +145,7 @@ void IosDeployStep::handleIsTransferringApp(IosToolHandler *handler, const QStri
                                             const QString &deviceId, int progress, int maxProgress,
                                             const QString &info)
 {
-    Q_UNUSED(handler); Q_UNUSED(bundlePath); Q_UNUSED(deviceId);
+    Q_UNUSED(handler); Q_UNUSED(bundlePath); Q_UNUSED(deviceId)
     QTC_CHECK(m_transferStatus == TransferInProgress);
     emit this->progress(progress * 100 / maxProgress, info);
 }
@@ -153,7 +153,7 @@ void IosDeployStep::handleIsTransferringApp(IosToolHandler *handler, const QStri
 void IosDeployStep::handleDidTransferApp(IosToolHandler *handler, const QString &bundlePath,
                                          const QString &deviceId, IosToolHandler::OpStatus status)
 {
-    Q_UNUSED(handler); Q_UNUSED(bundlePath); Q_UNUSED(deviceId);
+    Q_UNUSED(handler); Q_UNUSED(bundlePath); Q_UNUSED(deviceId)
     QTC_CHECK(m_transferStatus == TransferInProgress);
     if (status == IosToolHandler::Success) {
         m_transferStatus = TransferOk;
@@ -188,7 +188,7 @@ void IosDeployStep::handleFinished(IosToolHandler *handler)
 
 void IosDeployStep::handleErrorMsg(IosToolHandler *handler, const QString &msg)
 {
-    Q_UNUSED(handler);
+    Q_UNUSED(handler)
     if (msg.contains(QLatin1String("AMDeviceInstallApplication returned -402653103")))
         TaskHub::addTask(Task::Warning,
                          tr("The Info.plist might be incorrect."),
diff --git a/src/plugins/ios/iosplugin.cpp b/src/plugins/ios/iosplugin.cpp
index 080f9dcde70..da41cbb109e 100644
--- a/src/plugins/ios/iosplugin.cpp
+++ b/src/plugins/ios/iosplugin.cpp
@@ -110,8 +110,8 @@ IosPlugin::~IosPlugin()
 
 bool IosPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 {
-    Q_UNUSED(arguments);
-    Q_UNUSED(errorMessage);
+    Q_UNUSED(arguments)
+    Q_UNUSED(errorMessage)
 
     qRegisterMetaType<Ios::IosToolHandler::Dict>("Ios::IosToolHandler::Dict");
 
diff --git a/src/plugins/ios/iosqtversion.cpp b/src/plugins/ios/iosqtversion.cpp
index e508c53cfe0..23fb2c5dde7 100644
--- a/src/plugins/ios/iosqtversion.cpp
+++ b/src/plugins/ios/iosqtversion.cpp
@@ -74,8 +74,8 @@ Abis IosQtVersion::detectQtAbis() const
 
 void IosQtVersion::addToEnvironment(const Kit *k, Utils::Environment &env) const
 {
-    Q_UNUSED(k);
-    Q_UNUSED(env);
+    Q_UNUSED(k)
+    Q_UNUSED(env)
 }
 
 QString IosQtVersion::description() const
diff --git a/src/plugins/ios/iosrunner.cpp b/src/plugins/ios/iosrunner.cpp
index 8c2ab2bb63e..e0fb0d39ed9 100644
--- a/src/plugins/ios/iosrunner.cpp
+++ b/src/plugins/ios/iosrunner.cpp
@@ -218,7 +218,7 @@ void IosRunner::handleGotServerPorts(IosToolHandler *handler, const QString &bun
                                      Port qmlPort)
 {
     // Called when debugging on Device.
-    Q_UNUSED(bundlePath); Q_UNUSED(deviceId);
+    Q_UNUSED(bundlePath); Q_UNUSED(deviceId)
 
     if (m_toolHandler != handler)
         return;
@@ -247,7 +247,7 @@ void IosRunner::handleGotInferiorPid(IosToolHandler *handler, const QString &bun
                                      const QString &deviceId, qint64 pid)
 {
     // Called when debugging on Simulator.
-    Q_UNUSED(bundlePath); Q_UNUSED(deviceId);
+    Q_UNUSED(bundlePath); Q_UNUSED(deviceId)
 
     if (m_toolHandler != handler)
         return;
@@ -272,7 +272,7 @@ void IosRunner::handleGotInferiorPid(IosToolHandler *handler, const QString &bun
 
 void IosRunner::handleAppOutput(IosToolHandler *handler, const QString &output)
 {
-    Q_UNUSED(handler);
+    Q_UNUSED(handler)
     QRegExp qmlPortRe("QML Debugger: Waiting for connection on port ([0-9]+)...");
     int index = qmlPortRe.indexIn(output);
     QString res(output);
@@ -284,7 +284,7 @@ void IosRunner::handleAppOutput(IosToolHandler *handler, const QString &output)
 
 void IosRunner::handleErrorMsg(IosToolHandler *handler, const QString &msg)
 {
-    Q_UNUSED(handler);
+    Q_UNUSED(handler)
     QString res(msg);
     QString lockedErr ="Unexpected reply: ELocked (454c6f636b6564) vs OK (4f4b)";
     if (msg.contains("AMDeviceStartService returned -402653150")) {
@@ -308,7 +308,7 @@ void IosRunner::handleErrorMsg(IosToolHandler *handler, const QString &msg)
 
 void IosRunner::handleToolExited(IosToolHandler *handler, int code)
 {
-    Q_UNUSED(handler);
+    Q_UNUSED(handler)
     m_cleanExit = (code == 0);
 }
 
diff --git a/src/plugins/ios/iostoolhandler.cpp b/src/plugins/ios/iostoolhandler.cpp
index 646183db051..e78ec72db48 100644
--- a/src/plugins/ios/iostoolhandler.cpp
+++ b/src/plugins/ios/iostoolhandler.cpp
@@ -818,7 +818,7 @@ IosSimulatorToolHandlerPrivate::~IosSimulatorToolHandlerPrivate()
 void IosSimulatorToolHandlerPrivate::requestTransferApp(const QString &appBundlePath,
                                                         const QString &deviceIdentifier, int timeout)
 {
-    Q_UNUSED(timeout);
+    Q_UNUSED(timeout)
     m_bundlePath = appBundlePath;
     m_deviceId = deviceIdentifier;
     isTransferringApp(m_bundlePath, m_deviceId, 0, 100, "");
@@ -847,8 +847,8 @@ void IosSimulatorToolHandlerPrivate::requestRunApp(const QString &appBundlePath,
                                                    IosToolHandler::RunKind runType,
                                                    const QString &deviceIdentifier, int timeout)
 {
-    Q_UNUSED(timeout);
-    Q_UNUSED(deviceIdentifier);
+    Q_UNUSED(timeout)
+    Q_UNUSED(deviceIdentifier)
     m_bundlePath = appBundlePath;
     m_deviceId = m_devType.identifier;
     m_runKind = runType;
@@ -880,8 +880,8 @@ void IosSimulatorToolHandlerPrivate::requestRunApp(const QString &appBundlePath,
 
 void IosSimulatorToolHandlerPrivate::requestDeviceInfo(const QString &deviceId, int timeout)
 {
-    Q_UNUSED(timeout);
-    Q_UNUSED(deviceId);
+    Q_UNUSED(timeout)
+    Q_UNUSED(deviceId)
 }
 
 bool IosSimulatorToolHandlerPrivate::isRunning() const
@@ -962,7 +962,7 @@ void IosSimulatorToolHandlerPrivate::launchAppOnSimulator(const QStringList &ext
             QThread::msleep(1000);
         } while (!fi.isCanceled() && kill(pid, 0) == 0);
 #else
-    Q_UNUSED(pid);
+    Q_UNUSED(pid)
 #endif
         // Future is cancelled if the app is stopped from the qt creator.
         if (!fi.isCanceled())