Only use one macro per line

Also add a ; where it is missing.

Task-number: QTBUG-82978
Change-Id: Ic5d2a07363c25ab641d234baca89bc62238458cb
Reviewed-by: Friedemann Kleint <[email protected]>
Reviewed-by: Volker Hilsheimer <[email protected]>

10 files changed, 32 insertions, 14 deletions

diff --git a/src/corelib/tools/qarraydata.cpp b/src/corelib/tools/qarraydata.cpp
index f22ff440bcd..514dd7c4de2 100644
--- a/src/corelib/tools/qarraydata.cpp
+++ b/src/corelib/tools/qarraydata.cpp
@@ -267,7 +267,8 @@ void QArrayData::deallocate(QArrayData *data, size_t objectSize,
     // Alignment is a power of two
     Q_ASSERT(alignment >= alignof(QArrayData)
             && !(alignment & (alignment - 1)));
-    Q_UNUSED(objectSize) Q_UNUSED(alignment)
+    Q_UNUSED(objectSize);
+    Q_UNUSED(alignment);
 
     Q_ASSERT_X(data == nullptr || !data->isStatic(), "QArrayData::deallocate",
                "Static data cannot be deleted");
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index 1db1ebf4e58..64d10d66411 100644
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -289,7 +289,8 @@ static void qDBusUpdateDispatchStatus(DBusConnection *connection, DBusDispatchSt
 static void qDBusNewConnection(DBusServer *server, DBusConnection *connection, void *data)
 {
     // ### We may want to separate the server from the QDBusConnectionPrivate
-    Q_ASSERT(server); Q_UNUSED(server);
+    Q_ASSERT(server);
+    Q_UNUSED(server);
     Q_ASSERT(connection);
     Q_ASSERT(data);
 
diff --git a/src/network/access/http2/hpack.cpp b/src/network/access/http2/hpack.cpp
index b40cc29e1ab..7461095f0a0 100644
--- a/src/network/access/http2/hpack.cpp
+++ b/src/network/access/http2/hpack.cpp
@@ -391,7 +391,8 @@ bool Encoder::encodeLiteralField(BitOStream &outputStream, const BitPattern &fie
 
     QByteArray name;
     const bool found = lookupTable.fieldName(nameIndex, &name);
-    Q_UNUSED(found) Q_ASSERT(found);
+    Q_UNUSED(found);
+    Q_ASSERT(found);
 
     if (fieldType == LiteralIncrementalIndexing) {
         if (!lookupTable.prependField(name, value))
diff --git a/src/network/access/http2/hpacktable.cpp b/src/network/access/http2/hpacktable.cpp
index fddb5feca56..d963cf261b5 100644
--- a/src/network/access/http2/hpacktable.cpp
+++ b/src/network/access/http2/hpacktable.cpp
@@ -183,7 +183,8 @@ bool FieldLookupTable::prependField(const QByteArray &name, const QByteArray &va
 
     if (useIndex) {
         const auto result = searchIndex.insert(frontKey());
-        Q_UNUSED(result) Q_ASSERT(result.second);
+        Q_UNUSED(result);
+        Q_ASSERT(result.second);
     }
 
     return true;
@@ -198,7 +199,8 @@ void FieldLookupTable::evictEntry()
 
     if (useIndex) {
         const auto res = searchIndex.erase(backKey());
-        Q_UNUSED(res) Q_ASSERT(res == 1);
+        Q_UNUSED(res);
+        Q_ASSERT(res == 1);
     }
 
     const HeaderField &field = back();
diff --git a/src/network/access/qhttp2protocolhandler.cpp b/src/network/access/qhttp2protocolhandler.cpp
index c8b051731a7..f71a4e9bd4b 100644
--- a/src/network/access/qhttp2protocolhandler.cpp
+++ b/src/network/access/qhttp2protocolhandler.cpp
@@ -679,7 +679,8 @@ void QHttp2ProtocolHandler::handlePRIORITY()
     quint32 streamDependency = 0;
     uchar weight = 0;
     const bool noErr = inboundFrame.priority(&streamDependency, &weight);
-    Q_UNUSED(noErr) Q_ASSERT(noErr);
+    Q_UNUSED(noErr);
+    Q_ASSERT(noErr);
 
 
     const bool exclusive = streamDependency & 0x80000000;
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index 148cfdb09b5..debdaaa5d49 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -696,7 +696,8 @@ void QNetworkAccessManager::enableStrictTransportSecurityStore(bool enabled, con
     d->stsStore.reset(enabled ? new QHstsStore(storeDir) : nullptr);
     d->stsCache.setStore(d->stsStore.data());
 #else
-    Q_UNUSED(enabled) Q_UNUSED(storeDir)
+    Q_UNUSED(enabled);
+    Q_UNUSED(storeDir);
     qWarning("HSTS permanent store requires the feature 'settings' enabled");
 #endif // QT_CONFIG(settings)
 }
diff --git a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
index dca57372fc5..c4ff9a211b6 100644
--- a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
+++ b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
@@ -1806,9 +1806,13 @@ bool AtSpiAdaptor::textInterface(QAccessibleInterface *interface, const QString
         uint coordType = message.arguments().at(4).toUInt();
         uint xClipType = message.arguments().at(5).toUInt();
         uint yClipType = message.arguments().at(6).toUInt();
-        Q_UNUSED(x) Q_UNUSED (y) Q_UNUSED(width)
-        Q_UNUSED(height) Q_UNUSED(coordType)
-        Q_UNUSED(xClipType) Q_UNUSED(yClipType)
+        Q_UNUSED(x);
+        Q_UNUSED(y);
+        Q_UNUSED(width);
+        Q_UNUSED(height);
+        Q_UNUSED(coordType);
+        Q_UNUSED(xClipType);
+        Q_UNUSED(yClipType);
         qCDebug(lcAccessibilityAtspi) << "Not implemented: QSpiAdaptor::GetBoundedRanges";
         sendReply(connection, message, QVariant::fromValue(QSpiTextRangeList()));
     } else if (function == QLatin1String("GetCharacterAtOffset")) {
diff --git a/src/plugins/platforms/cocoa/qnsview_drawing.mm b/src/plugins/platforms/cocoa/qnsview_drawing.mm
index 2fd63fad67a..2b9cffa714e 100644
--- a/src/plugins/platforms/cocoa/qnsview_drawing.mm
+++ b/src/plugins/platforms/cocoa/qnsview_drawing.mm
@@ -228,7 +228,9 @@
 */
 - (BOOL)layer:(CALayer *)layer shouldInheritContentsScale:(CGFloat)scale fromWindow:(NSWindow *)window
 {
-    Q_UNUSED(layer); Q_UNUSED(scale); Q_UNUSED(window);
+    Q_UNUSED(layer);
+    Q_UNUSED(scale);
+    Q_UNUSED(window);
     return NO;
 }
 
diff --git a/src/testlib/qsignaldumper.cpp b/src/testlib/qsignaldumper.cpp
index 70f4d5e63db..8510b3ed6f8 100644
--- a/src/testlib/qsignaldumper.cpp
+++ b/src/testlib/qsignaldumper.cpp
@@ -66,7 +66,9 @@ enum { IndentSpacesCount = 4 };
 
 static void qSignalDumperCallback(QObject *caller, int signal_index, void **argv)
 {
-    Q_ASSERT(caller); Q_ASSERT(argv); Q_UNUSED(argv);
+    Q_ASSERT(caller);
+    Q_ASSERT(argv);
+    Q_UNUSED(argv);
     const QMetaObject *mo = caller->metaObject();
     Q_ASSERT(mo);
     QMetaMethod member = QMetaObjectPrivate::signal(mo, signal_index);
@@ -123,7 +125,9 @@ static void qSignalDumperCallback(QObject *caller, int signal_index, void **argv
 
 static void qSignalDumperCallbackSlot(QObject *caller, int method_index, void **argv)
 {
-    Q_ASSERT(caller); Q_ASSERT(argv); Q_UNUSED(argv);
+    Q_ASSERT(caller);
+    Q_ASSERT(argv);
+    Q_UNUSED(argv);
     const QMetaObject *mo = caller->metaObject();
     Q_ASSERT(mo);
     QMetaMethod member = mo->method(method_index);
diff --git a/src/widgets/itemviews/qtableview.cpp b/src/widgets/itemviews/qtableview.cpp
index f8ff319516d..4afcc3ef6a0 100644
--- a/src/widgets/itemviews/qtableview.cpp
+++ b/src/widgets/itemviews/qtableview.cpp
@@ -123,7 +123,8 @@ void QSpanCollection::updateSpan(QSpanCollection::Span *span, int old_height)
         while (-it_y.key() <= span->top() + old_height -1) {
             if (-it_y.key() > span->bottom()) {
                 int removed = (*it_y).remove(-span->left());
-                Q_ASSERT(removed == 1); Q_UNUSED(removed);
+                Q_ASSERT(removed == 1);
+                Q_UNUSED(removed);
                 if (it_y->isEmpty()) {
                     it_y = index.erase(it_y);
                 }