diff options
| author | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2020-07-02 16:26:10 +0200 |
|---|---|---|
| committer | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2020-07-03 11:14:11 +0200 |
| commit | fdc5e91dcf6a2ee1b16a572a2266c77608e80ade (patch) | |
| tree | 29b9c616587a31a85e8eab76e67c0fa01383bc63 /src/network | |
| parent | 2eea8e075460f2e4d88a01610d1b0aa107b5c5f1 (diff) | |
Only use one macro per line
Also add a ; where it is missing.
Task-number: QTBUG-82978
Change-Id: Ic5d2a07363c25ab641d234baca89bc62238458cb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/access/http2/hpack.cpp | 3 | ||||
| -rw-r--r-- | src/network/access/http2/hpacktable.cpp | 6 | ||||
| -rw-r--r-- | src/network/access/qhttp2protocolhandler.cpp | 3 | ||||
| -rw-r--r-- | src/network/access/qnetworkaccessmanager.cpp | 3 |
4 files changed, 10 insertions, 5 deletions
diff --git a/src/network/access/http2/hpack.cpp b/src/network/access/http2/hpack.cpp index b40cc29e1a..7461095f0a 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 fddb5feca5..d963cf261b 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 c8b051731a..f71a4e9bd4 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 148cfdb09b..debdaaa5d4 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) } |