diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2012-04-03 12:11:55 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-03 09:22:17 +0200 |
commit | 07d3b18a5fc0b6431cafef57c9df22696e27b805 (patch) | |
tree | a3f506ea82b1db0072aec4fad7287612149ecd49 /src/qml/qml/qqmlboundsignal_p.h | |
parent | 1b6c1c3f85483f1d19375ce44de4e61b7d209f14 (diff) |
Revert "Add QQmlBoundSignalNoParams"
This reverts commit ec7deb3d123bb44b5d57590615a60ed48b1d2860.
Other Qt modules may be relying on QObject::receivers() to
know when there is a QML signal handler for a signal, and
using QQmlNotifierEndpoint in QQmlBoundSignalNoParams breaks
this assumption.
Change-Id: I1b8085254697d909f85a88617eb4e3f258b88950
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmlboundsignal_p.h')
-rw-r--r-- | src/qml/qml/qqmlboundsignal_p.h | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/src/qml/qml/qqmlboundsignal_p.h b/src/qml/qml/qqmlboundsignal_p.h index 22cc5a9f83..2c24a24cfc 100644 --- a/src/qml/qml/qqmlboundsignal_p.h +++ b/src/qml/qml/qqmlboundsignal_p.h @@ -57,7 +57,6 @@ #include <private/qqmlabstractexpression_p.h> #include <private/qqmljavascriptexpression_p.h> -#include <private/qqmlnotifier_p.h> #include <private/qobject_p.h> QT_BEGIN_NAMESPACE @@ -148,31 +147,6 @@ private: QObject *m_owner; }; -class Q_QML_EXPORT QQmlBoundSignalNoParams : public QQmlAbstractBoundSignal, - public QQmlNotifierEndpoint -{ -public: - QQmlBoundSignalNoParams(QObject *scope, const QMetaMethod &signal, QObject *owner); - virtual ~QQmlBoundSignalNoParams(); - - int index() const; - - QQmlBoundSignalExpression *expression() const; - QQmlBoundSignalExpression *setExpression(QQmlBoundSignalExpression *); - QObject *object() { return m_owner; } - - static void subscriptionCallback(QQmlNotifierEndpoint *e); - - bool isEvaluating() const { return m_isEvaluating; } - -private: - QQmlBoundSignalExpression *m_expression; - QObject *m_owner; - int m_index; - bool m_isEvaluating; -}; - - QT_END_NAMESPACE #endif // QQMLBOUNDSIGNAL_P_H |