Split responsibilities in QDeclarativeExpression more cleanly

1 files changed, 11 insertions, 17 deletions

diff --git a/src/declarative/qml/qdeclarativebinding_p_p.h b/src/declarative/qml/qdeclarativebinding_p_p.h
index 617ec4b..6926158 100644
--- a/src/declarative/qml/qdeclarativebinding_p_p.h
+++ b/src/declarative/qml/qdeclarativebinding_p_p.h
@@ -60,30 +60,24 @@
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeBindingData : public QDeclarativeExpressionData
-{
-public:
-    QDeclarativeBindingData();
-    virtual ~QDeclarativeBindingData();
-
-    bool updating:1;
-    bool enabled:1;
-
-    QDeclarativeProperty property;
-
-    virtual void refresh();
-};
-
 class QDeclarativeBindingPrivate : public QDeclarativeExpressionPrivate
 {
     Q_DECLARE_PUBLIC(QDeclarativeBinding)
 public:
     QDeclarativeBindingPrivate();
-
-    QDeclarativeBindingData *bindingData() { return static_cast<QDeclarativeBindingData *>(data); }
-    const QDeclarativeBindingData *bindingData() const { return static_cast<const QDeclarativeBindingData *>(data); }
+    ~QDeclarativeBindingPrivate();
 
     virtual void emitValueChanged();
+
+protected:
+    virtual void refresh();
+
+private:
+    bool updating:1;
+    bool enabled:1;
+    QDeclarativeProperty property; 
+
+    bool *deleted;
 };
 
 QT_END_NAMESPACE