aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorLars Schmertmann <Lars.Schmertmann@governikus.de>2020-06-26 14:43:02 +0200
committerLars Schmertmann <Lars.Schmertmann@governikus.de>2020-06-26 19:18:03 +0200
commite79281533d61dda90d1c5995345a66e6089c7501 (patch)
tree5033642cb0ae1d76aa0fc0525e153c04eefc921d /src/plugins
parent6d8aca544ccb1e2624a679e2d65622461f643291 (diff)
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 <shawn.rutledge@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/qmltooling/qmldbg_preview/qqmldebugtranslationservice.cpp12
-rw-r--r--src/plugins/scenegraph/openvg/qsgopenvgadaptation.cpp4
-rw-r--r--src/plugins/scenegraph/openvg/qsgopenvgcontext.cpp6
-rw-r--r--src/plugins/scenegraph/openvg/qsgopenvglayer.cpp4
-rw-r--r--src/plugins/scenegraph/openvg/qsgopenvgnodevisitor.cpp4
-rw-r--r--src/plugins/scenegraph/openvg/qsgopenvgrenderloop.cpp2
-rw-r--r--src/plugins/scenegraph/openvg/qsgopenvgtexture.cpp2
7 files changed, 17 insertions, 17 deletions
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<QQmlContextData> &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<QSGSimpleRectNode *>(node)) {
// TODO: Try and render the QSGSimpleRectNode
- Q_UNUSED(rectNode)
+ Q_UNUSED(rectNode);
return false;
} else if (QSGSimpleTextureNode *tn = dynamic_cast<QSGSimpleTextureNode *>(node)) {
// TODO: Try and render the QSGSimpleTextureNode
- Q_UNUSED(tn)
+ Q_UNUSED(tn);
return false;
} else if (QSGOpenVGNinePatchNode *nn = dynamic_cast<QSGOpenVGNinePatchNode *>(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);