From dbcbce68850c388db65c6541705d41c9b5acea15 Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Mon, 14 May 2012 11:56:36 +1000 Subject: [PATCH] Don't pass the expression string to the signal handler profiler. Working towards removing the need to store a copy of the expression string in the expression. Author: Christiaan Janssen Change-Id: I2cedfcf455c9aa4f1fb2ed422533945371038c58 Reviewed-by: Michael Brasser --- src/qml/debugger/qqmlprofilerservice_p.h | 5 +---- src/qml/qml/qqmlboundsignal.cpp | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/qml/debugger/qqmlprofilerservice_p.h b/src/qml/debugger/qqmlprofilerservice_p.h index 576f981..5d10021 100644 --- a/src/qml/debugger/qqmlprofilerservice_p.h +++ b/src/qml/debugger/qqmlprofilerservice_p.h @@ -212,16 +212,13 @@ struct QQmlBindingProfiler { }; struct QQmlHandlingSignalProfiler { - QQmlHandlingSignalProfiler(QObject *object, int index, QQmlBoundSignalExpression *expression) + QQmlHandlingSignalProfiler(QQmlBoundSignalExpression *expression) { enabled = QQmlProfilerService::instance ? QQmlProfilerService::instance->profilingEnabled() : false; if (enabled) { QQmlProfilerService *service = QQmlProfilerService::instance; service->startRange(QQmlProfilerService::HandlingSignal); - service->rangeData(QQmlProfilerService::HandlingSignal, - QLatin1String(object->metaObject()->method(index).methodSignature()) + QLatin1String(": ") - + expression->expression()); service->rangeLocation(QQmlProfilerService::HandlingSignal, expression->sourceFile(), expression->lineNumber(), expression->columnNumber()); diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp index 17237d4..b3d07c3 100644 --- a/src/qml/qml/qqmlboundsignal.cpp +++ b/src/qml/qml/qqmlboundsignal.cpp @@ -289,7 +289,7 @@ void QQmlBoundSignal::subscriptionCallback(QQmlNotifierEndpoint *e, void **a) if (QQmlDebugService::isDebuggingEnabled()) QV8DebugService::instance()->signalEmitted(QString::fromLatin1(s->m_scope->metaObject()->method(s->m_index).methodSignature())); - QQmlHandlingSignalProfiler prof(*(s->m_scope), s->m_index, s->m_expression); + QQmlHandlingSignalProfiler prof(s->m_expression); s->setIsEvaluating(true); -- 1.7.2.5