From 8d7d210aa59f4c6e7d370ec7b1fdee6dd8f15324 Mon Sep 17 00:00:00 2001
From: Mate Barany <mate.barany@qt.io>
Date: Thu, 1 Sep 2022 17:48:08 +0200
Subject: uic: Change some QLatin1String literals to QString literals
While working on QTBUG-98434 some potential improvements were
found in the pre-existing code.
Some of the QLatin1String literals are used to initialize
QStrings or are converted to QStrings and so it makes sense to
replace them with QString literals.
As a related change, change the type of namespaceDelimitier from
QString to QL1SV, since it is used only for a function call and
that function has an overload to take QL1SV.
Task-number: QTBUG-103100
Change-Id: I56db6ddd84ad2a7133a765bb49ecd8f962ac5c13
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
---
src/tools/uic/cpp/cppwriteinitialization.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 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 b13521f596a..56ce2d00278 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -669,7 +669,7 @@ void WriteInitialization::acceptWidget(DomWidget *node)
const DomPropertyMap attributes = propertyMap(node->elementAttribute());
- const QString pageDefaultString = "Page"_L1;
+ const QString pageDefaultString = u"Page"_s;
if (cwi->extends(parentClass, "QMainWindow")) {
if (cwi->extends(className, "QMenuBar")) {
@@ -781,10 +781,10 @@ void WriteInitialization::acceptWidget(DomWidget *node)
};
static const QStringList trees = {
- "QTreeView"_L1, "QTreeWidget"_L1
+ u"QTreeView"_s, u"QTreeWidget"_s
};
static const QStringList tables = {
- "QTableView"_L1, "QTableWidget"_L1
+ u"QTableView"_s, u"QTableWidget"_s
};
if (cwi->extendsOneOf(className, trees)) {
@@ -1237,8 +1237,8 @@ void WriteInitialization::writeProperties(const QString &varName,
continue;
}
static const QStringList currentIndexWidgets = {
- "QComboBox"_L1, "QStackedWidget"_L1,
- "QTabWidget"_L1, "QToolBox"_L1
+ u"QComboBox"_s, u"QStackedWidget"_s,
+ u"QTabWidget"_s, u"QToolBox"_s
};
if (propertyName == "currentIndex"_L1 // set currentIndex later
&& (m_uic->customWidgetsInfo()->extendsOneOf(className, currentIndexWidgets))) {
@@ -1929,7 +1929,7 @@ QString WriteInitialization::writeBrushInitialization(const DomBrush *brush)
void WriteInitialization::writeBrush(const DomBrush *brush, const QString &brushName)
{
- QString style = "SolidPattern"_L1;
+ QString style = u"SolidPattern"_s;
if (brush->hasAttributeBrushStyle())
style = brush->attributeBrushStyle();
--
cgit v1.2.3