diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2012-03-21 16:28:32 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-26 07:24:29 +0200 |
commit | fa3ef5376acc69b147718f49eddb842fdd5d2dd2 (patch) | |
tree | a9757d4739982ca784053142e1312acc1064727a /src | |
parent | a329f246c02e2579f6a559c05240f63f0b5d5d3c (diff) |
Use QQmlAbstractBoundSignal where appropriate.
Prepare for the addition of another subclass.
Change-Id: I340f735503e661d9d735f3316a065f807294921b
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/qml/debugger/qqmlenginedebugservice.cpp | 4 | ||||
-rw-r--r-- | src/qml/qml/qqmlboundsignal.cpp | 6 | ||||
-rw-r--r-- | src/qml/qml/qqmlboundsignal_p.h | 6 | ||||
-rw-r--r-- | src/qml/qml/qqmlcontext.h | 1 | ||||
-rw-r--r-- | src/qml/qml/qqmlproperty.cpp | 4 |
5 files changed, 8 insertions, 13 deletions
diff --git a/src/qml/debugger/qqmlenginedebugservice.cpp b/src/qml/debugger/qqmlenginedebugservice.cpp index 40af773c68..4bd8753c6f 100644 --- a/src/qml/debugger/qqmlenginedebugservice.cpp +++ b/src/qml/debugger/qqmlenginedebugservice.cpp @@ -223,7 +223,7 @@ void QQmlEngineDebugService::buildObjectDump(QDataStream &message, int childrenCount = children.count(); for (int ii = 0; ii < children.count(); ++ii) { - if (qobject_cast<QQmlContext*>(children[ii]) || QQmlBoundSignal::cast(children[ii])) + if (qobject_cast<QQmlContext*>(children[ii]) || qobject_cast<QQmlAbstractBoundSignal*>(children[ii])) --childrenCount; } @@ -235,7 +235,7 @@ void QQmlEngineDebugService::buildObjectDump(QDataStream &message, QObject *child = children.at(ii); if (qobject_cast<QQmlContext*>(child)) continue; - QQmlBoundSignal *signal = QQmlBoundSignal::cast(child); + QQmlAbstractBoundSignal *signal = qobject_cast<QQmlAbstractBoundSignal*>(child); if (signal) { if (!dumpProperties) continue; diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp index 543b69a1c5..f8015a5d85 100644 --- a/src/qml/qml/qqmlboundsignal.cpp +++ b/src/qml/qml/qqmlboundsignal.cpp @@ -161,12 +161,6 @@ QQmlExpression *QQmlBoundSignal::setExpression(QQmlExpression *e) return rv; } -QQmlBoundSignal *QQmlBoundSignal::cast(QObject *o) -{ - QQmlAbstractBoundSignal *s = qobject_cast<QQmlAbstractBoundSignal*>(o); - return static_cast<QQmlBoundSignal *>(s); -} - int QQmlBoundSignal::qt_metacall(QMetaObject::Call c, int id, void **a) { if (c == QMetaObject::InvokeMetaMethod && id == evaluateIdx) { diff --git a/src/qml/qml/qqmlboundsignal_p.h b/src/qml/qml/qqmlboundsignal_p.h index 11386159cb..ab14de018d 100644 --- a/src/qml/qml/qqmlboundsignal_p.h +++ b/src/qml/qml/qqmlboundsignal_p.h @@ -67,6 +67,10 @@ class Q_QML_EXPORT QQmlAbstractBoundSignal : public QObject public: QQmlAbstractBoundSignal(QObject *parent = 0); virtual ~QQmlAbstractBoundSignal() = 0; + + virtual int index() const = 0; + virtual QQmlExpression *expression() const = 0; + virtual QQmlExpression *setExpression(QQmlExpression *) = 0; }; class QQmlBoundSignalParameters; @@ -85,8 +89,6 @@ public: bool isEvaluating() const { return m_isEvaluating; } - static QQmlBoundSignal *cast(QObject *); - protected: virtual int qt_metacall(QMetaObject::Call c, int id, void **a); diff --git a/src/qml/qml/qqmlcontext.h b/src/qml/qml/qqmlcontext.h index f6d8aa1d3a..4b11095ec2 100644 --- a/src/qml/qml/qqmlcontext.h +++ b/src/qml/qml/qqmlcontext.h @@ -98,7 +98,6 @@ private: friend class QQmlComponent; friend class QQmlComponentPrivate; friend class QQmlScriptPrivate; - friend class QQmlBoundSignalProxy; friend class QQmlContextData; QQmlContext(QQmlContextData *); QQmlContext(QQmlEngine *, bool); diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp index 14778ce6c8..ebcf903ab3 100644 --- a/src/qml/qml/qqmlproperty.cpp +++ b/src/qml/qml/qqmlproperty.cpp @@ -928,7 +928,7 @@ QQmlPropertyPrivate::signalExpression(const QQmlProperty &that) for (int ii = 0; ii < children.count(); ++ii) { QObject *child = children.at(ii); - QQmlBoundSignal *signal = QQmlBoundSignal::cast(child); + QQmlAbstractBoundSignal *signal = qobject_cast<QQmlAbstractBoundSignal*>(child); if (signal && signal->index() == that.index()) return signal->expression(); } @@ -957,7 +957,7 @@ QQmlPropertyPrivate::setSignalExpression(const QQmlProperty &that, for (int ii = 0; ii < children.count(); ++ii) { QObject *child = children.at(ii); - QQmlBoundSignal *signal = QQmlBoundSignal::cast(child); + QQmlAbstractBoundSignal *signal = qobject_cast<QQmlAbstractBoundSignal*>(child); if (signal && signal->index() == that.index()) return signal->setExpression(expr); } |