From e27bcd5abd2364a4b184b105d1b5b6111d19cbd9 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Fri, 19 Feb 2021 17:37:54 +0100 Subject: QML: Make retrieval of a signal name from a handler accessible We want to do that in other places, too. Change-Id: Id42495d239c2dccffa390478c8b57ec1acab7408 Reviewed-by: Fabian Kosmale (cherry picked from commit 1daee0b03050487cfc4b483262ca73e5a24267ff) Reviewed-by: Qt Cherry-pick Bot --- src/qml/qml/qqmltypecompiler.cpp | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) (limited to 'src/qml/qml/qqmltypecompiler.cpp') diff --git a/src/qml/qml/qqmltypecompiler.cpp b/src/qml/qml/qqmltypecompiler.cpp index f04272e5b9..3be3c6fc0e 100644 --- a/src/qml/qml/qqmltypecompiler.cpp +++ b/src/qml/qml/qqmltypecompiler.cpp @@ -356,30 +356,20 @@ bool SignalHandlerConverter::convertSignalHandlerExpressionsToFunctionDeclaratio QQmlPropertyResolver resolver(propertyCache); - Q_ASSERT(bindingPropertyName.startsWith(QLatin1String("on"))); - QString signalNameCandidate = bindingPropertyName; - signalNameCandidate.remove(0, 2); - - // Note that the property name could start with any alpha or '_' or '$' character, - // so we need to do the lower-casing of the first alpha character. - for (int firstAlphaIndex = 0; firstAlphaIndex < signalNameCandidate.size(); ++firstAlphaIndex) { - if (signalNameCandidate.at(firstAlphaIndex).isUpper()) { - signalNameCandidate[firstAlphaIndex] = signalNameCandidate.at(firstAlphaIndex).toLower(); - break; - } - } + const QString signalName = QmlIR::IRBuilder::signalNameFromSignalPropertyName( + bindingPropertyName); QString qPropertyName; - if (signalNameCandidate.endsWith(QLatin1String("Changed"))) - qPropertyName = signalNameCandidate.mid(0, signalNameCandidate.length() - static_cast(strlen("Changed"))); + if (signalName.endsWith(QLatin1String("Changed"))) + qPropertyName = signalName.mid(0, signalName.length() - static_cast(strlen("Changed"))); QList parameters; bool notInRevision = false; - QQmlPropertyData * const signal = resolver.signal(signalNameCandidate, ¬InRevision); - QQmlPropertyData * const signalPropertyData = resolver.property(signalNameCandidate, /*notInRevision ptr*/nullptr); + QQmlPropertyData * const signal = resolver.signal(signalName, ¬InRevision); + QQmlPropertyData * const signalPropertyData = resolver.property(signalName, /*notInRevision ptr*/nullptr); QQmlPropertyData * const qPropertyData = !qPropertyName.isEmpty() ? resolver.property(qPropertyName) : nullptr; - QString finalSignalHandlerPropertyName = signalNameCandidate; + QString finalSignalHandlerPropertyName = signalName; uint flags = QV4::CompiledData::Binding::IsSignalHandlerExpression; const bool isPropertyObserver = !signalPropertyData && qPropertyData && qPropertyData->isBindable(); @@ -439,7 +429,7 @@ bool SignalHandlerConverter::convertSignalHandlerExpressionsToFunctionDeclaratio } } - QHash::ConstIterator entry = customSignals.constFind(signalNameCandidate); + QHash::ConstIterator entry = customSignals.constFind(signalName); if (entry == customSignals.constEnd() && !qPropertyName.isEmpty()) entry = customSignals.constFind(qPropertyName); -- cgit v1.2.3