From e79281533d61dda90d1c5995345a66e6089c7501 Mon Sep 17 00:00:00 2001 From: Lars Schmertmann Date: Fri, 26 Jun 2020 14:43:02 +0200 Subject: Add ; to Q_UNUSED and UNUSED_PARAM This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: Iead53d18fd790fb2d870d80ef2db79666f0d2392 Reviewed-by: Shawn Rutledge Reviewed-by: Ulf Hermann --- src/3rdparty/masm/assembler/LinkBuffer.h | 10 +++++----- src/3rdparty/masm/assembler/MacroAssemblerARM64.h | 2 +- src/imports/labsanimation/qquickboundaryrule.cpp | 2 +- src/imports/localstorage/qquicklocalstorage.cpp | 2 +- .../qmldbg_preview/qqmldebugtranslationservice.cpp | 12 ++++++------ src/plugins/scenegraph/openvg/qsgopenvgadaptation.cpp | 4 ++-- src/plugins/scenegraph/openvg/qsgopenvgcontext.cpp | 6 +++--- src/plugins/scenegraph/openvg/qsgopenvglayer.cpp | 4 ++-- src/plugins/scenegraph/openvg/qsgopenvgnodevisitor.cpp | 4 ++-- src/plugins/scenegraph/openvg/qsgopenvgrenderloop.cpp | 2 +- src/plugins/scenegraph/openvg/qsgopenvgtexture.cpp | 2 +- src/qml/common/qv4compileddata_p.h | 2 +- src/qml/jit/qv4baselineassembler.cpp | 6 +++--- src/qml/jsruntime/qv4qmlcontext.cpp | 8 ++++---- src/qml/jsruntime/qv4regexp.cpp | 2 +- src/qml/jsruntime/qv4urlobject.cpp | 4 ++-- src/qml/qml/qqmlengine.cpp | 4 ++-- src/qml/qml/qqmlpropertydata_p.h | 2 +- src/qml/qml/qqmltype.cpp | 4 ++-- src/qml/util/qqmlpropertymap.cpp | 2 +- src/qml/util/qqmlpropertymap.h | 2 +- src/qmldebug/qqmldebugtranslationclient.cpp | 4 ++-- src/qmlmodels/qqmlobjectmodel_p.h | 2 +- src/quick/accessible/qaccessiblequickitem.cpp | 2 +- src/quick/accessible/qaccessiblequickview.cpp | 2 +- src/quick/designer/qquickdesignercustomobjectdata.cpp | 4 ++-- src/quick/designer/qquickdesignersupportitems.cpp | 4 ++-- src/quick/designer/qquickdesignerwindowmanager.cpp | 2 +- src/quick/handlers/qquickpointerhandler.cpp | 2 +- src/quick/handlers/qquickwheelhandler.cpp | 2 +- src/quick/items/context2d/qquickcontext2d.cpp | 2 +- src/quick/items/qquickitem.cpp | 8 ++++---- src/quick/items/qquicktextinput.cpp | 4 ++-- .../software/qsgsoftwareinternalrectanglenode_p.h | 2 +- src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp | 2 +- src/quick/scenegraph/coreapi/qsgnodeupdater.cpp | 4 ++-- src/quick/scenegraph/coreapi/qsgtexture.cpp | 2 +- src/quick/scenegraph/qsgadaptationlayer_p.h | 4 ++-- src/quick/scenegraph/qsgrenderloop.cpp | 2 +- src/quick/util/qquickglobal.cpp | 2 +- 40 files changed, 71 insertions(+), 71 deletions(-) (limited to 'src') diff --git a/src/3rdparty/masm/assembler/LinkBuffer.h b/src/3rdparty/masm/assembler/LinkBuffer.h index ba57564a1d..ba5a98733e 100644 --- a/src/3rdparty/masm/assembler/LinkBuffer.h +++ b/src/3rdparty/masm/assembler/LinkBuffer.h @@ -93,7 +93,7 @@ public: #endif { #ifdef NDEBUG - UNUSED_PARAM(effort) + UNUSED_PARAM(effort); #endif // Simon: Moved this to the sub-classes linkCode(ownerUID, effort); } @@ -327,8 +327,8 @@ inline typename LinkBufferBase::Code template class ExecutableOffsetCalculator> inline void LinkBufferBase::linkCode(void* ownerUID, JITCompilationEffort effort) { - UNUSED_PARAM(ownerUID) - UNUSED_PARAM(effort) + UNUSED_PARAM(ownerUID); + UNUSED_PARAM(effort); ASSERT(!m_code); m_executableMemory = m_assembler->m_assembler.executableCopy(*m_globalData, ownerUID, effort); if (!m_executableMemory) @@ -435,8 +435,8 @@ inline void BranchCompactingLinkBuffer::makeExecutable() template inline void BranchCompactingLinkBuffer::linkCode(void* ownerUID, JITCompilationEffort effort) { - UNUSED_PARAM(ownerUID) - UNUSED_PARAM(effort) + UNUSED_PARAM(ownerUID); + UNUSED_PARAM(effort); ASSERT(!m_code); m_initialSize = m_assembler->m_assembler.codeSize(); m_executableMemory = m_globalData->executableAllocator.allocate(*m_globalData, m_initialSize, ownerUID, effort); diff --git a/src/3rdparty/masm/assembler/MacroAssemblerARM64.h b/src/3rdparty/masm/assembler/MacroAssemblerARM64.h index c0c68f6393..c131cdfcae 100644 --- a/src/3rdparty/masm/assembler/MacroAssemblerARM64.h +++ b/src/3rdparty/masm/assembler/MacroAssemblerARM64.h @@ -3224,7 +3224,7 @@ private: { #if 1 Q_UNUSED(immediate); - Q_UNUSED(dest) + Q_UNUSED(dest); #else intptr_t currentRegisterContents; if (dest.value(currentRegisterContents)) { diff --git a/src/imports/labsanimation/qquickboundaryrule.cpp b/src/imports/labsanimation/qquickboundaryrule.cpp index 3558c8bfa0..3083dd26d2 100644 --- a/src/imports/labsanimation/qquickboundaryrule.cpp +++ b/src/imports/labsanimation/qquickboundaryrule.cpp @@ -117,7 +117,7 @@ void QQuickBoundaryReturnJob::updateCurrentTime(int t) void QQuickBoundaryReturnJob::updateState(QAbstractAnimationJob::State newState, QAbstractAnimationJob::State oldState) { - Q_UNUSED(oldState) + Q_UNUSED(oldState); if (newState == QAbstractAnimationJob::Stopped) { qCDebug(lcBR) << "return animation done"; boundaryRule->resetOvershoot(); diff --git a/src/imports/localstorage/qquicklocalstorage.cpp b/src/imports/localstorage/qquicklocalstorage.cpp index 333e697e3c..62f19eed63 100644 --- a/src/imports/localstorage/qquicklocalstorage.cpp +++ b/src/imports/localstorage/qquicklocalstorage.cpp @@ -785,7 +785,7 @@ void QQuickLocalStorage::openDatabaseSync(QQmlV4Function *args) args->setReturnValue(db.asReturnedValue()); #else - Q_UNUSED(args) + Q_UNUSED(args); #endif // settings } diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmldebugtranslationservice.cpp b/src/plugins/qmltooling/qmldbg_preview/qqmldebugtranslationservice.cpp index 5da26e9610..785fca6427 100644 --- a/src/plugins/qmltooling/qmldbg_preview/qqmldebugtranslationservice.cpp +++ b/src/plugins/qmltooling/qmldbg_preview/qqmldebugtranslationservice.cpp @@ -48,13 +48,13 @@ QQmlDebugTranslationServiceImpl::QQmlDebugTranslationServiceImpl(QObject *parent void QQmlDebugTranslationServiceImpl::messageReceived(const QByteArray &message) { - Q_UNUSED(message) + Q_UNUSED(message); } QString QQmlDebugTranslationServiceImpl::foundElidedText(QObject *textObject, const QString &layoutText, const QString &elideText) { - Q_UNUSED(textObject) - Q_UNUSED(layoutText) + Q_UNUSED(textObject); + Q_UNUSED(layoutText); return elideText; } @@ -62,9 +62,9 @@ void QQmlDebugTranslationServiceImpl::foundTranslationBinding( QQmlTranslationBinding *binding, QObject *scopeObject, const QQmlRefPointer &contextData) { - Q_UNUSED(binding) - Q_UNUSED(scopeObject) - Q_UNUSED(contextData) + Q_UNUSED(binding); + Q_UNUSED(scopeObject); + Q_UNUSED(contextData); } QT_END_NAMESPACE diff --git a/src/plugins/scenegraph/openvg/qsgopenvgadaptation.cpp b/src/plugins/scenegraph/openvg/qsgopenvgadaptation.cpp index 1a26522459..006e20a096 100644 --- a/src/plugins/scenegraph/openvg/qsgopenvgadaptation.cpp +++ b/src/plugins/scenegraph/openvg/qsgopenvgadaptation.cpp @@ -56,7 +56,7 @@ QStringList QSGOpenVGAdaptation::keys() const QSGContext *QSGOpenVGAdaptation::create(const QString &key) const { - Q_UNUSED(key) + Q_UNUSED(key); if (!instance) instance = new QSGOpenVGContext(); return instance; @@ -69,7 +69,7 @@ QSGRenderLoop *QSGOpenVGAdaptation::createWindowManager() QSGContextFactoryInterface::Flags QSGOpenVGAdaptation::flags(const QString &key) const { - Q_UNUSED(key) + Q_UNUSED(key); return 0; } diff --git a/src/plugins/scenegraph/openvg/qsgopenvgcontext.cpp b/src/plugins/scenegraph/openvg/qsgopenvgcontext.cpp index 0d38cd2ab1..a47a4258b0 100644 --- a/src/plugins/scenegraph/openvg/qsgopenvgcontext.cpp +++ b/src/plugins/scenegraph/openvg/qsgopenvgcontext.cpp @@ -113,7 +113,7 @@ QSGRenderer *QSGOpenVGRenderContext::createRenderer(QSGRendererInterface::Render QSGOpenVGContext::QSGOpenVGContext(QObject *parent) { - Q_UNUSED(parent) + Q_UNUSED(parent); } QSGRenderContext *QSGOpenVGContext::createRenderContext() @@ -133,13 +133,13 @@ QSGImageNode *QSGOpenVGContext::createImageNode() QSGPainterNode *QSGOpenVGContext::createPainterNode(QQuickPaintedItem *item) { - Q_UNUSED(item) + Q_UNUSED(item); return new QSGOpenVGPainterNode(item); } QSGGlyphNode *QSGOpenVGContext::createGlyphNode(QSGRenderContext *rc, bool preferNativeGlyphNode) { - Q_UNUSED(preferNativeGlyphNode) + Q_UNUSED(preferNativeGlyphNode); return new QSGOpenVGGlyphNode(rc); } diff --git a/src/plugins/scenegraph/openvg/qsgopenvglayer.cpp b/src/plugins/scenegraph/openvg/qsgopenvglayer.cpp index 3ecf0dcb31..795e3f62d3 100644 --- a/src/plugins/scenegraph/openvg/qsgopenvglayer.cpp +++ b/src/plugins/scenegraph/openvg/qsgopenvglayer.cpp @@ -185,12 +185,12 @@ void QSGOpenVGLayer::setRecursive(bool recursive) void QSGOpenVGLayer::setFormat(uint format) { - Q_UNUSED(format) + Q_UNUSED(format); } void QSGOpenVGLayer::setHasMipmaps(bool mipmap) { - Q_UNUSED(mipmap) + Q_UNUSED(mipmap); } void QSGOpenVGLayer::setDevicePixelRatio(qreal ratio) diff --git a/src/plugins/scenegraph/openvg/qsgopenvgnodevisitor.cpp b/src/plugins/scenegraph/openvg/qsgopenvgnodevisitor.cpp index 41606c653a..7770a46a7f 100644 --- a/src/plugins/scenegraph/openvg/qsgopenvgnodevisitor.cpp +++ b/src/plugins/scenegraph/openvg/qsgopenvgnodevisitor.cpp @@ -127,11 +127,11 @@ bool QSGOpenVGNodeVisitor::visit(QSGGeometryNode *node) { if (QSGSimpleRectNode *rectNode = dynamic_cast(node)) { // TODO: Try and render the QSGSimpleRectNode - Q_UNUSED(rectNode) + Q_UNUSED(rectNode); return false; } else if (QSGSimpleTextureNode *tn = dynamic_cast(node)) { // TODO: Try and render the QSGSimpleTextureNode - Q_UNUSED(tn) + Q_UNUSED(tn); return false; } else if (QSGOpenVGNinePatchNode *nn = dynamic_cast(node)) { renderRenderableNode(nn); diff --git a/src/plugins/scenegraph/openvg/qsgopenvgrenderloop.cpp b/src/plugins/scenegraph/openvg/qsgopenvgrenderloop.cpp index 90ccab2682..75fdc3d966 100644 --- a/src/plugins/scenegraph/openvg/qsgopenvgrenderloop.cpp +++ b/src/plugins/scenegraph/openvg/qsgopenvgrenderloop.cpp @@ -159,7 +159,7 @@ QSGRenderContext *QSGOpenVGRenderLoop::createRenderContext(QSGContext *) const void QSGOpenVGRenderLoop::releaseResources(QQuickWindow *window) { - Q_UNUSED(window) + Q_UNUSED(window); } QSurface::SurfaceType QSGOpenVGRenderLoop::windowSurfaceType() const diff --git a/src/plugins/scenegraph/openvg/qsgopenvgtexture.cpp b/src/plugins/scenegraph/openvg/qsgopenvgtexture.cpp index 19a61b5789..574cd9aa51 100644 --- a/src/plugins/scenegraph/openvg/qsgopenvgtexture.cpp +++ b/src/plugins/scenegraph/openvg/qsgopenvgtexture.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE QSGOpenVGTexture::QSGOpenVGTexture(const QImage &image, uint flags) { - Q_UNUSED(flags) + Q_UNUSED(flags); VGImageFormat format = QSGOpenVGHelpers::qImageFormatToVGImageFormat(image.format()); m_image = vgCreateImage(format, image.width(), image.height(), VG_IMAGE_QUALITY_BETTER); diff --git a/src/qml/common/qv4compileddata_p.h b/src/qml/common/qv4compileddata_p.h index 152c70f107..8c4aa1b12e 100644 --- a/src/qml/common/qv4compileddata_p.h +++ b/src/qml/common/qv4compileddata_p.h @@ -1394,7 +1394,7 @@ public: errorString->clear(); return true; #else - Q_UNUSED(outputFileName) + Q_UNUSED(outputFileName); *errorString = QStringLiteral("features.temporaryfile is disabled."); return false; #endif diff --git a/src/qml/jit/qv4baselineassembler.cpp b/src/qml/jit/qv4baselineassembler.cpp index dd6a40afe0..69670e1773 100644 --- a/src/qml/jit/qv4baselineassembler.cpp +++ b/src/qml/jit/qv4baselineassembler.cpp @@ -888,7 +888,7 @@ void BaselineAssembler::storeReg(int reg) void BaselineAssembler::loadLocal(int index, int level) { Heap::CallContext ctx; - Q_UNUSED(ctx) + Q_UNUSED(ctx); pasm()->loadPointerFromValue(regAddr(CallData::Context), PlatformAssembler::ScratchRegister); while (level) { pasm()->loadPtr(Address(PlatformAssembler::ScratchRegister, ctx.outer.offset), PlatformAssembler::ScratchRegister); @@ -900,7 +900,7 @@ void BaselineAssembler::loadLocal(int index, int level) void BaselineAssembler::storeLocal(int index, int level) { Heap::CallContext ctx; - Q_UNUSED(ctx) + Q_UNUSED(ctx); pasm()->loadPtr(regAddr(CallData::Context), PlatformAssembler::ScratchRegister); while (level) { pasm()->loadPtr(Address(PlatformAssembler::ScratchRegister, ctx.outer.offset), PlatformAssembler::ScratchRegister); @@ -1592,7 +1592,7 @@ void BaselineAssembler::pushCatchContext(int index, int name) void BaselineAssembler::popContext() { Heap::CallContext ctx; - Q_UNUSED(ctx) + Q_UNUSED(ctx); pasm()->loadPointerFromValue(regAddr(CallData::Context), PlatformAssembler::ScratchRegister); pasm()->loadPtr(Address(PlatformAssembler::ScratchRegister, ctx.outer.offset), PlatformAssembler::ScratchRegister); pasm()->storeHeapObject(PlatformAssembler::ScratchRegister, regAddr(CallData::Context)); diff --git a/src/qml/jsruntime/qv4qmlcontext.cpp b/src/qml/jsruntime/qv4qmlcontext.cpp index 9863edead0..b6b268fc9b 100644 --- a/src/qml/jsruntime/qv4qmlcontext.cpp +++ b/src/qml/jsruntime/qv4qmlcontext.cpp @@ -501,7 +501,7 @@ ReturnedValue QQmlContextWrapper::resolveQmlContextPropertyLookupGetter(Lookup * ReturnedValue QQmlContextWrapper::lookupScript(Lookup *l, ExecutionEngine *engine, Value *base) { - Q_UNUSED(base) + Q_UNUSED(base); Scope scope(engine); Scoped qmlContext(scope, engine->qmlContext()); if (!qmlContext) @@ -519,14 +519,14 @@ ReturnedValue QQmlContextWrapper::lookupScript(Lookup *l, ExecutionEngine *engin ReturnedValue QQmlContextWrapper::lookupSingleton(Lookup *l, ExecutionEngine *engine, Value *base) { - Q_UNUSED(engine) - Q_UNUSED(base) + Q_UNUSED(engine); + Q_UNUSED(base); return Value::fromHeapObject(l->qmlContextSingletonLookup.singleton).asReturnedValue(); } ReturnedValue QQmlContextWrapper::lookupIdObject(Lookup *l, ExecutionEngine *engine, Value *base) { - Q_UNUSED(base) + Q_UNUSED(base); Scope scope(engine); Scoped qmlContext(scope, engine->qmlContext()); if (!qmlContext) diff --git a/src/qml/jsruntime/qv4regexp.cpp b/src/qml/jsruntime/qv4regexp.cpp index 76daead842..ea869f982f 100644 --- a/src/qml/jsruntime/qv4regexp.cpp +++ b/src/qml/jsruntime/qv4regexp.cpp @@ -224,7 +224,7 @@ void Heap::RegExp::init(ExecutionEngine *engine, const QString &pattern, uint fl JSC::Yarr::jitCompile(yarrPattern, JSC::Yarr::Char16, vm, *jitCode); } #else - Q_UNUSED(engine) + Q_UNUSED(engine); #endif if (hasValidJITCode()) { valid = true; diff --git a/src/qml/jsruntime/qv4urlobject.cpp b/src/qml/jsruntime/qv4urlobject.cpp index 73b1510d2e..7e52c63248 100644 --- a/src/qml/jsruntime/qv4urlobject.cpp +++ b/src/qml/jsruntime/qv4urlobject.cpp @@ -62,7 +62,7 @@ void Heap::UrlCtor::init(QV4::ExecutionContext *scope) void UrlPrototype::init(ExecutionEngine *engine, Object *ctor) { - Q_UNUSED(ctor) + Q_UNUSED(ctor); Scope scope(engine); ScopedObject o(scope); @@ -721,7 +721,7 @@ void Heap::UrlSearchParamsCtor::init(QV4::ExecutionContext *scope) void UrlSearchParamsPrototype::init(ExecutionEngine *engine, Object *ctor) { - Q_UNUSED(ctor) + Q_UNUSED(ctor); Scope scope(engine); ScopedObject o(scope); diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index c810b26f39..27bc1fa6ba 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -2572,8 +2572,8 @@ bool QQml_isFileCaseCorrect(const QString &fileName, int lengthIn /* = -1 */) return false; } #else - Q_UNUSED(lengthIn) - Q_UNUSED(fileName) + Q_UNUSED(lengthIn); + Q_UNUSED(fileName); #endif return true; } diff --git a/src/qml/qml/qqmlpropertydata_p.h b/src/qml/qml/qqmlpropertydata_p.h index 517b865cbb..6f1e1b6e4e 100644 --- a/src/qml/qml/qqmlpropertydata_p.h +++ b/src/qml/qml/qqmlpropertydata_p.h @@ -428,7 +428,7 @@ private: bool QQmlPropertyData::operator==(const QQmlPropertyData &other) const { - Q_UNUSED(m_reserved) + Q_UNUSED(m_reserved); return flags() == other.flags() && propType() == other.propType() && coreIndex() == other.coreIndex() && diff --git a/src/qml/qml/qqmltype.cpp b/src/qml/qml/qqmltype.cpp index 1d343b91cc..26c970bf60 100644 --- a/src/qml/qml/qqmltype.cpp +++ b/src/qml/qml/qqmltype.cpp @@ -792,7 +792,7 @@ int QQmlType::scopedEnumIndex(QQmlEnginePrivate *engine, const QString &name, bo int QQmlType::scopedEnumValue(QQmlEnginePrivate *engine, int index, const QV4::String *name, bool *ok) const { - Q_UNUSED(engine) + Q_UNUSED(engine); Q_ASSERT(ok); *ok = true; @@ -809,7 +809,7 @@ int QQmlType::scopedEnumValue(QQmlEnginePrivate *engine, int index, const QV4::S int QQmlType::scopedEnumValue(QQmlEnginePrivate *engine, int index, const QString &name, bool *ok) const { - Q_UNUSED(engine) + Q_UNUSED(engine); Q_ASSERT(ok); *ok = true; diff --git a/src/qml/util/qqmlpropertymap.cpp b/src/qml/util/qqmlpropertymap.cpp index 82f048d9d9..4681cac864 100644 --- a/src/qml/util/qqmlpropertymap.cpp +++ b/src/qml/util/qqmlpropertymap.cpp @@ -337,7 +337,7 @@ QVariant QQmlPropertyMap::operator[](const QString &key) const */ QVariant QQmlPropertyMap::updateValue(const QString &key, const QVariant &input) { - Q_UNUSED(key) + Q_UNUSED(key); return input; } diff --git a/src/qml/util/qqmlpropertymap.h b/src/qml/util/qqmlpropertymap.h index cb7ada3d79..d948989833 100644 --- a/src/qml/util/qqmlpropertymap.h +++ b/src/qml/util/qqmlpropertymap.h @@ -82,7 +82,7 @@ protected: QQmlPropertyMap(DerivedType *derived, QObject *parentObj) : QQmlPropertyMap(&DerivedType::staticMetaObject, parentObj) { - Q_UNUSED(derived) + Q_UNUSED(derived); } private: diff --git a/src/qmldebug/qqmldebugtranslationclient.cpp b/src/qmldebug/qqmldebugtranslationclient.cpp index 1fd0748fa0..33f887b059 100644 --- a/src/qmldebug/qqmldebugtranslationclient.cpp +++ b/src/qmldebug/qqmldebugtranslationclient.cpp @@ -69,8 +69,8 @@ void QQmlDebugTranslationClient::messageReceived(const QByteArray &data) void QQmlDebugTranslationClient::triggerLanguage(const QUrl &url, const QString &locale) { - Q_UNUSED(url) - Q_UNUSED(locale) + Q_UNUSED(url); + Q_UNUSED(locale); } QT_END_NAMESPACE diff --git a/src/qmlmodels/qqmlobjectmodel_p.h b/src/qmlmodels/qqmlobjectmodel_p.h index 761e9c73ec..5f91b5e8a0 100644 --- a/src/qmlmodels/qqmlobjectmodel_p.h +++ b/src/qmlmodels/qqmlobjectmodel_p.h @@ -93,7 +93,7 @@ public: virtual void setWatchedRoles(const QList &roles) = 0; virtual QQmlIncubator::Status incubationStatus(int index) = 0; - virtual void drainReusableItemsPool(int maxPoolTime) { Q_UNUSED(maxPoolTime) } + virtual void drainReusableItemsPool(int maxPoolTime) { Q_UNUSED(maxPoolTime); } virtual int poolSize() { return 0; } virtual int indexOf(QObject *object, QObject *objectContext) const = 0; diff --git a/src/quick/accessible/qaccessiblequickitem.cpp b/src/quick/accessible/qaccessiblequickitem.cpp index 5e1ae25c38..bca03b496d 100644 --- a/src/quick/accessible/qaccessiblequickitem.cpp +++ b/src/quick/accessible/qaccessiblequickitem.cpp @@ -339,7 +339,7 @@ void QAccessibleQuickItem::doAction(const QString &actionName) QStringList QAccessibleQuickItem::keyBindingsForAction(const QString &actionName) const { - Q_UNUSED(actionName) + Q_UNUSED(actionName); return QStringList(); } diff --git a/src/quick/accessible/qaccessiblequickview.cpp b/src/quick/accessible/qaccessiblequickview.cpp index b23b0316f5..b0d2c485f1 100644 --- a/src/quick/accessible/qaccessiblequickview.cpp +++ b/src/quick/accessible/qaccessiblequickview.cpp @@ -120,7 +120,7 @@ QString QAccessibleQuickWindow::text(QAccessible::Text text) const return QString::fromLatin1(object()->metaObject()->className()) ; } #else - Q_UNUSED(text) + Q_UNUSED(text); #endif return window()->title(); } diff --git a/src/quick/designer/qquickdesignercustomobjectdata.cpp b/src/quick/designer/qquickdesignercustomobjectdata.cpp index 66a86bffd5..86a14b622e 100644 --- a/src/quick/designer/qquickdesignercustomobjectdata.cpp +++ b/src/quick/designer/qquickdesignercustomobjectdata.cpp @@ -291,8 +291,8 @@ void QQuickDesignerCustomObjectData::keepBindingFromGettingDeleted(QQmlContext * const QQuickDesignerSupport::PropertyName &propertyName) { //Refcounting is taking care - Q_UNUSED(context) - Q_UNUSED(propertyName) + Q_UNUSED(context); + Q_UNUSED(propertyName); } void QQuickDesignerCustomObjectData::handleDestroyed() diff --git a/src/quick/designer/qquickdesignersupportitems.cpp b/src/quick/designer/qquickdesignersupportitems.cpp index 4fd9158f4a..cec4fa2d7c 100644 --- a/src/quick/designer/qquickdesignersupportitems.cpp +++ b/src/quick/designer/qquickdesignersupportitems.cpp @@ -214,7 +214,7 @@ QObject *QQuickDesignerSupportItems::createPrimitive(const QString &typeName, QT { ComponentCompleteDisabler disableComponentComplete; - Q_UNUSED(disableComponentComplete) + Q_UNUSED(disableComponentComplete); QObject *object = nullptr; QQmlType type = QQmlMetaType::qmlType(typeName, version); @@ -260,7 +260,7 @@ QObject *QQuickDesignerSupportItems::createPrimitive(const QString &typeName, QT QObject *QQuickDesignerSupportItems::createComponent(const QUrl &componentUrl, QQmlContext *context) { ComponentCompleteDisabler disableComponentComplete; - Q_UNUSED(disableComponentComplete) + Q_UNUSED(disableComponentComplete); QQmlComponent component(context->engine(), componentUrl); diff --git a/src/quick/designer/qquickdesignerwindowmanager.cpp b/src/quick/designer/qquickdesignerwindowmanager.cpp index 04df6b2832..18daab70e8 100644 --- a/src/quick/designer/qquickdesignerwindowmanager.cpp +++ b/src/quick/designer/qquickdesignerwindowmanager.cpp @@ -86,7 +86,7 @@ void QQuickDesignerWindowManager::makeOpenGLContext(QQuickWindow *window) m_openGlContext->makeCurrent(window); } #else - Q_UNUSED(window) + Q_UNUSED(window); #endif } diff --git a/src/quick/handlers/qquickpointerhandler.cpp b/src/quick/handlers/qquickpointerhandler.cpp index 2a02511402..ce59a35b62 100644 --- a/src/quick/handlers/qquickpointerhandler.cpp +++ b/src/quick/handlers/qquickpointerhandler.cpp @@ -605,7 +605,7 @@ void QQuickPointerHandler::handlePointerEvent(QQuickPointerEvent *event) bool QQuickPointerHandler::wantsPointerEvent(QQuickPointerEvent *event) { Q_D(const QQuickPointerHandler); - Q_UNUSED(event) + Q_UNUSED(event); return d->enabled; } diff --git a/src/quick/handlers/qquickwheelhandler.cpp b/src/quick/handlers/qquickwheelhandler.cpp index 64bf5bc540..b55d9aa27b 100644 --- a/src/quick/handlers/qquickwheelhandler.cpp +++ b/src/quick/handlers/qquickwheelhandler.cpp @@ -479,7 +479,7 @@ void QQuickWheelHandler::handleEventPoint(QQuickEventPoint *point) void QQuickWheelHandler::onTargetChanged(QQuickItem *oldTarget) { - Q_UNUSED(oldTarget) + Q_UNUSED(oldTarget); Q_D(QQuickWheelHandler); d->metaPropertyDirty = true; } diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp index 4b231befd9..d705d08f71 100644 --- a/src/quick/items/context2d/qquickcontext2d.cpp +++ b/src/quick/items/context2d/qquickcontext2d.cpp @@ -144,7 +144,7 @@ Q_QUICK_PRIVATE_EXPORT QColor qt_color_from_string(const QV4::Value &name) return QColor(p); else { bool isRgb(false), isHsl(false), hasAlpha(false); - Q_UNUSED(isHsl) + Q_UNUSED(isHsl); while (isspace(*p)) p++; if (strncmp(p, "rgb", 3) == 0) diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index a709ea18be..e02ae15373 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -274,7 +274,7 @@ void QQuickContents::updateRect() void QQuickContents::itemGeometryChanged(QQuickItem *changed, QQuickGeometryChange change, const QRectF &) { - Q_UNUSED(changed) + Q_UNUSED(changed); bool wChanged = false; bool hChanged = false; //### we can only pass changed if the left edge has moved left, or the right edge has moved right @@ -3813,7 +3813,7 @@ void QQuickItem::geometryChange(const QRectF &newGeometry, const QRectF &oldGeom QSGNode *QQuickItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *updatePaintNodeData) { - Q_UNUSED(updatePaintNodeData) + Q_UNUSED(updatePaintNodeData); delete oldNode; return nullptr; } @@ -8804,7 +8804,7 @@ void QQuickItemLayer::setName(const QByteArray &name) { void QQuickItemLayer::itemOpacityChanged(QQuickItem *item) { - Q_UNUSED(item) + Q_UNUSED(item); updateOpacity(); } @@ -8815,7 +8815,7 @@ void QQuickItemLayer::itemGeometryChanged(QQuickItem *, QQuickGeometryChange, co void QQuickItemLayer::itemParentChanged(QQuickItem *item, QQuickItem *parent) { - Q_UNUSED(item) + Q_UNUSED(item); Q_ASSERT(item == m_item); Q_ASSERT(parent != m_effectSource); Q_ASSERT(parent == nullptr || parent != m_effect); diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index bdbf23bfe2..7917b51c26 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -3553,7 +3553,7 @@ bool QQuickTextInputPrivate::finishChange(int validateFromState, bool update, bo { Q_Q(QQuickTextInput); - Q_UNUSED(update) + Q_UNUSED(update); #if QT_CONFIG(im) bool inputMethodAttributesChanged = m_textDirty || m_selDirty; #endif @@ -3666,7 +3666,7 @@ void QQuickTextInputPrivate::internalSetText(const QString &txt, int pos, bool e bool changed = finishChange(-1, true, edited); #if !QT_CONFIG(accessibility) - Q_UNUSED(changed) + Q_UNUSED(changed); #else Q_Q(QQuickTextInput); if (changed && QAccessible::isActive()) { diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwareinternalrectanglenode_p.h b/src/quick/scenegraph/adaptations/software/qsgsoftwareinternalrectanglenode_p.h index 125520de26..e39d013b49 100644 --- a/src/quick/scenegraph/adaptations/software/qsgsoftwareinternalrectanglenode_p.h +++ b/src/quick/scenegraph/adaptations/software/qsgsoftwareinternalrectanglenode_p.h @@ -71,7 +71,7 @@ public: void setGradientStops(const QGradientStops &stops) override; void setGradientVertical(bool vertical) override; void setRadius(qreal radius) override; - void setAntialiasing(bool antialiasing) override { Q_UNUSED(antialiasing) } + void setAntialiasing(bool antialiasing) override { Q_UNUSED(antialiasing); } void setAligned(bool aligned) override; void update() override; diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp index 8341f0dc57..249f9f9172 100644 --- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp +++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp @@ -388,7 +388,7 @@ void qsg_dumpShadowRoots(Node *n) --indent; #else - Q_UNUSED(n) + Q_UNUSED(n); #endif } diff --git a/src/quick/scenegraph/coreapi/qsgnodeupdater.cpp b/src/quick/scenegraph/coreapi/qsgnodeupdater.cpp index 8bc9ded594..57faf0faad 100644 --- a/src/quick/scenegraph/coreapi/qsgnodeupdater.cpp +++ b/src/quick/scenegraph/coreapi/qsgnodeupdater.cpp @@ -165,7 +165,7 @@ void QSGNodeUpdater::leaveGeometryNode(QSGGeometryNode *g) #ifdef QSG_UPDATER_DEBUG qDebug() << "leave geometry" << g; #else - Q_UNUSED(g) + Q_UNUSED(g); #endif } @@ -186,7 +186,7 @@ void QSGNodeUpdater::leaveRenderNode(QSGRenderNode *r) #ifdef QSG_UPDATER_DEBUG qDebug() << "leave render" << r; #else - Q_UNUSED(r) + Q_UNUSED(r); #endif } diff --git a/src/quick/scenegraph/coreapi/qsgtexture.cpp b/src/quick/scenegraph/coreapi/qsgtexture.cpp index 9daa8de37d..eebd5d1ab9 100644 --- a/src/quick/scenegraph/coreapi/qsgtexture.cpp +++ b/src/quick/scenegraph/coreapi/qsgtexture.cpp @@ -196,7 +196,7 @@ static void qt_debug_remove_texture(QSGTexture* texture) } } #else - Q_UNUSED(texture) + Q_UNUSED(texture); #endif --qt_debug_texture_count; diff --git a/src/quick/scenegraph/qsgadaptationlayer_p.h b/src/quick/scenegraph/qsgadaptationlayer_p.h index 512986556d..a59d11430e 100644 --- a/src/quick/scenegraph/qsgadaptationlayer_p.h +++ b/src/quick/scenegraph/qsgadaptationlayer_p.h @@ -142,7 +142,7 @@ public: virtual void setGradientStops(const QGradientStops &stops) = 0; virtual void setGradientVertical(bool vertical) = 0; virtual void setRadius(qreal radius) = 0; - virtual void setAntialiasing(bool antialiasing) { Q_UNUSED(antialiasing) } + virtual void setAntialiasing(bool antialiasing) { Q_UNUSED(antialiasing); } virtual void setAligned(bool aligned) = 0; virtual void update() = 0; @@ -162,7 +162,7 @@ public: // in the inner source rect maps to the upper-left corner of the inner target rect. virtual void setSubSourceRect(const QRectF &rect) = 0; virtual void setTexture(QSGTexture *texture) = 0; - virtual void setAntialiasing(bool antialiasing) { Q_UNUSED(antialiasing) } + virtual void setAntialiasing(bool antialiasing) { Q_UNUSED(antialiasing); } virtual void setMirror(bool mirror) = 0; virtual void setMipmapFiltering(QSGTexture::Filtering filtering) = 0; virtual void setFiltering(QSGTexture::Filtering filtering) = 0; diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp index 8388fa9576..c2c17508f1 100644 --- a/src/quick/scenegraph/qsgrenderloop.cpp +++ b/src/quick/scenegraph/qsgrenderloop.cpp @@ -131,7 +131,7 @@ void QSGRenderLoop::postJob(QQuickWindow *window, QRunnable *job) cd->rhi->makeThreadLocalNativeContextCurrent(); job->run(); #else - Q_UNUSED(window) + Q_UNUSED(window); job->run(); #endif delete job; diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp index 2c20f1c76a..6896d3d3e4 100644 --- a/src/quick/util/qquickglobal.cpp +++ b/src/quick/util/qquickglobal.cpp @@ -167,7 +167,7 @@ class QQuickValueTypeProvider : public QQmlValueTypeProvider public: #if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS) - #define ASSERT_VALID_SIZE(size, min) Q_UNUSED(size) + #define ASSERT_VALID_SIZE(size, min) Q_UNUSED(size); #else #define ASSERT_VALID_SIZE(size, min) Q_ASSERT(size >= min) #endif -- cgit v1.2.3