From 6ce2f3f26bf08b4c6952f492a3731eb4fe5a42bc Mon Sep 17 00:00:00 2001 From: Lars Schmertmann Date: Sat, 27 Jun 2020 14:18:09 +0200 Subject: Add ; to Q_UNUSED This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I3f0b6717956ca8fa486bed9817b89dfa19f5e0e1 Reviewed-by: Friedemann Kleint --- src/gui/accessible/linux/atspiadaptor.cpp | 4 +-- src/gui/accessible/qaccessiblecache.cpp | 2 +- src/gui/image/qpixmap_blitter_p.h | 18 +++++------ src/gui/image/qpnghandler.cpp | 2 +- src/gui/kernel/qguiapplication.cpp | 8 ++--- src/gui/kernel/qhighdpiscaling_p.h | 2 +- src/gui/kernel/qplatformdialoghelper.cpp | 4 +-- src/gui/kernel/qplatformgraphicsbufferhelper.cpp | 8 ++--- src/gui/kernel/qplatforminputcontext.cpp | 8 ++--- src/gui/kernel/qplatformintegration.cpp | 6 ++-- src/gui/kernel/qplatformintegrationplugin.cpp | 6 ++-- src/gui/kernel/qplatformnativeinterface.cpp | 2 +- src/gui/kernel/qplatformsessionmanager.cpp | 8 ++--- src/gui/kernel/qplatformtheme.cpp | 4 +-- src/gui/kernel/qplatformwindow.cpp | 6 ++-- src/gui/kernel/qwindow.cpp | 2 +- src/gui/kernel/qwindowsysteminterface.cpp | 36 +++++++++++----------- .../platform/unix/dbusmenu/qdbusmenuadaptor.cpp | 6 ++-- src/gui/platform/unix/dbusmenu/qdbusmenutypes.cpp | 2 +- src/gui/platform/unix/qeventdispatcher_glib.cpp | 2 +- src/gui/platform/unix/qgenericunixservices.cpp | 6 ++-- src/gui/rhi/qrhinull.cpp | 2 +- src/gui/text/qfontengine.cpp | 20 ++++++------ src/gui/text/qtextimagehandler.cpp | 4 +-- src/gui/text/qtextmarkdownimporter.cpp | 6 ++-- src/gui/text/unix/qfontconfigdatabase.cpp | 2 +- src/gui/text/windows/qwindowsfontdatabase.cpp | 4 +-- src/gui/text/windows/qwindowsfontengine.cpp | 2 +- src/gui/util/qastchandler.cpp | 2 +- src/gui/util/qktxhandler.cpp | 2 +- src/gui/util/qpkmhandler.cpp | 2 +- src/gui/util/qundostack.cpp | 2 +- 32 files changed, 95 insertions(+), 95 deletions(-) (limited to 'src/gui') diff --git a/src/gui/accessible/linux/atspiadaptor.cpp b/src/gui/accessible/linux/atspiadaptor.cpp index 812ac276b2..8d53be8c42 100644 --- a/src/gui/accessible/linux/atspiadaptor.cpp +++ b/src/gui/accessible/linux/atspiadaptor.cpp @@ -984,7 +984,7 @@ void AtSpiAdaptor::notify(QAccessibleEvent *event) } // send a cursor update - Q_UNUSED(cursorPosition) + Q_UNUSED(cursorPosition); // QDBusVariant cursorData; // cursorData.setVariant(QVariant::fromValue(cursorPosition)); // QVariantList args = packDBusSignalArguments(QString(), cursorPosition, 0, QVariant::fromValue(cursorData)); @@ -1790,7 +1790,7 @@ bool AtSpiAdaptor::textInterface(QAccessibleInterface *interface, const QString } else if (function == QLatin1String("GetAttributeRun")) { int offset = message.arguments().at(0).toInt(); bool includeDefaults = message.arguments().at(1).toBool(); - Q_UNUSED(includeDefaults) + Q_UNUSED(includeDefaults); connection.send(message.createReply(getAttributes(interface, offset, includeDefaults))); } else if (function == QLatin1String("GetAttributeValue")) { int offset = message.arguments().at(0).toInt(); diff --git a/src/gui/accessible/qaccessiblecache.cpp b/src/gui/accessible/qaccessiblecache.cpp index 17c75abcc1..84d0936386 100644 --- a/src/gui/accessible/qaccessiblecache.cpp +++ b/src/gui/accessible/qaccessiblecache.cpp @@ -142,7 +142,7 @@ bool QAccessibleCache::containsObject(QObject *obj) const QAccessible::Id QAccessibleCache::insert(QObject *object, QAccessibleInterface *iface) const { Q_ASSERT(iface); - Q_UNUSED(object) + Q_UNUSED(object); // object might be 0 Q_ASSERT(!containsObject(object)); diff --git a/src/gui/image/qpixmap_blitter_p.h b/src/gui/image/qpixmap_blitter_p.h index d70cbcdcc3..d39905f883 100644 --- a/src/gui/image/qpixmap_blitter_p.h +++ b/src/gui/image/qpixmap_blitter_p.h @@ -120,7 +120,7 @@ inline void QBlittablePlatformPixmap::markRasterOverlay(const QRectF &rect) #ifdef QT_BLITTER_RASTEROVERLAY markRasterOverlayImpl(rect); #else - Q_UNUSED(rect) + Q_UNUSED(rect); #endif } @@ -129,7 +129,7 @@ inline void QBlittablePlatformPixmap::markRasterOverlay(const QVectorPath &path) #ifdef QT_BLITTER_RASTEROVERLAY markRasterOverlayImpl(path.convertToPainterPath().boundingRect()); #else - Q_UNUSED(path) + Q_UNUSED(path); #endif } @@ -141,8 +141,8 @@ inline void QBlittablePlatformPixmap::markRasterOverlay(const QPointF &pos, cons rect.moveBottomLeft(pos); markRasterOverlay(rect); #else - Q_UNUSED(pos) - Q_UNUSED(ti) + Q_UNUSED(pos); + Q_UNUSED(ti); #endif } @@ -153,8 +153,8 @@ inline void QBlittablePlatformPixmap::markRasterOverlay(const QRect *rects, int markRasterOverlay(rects[i]); } #else - Q_UNUSED(rects) - Q_UNUSED(rectCount) + Q_UNUSED(rects); + Q_UNUSED(rectCount); #endif } inline void QBlittablePlatformPixmap::markRasterOverlay(const QRectF *rects, int rectCount) @@ -164,8 +164,8 @@ inline void QBlittablePlatformPixmap::markRasterOverlay(const QRectF *rects, int markRasterOverlay(rects[i]); } #else - Q_UNUSED(rects) - Q_UNUSED(rectCount) + Q_UNUSED(rects); + Q_UNUSED(rectCount); #endif } @@ -203,7 +203,7 @@ inline void QBlittablePlatformPixmap::unmarkRasterOverlay(const QRectF &rect) #ifdef QT_BLITTER_RASTEROVERLAY unmarkRasterOverlayImpl(rect); #else - Q_UNUSED(rect) + Q_UNUSED(rect); #endif } diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp index e01c211cda..7cca0788fe 100644 --- a/src/gui/image/qpnghandler.cpp +++ b/src/gui/image/qpnghandler.cpp @@ -531,7 +531,7 @@ void QPngHandlerPrivate::readPngTexts(png_info *info) text_ptr++; } #else - Q_UNUSED(info) + Q_UNUSED(info); #endif } diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 4d2d79c274..34331e3b0e 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -2676,7 +2676,7 @@ void QGuiApplicationPrivate::processTabletEvent(QWindowSystemInterfacePrivate::T processMouseEvent(&mouseEvent); } #else - Q_UNUSED(e) + Q_UNUSED(e); #endif } @@ -2690,7 +2690,7 @@ void QGuiApplicationPrivate::processTabletEnterProximityEvent(QWindowSystemInter ev.setTimestamp(e->timestamp); QGuiApplication::sendSpontaneousEvent(qGuiApp, &ev); #else - Q_UNUSED(e) + Q_UNUSED(e); #endif } @@ -2704,7 +2704,7 @@ void QGuiApplicationPrivate::processTabletLeaveProximityEvent(QWindowSystemInter ev.setTimestamp(e->timestamp); QGuiApplication::sendSpontaneousEvent(qGuiApp, &ev); #else - Q_UNUSED(e) + Q_UNUSED(e); #endif } @@ -4196,7 +4196,7 @@ void QGuiApplicationPrivate::notifyThemeChanged() #if QT_CONFIG(draganddrop) void QGuiApplicationPrivate::notifyDragStarted(const QDrag *drag) { - Q_UNUSED(drag) + Q_UNUSED(drag); } #endif diff --git a/src/gui/kernel/qhighdpiscaling_p.h b/src/gui/kernel/qhighdpiscaling_p.h index dfacf2a4f3..542506dcb0 100644 --- a/src/gui/kernel/qhighdpiscaling_p.h +++ b/src/gui/kernel/qhighdpiscaling_p.h @@ -179,7 +179,7 @@ inline QRectF scale(const QRectF &rect, qreal scaleFactor, QPoint origin = QPoin inline QMargins scale(const QMargins &margins, qreal scaleFactor, QPoint origin = QPoint(0, 0)) { - Q_UNUSED(origin) + Q_UNUSED(origin); return QMargins(qRound(qreal(margins.left()) * scaleFactor), qRound(qreal(margins.top()) * scaleFactor), qRound(qreal(margins.right()) * scaleFactor), qRound(qreal(margins.bottom()) * scaleFactor)); } diff --git a/src/gui/kernel/qplatformdialoghelper.cpp b/src/gui/kernel/qplatformdialoghelper.cpp index 443f5d2552..4c2e1af84d 100644 --- a/src/gui/kernel/qplatformdialoghelper.cpp +++ b/src/gui/kernel/qplatformdialoghelper.cpp @@ -741,7 +741,7 @@ QStringList QFileDialogOptions::supportedSchemes() const void QPlatformFileDialogHelper::selectMimeTypeFilter(const QString &filter) { - Q_UNUSED(filter) + Q_UNUSED(filter); } QString QPlatformFileDialogHelper::selectedMimeTypeFilter() const @@ -790,7 +790,7 @@ QStringList QPlatformFileDialogHelper::cleanFilterList(const QString &filter) f = match.captured(2); return f.split(QLatin1Char(' '), Qt::SkipEmptyParts); #else - Q_UNUSED(filter) + Q_UNUSED(filter); return QStringList(); #endif } diff --git a/src/gui/kernel/qplatformgraphicsbufferhelper.cpp b/src/gui/kernel/qplatformgraphicsbufferhelper.cpp index ab9a92a383..ff72171b85 100644 --- a/src/gui/kernel/qplatformgraphicsbufferhelper.cpp +++ b/src/gui/kernel/qplatformgraphicsbufferhelper.cpp @@ -255,10 +255,10 @@ bool QPlatformGraphicsBufferHelper::bindSWToTexture(const QPlatformGraphicsBuffe return true; #else - Q_UNUSED(graphicsBuffer) - Q_UNUSED(swizzleRandB) - Q_UNUSED(premultipliedB) - Q_UNUSED(subRect) + Q_UNUSED(graphicsBuffer); + Q_UNUSED(swizzleRandB); + Q_UNUSED(premultipliedB); + Q_UNUSED(subRect); return false; #endif // QT_NO_OPENGL } diff --git a/src/gui/kernel/qplatforminputcontext.cpp b/src/gui/kernel/qplatforminputcontext.cpp index 9771e6ba11..83a05d0221 100644 --- a/src/gui/kernel/qplatforminputcontext.cpp +++ b/src/gui/kernel/qplatforminputcontext.cpp @@ -106,7 +106,7 @@ bool QPlatformInputContext::isValid() const */ bool QPlatformInputContext::hasCapability(Capability capability) const { - Q_UNUSED(capability) + Q_UNUSED(capability); return true; } @@ -136,7 +136,7 @@ void QPlatformInputContext::update(Qt::InputMethodQueries) */ void QPlatformInputContext::invokeAction(QInputMethod::Action action, int cursorPosition) { - Q_UNUSED(cursorPosition) + Q_UNUSED(cursorPosition); // Default behavior for simple ephemeral input contexts. Some // complex input contexts should not be reset here. if (action == QInputMethod::Click) @@ -151,7 +151,7 @@ void QPlatformInputContext::invokeAction(QInputMethod::Action action, int cursor */ bool QPlatformInputContext::filterEvent(const QEvent *event) { - Q_UNUSED(event) + Q_UNUSED(event); return false; } @@ -251,7 +251,7 @@ void QPlatformInputContext::emitInputDirectionChanged(Qt::LayoutDirection newDir */ void QPlatformInputContext::setFocusObject(QObject *object) { - Q_UNUSED(object) + Q_UNUSED(object); } /*! diff --git a/src/gui/kernel/qplatformintegration.cpp b/src/gui/kernel/qplatformintegration.cpp index 63f66e6bf7..090629073a 100644 --- a/src/gui/kernel/qplatformintegration.cpp +++ b/src/gui/kernel/qplatformintegration.cpp @@ -324,7 +324,7 @@ QPlatformSharedGraphicsCache *QPlatformIntegration::createPlatformSharedGraphics */ QPaintEngine *QPlatformIntegration::createImagePaintEngine(QPaintDevice *paintDevice) const { - Q_UNUSED(paintDevice) + Q_UNUSED(paintDevice); return nullptr; } @@ -472,7 +472,7 @@ QStringList QPlatformIntegration::themeNames() const class QPlatformTheme *QPlatformIntegration::createPlatformTheme(const QString &name) const { - Q_UNUSED(name) + Q_UNUSED(name); return new QPlatformTheme; } @@ -483,7 +483,7 @@ class QPlatformTheme *QPlatformIntegration::createPlatformTheme(const QString &n */ QPlatformOffscreenSurface *QPlatformIntegration::createPlatformOffscreenSurface(QOffscreenSurface *surface) const { - Q_UNUSED(surface) + Q_UNUSED(surface); return nullptr; } diff --git a/src/gui/kernel/qplatformintegrationplugin.cpp b/src/gui/kernel/qplatformintegrationplugin.cpp index b100eacbb5..e024276797 100644 --- a/src/gui/kernel/qplatformintegrationplugin.cpp +++ b/src/gui/kernel/qplatformintegrationplugin.cpp @@ -52,15 +52,15 @@ QPlatformIntegrationPlugin::~QPlatformIntegrationPlugin() QPlatformIntegration *QPlatformIntegrationPlugin::create(const QString &key, const QStringList ¶mList) { - Q_UNUSED(key) + Q_UNUSED(key); Q_UNUSED(paramList); return nullptr; } QPlatformIntegration *QPlatformIntegrationPlugin::create(const QString &key, const QStringList ¶mList, int &argc, char **argv) { - Q_UNUSED(argc) - Q_UNUSED(argv) + Q_UNUSED(argc); + Q_UNUSED(argv); return create(key, paramList); // Fallback for platform plugins that do not implement the argc/argv version. } diff --git a/src/gui/kernel/qplatformnativeinterface.cpp b/src/gui/kernel/qplatformnativeinterface.cpp index 8c9e73fbc2..15b08e195a 100644 --- a/src/gui/kernel/qplatformnativeinterface.cpp +++ b/src/gui/kernel/qplatformnativeinterface.cpp @@ -137,7 +137,7 @@ QFunctionPointer QPlatformNativeInterface::platformFunction(const QByteArray &fu */ QVariantMap QPlatformNativeInterface::windowProperties(QPlatformWindow *window) const { - Q_UNUSED(window) + Q_UNUSED(window); return QVariantMap(); } diff --git a/src/gui/kernel/qplatformsessionmanager.cpp b/src/gui/kernel/qplatformsessionmanager.cpp index a66fc6d016..bc4ce22c0f 100644 --- a/src/gui/kernel/qplatformsessionmanager.cpp +++ b/src/gui/kernel/qplatformsessionmanager.cpp @@ -118,14 +118,14 @@ QStringList QPlatformSessionManager::discardCommand() const void QPlatformSessionManager::setManagerProperty(const QString &name, const QString &value) { - Q_UNUSED(name) - Q_UNUSED(value) + Q_UNUSED(name); + Q_UNUSED(value); } void QPlatformSessionManager::setManagerProperty(const QString &name, const QStringList &value) { - Q_UNUSED(name) - Q_UNUSED(value) + Q_UNUSED(name); + Q_UNUSED(value); } bool QPlatformSessionManager::isPhase2() const diff --git a/src/gui/kernel/qplatformtheme.cpp b/src/gui/kernel/qplatformtheme.cpp index 6d0c49c327..b086989b15 100644 --- a/src/gui/kernel/qplatformtheme.cpp +++ b/src/gui/kernel/qplatformtheme.cpp @@ -410,7 +410,7 @@ const QPalette *QPlatformTheme::palette(Palette type) const const QFont *QPlatformTheme::font(Font type) const { - Q_UNUSED(type) + Q_UNUSED(type); return nullptr; } @@ -698,7 +698,7 @@ QString QPlatformTheme::standardButtonText(int button) const QKeySequence QPlatformTheme::standardButtonShortcut(int button) const { - Q_UNUSED(button) + Q_UNUSED(button); return QKeySequence(); } #endif // QT_CONFIG(shortcut) diff --git a/src/gui/kernel/qplatformwindow.cpp b/src/gui/kernel/qplatformwindow.cpp index fc736033c2..c6e6afcc91 100644 --- a/src/gui/kernel/qplatformwindow.cpp +++ b/src/gui/kernel/qplatformwindow.cpp @@ -492,7 +492,7 @@ bool QPlatformWindow::windowEvent(QEvent *event) bool QPlatformWindow::startSystemResize(Qt::Edges edges) { - Q_UNUSED(edges) + Q_UNUSED(edges); return false; } @@ -519,7 +519,7 @@ bool QPlatformWindow::startSystemMove() void QPlatformWindow::setFrameStrutEventsEnabled(bool enabled) { - Q_UNUSED(enabled) // Do not warn as widgets enable it by default causing warnings with XCB. + Q_UNUSED(enabled); // Do not warn as widgets enable it by default causing warnings with XCB. } /*! @@ -607,7 +607,7 @@ QSize QPlatformWindow::constrainWindowSize(const QSize &size) void QPlatformWindow::setAlertState(bool enable) { - Q_UNUSED(enable) + Q_UNUSED(enable); } /*! diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index c06f03f4e7..9e11156c26 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -571,7 +571,7 @@ void QWindowPrivate::clearFocusObject() // implement heightForWidth(). QRectF QWindowPrivate::closestAcceptableGeometry(const QRectF &rect) const { - Q_UNUSED(rect) + Q_UNUSED(rect); return QRectF(); } diff --git a/src/gui/kernel/qwindowsysteminterface.cpp b/src/gui/kernel/qwindowsysteminterface.cpp index fb9f4cafe0..271a627a1d 100644 --- a/src/gui/kernel/qwindowsysteminterface.cpp +++ b/src/gui/kernel/qwindowsysteminterface.cpp @@ -473,16 +473,16 @@ bool QWindowSystemInterface::handleShortcutEvent(QWindow *window, ulong timestam return shortcutMap.tryShortcut(&keyEvent); #else - Q_UNUSED(window) - Q_UNUSED(timestamp) - Q_UNUSED(keyCode) - Q_UNUSED(modifiers) - Q_UNUSED(nativeScanCode) - Q_UNUSED(nativeVirtualKey) - Q_UNUSED(nativeModifiers) - Q_UNUSED(text) - Q_UNUSED(autorepeat) - Q_UNUSED(count) + Q_UNUSED(window); + Q_UNUSED(timestamp); + Q_UNUSED(keyCode); + Q_UNUSED(modifiers); + Q_UNUSED(nativeScanCode); + Q_UNUSED(nativeVirtualKey); + Q_UNUSED(nativeModifiers); + Q_UNUSED(text); + Q_UNUSED(autorepeat); + Q_UNUSED(count); return false; #endif } @@ -528,7 +528,7 @@ bool QWindowSystemInterface::handleExtendedKeyEvent(QWindow *window, ulong times return true; } #else - Q_UNUSED(tryShortcutOverride) + Q_UNUSED(tryShortcutOverride); #endif QWindowSystemInterfacePrivate::KeyEvent * e = @@ -1222,13 +1222,13 @@ Q_GUI_EXPORT bool qt_sendShortcutOverrideEvent(QObject *o, ulong timestamp, int // Then as QShortcutEvent return shortcutMap.tryShortcut(&qevent); #else - Q_UNUSED(o) - Q_UNUSED(timestamp) - Q_UNUSED(k) - Q_UNUSED(mods) - Q_UNUSED(text) - Q_UNUSED(autorep) - Q_UNUSED(count) + Q_UNUSED(o); + Q_UNUSED(timestamp); + Q_UNUSED(k); + Q_UNUSED(mods); + Q_UNUSED(text); + Q_UNUSED(autorep); + Q_UNUSED(count); return false; #endif } diff --git a/src/gui/platform/unix/dbusmenu/qdbusmenuadaptor.cpp b/src/gui/platform/unix/dbusmenu/qdbusmenuadaptor.cpp index eabb4b4122..9cdc1601e6 100644 --- a/src/gui/platform/unix/dbusmenu/qdbusmenuadaptor.cpp +++ b/src/gui/platform/unix/dbusmenu/qdbusmenuadaptor.cpp @@ -103,7 +103,7 @@ bool QDBusMenuAdaptor::AboutToShow(int id) QList QDBusMenuAdaptor::AboutToShowGroup(const QList &ids, QList &idErrors) { qCDebug(qLcMenu) << ids; - Q_UNUSED(idErrors) + Q_UNUSED(idErrors); idErrors.clear(); for (int id : ids) AboutToShow(id); @@ -112,8 +112,8 @@ QList QDBusMenuAdaptor::AboutToShowGroup(const QList &ids, QList void QDBusMenuAdaptor::Event(int id, const QString &eventId, const QDBusVariant &data, uint timestamp) { - Q_UNUSED(data) - Q_UNUSED(timestamp) + Q_UNUSED(data); + Q_UNUSED(timestamp); QDBusPlatformMenuItem *item = QDBusPlatformMenuItem::byId(id); qCDebug(qLcMenu) << id << (item ? item->text() : QLatin1String("")) << eventId; if (item && eventId == QLatin1String("clicked")) diff --git a/src/gui/platform/unix/dbusmenu/qdbusmenutypes.cpp b/src/gui/platform/unix/dbusmenu/qdbusmenutypes.cpp index 6fadea5d28..73ff0aee69 100644 --- a/src/gui/platform/unix/dbusmenu/qdbusmenutypes.cpp +++ b/src/gui/platform/unix/dbusmenu/qdbusmenutypes.cpp @@ -214,7 +214,7 @@ QDBusMenuItem::QDBusMenuItem(const QDBusPlatformMenuItem *item) QDBusMenuItemList QDBusMenuItem::items(const QList &ids, const QStringList &propertyNames) { - Q_UNUSED(propertyNames) + Q_UNUSED(propertyNames); QDBusMenuItemList ret; const QList items = QDBusPlatformMenuItem::byIds(ids); ret.reserve(items.size()); diff --git a/src/gui/platform/unix/qeventdispatcher_glib.cpp b/src/gui/platform/unix/qeventdispatcher_glib.cpp index 0ccbf01e80..42b66af686 100644 --- a/src/gui/platform/unix/qeventdispatcher_glib.cpp +++ b/src/gui/platform/unix/qeventdispatcher_glib.cpp @@ -57,7 +57,7 @@ struct GUserEventSource static gboolean userEventSourcePrepare(GSource *source, gint *timeout) { - Q_UNUSED(timeout) + Q_UNUSED(timeout); GUserEventSource *userEventSource = reinterpret_cast(source); return userEventSource->d->wakeUpCalled; } diff --git a/src/gui/platform/unix/qgenericunixservices.cpp b/src/gui/platform/unix/qgenericunixservices.cpp index 10d5468b9a..cd32cd2a0b 100644 --- a/src/gui/platform/unix/qgenericunixservices.cpp +++ b/src/gui/platform/unix/qgenericunixservices.cpp @@ -220,7 +220,7 @@ static inline QDBusMessage xdgDesktopPortalOpenFile(const QUrl &url) return QDBusConnection::sessionBus().call(message); } #else - Q_UNUSED(url) + Q_UNUSED(url); #endif return QDBusMessage::createError(QDBusError::InternalError, qt_error_string()); @@ -357,14 +357,14 @@ QByteArray QGenericUnixServices::desktopEnvironment() const bool QGenericUnixServices::openUrl(const QUrl &url) { - Q_UNUSED(url) + Q_UNUSED(url); qWarning("openUrl() not supported on this platform"); return false; } bool QGenericUnixServices::openDocument(const QUrl &url) { - Q_UNUSED(url) + Q_UNUSED(url); qWarning("openDocument() not supported on this platform"); return false; } diff --git a/src/gui/rhi/qrhinull.cpp b/src/gui/rhi/qrhinull.cpp index 7511859d31..a541ecee28 100644 --- a/src/gui/rhi/qrhinull.cpp +++ b/src/gui/rhi/qrhinull.cpp @@ -637,7 +637,7 @@ bool QNullTexture::create() bool QNullTexture::createFrom(QRhiTexture::NativeTexture src) { - Q_UNUSED(src) + Q_UNUSED(src); QRHI_RES_RHI(QRhiNull); const bool isCube = m_flags.testFlag(CubeMap); const bool hasMipMaps = m_flags.testFlag(MipMapped); diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp index b931de1945..d3c8c1a840 100644 --- a/src/gui/text/qfontengine.cpp +++ b/src/gui/text/qfontengine.cpp @@ -103,12 +103,12 @@ bool qt_useHarfbuzzNG() int QFontEngine::getPointInOutline(glyph_t glyph, int flags, quint32 point, QFixed *xpos, QFixed *ypos, quint32 *nPoints) { - Q_UNUSED(glyph) - Q_UNUSED(flags) - Q_UNUSED(point) - Q_UNUSED(xpos) - Q_UNUSED(ypos) - Q_UNUSED(nPoints) + Q_UNUSED(glyph); + Q_UNUSED(flags); + Q_UNUSED(point); + Q_UNUSED(xpos); + Q_UNUSED(ypos); + Q_UNUSED(nPoints); return Err_Not_Covered; } @@ -954,9 +954,9 @@ void QFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_metr */ bool QFontEngine::getSfntTableData(uint tag, uchar *buffer, uint *length) const { - Q_UNUSED(tag) - Q_UNUSED(buffer) - Q_UNUSED(length) + Q_UNUSED(tag); + Q_UNUSED(buffer); + Q_UNUSED(length); return false; } @@ -1538,7 +1538,7 @@ QFontEngineBox::~QFontEngineBox() glyph_t QFontEngineBox::glyphIndex(uint ucs4) const { - Q_UNUSED(ucs4) + Q_UNUSED(ucs4); return 0; } diff --git a/src/gui/text/qtextimagehandler.cpp b/src/gui/text/qtextimagehandler.cpp index cae8304438..9bdc874564 100644 --- a/src/gui/text/qtextimagehandler.cpp +++ b/src/gui/text/qtextimagehandler.cpp @@ -219,7 +219,7 @@ QTextImageHandler::QTextImageHandler(QObject *parent) QSizeF QTextImageHandler::intrinsicSize(QTextDocument *doc, int posInDocument, const QTextFormat &format) { - Q_UNUSED(posInDocument) + Q_UNUSED(posInDocument); const QTextImageFormat imageFormat = format.toImageFormat(); if (QCoreApplication::instance()->thread() != QThread::currentThread()) @@ -236,7 +236,7 @@ QImage QTextImageHandler::image(QTextDocument *doc, const QTextImageFormat &imag void QTextImageHandler::drawObject(QPainter *p, const QRectF &rect, QTextDocument *doc, int posInDocument, const QTextFormat &format) { - Q_UNUSED(posInDocument) + Q_UNUSED(posInDocument); const QTextImageFormat imageFormat = format.toImageFormat(); if (QCoreApplication::instance()->thread() != QThread::currentThread()) { diff --git a/src/gui/text/qtextmarkdownimporter.cpp b/src/gui/text/qtextmarkdownimporter.cpp index 72c445878c..97bdef50d7 100644 --- a/src/gui/text/qtextmarkdownimporter.cpp +++ b/src/gui/text/qtextmarkdownimporter.cpp @@ -111,7 +111,7 @@ static int CbText(MD_TEXTTYPE type, const MD_CHAR *text, MD_SIZE size, void *use static void CbDebugLog(const char *msg, void *userdata) { - Q_UNUSED(userdata) + Q_UNUSED(userdata); qCDebug(lcMD) << msg; } @@ -314,7 +314,7 @@ int QTextMarkdownImporter::cbEnterBlock(int blockType, void *det) int QTextMarkdownImporter::cbLeaveBlock(int blockType, void *detail) { - Q_UNUSED(detail) + Q_UNUSED(detail); switch (blockType) { case MD_BLOCK_P: m_listItem = false; @@ -432,7 +432,7 @@ int QTextMarkdownImporter::cbEnterSpan(int spanType, void *det) int QTextMarkdownImporter::cbLeaveSpan(int spanType, void *detail) { - Q_UNUSED(detail) + Q_UNUSED(detail); QTextCharFormat charFmt; if (!m_spanFormatStack.isEmpty()) { m_spanFormatStack.pop(); diff --git a/src/gui/text/unix/qfontconfigdatabase.cpp b/src/gui/text/unix/qfontconfigdatabase.cpp index 624fd1f9a5..f54af2e59e 100644 --- a/src/gui/text/unix/qfontconfigdatabase.cpp +++ b/src/gui/text/unix/qfontconfigdatabase.cpp @@ -830,7 +830,7 @@ QStringList QFontconfigDatabase::fallbacksForFamily(const QString &family, QFont static FcPattern *queryFont(const FcChar8 *file, const QByteArray &data, int id, FcBlanks *blanks, int *count) { #if FC_VERSION < 20402 - Q_UNUSED(data) + Q_UNUSED(data); return FcFreeTypeQuery(file, id, blanks, count); #else if (data.isEmpty()) diff --git a/src/gui/text/windows/qwindowsfontdatabase.cpp b/src/gui/text/windows/qwindowsfontdatabase.cpp index dab7fda3fd..6d9096786d 100644 --- a/src/gui/text/windows/qwindowsfontdatabase.cpp +++ b/src/gui/text/windows/qwindowsfontdatabase.cpp @@ -725,8 +725,8 @@ QWindowsFontDatabase::QWindowsFontDatabase() // Properties accessed by QWin32PrintEngine (Qt Print Support) static const int hfontMetaTypeId = qRegisterMetaType(); static const int logFontMetaTypeId = qRegisterMetaType(); - Q_UNUSED(hfontMetaTypeId) - Q_UNUSED(logFontMetaTypeId) + Q_UNUSED(hfontMetaTypeId); + Q_UNUSED(logFontMetaTypeId); if (lcQpaFonts().isDebugEnabled()) { QSharedPointer d = data(); diff --git a/src/gui/text/windows/qwindowsfontengine.cpp b/src/gui/text/windows/qwindowsfontengine.cpp index 4eac3afc75..cbf50f65da 100644 --- a/src/gui/text/windows/qwindowsfontengine.cpp +++ b/src/gui/text/windows/qwindowsfontengine.cpp @@ -960,7 +960,7 @@ QWindowsNativeImage *QWindowsFontEngine::drawGDIGlyph(HFONT font, glyph_t glyph, const QTransform &t, QImage::Format mask_format) { - Q_UNUSED(mask_format) + Q_UNUSED(mask_format); glyph_metrics_t gm = boundingBox(glyph); // printf(" -> for glyph %4x\n", glyph); diff --git a/src/gui/util/qastchandler.cpp b/src/gui/util/qastchandler.cpp index 6d163c6701..e91ae3e0f5 100644 --- a/src/gui/util/qastchandler.cpp +++ b/src/gui/util/qastchandler.cpp @@ -61,7 +61,7 @@ struct AstcHeader bool QAstcHandler::canRead(const QByteArray &suffix, const QByteArray &block) { - Q_UNUSED(suffix) + Q_UNUSED(suffix); return block.startsWith("\x13\xAB\xA1\x5C"); } diff --git a/src/gui/util/qktxhandler.cpp b/src/gui/util/qktxhandler.cpp index 7eda4c46fb..f6aa46718d 100644 --- a/src/gui/util/qktxhandler.cpp +++ b/src/gui/util/qktxhandler.cpp @@ -105,7 +105,7 @@ struct KTXMipmapLevel { bool QKtxHandler::canRead(const QByteArray &suffix, const QByteArray &block) { - Q_UNUSED(suffix) + Q_UNUSED(suffix); return (qstrncmp(block.constData(), ktxIdentifier, KTX_IDENTIFIER_LENGTH) == 0); } diff --git a/src/gui/util/qpkmhandler.cpp b/src/gui/util/qpkmhandler.cpp index e0c3b75efe..1c073cf94e 100644 --- a/src/gui/util/qpkmhandler.cpp +++ b/src/gui/util/qpkmhandler.cpp @@ -67,7 +67,7 @@ static PkmType typeMap[5] = { bool QPkmHandler::canRead(const QByteArray &suffix, const QByteArray &block) { - Q_UNUSED(suffix) + Q_UNUSED(suffix); return block.startsWith("PKM "); } diff --git a/src/gui/util/qundostack.cpp b/src/gui/util/qundostack.cpp index f7b5024389..84ef2787e1 100644 --- a/src/gui/util/qundostack.cpp +++ b/src/gui/util/qundostack.cpp @@ -215,7 +215,7 @@ int QUndoCommand::id() const bool QUndoCommand::mergeWith(const QUndoCommand *command) { - Q_UNUSED(command) + Q_UNUSED(command); return false; } -- cgit v1.2.3