diff options
author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-05-03 19:28:53 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-18 08:51:32 +0000 |
commit | 3488569817c8cf4bbfbdc95f0e0f6bfab3d9ab3e (patch) | |
tree | 1292b39a6ef33cd68cc01295907126f51e9596c5 /src/qml/qml/qqmlboundsignal.cpp | |
parent | 17a336714dcc16e786a619d68d2901e0e93e86a4 (diff) |
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>
Diffstat (limited to 'src/qml/qml/qqmlboundsignal.cpp')
-rw-r--r-- | src/qml/qml/qqmlboundsignal.cpp | 17 |
1 files changed, 4 insertions, 13 deletions
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; |