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, 52 insertions, 52 deletions

diff --git a/tests/auto/tools/uic/baseline/config.ui.h b/tests/auto/tools/uic/baseline/config.ui.h
index 5606978f09..cf21fd8c6f 100644
--- a/tests/auto/tools/uic/baseline/config.ui.h
+++ b/tests/auto/tools/uic/baseline/config.ui.h
@@ -135,20 +135,20 @@ public:
     void setupUi(QDialog *Config)
     {
         if (Config->objectName().isEmpty())
-            Config->setObjectName(QString::fromUtf8("Config"));
+            Config->setObjectName(QStringLiteral("Config"));
         Config->resize(600, 650);
         Config->setSizeGripEnabled(true);
         vboxLayout = new QVBoxLayout(Config);
         vboxLayout->setSpacing(6);
         vboxLayout->setContentsMargins(11, 11, 11, 11);
-        vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
+        vboxLayout->setObjectName(QStringLiteral("vboxLayout"));
         vboxLayout->setContentsMargins(8, 8, 8, 8);
         hboxLayout = new QHBoxLayout();
         hboxLayout->setSpacing(6);
-        hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
+        hboxLayout->setObjectName(QStringLiteral("hboxLayout"));
         hboxLayout->setContentsMargins(0, 0, 0, 0);
         ButtonGroup1 = new QGroupBox(Config);
-        ButtonGroup1->setObjectName(QString::fromUtf8("ButtonGroup1"));
+        ButtonGroup1->setObjectName(QStringLiteral("ButtonGroup1"));
         QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
         sizePolicy.setHorizontalStretch(0);
         sizePolicy.setVerticalStretch(0);
@@ -157,44 +157,44 @@ public:
         vboxLayout1 = new QVBoxLayout(ButtonGroup1);
         vboxLayout1->setSpacing(6);
         vboxLayout1->setContentsMargins(11, 11, 11, 11);
-        vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
+        vboxLayout1->setObjectName(QStringLiteral("vboxLayout1"));
         vboxLayout1->setContentsMargins(11, 11, 11, 11);
         size_176_220 = new QRadioButton(ButtonGroup1);
-        size_176_220->setObjectName(QString::fromUtf8("size_176_220"));
+        size_176_220->setObjectName(QStringLiteral("size_176_220"));
 
         vboxLayout1->addWidget(size_176_220);
 
         size_240_320 = new QRadioButton(ButtonGroup1);
-        size_240_320->setObjectName(QString::fromUtf8("size_240_320"));
+        size_240_320->setObjectName(QStringLiteral("size_240_320"));
 
         vboxLayout1->addWidget(size_240_320);
 
         size_320_240 = new QRadioButton(ButtonGroup1);
-        size_320_240->setObjectName(QString::fromUtf8("size_320_240"));
+        size_320_240->setObjectName(QStringLiteral("size_320_240"));
 
         vboxLayout1->addWidget(size_320_240);
 
         size_640_480 = new QRadioButton(ButtonGroup1);
-        size_640_480->setObjectName(QString::fromUtf8("size_640_480"));
+        size_640_480->setObjectName(QStringLiteral("size_640_480"));
 
         vboxLayout1->addWidget(size_640_480);
 
         size_800_600 = new QRadioButton(ButtonGroup1);
-        size_800_600->setObjectName(QString::fromUtf8("size_800_600"));
+        size_800_600->setObjectName(QStringLiteral("size_800_600"));
 
         vboxLayout1->addWidget(size_800_600);
 
         size_1024_768 = new QRadioButton(ButtonGroup1);
-        size_1024_768->setObjectName(QString::fromUtf8("size_1024_768"));
+        size_1024_768->setObjectName(QStringLiteral("size_1024_768"));
 
         vboxLayout1->addWidget(size_1024_768);
 
         hboxLayout1 = new QHBoxLayout();
         hboxLayout1->setSpacing(6);
-        hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
+        hboxLayout1->setObjectName(QStringLiteral("hboxLayout1"));
         hboxLayout1->setContentsMargins(0, 0, 0, 0);
         size_custom = new QRadioButton(ButtonGroup1);
-        size_custom->setObjectName(QString::fromUtf8("size_custom"));
+        size_custom->setObjectName(QStringLiteral("size_custom"));
         QSizePolicy sizePolicy1(QSizePolicy::Fixed, QSizePolicy::Fixed);
         sizePolicy1.setHorizontalStretch(0);
         sizePolicy1.setVerticalStretch(0);
@@ -204,7 +204,7 @@ public:
         hboxLayout1->addWidget(size_custom);
 
         size_width = new QSpinBox(ButtonGroup1);
-        size_width->setObjectName(QString::fromUtf8("size_width"));
+        size_width->setObjectName(QStringLiteral("size_width"));
         size_width->setMinimum(1);
         size_width->setMaximum(1280);
         size_width->setSingleStep(16);
@@ -213,7 +213,7 @@ public:
         hboxLayout1->addWidget(size_width);
 
         size_height = new QSpinBox(ButtonGroup1);
-        size_height->setObjectName(QString::fromUtf8("size_height"));
+        size_height->setObjectName(QStringLiteral("size_height"));
         size_height->setMinimum(1);
         size_height->setMaximum(1024);
         size_height->setSingleStep(16);
@@ -228,59 +228,59 @@ public:
         hboxLayout->addWidget(ButtonGroup1);
 
         ButtonGroup2 = new QGroupBox(Config);
-        ButtonGroup2->setObjectName(QString::fromUtf8("ButtonGroup2"));
+        ButtonGroup2->setObjectName(QStringLiteral("ButtonGroup2"));
         vboxLayout2 = new QVBoxLayout(ButtonGroup2);
         vboxLayout2->setSpacing(6);
         vboxLayout2->setContentsMargins(11, 11, 11, 11);
-        vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
+        vboxLayout2->setObjectName(QStringLiteral("vboxLayout2"));
         vboxLayout2->setContentsMargins(11, 11, 11, 11);
         depth_1 = new QRadioButton(ButtonGroup2);
-        depth_1->setObjectName(QString::fromUtf8("depth_1"));
+        depth_1->setObjectName(QStringLiteral("depth_1"));
 
         vboxLayout2->addWidget(depth_1);
 
         depth_4gray = new QRadioButton(ButtonGroup2);
-        depth_4gray->setObjectName(QString::fromUtf8("depth_4gray"));
+        depth_4gray->setObjectName(QStringLiteral("depth_4gray"));
 
         vboxLayout2->addWidget(depth_4gray);
 
         depth_8 = new QRadioButton(ButtonGroup2);
-        depth_8->setObjectName(QString::fromUtf8("depth_8"));
+        depth_8->setObjectName(QStringLiteral("depth_8"));
 
         vboxLayout2->addWidget(depth_8);
 
         depth_12 = new QRadioButton(ButtonGroup2);
-        depth_12->setObjectName(QString::fromUtf8("depth_12"));
+        depth_12->setObjectName(QStringLiteral("depth_12"));
 
         vboxLayout2->addWidget(depth_12);
 
         depth_15 = new QRadioButton(ButtonGroup2);
-        depth_15->setObjectName(QString::fromUtf8("depth_15"));
+        depth_15->setObjectName(QStringLiteral("depth_15"));
 
         vboxLayout2->addWidget(depth_15);
 
         depth_16 = new QRadioButton(ButtonGroup2);
-        depth_16->setObjectName(QString::fromUtf8("depth_16"));
+        depth_16->setObjectName(QStringLiteral("depth_16"));
 
         vboxLayout2->addWidget(depth_16);
 
         depth_18 = new QRadioButton(ButtonGroup2);
-        depth_18->setObjectName(QString::fromUtf8("depth_18"));
+        depth_18->setObjectName(QStringLiteral("depth_18"));
 
         vboxLayout2->addWidget(depth_18);
 
         depth_24 = new QRadioButton(ButtonGroup2);
-        depth_24->setObjectName(QString::fromUtf8("depth_24"));
+        depth_24->setObjectName(QStringLiteral("depth_24"));
 
         vboxLayout2->addWidget(depth_24);
 
         depth_32 = new QRadioButton(ButtonGroup2);
-        depth_32->setObjectName(QString::fromUtf8("depth_32"));
+        depth_32->setObjectName(QStringLiteral("depth_32"));
 
         vboxLayout2->addWidget(depth_32);
 
         depth_32_argb = new QRadioButton(ButtonGroup2);
-        depth_32_argb->setObjectName(QString::fromUtf8("depth_32_argb"));
+        depth_32_argb->setObjectName(QStringLiteral("depth_32_argb"));
 
         vboxLayout2->addWidget(depth_32_argb);
 
@@ -292,15 +292,15 @@ public:
 
         hboxLayout2 = new QHBoxLayout();
         hboxLayout2->setSpacing(6);
-        hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
+        hboxLayout2->setObjectName(QStringLiteral("hboxLayout2"));
         hboxLayout2->setContentsMargins(0, 0, 0, 0);
         TextLabel1_3 = new QLabel(Config);
-        TextLabel1_3->setObjectName(QString::fromUtf8("TextLabel1_3"));
+        TextLabel1_3->setObjectName(QStringLiteral("TextLabel1_3"));
 
         hboxLayout2->addWidget(TextLabel1_3);
 
         skin = new QComboBox(Config);
-        skin->setObjectName(QString::fromUtf8("skin"));
+        skin->setObjectName(QStringLiteral("skin"));
         QSizePolicy sizePolicy2(QSizePolicy::Expanding, QSizePolicy::Fixed);
         sizePolicy2.setHorizontalStretch(0);
         sizePolicy2.setVerticalStretch(0);
@@ -313,12 +313,12 @@ public:
         vboxLayout->addLayout(hboxLayout2);
 
         touchScreen = new QCheckBox(Config);
-        touchScreen->setObjectName(QString::fromUtf8("touchScreen"));
+        touchScreen->setObjectName(QStringLiteral("touchScreen"));
 
         vboxLayout->addWidget(touchScreen);
 
         lcdScreen = new QCheckBox(Config);
-        lcdScreen->setObjectName(QString::fromUtf8("lcdScreen"));
+        lcdScreen->setObjectName(QStringLiteral("lcdScreen"));
 
         vboxLayout->addWidget(lcdScreen);
 
@@ -327,7 +327,7 @@ public:
         vboxLayout->addItem(spacerItem);
 
         TextLabel1 = new QLabel(Config);
-        TextLabel1->setObjectName(QString::fromUtf8("TextLabel1"));
+        TextLabel1->setObjectName(QStringLiteral("TextLabel1"));
         sizePolicy.setHeightForWidth(TextLabel1->sizePolicy().hasHeightForWidth());
         TextLabel1->setSizePolicy(sizePolicy);
         TextLabel1->setWordWrap(true);
@@ -335,21 +335,21 @@ public:
         vboxLayout->addWidget(TextLabel1);
 
         GroupBox1 = new QGroupBox(Config);
-        GroupBox1->setObjectName(QString::fromUtf8("GroupBox1"));
+        GroupBox1->setObjectName(QStringLiteral("GroupBox1"));
         gridLayout = new QGridLayout(GroupBox1);
         gridLayout->setSpacing(6);
         gridLayout->setContentsMargins(11, 11, 11, 11);
-        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+        gridLayout->setObjectName(QStringLiteral("gridLayout"));
         gridLayout->setHorizontalSpacing(6);
         gridLayout->setVerticalSpacing(6);
         gridLayout->setContentsMargins(11, 11, 11, 11);
         TextLabel3 = new QLabel(GroupBox1);
-        TextLabel3->setObjectName(QString::fromUtf8("TextLabel3"));
+        TextLabel3->setObjectName(QStringLiteral("TextLabel3"));
 
         gridLayout->addWidget(TextLabel3, 6, 0, 1, 1);
 
         bslider = new QSlider(GroupBox1);
-        bslider->setObjectName(QString::fromUtf8("bslider"));
+        bslider->setObjectName(QStringLiteral("bslider"));
         QPalette palette;
         QBrush brush(QColor(128, 128, 128, 255));
         brush.setStyle(Qt::SolidPattern);
@@ -432,17 +432,17 @@ public:
         gridLayout->addWidget(bslider, 6, 1, 1, 1);
 
         blabel = new QLabel(GroupBox1);
-        blabel->setObjectName(QString::fromUtf8("blabel"));
+        blabel->setObjectName(QStringLiteral("blabel"));
 
         gridLayout->addWidget(blabel, 6, 2, 1, 1);
 
         TextLabel2 = new QLabel(GroupBox1);
-        TextLabel2->setObjectName(QString::fromUtf8("TextLabel2"));
+        TextLabel2->setObjectName(QStringLiteral("TextLabel2"));
 
         gridLayout->addWidget(TextLabel2, 4, 0, 1, 1);
 
         gslider = new QSlider(GroupBox1);
-        gslider->setObjectName(QString::fromUtf8("gslider"));
+        gslider->setObjectName(QStringLiteral("gslider"));
         QPalette palette1;
         palette1.setBrush(QPalette::Active, QPalette::WindowText, brush);
         QBrush brush11(QColor(0, 255, 0, 255));
@@ -513,22 +513,22 @@ public:
         gridLayout->addWidget(gslider, 4, 1, 1, 1);
 
         glabel = new QLabel(GroupBox1);
-        glabel->setObjectName(QString::fromUtf8("glabel"));
+        glabel->setObjectName(QStringLiteral("glabel"));
 
         gridLayout->addWidget(glabel, 4, 2, 1, 1);
 
         TextLabel7 = new QLabel(GroupBox1);
-        TextLabel7->setObjectName(QString::fromUtf8("TextLabel7"));
+        TextLabel7->setObjectName(QStringLiteral("TextLabel7"));
 
         gridLayout->addWidget(TextLabel7, 0, 0, 1, 1);
 
         TextLabel8 = new QLabel(GroupBox1);
-        TextLabel8->setObjectName(QString::fromUtf8("TextLabel8"));
+        TextLabel8->setObjectName(QStringLiteral("TextLabel8"));
 
         gridLayout->addWidget(TextLabel8, 0, 2, 1, 1);
 
         gammaslider = new QSlider(GroupBox1);
-        gammaslider->setObjectName(QString::fromUtf8("gammaslider"));
+        gammaslider->setObjectName(QStringLiteral("gammaslider"));
         QPalette palette2;
         palette2.setBrush(QPalette::Active, QPalette::WindowText, brush);
         palette2.setBrush(QPalette::Active, QPalette::Button, brush7);
@@ -593,17 +593,17 @@ public:
         gridLayout->addWidget(gammaslider, 0, 1, 1, 1);
 
         TextLabel1_2 = new QLabel(GroupBox1);
-        TextLabel1_2->setObjectName(QString::fromUtf8("TextLabel1_2"));
+        TextLabel1_2->setObjectName(QStringLiteral("TextLabel1_2"));
 
         gridLayout->addWidget(TextLabel1_2, 2, 0, 1, 1);
 
         rlabel = new QLabel(GroupBox1);
-        rlabel->setObjectName(QString::fromUtf8("rlabel"));
+        rlabel->setObjectName(QStringLiteral("rlabel"));
 
         gridLayout->addWidget(rlabel, 2, 2, 1, 1);
 
         rslider = new QSlider(GroupBox1);
-        rslider->setObjectName(QString::fromUtf8("rslider"));
+        rslider->setObjectName(QStringLiteral("rslider"));
         QPalette palette3;
         palette3.setBrush(QPalette::Active, QPalette::WindowText, brush);
         QBrush brush18(QColor(255, 0, 0, 255));
@@ -674,12 +674,12 @@ public:
         gridLayout->addWidget(rslider, 2, 1, 1, 1);
 
         PushButton3 = new QPushButton(GroupBox1);
-        PushButton3->setObjectName(QString::fromUtf8("PushButton3"));
+        PushButton3->setObjectName(QStringLiteral("PushButton3"));
 
         gridLayout->addWidget(PushButton3, 8, 0, 1, 3);
 
         MyCustomWidget1 = new GammaView(GroupBox1);
-        MyCustomWidget1->setObjectName(QString::fromUtf8("MyCustomWidget1"));
+        MyCustomWidget1->setObjectName(QStringLiteral("MyCustomWidget1"));
 
         gridLayout->addWidget(MyCustomWidget1, 0, 3, 9, 1);
 
@@ -688,21 +688,21 @@ public:
 
         hboxLayout3 = new QHBoxLayout();
         hboxLayout3->setSpacing(6);
-        hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3"));
+        hboxLayout3->setObjectName(QStringLiteral("hboxLayout3"));
         hboxLayout3->setContentsMargins(0, 0, 0, 0);
         spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
 
         hboxLayout3->addItem(spacerItem1);
 
         buttonOk = new QPushButton(Config);
-        buttonOk->setObjectName(QString::fromUtf8("buttonOk"));
+        buttonOk->setObjectName(QStringLiteral("buttonOk"));
         buttonOk->setAutoDefault(true);
         buttonOk->setDefault(true);
 
         hboxLayout3->addWidget(buttonOk);
 
         buttonCancel = new QPushButton(Config);
-        buttonCancel->setObjectName(QString::fromUtf8("buttonCancel"));
+        buttonCancel->setObjectName(QStringLiteral("buttonCancel"));
         buttonCancel->setAutoDefault(true);
 
         hboxLayout3->addWidget(buttonCancel);