No need to store the same data twice

Remove the index member from QQmlBoundSignal, as the
NotifierEndpoint already stores the index.

Change-Id: Idd8848ae1ca97b964ca1be0bab1c8aba540ace43
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

5 files changed, 9 insertions, 19 deletions

diff --git a/src/qml/debugger/qqmlenginedebugservice.cpp b/src/qml/debugger/qqmlenginedebugservice.cpp
index fd7d1c2da4..0a3ddc6db5 100644
--- a/src/qml/debugger/qqmlenginedebugservice.cpp
+++ b/src/qml/debugger/qqmlenginedebugservice.cpp
@@ -289,7 +289,7 @@ void QQmlEngineDebugService::buildObjectDump(QDataStream &message,
                 prop.value = expr->expression();
                 QObject *scope = expr->scopeObject();
                 if (scope) {
-                    QString methodName = QString::fromLatin1(QMetaObjectPrivate::signal(scope->metaObject(), signalHandler->index()).name());
+                    QString methodName = QString::fromLatin1(QMetaObjectPrivate::signal(scope->metaObject(), signalHandler->signalIndex()).name());
                     if (!methodName.isEmpty()) {
                         prop.name = QLatin1String("on") + methodName[0].toUpper()
                                 + methodName.mid(1);
diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp
index 90546ada52..83aa3c55f0 100644
--- a/src/qml/qml/qqmlboundsignal.cpp
+++ b/src/qml/qml/qqmlboundsignal.cpp
@@ -248,7 +248,7 @@ void QQmlBoundSignalExpression::evaluate(void **a)
 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)
+      m_expression(0), m_isEvaluating(false)
 {
     addToObject(owner);
     setCallback(QQmlNotifierEndpoint::QQmlBoundSignal);
@@ -259,8 +259,8 @@ QQmlBoundSignal::QQmlBoundSignal(QObject *target, int signal, QObject *owner,
         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);
+    signal = QQmlPropertyCache::originalClone(target, signal);
+    QQmlNotifierEndpoint::connect(target, signal, engine);
 }
 
 QQmlBoundSignal::~QQmlBoundSignal()
@@ -293,15 +293,6 @@ void QQmlBoundSignal::removeFromObject()
 
 
 /*!
-    Returns the signal index in the range returned by QObjectPrivate::signalIndex().
-    This is different from QMetaMethod::methodIndex().
-*/
-int QQmlBoundSignal::index() const
-{
-    return m_index;
-}
-
-/*!
     Returns the signal expression.
 */
 QQmlBoundSignalExpression *QQmlBoundSignal::expression() const
@@ -346,7 +337,7 @@ void QQmlBoundSignal_callback(QQmlNotifierEndpoint *e, void **a)
         return;
 
     if (QQmlDebugService::isDebuggingEnabled())
-        QV4DebugService::instance()->signalEmitted(QString::fromLatin1(QMetaObjectPrivate::signal(s->m_expression->target()->metaObject(), s->m_index).methodSignature()));
+        QV4DebugService::instance()->signalEmitted(QString::fromLatin1(QMetaObjectPrivate::signal(s->m_expression->target()->metaObject(), s->signalIndex()).methodSignature()));
 
     s->m_isEvaluating = true;
 
diff --git a/src/qml/qml/qqmlboundsignal_p.h b/src/qml/qml/qqmlboundsignal_p.h
index eb4a00a4d0..32e5a9c18c 100644
--- a/src/qml/qml/qqmlboundsignal_p.h
+++ b/src/qml/qml/qqmlboundsignal_p.h
@@ -105,8 +105,6 @@ public:
 
     void removeFromObject();
 
-    int index() const;
-
     QQmlBoundSignalExpression *expression() const;
     QQmlBoundSignalExpressionPointer setExpression(QQmlBoundSignalExpression *);
     QQmlBoundSignalExpressionPointer takeExpression(QQmlBoundSignalExpression *);
@@ -125,7 +123,6 @@ private:
     QQmlBoundSignal  *m_nextSignal;
 
     QQmlBoundSignalExpressionPointer m_expression;
-    int m_index;
     bool m_isEvaluating;
 };
 
diff --git a/src/qml/qml/qqmlnotifier_p.h b/src/qml/qml/qqmlnotifier_p.h
index 2a35dcda12..009ffb7107 100644
--- a/src/qml/qml/qqmlnotifier_p.h
+++ b/src/qml/qml/qqmlnotifier_p.h
@@ -88,6 +88,8 @@ public:
     inline bool isNotifying() const;
     inline void cancelNotify();
 
+    inline int signalIndex() const { return sourceSignal; }
+
 private:
     friend class QQmlData;
     friend class QQmlNotifier;
diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp
index eec6317364..f59d7060d2 100644
--- a/src/qml/qml/qqmlproperty.cpp
+++ b/src/qml/qml/qqmlproperty.cpp
@@ -890,7 +890,7 @@ QQmlPropertyPrivate::signalExpression(const QQmlProperty &that)
 
     QQmlBoundSignal *signalHandler = data->signalHandlers;
 
-    while (signalHandler && signalHandler->index() != QQmlPropertyPrivate::get(that)->signalIndex())
+    while (signalHandler && signalHandler->signalIndex() != QQmlPropertyPrivate::get(that)->signalIndex())
         signalHandler = signalHandler->m_nextSignal;
 
     if (signalHandler)
@@ -938,7 +938,7 @@ QQmlPropertyPrivate::takeSignalExpression(const QQmlProperty &that,
 
     QQmlBoundSignal *signalHandler = data->signalHandlers;
 
-    while (signalHandler && signalHandler->index() != QQmlPropertyPrivate::get(that)->signalIndex())
+    while (signalHandler && signalHandler->signalIndex() != QQmlPropertyPrivate::get(that)->signalIndex())
         signalHandler = signalHandler->m_nextSignal;
 
     if (signalHandler)