diff options
Diffstat (limited to 'src/quick/util/qquickpropertychanges.cpp')
-rw-r--r-- | src/quick/util/qquickpropertychanges.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/quick/util/qquickpropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp index 3d51269bc9..20aa52e472 100644 --- a/src/quick/util/qquickpropertychanges.cpp +++ b/src/quick/util/qquickpropertychanges.cpp @@ -142,29 +142,29 @@ public: QQuickReplaceSignalHandler() {} ~QQuickReplaceSignalHandler() {} - virtual EventType type() const { return SignalHandler; } + EventType type() const override { return SignalHandler; } QQmlProperty property; QQmlBoundSignalExpressionPointer expression; QQmlBoundSignalExpressionPointer reverseExpression; QQmlBoundSignalExpressionPointer rewindExpression; - virtual void execute() { + void execute() override { QQmlPropertyPrivate::setSignalExpression(property, expression); } - virtual bool isReversable() { return true; } - virtual void reverse() { + bool isReversable() override { return true; } + void reverse() override { QQmlPropertyPrivate::setSignalExpression(property, reverseExpression); } - virtual void saveOriginals() { + void saveOriginals() override { saveCurrentValues(); reverseExpression = rewindExpression; } - virtual bool needsCopy() { return true; } - virtual void copyOriginals(QQuickStateActionEvent *other) + bool needsCopy() override { return true; } + void copyOriginals(QQuickStateActionEvent *other) override { QQuickReplaceSignalHandler *rsh = static_cast<QQuickReplaceSignalHandler*>(other); saveCurrentValues(); @@ -173,14 +173,14 @@ public: reverseExpression = rsh->reverseExpression; } - virtual void rewind() { + void rewind() override { QQmlPropertyPrivate::setSignalExpression(property, rewindExpression); } - virtual void saveCurrentValues() { + void saveCurrentValues() override { rewindExpression = QQmlPropertyPrivate::signalExpression(property); } - virtual bool override(QQuickStateActionEvent*other) { + bool override(QQuickStateActionEvent *other) override { if (other == this) return true; if (other->type() != type()) @@ -397,10 +397,10 @@ QQuickPropertyChangesPrivate::property(const QString &property) Q_Q(QQuickPropertyChanges); QQmlProperty prop(object, property, qmlContext(q)); if (!prop.isValid()) { - qmlInfo(q) << QQuickPropertyChanges::tr("Cannot assign to non-existent property \"%1\"").arg(property); + qmlWarning(q) << QQuickPropertyChanges::tr("Cannot assign to non-existent property \"%1\"").arg(property); return QQmlProperty(); } else if (!(prop.type() & QQmlProperty::SignalProperty) && !prop.isWritable()) { - qmlInfo(q) << QQuickPropertyChanges::tr("Cannot assign to read-only property \"%1\"").arg(property); + qmlWarning(q) << QQuickPropertyChanges::tr("Cannot assign to read-only property \"%1\"").arg(property); return QQmlProperty(); } return prop; |