From 895fe4b881ae819981c337d65c8fae5f5daaf164 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@theqtcompany.com>
Date: Mon, 13 Apr 2015 10:29:45 +0200
Subject: Get rid of QQmlAbstractExpression

The class is always used together with QQmlJavaScriptExpression,
so we can just as well fold the functionality together into one
class and simplify our code.

Change-Id: I23820e51efaaea16ae5db7e2153a827d7b22999e
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
---
 src/qml/qml/qqmlcontext_p.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/qml/qml/qqmlcontext_p.h')

diff --git a/src/qml/qml/qqmlcontext_p.h b/src/qml/qml/qqmlcontext_p.h
index f5fd7d0a5c..95254d4baa 100644
--- a/src/qml/qml/qqmlcontext_p.h
+++ b/src/qml/qml/qqmlcontext_p.h
@@ -69,7 +69,7 @@ class QQmlExpression;
 class QQmlEngine;
 class QQmlExpression;
 class QQmlExpressionPrivate;
-class QQmlAbstractExpression;
+class QQmlJavaScriptExpression;
 class QQmlContextData;
 
 class QQmlContextPrivate : public QObjectPrivate
@@ -171,7 +171,7 @@ public:
     QQmlContextData **prevChild;
 
     // Expressions that use this context
-    QQmlAbstractExpression *expressions;
+    QQmlJavaScriptExpression *expressions;
 
     // Doubly-linked list of objects that are owned by this context
     QQmlData *contextObjects;
@@ -212,7 +212,7 @@ public:
 
 private:
     void refreshExpressionsRecursive(bool isGlobal);
-    void refreshExpressionsRecursive(QQmlAbstractExpression *);
+    void refreshExpressionsRecursive(QQmlJavaScriptExpression *);
     ~QQmlContextData() {}
 };
 
-- 
cgit v1.2.3