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>

1 files changed, 24 insertions, 30 deletions

diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp
index 77dccf6f04..813040c253 100644
--- a/src/qml/qml/qqmlboundsignal.cpp
+++ b/src/qml/qml/qqmlboundsignal.cpp
@@ -279,17 +279,36 @@ void QQmlBoundSignalExpression::evaluate(void **a)
 
 ////////////////////////////////////////////////////////////////////////
 
-QQmlAbstractBoundSignal::QQmlAbstractBoundSignal()
-: m_prevSignal(0), m_nextSignal(0)
+
+/*! \internal
+    \a signal MUST be in the signal index range (see QObjectPrivate::signalIndex()).
+    This is different from QMetaMethod::methodIndex().
+*/
+QQmlBoundSignal::QQmlBoundSignal(QObject *target, int signal, QObject *owner,
+                                 QQmlEngine *engine)
+    : m_prevSignal(0), m_nextSignal(0),
+      m_expression(0), m_index(signal), m_isEvaluating(false)
 {
+    addToObject(owner);
+    setCallback(QQmlNotifierEndpoint::QQmlBoundSignal);
+
+    /*
+        If this is a cloned method, connect to the 'original'. For example,
+        for the signal 'void aSignal(int parameter = 0)', if the method
+        index refers to 'aSignal()', get the index of 'aSignal(int)'.
+        This ensures that 'parameter' will be available from QML.
+    */
+    m_index = QQmlPropertyCache::originalClone(target, m_index);
+    QQmlNotifierEndpoint::connect(target, m_index, engine);
 }
 
-QQmlAbstractBoundSignal::~QQmlAbstractBoundSignal()
+QQmlBoundSignal::~QQmlBoundSignal()
 {
     removeFromObject();
+    m_expression = 0;
 }
 
-void QQmlAbstractBoundSignal::addToObject(QObject *obj)
+void QQmlBoundSignal::addToObject(QObject *obj)
 {
     Q_ASSERT(!m_prevSignal);
     Q_ASSERT(obj);
@@ -302,7 +321,7 @@ void QQmlAbstractBoundSignal::addToObject(QObject *obj)
     data->signalHandlers = this;
 }
 
-void QQmlAbstractBoundSignal::removeFromObject()
+void QQmlBoundSignal::removeFromObject()
 {
     if (m_prevSignal) {
         *m_prevSignal = m_nextSignal;
@@ -312,31 +331,6 @@ void QQmlAbstractBoundSignal::removeFromObject()
     }
 }
 
-/*! \internal
-    \a signal MUST be in the signal index range (see QObjectPrivate::signalIndex()).
-    This is different from QMetaMethod::methodIndex().
-*/
-QQmlBoundSignal::QQmlBoundSignal(QObject *target, int signal, QObject *owner,
-                                 QQmlEngine *engine)
-: m_expression(0), m_index(signal), m_isEvaluating(false)
-{
-    addToObject(owner);
-    setCallback(QQmlNotifierEndpoint::QQmlBoundSignal);
-
-    /*
-        If this is a cloned method, connect to the 'original'. For example,
-        for the signal 'void aSignal(int parameter = 0)', if the method
-        index refers to 'aSignal()', get the index of 'aSignal(int)'.
-        This ensures that 'parameter' will be available from QML.
-    */
-    m_index = QQmlPropertyCache::originalClone(target, m_index);
-    QQmlNotifierEndpoint::connect(target, m_index, engine);
-}
-
-QQmlBoundSignal::~QQmlBoundSignal()
-{
-    m_expression = 0;
-}
 
 /*!
     Returns the signal index in the range returned by QObjectPrivate::signalIndex().