From 4bdccc8abcd7ab3a80c0d84fd005452d5ffceb6b Mon Sep 17 00:00:00 2001 From: Lars Schmertmann Date: Sat, 27 Jun 2020 13:01:45 +0200 Subject: Add ; to Q_UNUSED This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: Id948c173695923a1ea83a2098bafc10cfd4dc22b Reviewed-by: Allan Sandfeld Jensen --- src/core/renderer/content_renderer_client_qt.cpp | 2 +- src/core/web_contents_delegate_qt.cpp | 6 +++--- src/pdf/qpdflinkmodel.cpp | 2 +- src/pdf/qpdfsearchmodel.cpp | 2 +- src/pdfwidgets/qpdfview.cpp | 4 ++-- src/webengine/api/qquickwebengineview.cpp | 4 ++-- src/webenginewidgets/api/qwebenginepage.cpp | 6 +++--- src/webenginewidgets/api/qwebengineview.cpp | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp index b2138a82a..8c4d02ad7 100644 --- a/src/core/renderer/content_renderer_client_qt.cpp +++ b/src/core/renderer/content_renderer_client_qt.cpp @@ -292,7 +292,7 @@ void ContentRendererClientQt::GetNavigationErrorStringsInternal(content::RenderF const error_page::Error &error, std::string *errorHtml) { - Q_UNUSED(renderFrame) + Q_UNUSED(renderFrame); const bool isPost = QByteArray::fromStdString(httpMethod) == QByteArrayLiteral("POST"); if (errorHtml) { diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp index 63f52433e..53dfcb8a2 100644 --- a/src/core/web_contents_delegate_qt.cpp +++ b/src/core/web_contents_delegate_qt.cpp @@ -236,7 +236,7 @@ QUrl WebContentsDelegateQt::url(content::WebContents* source) const { } void WebContentsDelegateQt::AddNewContents(content::WebContents* source, std::unique_ptr new_contents, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, bool user_gesture, bool* was_blocked) { - Q_UNUSED(source) + Q_UNUSED(source); QSharedPointer newAdapter = createWindow(std::move(new_contents), disposition, initial_pos, user_gesture); // Chromium can forget to pass user-agent override settings to new windows (see QTBUG-61774 and QTBUG-76249), // so set it here. Note the actual value doesn't really matter here. Only the second value does, but we try @@ -592,7 +592,7 @@ void WebContentsDelegateQt::RunFileChooser(content::RenderFrameHost * /*frameHos bool WebContentsDelegateQt::DidAddMessageToConsole(content::WebContents *source, blink::mojom::ConsoleMessageLevel log_level, const base::string16 &message, int32_t line_no, const base::string16 &source_id) { - Q_UNUSED(source) + Q_UNUSED(source); m_viewClient->javaScriptConsoleMessage(mapToJavascriptConsoleMessageLevel(log_level), toQt(message), static_cast(line_no), toQt(source_id)); return false; } @@ -623,7 +623,7 @@ void WebContentsDelegateQt::SetContentsBounds(content::WebContents *source, cons void WebContentsDelegateQt::UpdateTargetURL(content::WebContents* source, const GURL& url) { - Q_UNUSED(source) + Q_UNUSED(source); m_viewClient->didUpdateTargetURL(toQt(url)); } diff --git a/src/pdf/qpdflinkmodel.cpp b/src/pdf/qpdflinkmodel.cpp index 900d3cd9e..68ae7bc6d 100644 --- a/src/pdf/qpdflinkmodel.cpp +++ b/src/pdf/qpdflinkmodel.cpp @@ -66,7 +66,7 @@ QHash QPdfLinkModel::roleNames() const int QPdfLinkModel::rowCount(const QModelIndex &parent) const { Q_D(const QPdfLinkModel); - Q_UNUSED(parent) + Q_UNUSED(parent); return d->links.count(); } diff --git a/src/pdf/qpdfsearchmodel.cpp b/src/pdf/qpdfsearchmodel.cpp index 27b7833fc..f87c1494f 100644 --- a/src/pdf/qpdfsearchmodel.cpp +++ b/src/pdf/qpdfsearchmodel.cpp @@ -78,7 +78,7 @@ QHash QPdfSearchModel::roleNames() const int QPdfSearchModel::rowCount(const QModelIndex &parent) const { Q_D(const QPdfSearchModel); - Q_UNUSED(parent) + Q_UNUSED(parent); return d->rowCountSoFar; } diff --git a/src/pdfwidgets/qpdfview.cpp b/src/pdfwidgets/qpdfview.cpp index 35e368633..648e3ed57 100644 --- a/src/pdfwidgets/qpdfview.cpp +++ b/src/pdfwidgets/qpdfview.cpp @@ -161,8 +161,8 @@ void QPdfViewPrivate::pageRendered(int pageNumber, QSize imageSize, const QImage { Q_Q(QPdfView); - Q_UNUSED(imageSize) - Q_UNUSED(requestId) + Q_UNUSED(imageSize); + Q_UNUSED(requestId); if (!m_cachedPagesLRU.contains(pageNumber)) { if (m_cachedPagesLRU.length() > m_pageCacheLimit) diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index f659d15ca..7fddb16a9 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -1550,7 +1550,7 @@ void QQuickWebEngineView::setWebChannel(QQmlWebChannel *webChannel) d->adapter->setWebChannel(webChannel, d->m_webChannelWorld); Q_EMIT webChannelChanged(); #else - Q_UNUSED(webChannel) + Q_UNUSED(webChannel); qWarning("WebEngine compiled without webchannel support"); #endif } @@ -1572,7 +1572,7 @@ void QQuickWebEngineView::setWebChannelWorld(uint webChannelWorld) d->adapter->setWebChannel(d->m_webChannel, d->m_webChannelWorld); Q_EMIT webChannelWorldChanged(webChannelWorld); #else - Q_UNUSED(webChannelWorld) + Q_UNUSED(webChannelWorld); qWarning("WebEngine compiled without webchannel support"); #endif } diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 6fb3c5c43..c3439fde5 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -548,7 +548,7 @@ QObject *QWebEnginePagePrivate::accessibilityParentObject() void QWebEnginePagePrivate::updateAction(QWebEnginePage::WebAction action) const { #ifdef QT_NO_ACTION - Q_UNUSED(action) + Q_UNUSED(action); #else QAction *a = actions[action]; if (!a) @@ -1041,8 +1041,8 @@ void QWebEnginePage::setWebChannel(QWebChannel *channel, uint worldId) d->adapter->setWebChannel(channel, worldId); } #else - Q_UNUSED(channel) - Q_UNUSED(worldId) + Q_UNUSED(channel); + Q_UNUSED(worldId); qWarning("WebEngine compiled without webchannel support"); #endif } diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp index b06d99478..d4ea83ede 100644 --- a/src/webenginewidgets/api/qwebengineview.cpp +++ b/src/webenginewidgets/api/qwebengineview.cpp @@ -326,7 +326,7 @@ void QWebEngineView::reload() QWebEngineView *QWebEngineView::createWindow(QWebEnginePage::WebWindowType type) { - Q_UNUSED(type) + Q_UNUSED(type); return 0; } -- cgit v1.2.3