From 9985cc330adb2af1b601e8a77ff5f9b485729577 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 10 Jun 2020 16:01:22 +0200 Subject: uic: use C string literals for setObjectName() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Because setObjectName() now takes a QAnyStringView, passing C string literals is much more efficient than using QString::fromUtf8(). This patch only deals with setObjectName() as a known property, probably from a name attribute. If the objectName property is set by a element (or so I assume), we still emit a QString::fromUtf8(). Detecting objectName there would be too much magic. Besides, I haven't been able to find why sometimes there's a second setObjectName call right after the first, when in the XML it seems all kosher (name attribute and objectName agreeing on the content). Change-Id: Icf07bad841ac735a9c744bbd955428ba15758089 Reviewed-by: Thiago Macieira Reviewed-by: Qt CI Bot Reviewed-by: Friedemann Kleint Reviewed-by: Mårten Nordheim --- tests/auto/tools/uic/baseline/buttongroup.ui.h | 36 +++++++++++++------------- 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'tests/auto/tools/uic/baseline/buttongroup.ui.h') diff --git a/tests/auto/tools/uic/baseline/buttongroup.ui.h b/tests/auto/tools/uic/baseline/buttongroup.ui.h index f1b1345497..4fdd88cf60 100644 --- a/tests/auto/tools/uic/baseline/buttongroup.ui.h +++ b/tests/auto/tools/uic/baseline/buttongroup.ui.h @@ -51,12 +51,12 @@ public: void setupUi(QWidget *Form) { if (Form->objectName().isEmpty()) - Form->setObjectName(QString::fromUtf8("Form")); + Form->setObjectName("Form"); Form->resize(545, 471); gridLayout = new QGridLayout(Form); - gridLayout->setObjectName(QString::fromUtf8("gridLayout")); + gridLayout->setObjectName("gridLayout"); easingCurvePicker = new QListWidget(Form); - easingCurvePicker->setObjectName(QString::fromUtf8("easingCurvePicker")); + easingCurvePicker->setObjectName("easingCurvePicker"); QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); sizePolicy.setHorizontalStretch(0); sizePolicy.setVerticalStretch(0); @@ -72,17 +72,17 @@ public: gridLayout->addWidget(easingCurvePicker, 0, 0, 1, 2); verticalLayout = new QVBoxLayout(); - verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); + verticalLayout->setObjectName("verticalLayout"); groupBox_2 = new QGroupBox(Form); - groupBox_2->setObjectName(QString::fromUtf8("groupBox_2")); + groupBox_2->setObjectName("groupBox_2"); groupBox_2->setMaximumSize(QSize(16777215, 16777215)); gridLayout_2 = new QGridLayout(groupBox_2); - gridLayout_2->setObjectName(QString::fromUtf8("gridLayout_2")); + gridLayout_2->setObjectName("gridLayout_2"); lineRadio = new QRadioButton(groupBox_2); buttonGroup = new QButtonGroup(Form); - buttonGroup->setObjectName(QString::fromUtf8("buttonGroup")); + buttonGroup->setObjectName("buttonGroup"); buttonGroup->addButton(lineRadio); - lineRadio->setObjectName(QString::fromUtf8("lineRadio")); + lineRadio->setObjectName("lineRadio"); lineRadio->setMaximumSize(QSize(16777215, 40)); lineRadio->setLayoutDirection(Qt::LeftToRight); lineRadio->setChecked(true); @@ -91,7 +91,7 @@ public: circleRadio = new QRadioButton(groupBox_2); buttonGroup->addButton(circleRadio); - circleRadio->setObjectName(QString::fromUtf8("circleRadio")); + circleRadio->setObjectName("circleRadio"); circleRadio->setMaximumSize(QSize(16777215, 40)); gridLayout_2->addWidget(circleRadio, 1, 0, 1, 1); @@ -100,17 +100,17 @@ public: verticalLayout->addWidget(groupBox_2); groupBox = new QGroupBox(Form); - groupBox->setObjectName(QString::fromUtf8("groupBox")); + groupBox->setObjectName("groupBox"); QSizePolicy sizePolicy1(QSizePolicy::Fixed, QSizePolicy::Preferred); sizePolicy1.setHorizontalStretch(0); sizePolicy1.setVerticalStretch(0); sizePolicy1.setHeightForWidth(groupBox->sizePolicy().hasHeightForWidth()); groupBox->setSizePolicy(sizePolicy1); formLayout = new QFormLayout(groupBox); - formLayout->setObjectName(QString::fromUtf8("formLayout")); + formLayout->setObjectName("formLayout"); formLayout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow); label = new QLabel(groupBox); - label->setObjectName(QString::fromUtf8("label")); + label->setObjectName("label"); QSizePolicy sizePolicy2(QSizePolicy::Preferred, QSizePolicy::Preferred); sizePolicy2.setHorizontalStretch(0); sizePolicy2.setVerticalStretch(0); @@ -121,7 +121,7 @@ public: formLayout->setWidget(0, QFormLayout::LabelRole, label); periodSpinBox = new QDoubleSpinBox(groupBox); - periodSpinBox->setObjectName(QString::fromUtf8("periodSpinBox")); + periodSpinBox->setObjectName("periodSpinBox"); periodSpinBox->setEnabled(false); QSizePolicy sizePolicy3(QSizePolicy::Minimum, QSizePolicy::Fixed); sizePolicy3.setHorizontalStretch(0); @@ -136,7 +136,7 @@ public: formLayout->setWidget(0, QFormLayout::FieldRole, periodSpinBox); amplitudeSpinBox = new QDoubleSpinBox(groupBox); - amplitudeSpinBox->setObjectName(QString::fromUtf8("amplitudeSpinBox")); + amplitudeSpinBox->setObjectName("amplitudeSpinBox"); amplitudeSpinBox->setEnabled(false); amplitudeSpinBox->setMinimumSize(QSize(0, 30)); amplitudeSpinBox->setMinimum(-1.000000000000000); @@ -146,13 +146,13 @@ public: formLayout->setWidget(2, QFormLayout::FieldRole, amplitudeSpinBox); label_3 = new QLabel(groupBox); - label_3->setObjectName(QString::fromUtf8("label_3")); + label_3->setObjectName("label_3"); label_3->setMinimumSize(QSize(0, 30)); formLayout->setWidget(4, QFormLayout::LabelRole, label_3); overshootSpinBox = new QDoubleSpinBox(groupBox); - overshootSpinBox->setObjectName(QString::fromUtf8("overshootSpinBox")); + overshootSpinBox->setObjectName("overshootSpinBox"); overshootSpinBox->setEnabled(false); overshootSpinBox->setMinimumSize(QSize(0, 30)); overshootSpinBox->setMinimum(-1.000000000000000); @@ -162,7 +162,7 @@ public: formLayout->setWidget(4, QFormLayout::FieldRole, overshootSpinBox); label_2 = new QLabel(groupBox); - label_2->setObjectName(QString::fromUtf8("label_2")); + label_2->setObjectName("label_2"); label_2->setMinimumSize(QSize(0, 30)); formLayout->setWidget(2, QFormLayout::LabelRole, label_2); @@ -178,7 +178,7 @@ public: gridLayout->addLayout(verticalLayout, 1, 0, 1, 1); graphicsView = new QGraphicsView(Form); - graphicsView->setObjectName(QString::fromUtf8("graphicsView")); + graphicsView->setObjectName("graphicsView"); QSizePolicy sizePolicy4(QSizePolicy::Expanding, QSizePolicy::Expanding); sizePolicy4.setHorizontalStretch(0); sizePolicy4.setVerticalStretch(0); -- cgit v1.2.3