AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uic: optimize string handling in WriteInitialization::acceptWidget()

Browse Source 
Instead of building QStringLists out of statically-known
US-ASCII strings, use C arrays of QLatin1String instead.

QLatin1String is constexpr, so these tables, while causing
relocations, do not require runtime initialization.

Using QStringBuilder, these QLatin1Strings are almost a
drop-in replacement for the QStrings used before.

Effects on optimized GCC 5.3 Linux AMD64 builds:

  $ size bin/uic-*
     text    data     bss     dec     hex filename
   567104   31776      56  598936   92398 bin/uic-00-before
   565829   31944      24  597797   91f25 bin/uic-01-after

Change-Id: I469c62b0e8966731d7ac2fa092f4b4cd8ddb79f1
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
This commit is contained in:
Marc Mutz 2016-01-25 13:30:25 +01:00
parent bcc965ef4b
commit 342acf66fe
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/tools/uic/cpp/cppwriteinitialization.cpp
View File

@ -770,22 +770,23 @@ void WriteInitialization::acceptWidget(DomWidget *node)
//
// Special handling for qtableview/qtreeview fake header attributes
//
static QStringList realPropertyNames =
(QStringList() << QLatin1String("visible")
<< QLatin1String("cascadingSectionResizes")
<< QLatin1String("defaultSectionSize")
<< QLatin1String("highlightSections")
<< QLatin1String("minimumSectionSize")
<< QLatin1String("showSortIndicator")
<< QLatin1String("stretchLastSection"));
static const QLatin1String realPropertyNames[] = {
QLatin1String("visible"),
QLatin1String("cascadingSectionResizes"),
QLatin1String("defaultSectionSize"),
QLatin1String("highlightSections"),
QLatin1String("minimumSectionSize"),
QLatin1String("showSortIndicator"),
QLatin1String("stretchLastSection"),
};
if (m_uic->customWidgetsInfo()->extends(className, QLatin1String("QTreeView"))
|| m_uic->customWidgetsInfo()->extends(className, QLatin1String("QTreeWidget"))) {
DomPropertyList headerProperties;
foreach (const QString &realPropertyName, realPropertyNames) {
const QString upperPropertyName = realPropertyName.at(0).toUpper()
+ realPropertyName.mid(1);
const QString fakePropertyName = QLatin1String("header") + upperPropertyName;
for (auto realPropertyName : realPropertyNames) {
const QString fakePropertyName = QLatin1String("header")
+ QChar(QLatin1Char(realPropertyName.data()[0])).toUpper()
+ QLatin1String(realPropertyName.data() + 1, realPropertyName.size() - 1);
if (DomProperty *fakeProperty = attributes.value(fakePropertyName)) {
fakeProperty->setAttributeName(realPropertyName);
headerProperties << fakeProperty;
@ -797,16 +798,17 @@ void WriteInitialization::acceptWidget(DomWidget *node)
} else if (m_uic->customWidgetsInfo()->extends(className, QLatin1String("QTableView"))
|| m_uic->customWidgetsInfo()->extends(className, QLatin1String("QTableWidget"))) {
static QStringList headerPrefixes =
(QStringList() << QLatin1String("horizontalHeader")
<< QLatin1String("verticalHeader"));
static const QLatin1String headerPrefixes[] = {
QLatin1String("horizontalHeader"),
QLatin1String("verticalHeader"),
};
foreach (const QString &headerPrefix, headerPrefixes) {
for (auto headerPrefix : headerPrefixes) {
DomPropertyList headerProperties;
foreach (const QString &realPropertyName, realPropertyNames) {
const QString upperPropertyName = realPropertyName.at(0).toUpper()
+ realPropertyName.mid(1);
const QString fakePropertyName = headerPrefix + upperPropertyName;
for (auto realPropertyName : realPropertyNames) {
const QString fakePropertyName = headerPrefix
+ QChar(QLatin1Char(realPropertyName.data()[0])).toUpper()
+ QLatin1String(realPropertyName.data() + 1, realPropertyName.size() - 1);
if (DomProperty *fakeProperty = attributes.value(fakePropertyName)) {
fakeProperty->setAttributeName(realPropertyName);
headerProperties << fakeProperty;