diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2021-06-08 17:30:14 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-06-08 17:40:34 +0200 |
commit | 95b448bf89575dfd79ca071ebfeab8960eff6864 (patch) | |
tree | aa95baf0c30f6c565bf83ca43471fb6b1170025e /src | |
parent | 50fe714078db85eca99be374847d2e0807bc8108 (diff) |
Remove pointless evaluate() method
We never want to evaluate with a QList<QVariant>. The only place where
this was called used an empty list. We can just as well use the call
with void** then.
Change-Id: I9eb93ee37eecec8b01864cc86174d80e5705986c
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/qml/qml/qqmlboundsignal.cpp | 25 | ||||
-rw-r--r-- | src/qml/qml/qqmlboundsignal_p.h | 1 |
2 files changed, 1 insertions, 25 deletions
diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp index e624dc6e34..0dfbf1faee 100644 --- a/src/qml/qml/qqmlboundsignal.cpp +++ b/src/qml/qml/qqmlboundsignal.cpp @@ -217,29 +217,6 @@ void QQmlBoundSignalExpression::evaluate(void **a) ep->dereferenceScarceResources(); // "release" scarce resources if top-level expression evaluation is complete. } -void QQmlBoundSignalExpression::evaluate(const QList<QVariant> &args) -{ - Q_ASSERT (engine()); - - if (!expressionFunctionValid()) - return; - - QQmlEngine *qmlengine = engine(); - QQmlEnginePrivate *ep = QQmlEnginePrivate::get(qmlengine); - QV4::Scope scope(qmlengine->handle()); - - ep->referenceScarceResources(); // "hold" scarce resources in memory during evaluation. - - QV4::JSCallArguments jsCall(scope, args.count()); - for (int ii = 0; ii < args.count(); ++ii) { - jsCall.args[ii] = scope.engine->fromVariant(args[ii]); - } - - QQmlJavaScriptExpression::evaluate(jsCall.callData(scope), nullptr); - - ep->dereferenceScarceResources(); // "release" scarce resources if top-level expression evaluation is complete. -} - //////////////////////////////////////////////////////////////////////// @@ -361,7 +338,7 @@ void QQmlBoundSignal_callback(QQmlNotifierEndpoint *e, void **a) QQmlPropertyObserver::QQmlPropertyObserver(QQmlBoundSignalExpression *expr) : QPropertyObserver([](QPropertyObserver *self, QUntypedPropertyData *) { auto This = static_cast<QQmlPropertyObserver*>(self); - This->expression->evaluate(QList<QVariant>()); + This->expression->evaluate(nullptr); }) { expression.adopt(expr); diff --git a/src/qml/qml/qqmlboundsignal_p.h b/src/qml/qml/qqmlboundsignal_p.h index 075053b95e..0a3229b731 100644 --- a/src/qml/qml/qqmlboundsignal_p.h +++ b/src/qml/qml/qqmlboundsignal_p.h @@ -79,7 +79,6 @@ public: // evaluation of a bound signal expression doesn't return any value void evaluate(void **a); - void evaluate(const QList<QVariant> &args); QString expression() const; const QObject *target() const { return m_target; } |