summaryrefslogtreecommitdiffstats
path: root/src/tools/uic/cpp
diff options
context:
space:
mode:
authorAnton Kudryavtsev <antkudr@mail.ru>2017-03-19 21:01:59 +0300
committerAnton Kudryavtsev <antkudr@mail.ru>2017-03-30 04:28:09 +0000
commitf901afaf4963341cd8e16d54fe630f06df031182 (patch)
tree858348cdca9c6f641e87824e82d856a018b7d821 /src/tools/uic/cpp
parentcc4f610c2137e58ecdbb852b799a7535b81793a1 (diff)
Use QStringBuilder more
Change-Id: If5283e364e921d99ffa7a8fa1abb07356a4a2682 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/tools/uic/cpp')
-rw-r--r--src/tools/uic/cpp/cppwriteinitialization.cpp17
1 files changed, 7 insertions, 10 deletions
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 301d6fdabb..bbef010a9c 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -48,10 +48,11 @@ namespace {
// Fixup an enumeration name from class Qt.
// They are currently stored as "BottomToolBarArea" instead of "Qt::BottomToolBarArea".
// due to MO issues. This might be fixed in the future.
- void fixQtEnumerationName(QString& name) {
+ QLatin1String qtEnumerationPrefix(const QString &name) {
static const QLatin1String prefix("Qt::");
if (name.indexOf(prefix) != 0)
- name.prepend(prefix);
+ return prefix;
+ return QLatin1String();
}
// figure out the toolbar area of a DOM attrib list.
// By legacy, it is stored as an integer. As of 4.3.0, it is the enumeration value.
@@ -62,16 +63,12 @@ namespace {
switch (pstyle->kind()) {
case DomProperty::Number: {
- QString area = QLatin1String("static_cast<Qt::ToolBarArea>(");
- area += QString::number(pstyle->elementNumber());
- area += QLatin1String("), ");
- return area;
+ return QLatin1String("static_cast<Qt::ToolBarArea>(")
+ + QString::number(pstyle->elementNumber()) + QLatin1String("), ");
}
case DomProperty::Enum: {
- QString area = pstyle->elementEnum();
- fixQtEnumerationName(area);
- area += QLatin1String(", ");
- return area;
+ const QString area = pstyle->elementEnum();
+ return qtEnumerationPrefix(area) + area + QLatin1String(", ");
}
default:
break;