1 files changed, 16 insertions, 62 deletions

diff --git a/src/qml/qml/qqmlboundsignal_p.h b/src/qml/qml/qqmlboundsignal_p.h
index 8d677ea039..3742317484 100644
--- a/src/qml/qml/qqmlboundsignal_p.h
+++ b/src/qml/qml/qqmlboundsignal_p.h
@@ -47,7 +47,6 @@
 
 #include <QtCore/qmetaobject.h>
 
-#include <private/qqmlabstractexpression_p.h>
 #include <private/qqmljavascriptexpression_p.h>
 #include <private/qqmlboundsignalexpressionpointer_p.h>
 #include <private/qqmlnotifier_p.h>
@@ -58,7 +57,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QML_PRIVATE_EXPORT QQmlBoundSignalExpression : public QQmlAbstractExpression, public QQmlJavaScriptExpression, public QQmlRefCount
+class Q_QML_PRIVATE_EXPORT QQmlBoundSignalExpression : public QQmlJavaScriptExpression, public QQmlRefCount
 {
 public:
     QQmlBoundSignalExpression(QObject *target, int index,
@@ -73,9 +72,9 @@ public:
     QQmlBoundSignalExpression(QObject *target, int index,
                               QQmlContextData *ctxt, QObject *scope, QV4::Function *runtimeFunction);
 
-    // "inherited" from QQmlJavaScriptExpression.
-    static QString expressionIdentifier(QQmlJavaScriptExpression *);
-    static void expressionChanged(QQmlJavaScriptExpression *);
+    // inherited from QQmlJavaScriptExpression.
+    virtual QString expressionIdentifier();
+    virtual void expressionChanged();
 
     // evaluation of a bound signal expression doesn't return any value
     void evaluate(void **a);
@@ -92,80 +91,35 @@ private:
 
     void init(QQmlContextData *ctxt, QObject *scope);
 
-    bool expressionFunctionValid() const { return m_extra.flag(); }
-    void setExpressionFunctionValid(bool v) { m_extra.setFlagValue(v); }
-
-    bool invalidParameterName() const { return m_extra.flag2(); }
-    void setInvalidParameterName(bool v) { m_extra.setFlag2Value(v); }
+    bool expressionFunctionValid() const { return !m_function.isNullOrUndefined(); }
 
     int m_index;
-    QV4::PersistentValue m_function;
-
     QObject *m_target;
-
-    // only needed when !expressionFunctionValid()
-    struct ExtraData {
-        ExtraData(const QString &handlerName, const QString &parameterString,
-                  const QString &expression, const QString &fileName,
-                  quint16 line, quint16 column);
-        QString m_handlerName;
-        QString m_parameterString;
-        QString m_expression;
-        QQmlSourceLocation m_sourceLocation;
-        QV4::PersistentValue m_v8qmlscope;
-    };
-
-    // We store some flag bits in the following flag pointers.
-    //    flag  - expressionFunctionValid
-    //    flag2 - invalidParameterName
-    QFlagPointer<ExtraData> m_extra;
 };
 
-class Q_QML_PRIVATE_EXPORT QQmlAbstractBoundSignal
+class Q_QML_PRIVATE_EXPORT QQmlBoundSignal : public QQmlNotifierEndpoint
 {
 public:
-    QQmlAbstractBoundSignal();
-    virtual ~QQmlAbstractBoundSignal();
-
-    virtual int index() const = 0;
-    virtual QQmlBoundSignalExpression *expression() const = 0;
-    virtual QQmlBoundSignalExpressionPointer setExpression(QQmlBoundSignalExpression *) = 0;
-    virtual QQmlBoundSignalExpressionPointer takeExpression(QQmlBoundSignalExpression *) = 0;
-    virtual bool isEvaluating() const = 0;
+    QQmlBoundSignal(QObject *target, int signal, QObject *owner, QQmlEngine *engine);
+    ~QQmlBoundSignal();
 
     void removeFromObject();
-protected:
-    void addToObject(QObject *owner);
+
+    QQmlBoundSignalExpression *expression() const;
+    void takeExpression(QQmlBoundSignalExpression *);
 
 private:
-    friend class QQmlData;
+    friend void QQmlBoundSignal_callback(QQmlNotifierEndpoint *, void **);
     friend class QQmlPropertyPrivate;
+    friend class QQmlData;
     friend class QQmlEngineDebugService;
-    QQmlAbstractBoundSignal **m_prevSignal;
-    QQmlAbstractBoundSignal  *m_nextSignal;
-};
 
-class Q_QML_PRIVATE_EXPORT QQmlBoundSignal : public QQmlAbstractBoundSignal,
-                                             public QQmlNotifierEndpoint
-{
-public:
-    QQmlBoundSignal(QObject *target, int signal, QObject *owner, QQmlEngine *engine);
-    virtual ~QQmlBoundSignal();
-
-    int index() const;
-
-    QQmlBoundSignalExpression *expression() const;
-    QQmlBoundSignalExpressionPointer setExpression(QQmlBoundSignalExpression *);
-    QQmlBoundSignalExpressionPointer takeExpression(QQmlBoundSignalExpression *);
+    void addToObject(QObject *owner);
 
-    bool isEvaluating() const { return m_isEvaluating; }
-
-private:
-    friend void QQmlBoundSignal_callback(QQmlNotifierEndpoint *, void **);
+    QQmlBoundSignal **m_prevSignal;
+    QQmlBoundSignal  *m_nextSignal;
 
     QQmlBoundSignalExpressionPointer m_expression;
-    int m_index;
-    bool m_isEvaluating;
 };
 
 QT_END_NAMESPACE