diff options
author | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2020-06-26 14:43:02 +0200 |
---|---|---|
committer | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2020-06-26 19:18:03 +0200 |
commit | e79281533d61dda90d1c5995345a66e6089c7501 (patch) | |
tree | 5033642cb0ae1d76aa0fc0525e153c04eefc921d /src/quick/items | |
parent | 6d8aca544ccb1e2624a679e2d65622461f643291 (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/quick/items')
-rw-r--r-- | src/quick/items/context2d/qquickcontext2d.cpp | 2 | ||||
-rw-r--r-- | src/quick/items/qquickitem.cpp | 8 | ||||
-rw-r--r-- | src/quick/items/qquicktextinput.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
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()) { |