diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2020-06-24 10:42:19 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-06-24 17:45:40 +0200 |
commit | ee6deafdb1848759d9233c37241eab4a50f2cdbf (patch) | |
tree | 82a18032d916ea86b38d87dfb84178785fbc5153 /src/quick/util | |
parent | 56de8b41f24fda23eaba34dd6e034cf409966b17 (diff) |
Replace QQmlBoundSignalExpressionPointer with QQmlRefPointer
They do the same thing.
Change-Id: Ia35832e6175728e7480d09caba6d3833718d9e80
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/quick/util')
-rw-r--r-- | src/quick/util/qquickpropertychanges.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/quick/util/qquickpropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp index 74e8d056c5..e0cc66ed35 100644 --- a/src/quick/util/qquickpropertychanges.cpp +++ b/src/quick/util/qquickpropertychanges.cpp @@ -146,17 +146,17 @@ public: EventType type() const override { return SignalHandler; } QQmlProperty property; - QQmlBoundSignalExpressionPointer expression; - QQmlBoundSignalExpressionPointer reverseExpression; - QQmlBoundSignalExpressionPointer rewindExpression; + QQmlRefPointer<QQmlBoundSignalExpression> expression; + QQmlRefPointer<QQmlBoundSignalExpression> reverseExpression; + QQmlRefPointer<QQmlBoundSignalExpression> rewindExpression; void execute() override { - QQmlPropertyPrivate::setSignalExpression(property, expression); + QQmlPropertyPrivate::setSignalExpression(property, expression.data()); } bool isReversable() override { return true; } void reverse() override { - QQmlPropertyPrivate::setSignalExpression(property, reverseExpression); + QQmlPropertyPrivate::setSignalExpression(property, reverseExpression.data()); } void saveOriginals() override { @@ -175,7 +175,7 @@ public: } void rewind() override { - QQmlPropertyPrivate::setSignalExpression(property, rewindExpression); + QQmlPropertyPrivate::setSignalExpression(property, rewindExpression.data()); } void saveCurrentValues() override { rewindExpression = QQmlPropertyPrivate::signalExpression(property); @@ -292,8 +292,11 @@ void QQuickPropertyChangesPrivate::decodeBinding(const QString &propertyPrefix, if (prop.isSignalProperty()) { QQuickReplaceSignalHandler *handler = new QQuickReplaceSignalHandler; handler->property = prop; - handler->expression.take(new QQmlBoundSignalExpression(object, QQmlPropertyPrivate::get(prop)->signalIndex(), - QQmlContextData::get(qmlContext(q)), object, compilationUnit->runtimeFunctions.at(binding->value.compiledScriptIndex))); + handler->expression.adopt( + new QQmlBoundSignalExpression( + object, QQmlPropertyPrivate::get(prop)->signalIndex(), + QQmlContextData::get(qmlContext(q)), object, + compilationUnit->runtimeFunctions.at(binding->value.compiledScriptIndex))); signalReplacements << handler; return; } |