feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlPuppet: Adapt to C++ 17 [[maybe_unused]]

Browse Source 
It has the advantage to to move the attribute to the declaration instead
of using a workaround.

Change-Id: Ia6115ab8fefbe03f247edfea2b7bed73e9149068
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2022-07-07 17:35:44 +02:00
committed by Tim Jenssen
parent 1e6c8f6e61
commit 67324512e9
17 changed files with 76 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
View File

@@ -172,7 +172,7 @@ void QuickItemNodeInstance::enableUnifiedRenderPath(bool unifiedRenderPath)
s_unifiedRenderPath = unifiedRenderPath;
}
bool QuickItemNodeInstance::checkIfRefFromEffect(qint32 id)
bool QuickItemNodeInstance::checkIfRefFromEffect([[maybe_unused]] qint32 id)
{
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
if (s_unifiedRenderPath)
@@ -180,7 +180,6 @@ bool QuickItemNodeInstance::checkIfRefFromEffect(qint32 id)
return (s_createEffectItem || id == 0);
#else
Q_UNUSED(id)
return false;
#endif
}
@@ -273,14 +272,12 @@ QStringList QuickItemNodeInstance::allStates() const
return list;
}
void QuickItemNodeInstance::updateDirtyNode(QQuickItem *item)
void QuickItemNodeInstance::updateDirtyNode([[maybe_unused]] QQuickItem *item)
{
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
if (s_unifiedRenderPath)
return;
DesignerSupport::updateDirtyNode(item);
#else
Q_UNUSED(item)
#endif
}
@@ -639,11 +636,9 @@ void QuickItemNodeInstance::updateAllDirtyNodesRecursive(QQuickItem *parentItem)
updateDirtyNode(parentItem);
}
void QuickItemNodeInstance::setAllNodesDirtyRecursive(QQuickItem *parentItem) const
void QuickItemNodeInstance::setAllNodesDirtyRecursive([[maybe_unused]] QQuickItem *parentItem) const
{
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
Q_UNUSED(parentItem)
#else
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
const QList<QQuickItem *> children = parentItem->childItems();
for (QQuickItem *childItem : children)
setAllNodesDirtyRecursive(childItem);
@@ -656,10 +651,9 @@ static inline bool isRectangleSane(const QRectF &rect)
return rect.isValid() && (rect.width() < 10000) && (rect.height() < 10000);
}
static bool isEffectItem(QQuickItem *item)
static bool isEffectItem([[maybe_unused]] QQuickItem *item)
{
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
Q_UNUSED(item)
return false;
#else
if (qobject_cast<QQuickShaderEffectSource *>(item))