diff options
author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-05-03 17:02:55 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-18 04:10:48 +0000 |
commit | a75c0cb5a7de3b205bd612ecd5e49b4ecc225ecd (patch) | |
tree | cef347e6c36237ce17ea93f30cf01e5250d1aa59 /src/qml/qml/qqmlboundsignal_p.h | |
parent | 03598efeea1bca465df2aa5d9e2aa4e4fb4f052f (diff) |
Get rid of QQmlAbstractBoundSignal
QQmlBoundSignal is the only class inheriting from it, so we might
as well get rid of the abstract base class.
Change-Id: I1b59a5d30d9a6ff1111e54f47530687b47f39d70
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/qml/qqmlboundsignal_p.h')
-rw-r--r-- | src/qml/qml/qqmlboundsignal_p.h | 37 |
1 files changed, 11 insertions, 26 deletions
diff --git a/src/qml/qml/qqmlboundsignal_p.h b/src/qml/qml/qqmlboundsignal_p.h index bc30b25d6a..0a139875db 100644 --- a/src/qml/qml/qqmlboundsignal_p.h +++ b/src/qml/qml/qqmlboundsignal_p.h @@ -118,37 +118,14 @@ private: QFlagPointer<ExtraData> m_extra; }; -class Q_QML_PRIVATE_EXPORT QQmlAbstractBoundSignal -{ -public: - QQmlAbstractBoundSignal(); - virtual ~QQmlAbstractBoundSignal(); - - virtual int index() const = 0; - virtual QQmlBoundSignalExpression *expression() const = 0; - virtual QQmlBoundSignalExpressionPointer setExpression(QQmlBoundSignalExpression *) = 0; - virtual QQmlBoundSignalExpressionPointer takeExpression(QQmlBoundSignalExpression *) = 0; - virtual bool isEvaluating() const = 0; - - void removeFromObject(); -protected: - void addToObject(QObject *owner); - -private: - friend class QQmlData; - friend class QQmlPropertyPrivate; - friend class QQmlEngineDebugService; - QQmlAbstractBoundSignal **m_prevSignal; - QQmlAbstractBoundSignal *m_nextSignal; -}; - -class Q_QML_PRIVATE_EXPORT QQmlBoundSignal : public QQmlAbstractBoundSignal, - public QQmlNotifierEndpoint +class Q_QML_PRIVATE_EXPORT QQmlBoundSignal : public QQmlNotifierEndpoint { public: QQmlBoundSignal(QObject *target, int signal, QObject *owner, QQmlEngine *engine); virtual ~QQmlBoundSignal(); + void removeFromObject(); + int index() const; QQmlBoundSignalExpression *expression() const; @@ -159,6 +136,14 @@ public: private: friend void QQmlBoundSignal_callback(QQmlNotifierEndpoint *, void **); + friend class QQmlPropertyPrivate; + friend class QQmlData; + friend class QQmlEngineDebugService; + + void addToObject(QObject *owner); + + QQmlBoundSignal **m_prevSignal; + QQmlBoundSignal *m_nextSignal; QQmlBoundSignalExpressionPointer m_expression; int m_index; |