diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-20 09:26:37 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-20 09:26:37 (GMT) |
commit | 84aaee9b4514f70bf0abfd11e9b4fd3c66ceb1f1 (patch) | |
tree | 1aeaab1399a13a64846186a98c9b8cac2c81921b | |
parent | 6ed6b740e1ea9cfa64990bb2805d37197f4da45e (diff) | |
download | Qt-84aaee9b4514f70bf0abfd11e9b4fd3c66ceb1f1.zip Qt-84aaee9b4514f70bf0abfd11e9b4fd3c66ceb1f1.tar.gz Qt-84aaee9b4514f70bf0abfd11e9b4fd3c66ceb1f1.tar.bz2 |
Remove unnecessary methods from QmlBinding
QmlBinding is no longer instantiable from QML, so this stuff isn't needed.
-rw-r--r-- | src/declarative/qml/qmlbinding.cpp | 7 | ||||
-rw-r--r-- | src/declarative/qml/qmlbinding.h | 10 |
2 files changed, 3 insertions, 14 deletions
diff --git a/src/declarative/qml/qmlbinding.cpp b/src/declarative/qml/qmlbinding.cpp index e2f4682..57c1187 100644 --- a/src/declarative/qml/qmlbinding.cpp +++ b/src/declarative/qml/qmlbinding.cpp @@ -59,7 +59,6 @@ QmlBindingPrivate::QmlBindingPrivate() { } -QML_DEFINE_NOCREATE_TYPE(QmlBinding); QmlBinding::QmlBinding(void *data, QmlRefCount *rc, QObject *obj, QmlContext *ctxt, QObject *parent) : QmlExpression(ctxt, data, rc, obj, *new QmlBindingPrivate) { @@ -103,12 +102,6 @@ void QmlBinding::init() update(); } -void QmlBinding::setExpression(const QString &expr) -{ - QmlExpression::setExpression(expr); - update(); -} - void QmlBinding::forceUpdate() { Q_D(QmlBinding); diff --git a/src/declarative/qml/qmlbinding.h b/src/declarative/qml/qmlbinding.h index 10d81b8..5f6d6f4 100644 --- a/src/declarative/qml/qmlbinding.h +++ b/src/declarative/qml/qmlbinding.h @@ -65,13 +65,9 @@ public: QmlBinding(void *, QmlRefCount *, QObject *, QmlContext *, QObject *parent); ~QmlBinding(); - virtual void setTarget(const QmlMetaProperty &); + void setTarget(const QmlMetaProperty &); QmlMetaProperty property() const; - Q_CLASSINFO("DefaultProperty", "expression") - Q_PROPERTY(QString expression READ expression WRITE setExpression) - virtual void setExpression(const QString &); - void init(); void forceUpdate(); @@ -88,9 +84,9 @@ private: Q_DECLARE_PRIVATE(QmlBinding) }; -QT_END_NAMESPACE +Q_DECLARE_METATYPE(QmlBinding*); -QML_DECLARE_TYPE(QmlBinding) +QT_END_NAMESPACE QT_END_HEADER |