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>

1 files changed, 36 insertions, 36 deletions

diff --git a/tests/auto/tools/uic/baseline/validators.ui.h b/tests/auto/tools/uic/baseline/validators.ui.h
index 12b8ff09f3..374f547cc6 100644
--- a/tests/auto/tools/uic/baseline/validators.ui.h
+++ b/tests/auto/tools/uic/baseline/validators.ui.h
@@ -80,7 +80,7 @@ public:
     void setupUi(QWidget *ValidatorsForm)
     {
         if (ValidatorsForm->objectName().isEmpty())
-            ValidatorsForm->setObjectName(QString::fromUtf8("ValidatorsForm"));
+            ValidatorsForm->setObjectName(QStringLiteral("ValidatorsForm"));
         ValidatorsForm->resize(526, 668);
         vboxLayout = new QVBoxLayout(ValidatorsForm);
 #ifndef Q_OS_MAC
@@ -89,7 +89,7 @@ public:
 #ifndef Q_OS_MAC
         vboxLayout->setContentsMargins(9, 9, 9, 9);
 #endif
-        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        vboxLayout->setObjectName(QStringLiteral("vboxLayout"));
         hboxLayout = new QHBoxLayout();
 #ifndef Q_OS_MAC
         hboxLayout->setSpacing(6);
@@ -97,9 +97,9 @@ public:
 #ifndef Q_OS_MAC
         hboxLayout->setContentsMargins(0, 0, 0, 0);
 #endif
-        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        hboxLayout->setObjectName(QStringLiteral("hboxLayout"));
         localeSelector = new LocaleSelector(ValidatorsForm);
-        localeSelector->setObjectName(QString::fromUtf8("localeSelector"));
+        localeSelector->setObjectName(QStringLiteral("localeSelector"));
 
         hboxLayout->addWidget(localeSelector);
 
@@ -111,7 +111,7 @@ public:
         vboxLayout->addLayout(hboxLayout);
 
         groupBox = new QGroupBox(ValidatorsForm);
-        groupBox->setObjectName(QString::fromUtf8("groupBox"));
+        groupBox->setObjectName(QStringLiteral("groupBox"));
         vboxLayout1 = new QVBoxLayout(groupBox);
 #ifndef Q_OS_MAC
         vboxLayout1->setSpacing(6);
@@ -119,7 +119,7 @@ public:
 #ifndef Q_OS_MAC
         vboxLayout1->setContentsMargins(9, 9, 9, 9);
 #endif
-        vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
+        vboxLayout1->setObjectName(QStringLiteral("vboxLayout1"));
         hboxLayout1 = new QHBoxLayout();
 #ifndef Q_OS_MAC
         hboxLayout1->setSpacing(6);
@@ -127,7 +127,7 @@ public:
 #ifndef Q_OS_MAC
         hboxLayout1->setContentsMargins(0, 0, 0, 0);
 #endif
-        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
+        hboxLayout1->setObjectName(QStringLiteral("hboxLayout1"));
         gridLayout = new QGridLayout();
 #ifndef Q_OS_MAC
         gridLayout->setSpacing(6);
@@ -135,15 +135,15 @@ public:
 #ifndef Q_OS_MAC
         gridLayout->setContentsMargins(0, 0, 0, 0);
 #endif
-        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        gridLayout->setObjectName(QStringLiteral("gridLayout"));
         label = new QLabel(groupBox);
-        label->setObjectName(QString::fromUtf8("label"));
+        label->setObjectName(QStringLiteral("label"));
         label->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
 
         gridLayout->addWidget(label, 0, 0, 1, 1);
 
         minVal = new QSpinBox(groupBox);
-        minVal->setObjectName(QString::fromUtf8("minVal"));
+        minVal->setObjectName(QStringLiteral("minVal"));
         QSizePolicy sizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
         sizePolicy.setHorizontalStretch(1);
         sizePolicy.setVerticalStretch(0);
@@ -155,13 +155,13 @@ public:
         gridLayout->addWidget(minVal, 0, 1, 1, 1);
 
         label_2 = new QLabel(groupBox);
-        label_2->setObjectName(QString::fromUtf8("label_2"));
+        label_2->setObjectName(QStringLiteral("label_2"));
         label_2->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
 
         gridLayout->addWidget(label_2, 1, 0, 1, 1);
 
         maxVal = new QSpinBox(groupBox);
-        maxVal->setObjectName(QString::fromUtf8("maxVal"));
+        maxVal->setObjectName(QStringLiteral("maxVal"));
         sizePolicy.setHeightForWidth(maxVal->sizePolicy().hasHeightForWidth());
         maxVal->setSizePolicy(sizePolicy);
         maxVal->setMinimum(-1000000);
@@ -174,7 +174,7 @@ public:
         hboxLayout1->addLayout(gridLayout);
 
         frame = new QFrame(groupBox);
-        frame->setObjectName(QString::fromUtf8("frame"));
+        frame->setObjectName(QStringLiteral("frame"));
         frame->setFrameShape(QFrame::StyledPanel);
         frame->setFrameShadow(QFrame::Sunken);
         vboxLayout2 = new QVBoxLayout(frame);
@@ -184,9 +184,9 @@ public:
 #ifndef Q_OS_MAC
         vboxLayout2->setContentsMargins(9, 9, 9, 9);
 #endif
-        vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
+        vboxLayout2->setObjectName(QStringLiteral("vboxLayout2"));
         ledWidget = new LEDWidget(frame);
-        ledWidget->setObjectName(QString::fromUtf8("ledWidget"));
+        ledWidget->setObjectName(QStringLiteral("ledWidget"));
         QSizePolicy sizePolicy1(QSizePolicy::Preferred, QSizePolicy::Fixed);
         sizePolicy1.setHorizontalStretch(0);
         sizePolicy1.setVerticalStretch(0);
@@ -198,7 +198,7 @@ public:
         vboxLayout2->addWidget(ledWidget);
 
         label_7 = new QLabel(frame);
-        label_7->setObjectName(QString::fromUtf8("label_7"));
+        label_7->setObjectName(QStringLiteral("label_7"));
 
         vboxLayout2->addWidget(label_7);
 
@@ -213,7 +213,7 @@ public:
         vboxLayout1->addItem(spacerItem1);
 
         editor = new QLineEdit(groupBox);
-        editor->setObjectName(QString::fromUtf8("editor"));
+        editor->setObjectName(QStringLiteral("editor"));
 
         vboxLayout1->addWidget(editor);
 
@@ -221,7 +221,7 @@ public:
         vboxLayout->addWidget(groupBox);
 
         groupBox_2 = new QGroupBox(ValidatorsForm);
-        groupBox_2->setObjectName(QString::fromUtf8("groupBox_2"));
+        groupBox_2->setObjectName(QStringLiteral("groupBox_2"));
         vboxLayout3 = new QVBoxLayout(groupBox_2);
 #ifndef Q_OS_MAC
         vboxLayout3->setSpacing(6);
@@ -229,7 +229,7 @@ public:
 #ifndef Q_OS_MAC
         vboxLayout3->setContentsMargins(9, 9, 9, 9);
 #endif
-        vboxLayout3->setObjectName(QString::fromUtf8("vboxLayout3"));
+        vboxLayout3->setObjectName(QStringLiteral("vboxLayout3"));
         hboxLayout2 = new QHBoxLayout();
 #ifndef Q_OS_MAC
         hboxLayout2->setSpacing(6);
@@ -237,7 +237,7 @@ public:
 #ifndef Q_OS_MAC
         hboxLayout2->setContentsMargins(0, 0, 0, 0);
 #endif
-        hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
+        hboxLayout2->setObjectName(QStringLiteral("hboxLayout2"));
         gridLayout1 = new QGridLayout();
 #ifndef Q_OS_MAC
         gridLayout1->setSpacing(6);
@@ -245,15 +245,15 @@ public:
 #ifndef Q_OS_MAC
         gridLayout1->setContentsMargins(0, 0, 0, 0);
 #endif
-        gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
+        gridLayout1->setObjectName(QStringLiteral("gridLayout1"));
         label_3 = new QLabel(groupBox_2);
-        label_3->setObjectName(QString::fromUtf8("label_3"));
+        label_3->setObjectName(QStringLiteral("label_3"));
         label_3->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
 
         gridLayout1->addWidget(label_3, 0, 0, 1, 1);
 
         doubleMinVal = new QDoubleSpinBox(groupBox_2);
-        doubleMinVal->setObjectName(QString::fromUtf8("doubleMinVal"));
+        doubleMinVal->setObjectName(QStringLiteral("doubleMinVal"));
         sizePolicy.setHeightForWidth(doubleMinVal->sizePolicy().hasHeightForWidth());
         doubleMinVal->setSizePolicy(sizePolicy);
         doubleMinVal->setMinimum(-100000);
@@ -263,24 +263,24 @@ public:
         gridLayout1->addWidget(doubleMinVal, 0, 1, 1, 1);
 
         label_5 = new QLabel(groupBox_2);
-        label_5->setObjectName(QString::fromUtf8("label_5"));
+        label_5->setObjectName(QStringLiteral("label_5"));
         label_5->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
 
         gridLayout1->addWidget(label_5, 0, 2, 1, 1);
 
         doubleFormat = new QComboBox(groupBox_2);
-        doubleFormat->setObjectName(QString::fromUtf8("doubleFormat"));
+        doubleFormat->setObjectName(QStringLiteral("doubleFormat"));
 
         gridLayout1->addWidget(doubleFormat, 0, 3, 1, 1);
 
         label_4 = new QLabel(groupBox_2);
-        label_4->setObjectName(QString::fromUtf8("label_4"));
+        label_4->setObjectName(QStringLiteral("label_4"));
         label_4->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
 
         gridLayout1->addWidget(label_4, 1, 0, 1, 1);
 
         doubleMaxVal = new QDoubleSpinBox(groupBox_2);
-        doubleMaxVal->setObjectName(QString::fromUtf8("doubleMaxVal"));
+        doubleMaxVal->setObjectName(QStringLiteral("doubleMaxVal"));
         sizePolicy.setHeightForWidth(doubleMaxVal->sizePolicy().hasHeightForWidth());
         doubleMaxVal->setSizePolicy(sizePolicy);
         doubleMaxVal->setMinimum(-100000);
@@ -290,13 +290,13 @@ public:
         gridLayout1->addWidget(doubleMaxVal, 1, 1, 1, 1);
 
         label_6 = new QLabel(groupBox_2);
-        label_6->setObjectName(QString::fromUtf8("label_6"));
+        label_6->setObjectName(QStringLiteral("label_6"));
         label_6->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
 
         gridLayout1->addWidget(label_6, 1, 2, 1, 1);
 
         doubleDecimals = new QSpinBox(groupBox_2);
-        doubleDecimals->setObjectName(QString::fromUtf8("doubleDecimals"));
+        doubleDecimals->setObjectName(QStringLiteral("doubleDecimals"));
         doubleDecimals->setValue(2);
 
         gridLayout1->addWidget(doubleDecimals, 1, 3, 1, 1);
@@ -305,7 +305,7 @@ public:
         hboxLayout2->addLayout(gridLayout1);
 
         frame_2 = new QFrame(groupBox_2);
-        frame_2->setObjectName(QString::fromUtf8("frame_2"));
+        frame_2->setObjectName(QStringLiteral("frame_2"));
         frame_2->setFrameShape(QFrame::StyledPanel);
         frame_2->setFrameShadow(QFrame::Sunken);
         vboxLayout4 = new QVBoxLayout(frame_2);
@@ -315,16 +315,16 @@ public:
 #ifndef Q_OS_MAC
         vboxLayout4->setContentsMargins(9, 9, 9, 9);
 #endif
-        vboxLayout4->setObjectName(QString::fromUtf8("vboxLayout4"));
+        vboxLayout4->setObjectName(QStringLiteral("vboxLayout4"));
         doubleLedWidget = new LEDWidget(frame_2);
-        doubleLedWidget->setObjectName(QString::fromUtf8("doubleLedWidget"));
+        doubleLedWidget->setObjectName(QStringLiteral("doubleLedWidget"));
         doubleLedWidget->setPixmap(QPixmap(QString::fromUtf8(":/ledoff.png")));
         doubleLedWidget->setAlignment(Qt::AlignCenter);
 
         vboxLayout4->addWidget(doubleLedWidget);
 
         label_8 = new QLabel(frame_2);
-        label_8->setObjectName(QString::fromUtf8("label_8"));
+        label_8->setObjectName(QStringLiteral("label_8"));
 
         vboxLayout4->addWidget(label_8);
 
@@ -339,7 +339,7 @@ public:
         vboxLayout3->addItem(spacerItem2);
 
         doubleEditor = new QLineEdit(groupBox_2);
-        doubleEditor->setObjectName(QString::fromUtf8("doubleEditor"));
+        doubleEditor->setObjectName(QStringLiteral("doubleEditor"));
 
         vboxLayout3->addWidget(doubleEditor);
 
@@ -355,13 +355,13 @@ public:
         hboxLayout3->setSpacing(6);
 #endif
         hboxLayout3->setContentsMargins(0, 0, 0, 0);
-        hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3"));
+        hboxLayout3->setObjectName(QStringLiteral("hboxLayout3"));
         spacerItem4 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
 
         hboxLayout3->addItem(spacerItem4);
 
         pushButton = new QPushButton(ValidatorsForm);
-        pushButton->setObjectName(QString::fromUtf8("pushButton"));
+        pushButton->setObjectName(QStringLiteral("pushButton"));
 
         hboxLayout3->addWidget(pushButton);