From 1da975cdc5297ddde584981c4bf301b288ccaca9 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 25 Jan 2016 13:22:55 +0100 Subject: QLatin1String: add at()/op[]/mid()/right()/left() QLatin1String can be used as a string-view-like type. When attempting to do so in uic, mid() and at() were found to be missing. Added the others for completeness. Use the new functions in uic, for which they were originally conceived. [ChangeLog][QtCore][QLatin1String] Added at(), operator[](), mid(), right(), left(). Change-Id: I4cfe3e9ed1157dedee754b2012d9678fe72b161e Reviewed-by: Milian Wolff Reviewed-by: Lars Knoll --- src/tools/uic/cpp/cppwriteinitialization.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/tools/uic/cpp/cppwriteinitialization.cpp') diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index 0886cf4c4a..ebb7f8691a 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -785,8 +785,7 @@ void WriteInitialization::acceptWidget(DomWidget *node) DomPropertyList headerProperties; for (auto realPropertyName : realPropertyNames) { const QString fakePropertyName = QLatin1String("header") - + QChar(QLatin1Char(realPropertyName.data()[0])).toUpper() - + QLatin1String(realPropertyName.data() + 1, realPropertyName.size() - 1); + + QChar(realPropertyName.at(0)).toUpper() + realPropertyName.mid(1); if (DomProperty *fakeProperty = attributes.value(fakePropertyName)) { fakeProperty->setAttributeName(realPropertyName); headerProperties << fakeProperty; @@ -807,8 +806,7 @@ void WriteInitialization::acceptWidget(DomWidget *node) DomPropertyList headerProperties; for (auto realPropertyName : realPropertyNames) { const QString fakePropertyName = headerPrefix - + QChar(QLatin1Char(realPropertyName.data()[0])).toUpper() - + QLatin1String(realPropertyName.data() + 1, realPropertyName.size() - 1); + + QChar(realPropertyName.at(0)).toUpper() + realPropertyName.mid(1); if (DomProperty *fakeProperty = attributes.value(fakePropertyName)) { fakeProperty->setAttributeName(realPropertyName); headerProperties << fakeProperty; -- cgit v1.2.3