summaryrefslogtreecommitdiffstats
path: root/tests/auto/tools/uic/baseline/previewconfigurationwidget.ui.h
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2011-12-11 16:55:01 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-20 15:17:08 +0100
commit49b08f96e824f49fab9aa5c9a1a0ed582d4558bb (patch)
treeb9e1df0b1a332a78ce1ef9cf0d90265098c9e414 /tests/auto/tools/uic/baseline/previewconfigurationwidget.ui.h
parentac1689245419a6fd44e3250d2fdf3d3a058a0c17 (diff)
uic: use QStringLiteral() instead of QString::fromUtf8() where applicable
Many (most?) strings written aren't in fact UTF-8, and we can check at compile-time which are and which aren't, so don't hard-code fromUtf8() but use the much more efficient QStringLiteral() where applicable. This is low-hanging fruit. This patch only optimises US-ASCII string literals, not those that are latin-1 or even UTF-8, because that would require more extensive changes to the original fixString() function. Likewise, there are also other calls to QString::fromUtf8() being generated (e.g. in the pixmap code) that could benefit from being turned into QStringLiterals, but their code paths are more involved than those this patch fixes. This patch at least suffices in turning all the setObjectName() arguments into QStringLiterals, which was the main goal. The autotest baseline has been updated with the new expected results. Change-Id: Ic1ef67f500f9ff92d36164d515f4e004ef2a10bc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'tests/auto/tools/uic/baseline/previewconfigurationwidget.ui.h')
-rw-r--r--tests/auto/tools/uic/baseline/previewconfigurationwidget.ui.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/auto/tools/uic/baseline/previewconfigurationwidget.ui.h b/tests/auto/tools/uic/baseline/previewconfigurationwidget.ui.h
index 3392d6f220..1bdf1a049b 100644
--- a/tests/auto/tools/uic/baseline/previewconfigurationwidget.ui.h
+++ b/tests/auto/tools/uic/baseline/previewconfigurationwidget.ui.h
@@ -44,40 +44,40 @@ public:
void setupUi(QGroupBox *PreviewConfigurationWidget)
{
if (PreviewConfigurationWidget->objectName().isEmpty())
- PreviewConfigurationWidget->setObjectName(QString::fromUtf8("PreviewConfigurationWidget"));
+ PreviewConfigurationWidget->setObjectName(QStringLiteral("PreviewConfigurationWidget"));
PreviewConfigurationWidget->setCheckable(true);
formLayout = new QFormLayout(PreviewConfigurationWidget);
- formLayout->setObjectName(QString::fromUtf8("formLayout"));
+ formLayout->setObjectName(QStringLiteral("formLayout"));
m_styleLabel = new QLabel(PreviewConfigurationWidget);
- m_styleLabel->setObjectName(QString::fromUtf8("m_styleLabel"));
+ m_styleLabel->setObjectName(QStringLiteral("m_styleLabel"));
formLayout->setWidget(0, QFormLayout::LabelRole, m_styleLabel);
m_styleCombo = new QComboBox(PreviewConfigurationWidget);
- m_styleCombo->setObjectName(QString::fromUtf8("m_styleCombo"));
+ m_styleCombo->setObjectName(QStringLiteral("m_styleCombo"));
formLayout->setWidget(0, QFormLayout::FieldRole, m_styleCombo);
m_appStyleSheetLabel = new QLabel(PreviewConfigurationWidget);
- m_appStyleSheetLabel->setObjectName(QString::fromUtf8("m_appStyleSheetLabel"));
+ m_appStyleSheetLabel->setObjectName(QStringLiteral("m_appStyleSheetLabel"));
formLayout->setWidget(1, QFormLayout::LabelRole, m_appStyleSheetLabel);
hboxLayout = new QHBoxLayout();
- hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+ hboxLayout->setObjectName(QStringLiteral("hboxLayout"));
m_appStyleSheetLineEdit = new qdesigner_internal::TextPropertyEditor(PreviewConfigurationWidget);
- m_appStyleSheetLineEdit->setObjectName(QString::fromUtf8("m_appStyleSheetLineEdit"));
+ m_appStyleSheetLineEdit->setObjectName(QStringLiteral("m_appStyleSheetLineEdit"));
m_appStyleSheetLineEdit->setMinimumSize(QSize(149, 0));
hboxLayout->addWidget(m_appStyleSheetLineEdit);
m_appStyleSheetChangeButton = new QToolButton(PreviewConfigurationWidget);
- m_appStyleSheetChangeButton->setObjectName(QString::fromUtf8("m_appStyleSheetChangeButton"));
+ m_appStyleSheetChangeButton->setObjectName(QStringLiteral("m_appStyleSheetChangeButton"));
hboxLayout->addWidget(m_appStyleSheetChangeButton);
m_appStyleSheetClearButton = new QToolButton(PreviewConfigurationWidget);
- m_appStyleSheetClearButton->setObjectName(QString::fromUtf8("m_appStyleSheetClearButton"));
+ m_appStyleSheetClearButton->setObjectName(QStringLiteral("m_appStyleSheetClearButton"));
hboxLayout->addWidget(m_appStyleSheetClearButton);
@@ -85,19 +85,19 @@ public:
formLayout->setLayout(1, QFormLayout::FieldRole, hboxLayout);
m_skinLabel = new QLabel(PreviewConfigurationWidget);
- m_skinLabel->setObjectName(QString::fromUtf8("m_skinLabel"));
+ m_skinLabel->setObjectName(QStringLiteral("m_skinLabel"));
formLayout->setWidget(2, QFormLayout::LabelRole, m_skinLabel);
hboxLayout1 = new QHBoxLayout();
- hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
+ hboxLayout1->setObjectName(QStringLiteral("hboxLayout1"));
m_skinCombo = new QComboBox(PreviewConfigurationWidget);
- m_skinCombo->setObjectName(QString::fromUtf8("m_skinCombo"));
+ m_skinCombo->setObjectName(QStringLiteral("m_skinCombo"));
hboxLayout1->addWidget(m_skinCombo);
m_skinRemoveButton = new QToolButton(PreviewConfigurationWidget);
- m_skinRemoveButton->setObjectName(QString::fromUtf8("m_skinRemoveButton"));
+ m_skinRemoveButton->setObjectName(QStringLiteral("m_skinRemoveButton"));
hboxLayout1->addWidget(m_skinRemoveButton);