diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-01 15:56:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-01 15:56:53 (GMT) |
| commit | e8c0f90ee076cacf2442fddb5b21f93ffafe0876 (patch) | |
| tree | 25788c724d28c853c8ba6d79291fb3ea8a5540ed /src/declarative/qml/qdeclarativebinding_p.h | |
| parent | 2f708cf6f4877f38a8d3369e14b89eb438c5c4ca (diff) | |
| parent | 9d9152a4c0fd3752418662b0fcdd77b3906d9b5b (diff) | |
| download | Qt-e8c0f90ee076cacf2442fddb5b21f93ffafe0876.zip Qt-e8c0f90ee076cacf2442fddb5b21f93ffafe0876.tar.gz Qt-e8c0f90ee076cacf2442fddb5b21f93ffafe0876.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team:
Ensure header is considered when positioning content with snapping.
Fix integer overflow in QDeclarativeItemPrivate::origin enumeration
Correct ownership semantics for QObject derived types
Correctly handle CppOwnership even when a QDeclarativeData doesn't exist
Fix Browser.qml warnings
Document which header to include for qmlRegister functions.
Don't draw null pixmap in QDeclarativeImage paint function
Fix id documentation
Link to List Properties docs from QML Intro page
Remove expect-fails from passing tests
Add license to example code
Improve consistency in handling of aliases, bindings and value types
Move KeyNavigation example to snippets, plus some doc rewording
Diffstat (limited to 'src/declarative/qml/qdeclarativebinding_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativebinding_p.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/declarative/qml/qdeclarativebinding_p.h b/src/declarative/qml/qdeclarativebinding_p.h index 0b9bde6..7823a3d 100644 --- a/src/declarative/qml/qdeclarativebinding_p.h +++ b/src/declarative/qml/qdeclarativebinding_p.h @@ -78,14 +78,16 @@ public: enum Type { PropertyBinding, ValueTypeProxy }; virtual Type bindingType() const { return PropertyBinding; } + QObject *object() const; + int propertyIndex() const; + void setEnabled(bool e) { setEnabled(e, QDeclarativePropertyPrivate::DontRemoveBinding); } virtual void setEnabled(bool, QDeclarativePropertyPrivate::WriteFlags) = 0; - virtual int propertyIndex() = 0; void update() { update(QDeclarativePropertyPrivate::DontRemoveBinding); } virtual void update(QDeclarativePropertyPrivate::WriteFlags) = 0; - void addToObject(QObject *); + void addToObject(QObject *, int); void removeFromObject(); static Pointer getPointer(QDeclarativeAbstractBinding *p) { return p ? p->weakPointer() : Pointer(); } @@ -98,12 +100,14 @@ private: Pointer weakPointer(); friend class QDeclarativeData; + friend class QDeclarativeComponentPrivate; friend class QDeclarativeValueTypeProxyBinding; friend class QDeclarativePropertyPrivate; friend class QDeclarativeVME; friend class QtSharedPointer::ExternalRefCount<QDeclarativeAbstractBinding>; QObject *m_object; + int m_propertyIndex; QDeclarativeAbstractBinding **m_mePtr; QDeclarativeAbstractBinding **m_prevBinding; QDeclarativeAbstractBinding *m_nextBinding; @@ -118,11 +122,12 @@ public: virtual Type bindingType() const { return ValueTypeProxy; } virtual void setEnabled(bool, QDeclarativePropertyPrivate::WriteFlags); - virtual int propertyIndex(); virtual void update(QDeclarativePropertyPrivate::WriteFlags); QDeclarativeAbstractBinding *binding(int propertyIndex); + void removeBindings(quint32 mask); + protected: ~QDeclarativeValueTypeProxyBinding(); @@ -154,7 +159,6 @@ public: // Inherited from QDeclarativeAbstractBinding virtual void setEnabled(bool, QDeclarativePropertyPrivate::WriteFlags flags); - virtual int propertyIndex(); virtual void update(QDeclarativePropertyPrivate::WriteFlags flags); virtual QString expression() const; |