summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2009-10-09 05:40:03 (GMT)
committerYann Bodson <yann.bodson@nokia.com>2009-10-09 05:40:03 (GMT)
commita6743af8705a93fb30e278dd634ff37597ddb627 (patch)
tree511015f93c08be2f4bd7890c6ab3b697a2983054
parent48b48fba165683bf8f1a24eb7cf53cb1d6ab0795 (diff)
downloadQt-a6743af8705a93fb30e278dd634ff37597ddb627.zip
Qt-a6743af8705a93fb30e278dd634ff37597ddb627.tar.gz
Qt-a6743af8705a93fb30e278dd634ff37597ddb627.tar.bz2
Remove deprecated write to signal property support
-rw-r--r--src/declarative/qml/qmlmetaproperty.cpp30
-rw-r--r--src/declarative/qml/qmlmetaproperty_p.h2
2 files changed, 1 insertions, 31 deletions
diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp
index 302ce8c..a43f6c3 100644
--- a/src/declarative/qml/qmlmetaproperty.cpp
+++ b/src/declarative/qml/qmlmetaproperty.cpp
@@ -698,30 +698,6 @@ QVariant QmlMetaProperty::read() const
return QVariant();
}
-void QmlMetaPropertyPrivate::writeSignalProperty(const QVariant &value)
-{
- QString expr = value.toString();
- const QObjectList &children = object->children();
-
- for (int ii = 0; ii < children.count(); ++ii) {
- QmlBoundSignal *sig = QmlBoundSignal::cast(children.at(ii));
- if (sig && sig->index() == core.coreIndex) {
- if (expr.isEmpty()) {
- sig->disconnect();
- sig->deleteLater();
- } else {
- sig->expression()->setExpression(expr);
- }
- return;
- }
- }
-
- if (!expr.isEmpty()) {
- // XXX scope
- (void *)new QmlBoundSignal(qmlContext(object), expr, object, q->method(), object);
- }
-}
-
QVariant QmlMetaPropertyPrivate::readValueProperty()
{
uint type = q->type();
@@ -963,11 +939,7 @@ void QmlMetaProperty::write(const QVariant &value, WriteSource source) const
if (!d->object)
return;
- if (type() & SignalProperty) {
-
- d->writeSignalProperty(value);
-
- } else if (d->core.isValid()) {
+ if (type() & Property && d->core.isValid()) {
d->writeValueProperty(value, source);
diff --git a/src/declarative/qml/qmlmetaproperty_p.h b/src/declarative/qml/qmlmetaproperty_p.h
index 00b9c3a..4576b71 100644
--- a/src/declarative/qml/qmlmetaproperty_p.h
+++ b/src/declarative/qml/qmlmetaproperty_p.h
@@ -96,8 +96,6 @@ public:
int propertyType() const;
QmlMetaProperty::PropertyCategory propertyCategory() const;
- void writeSignalProperty(const QVariant &);
-
QVariant readValueProperty();
void writeValueProperty(const QVariant &, QmlMetaProperty::WriteSource);
static void write(QObject *, const QmlPropertyCache::Data &, const QVariant &, QmlContext *);