Remove the manual vtable from QQmlJavaScriptExpression

Now that the class got unified with QQmlAbstractExpression, it has a
vtable anyway, so we can just as well remove the old hack.

Change-Id: Ifa095297e3d75564c4305ce3655eaa57436ef4a8
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

1 files changed, 3 insertions, 15 deletions

diff --git a/src/qml/qml/qqmlexpression.cpp b/src/qml/qml/qqmlexpression.cpp
index 9617e430b8..f84a5c2e16 100644
--- a/src/qml/qml/qqmlexpression.cpp
+++ b/src/qml/qml/qqmlexpression.cpp
@@ -45,13 +45,8 @@
 
 QT_BEGIN_NAMESPACE
 
-static QQmlJavaScriptExpression::VTable QQmlExpressionPrivate_jsvtable = {
-    QQmlExpressionPrivate::expressionIdentifier,
-    QQmlExpressionPrivate::expressionChanged
-};
-
 QQmlExpressionPrivate::QQmlExpressionPrivate()
-: QQmlJavaScriptExpression(&QQmlExpressionPrivate_jsvtable),
+: QQmlJavaScriptExpression(),
   expressionFunctionValid(true),
   line(0), column(0)
 {
@@ -432,22 +427,15 @@ QQmlError QQmlExpression::error() const
     calling QQmlExpression::evaluate()) before this signal will be emitted.
 */
 
-void QQmlExpressionPrivate::expressionChanged(QQmlJavaScriptExpression *e)
-{
-    QQmlExpressionPrivate *This = static_cast<QQmlExpressionPrivate *>(e);
-    This->expressionChanged();
-}
-
 void QQmlExpressionPrivate::expressionChanged()
 {
     Q_Q(QQmlExpression);
     emit q->valueChanged();
 }
 
-QString QQmlExpressionPrivate::expressionIdentifier(QQmlJavaScriptExpression *e)
+QString QQmlExpressionPrivate::expressionIdentifier()
 {
-    QQmlExpressionPrivate *This = static_cast<QQmlExpressionPrivate *>(e);
-    return QLatin1Char('"') + This->expression + QLatin1Char('"');
+    return QLatin1Char('"') + expression + QLatin1Char('"');
 }
 
 QT_END_NAMESPACE