49b08f96e8
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>
198 lines
7.4 KiB
C++
198 lines
7.4 KiB
C++
/*
|
|
*********************************************************************
|
|
**
|
|
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
|
|
** Contact: http://www.qt-project.org/
|
|
**
|
|
** This file is part of the autotests of the Qt Toolkit.
|
|
**
|
|
** $QT_BEGIN_LICENSE:LGPL$
|
|
** GNU Lesser General Public License Usage
|
|
** This file may be used under the terms of the GNU Lesser General Public
|
|
** License version 2.1 as published by the Free Software Foundation and
|
|
** appearing in the file LICENSE.LGPL included in the packaging of this
|
|
** file. Please review the following information to ensure the GNU Lesser
|
|
** General Public License version 2.1 requirements will be met:
|
|
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
**
|
|
** In addition, as a special exception, Nokia gives you certain additional
|
|
** rights. These rights are described in the Nokia Qt LGPL Exception
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU General
|
|
** Public License version 3.0 as published by the Free Software Foundation
|
|
** and appearing in the file LICENSE.GPL included in the packaging of this
|
|
** file. Please review the following information to ensure the GNU General
|
|
** Public License version 3.0 requirements will be met:
|
|
** http://www.gnu.org/copyleft/gpl.html.
|
|
**
|
|
** Other Usage
|
|
** Alternatively, this file may be used in accordance with the terms and
|
|
** conditions contained in a signed written agreement between you and Nokia.
|
|
**
|
|
**
|
|
**
|
|
**
|
|
**
|
|
**
|
|
** $QT_END_LICENSE$
|
|
**
|
|
*********************************************************************
|
|
*/
|
|
|
|
/********************************************************************************
|
|
** Form generated from reading UI file 'newactiondialog.ui'
|
|
**
|
|
** Created: Fri Sep 4 10:17:14 2009
|
|
** by: Qt User Interface Compiler version 4.6.0
|
|
**
|
|
** WARNING! All changes made in this file will be lost when recompiling UI file!
|
|
********************************************************************************/
|
|
|
|
#ifndef NEWACTIONDIALOG_H
|
|
#define NEWACTIONDIALOG_H
|
|
|
|
#include <QtCore/QVariant>
|
|
#include <QtWidgets/QAction>
|
|
#include <QtWidgets/QApplication>
|
|
#include <QtWidgets/QButtonGroup>
|
|
#include <QtWidgets/QDialog>
|
|
#include <QtWidgets/QDialogButtonBox>
|
|
#include <QtWidgets/QFormLayout>
|
|
#include <QtWidgets/QFrame>
|
|
#include <QtWidgets/QHBoxLayout>
|
|
#include <QtWidgets/QHeaderView>
|
|
#include <QtWidgets/QLabel>
|
|
#include <QtWidgets/QLineEdit>
|
|
#include <QtWidgets/QSpacerItem>
|
|
#include <QtWidgets/QVBoxLayout>
|
|
#include "iconselector_p.h"
|
|
|
|
QT_BEGIN_NAMESPACE
|
|
|
|
namespace qdesigner_internal {
|
|
|
|
class Ui_NewActionDialog
|
|
{
|
|
public:
|
|
QVBoxLayout *verticalLayout;
|
|
QFormLayout *formLayout;
|
|
QLabel *label;
|
|
QLineEdit *editActionText;
|
|
QLabel *label_3;
|
|
QLineEdit *editObjectName;
|
|
QLabel *label_2;
|
|
QHBoxLayout *horizontalLayout;
|
|
qdesigner_internal::IconSelector *iconSelector;
|
|
QSpacerItem *spacerItem;
|
|
QSpacerItem *verticalSpacer;
|
|
QFrame *line;
|
|
QDialogButtonBox *buttonBox;
|
|
|
|
void setupUi(QDialog *qdesigner_internal__NewActionDialog)
|
|
{
|
|
if (qdesigner_internal__NewActionDialog->objectName().isEmpty())
|
|
qdesigner_internal__NewActionDialog->setObjectName(QStringLiteral("qdesigner_internal__NewActionDialog"));
|
|
qdesigner_internal__NewActionDialog->resize(363, 156);
|
|
verticalLayout = new QVBoxLayout(qdesigner_internal__NewActionDialog);
|
|
verticalLayout->setObjectName(QStringLiteral("verticalLayout"));
|
|
formLayout = new QFormLayout();
|
|
formLayout->setObjectName(QStringLiteral("formLayout"));
|
|
label = new QLabel(qdesigner_internal__NewActionDialog);
|
|
label->setObjectName(QStringLiteral("label"));
|
|
|
|
formLayout->setWidget(0, QFormLayout::LabelRole, label);
|
|
|
|
editActionText = new QLineEdit(qdesigner_internal__NewActionDialog);
|
|
editActionText->setObjectName(QStringLiteral("editActionText"));
|
|
editActionText->setMinimumSize(QSize(255, 0));
|
|
|
|
formLayout->setWidget(0, QFormLayout::FieldRole, editActionText);
|
|
|
|
label_3 = new QLabel(qdesigner_internal__NewActionDialog);
|
|
label_3->setObjectName(QStringLiteral("label_3"));
|
|
|
|
formLayout->setWidget(1, QFormLayout::LabelRole, label_3);
|
|
|
|
editObjectName = new QLineEdit(qdesigner_internal__NewActionDialog);
|
|
editObjectName->setObjectName(QStringLiteral("editObjectName"));
|
|
|
|
formLayout->setWidget(1, QFormLayout::FieldRole, editObjectName);
|
|
|
|
label_2 = new QLabel(qdesigner_internal__NewActionDialog);
|
|
label_2->setObjectName(QStringLiteral("label_2"));
|
|
|
|
formLayout->setWidget(2, QFormLayout::LabelRole, label_2);
|
|
|
|
horizontalLayout = new QHBoxLayout();
|
|
horizontalLayout->setObjectName(QStringLiteral("horizontalLayout"));
|
|
iconSelector = new qdesigner_internal::IconSelector(qdesigner_internal__NewActionDialog);
|
|
iconSelector->setObjectName(QStringLiteral("iconSelector"));
|
|
|
|
horizontalLayout->addWidget(iconSelector);
|
|
|
|
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
|
|
|
|
horizontalLayout->addItem(spacerItem);
|
|
|
|
|
|
formLayout->setLayout(2, QFormLayout::FieldRole, horizontalLayout);
|
|
|
|
|
|
verticalLayout->addLayout(formLayout);
|
|
|
|
verticalSpacer = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
|
|
|
|
verticalLayout->addItem(verticalSpacer);
|
|
|
|
line = new QFrame(qdesigner_internal__NewActionDialog);
|
|
line->setObjectName(QStringLiteral("line"));
|
|
line->setFrameShape(QFrame::HLine);
|
|
line->setFrameShadow(QFrame::Sunken);
|
|
|
|
verticalLayout->addWidget(line);
|
|
|
|
buttonBox = new QDialogButtonBox(qdesigner_internal__NewActionDialog);
|
|
buttonBox->setObjectName(QStringLiteral("buttonBox"));
|
|
buttonBox->setOrientation(Qt::Horizontal);
|
|
buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
|
|
|
|
verticalLayout->addWidget(buttonBox);
|
|
|
|
#ifndef QT_NO_SHORTCUT
|
|
label->setBuddy(editActionText);
|
|
label_3->setBuddy(editObjectName);
|
|
label_2->setBuddy(iconSelector);
|
|
#endif // QT_NO_SHORTCUT
|
|
QWidget::setTabOrder(editActionText, editObjectName);
|
|
|
|
retranslateUi(qdesigner_internal__NewActionDialog);
|
|
QObject::connect(buttonBox, SIGNAL(accepted()), qdesigner_internal__NewActionDialog, SLOT(accept()));
|
|
QObject::connect(buttonBox, SIGNAL(rejected()), qdesigner_internal__NewActionDialog, SLOT(reject()));
|
|
|
|
QMetaObject::connectSlotsByName(qdesigner_internal__NewActionDialog);
|
|
} // setupUi
|
|
|
|
void retranslateUi(QDialog *qdesigner_internal__NewActionDialog)
|
|
{
|
|
qdesigner_internal__NewActionDialog->setWindowTitle(QApplication::translate("qdesigner_internal::NewActionDialog", "New Action...", 0, QApplication::UnicodeUTF8));
|
|
label->setText(QApplication::translate("qdesigner_internal::NewActionDialog", "&Text:", 0, QApplication::UnicodeUTF8));
|
|
label_3->setText(QApplication::translate("qdesigner_internal::NewActionDialog", "Object &name:", 0, QApplication::UnicodeUTF8));
|
|
label_2->setText(QApplication::translate("qdesigner_internal::NewActionDialog", "&Icon:", 0, QApplication::UnicodeUTF8));
|
|
} // retranslateUi
|
|
|
|
};
|
|
|
|
} // namespace qdesigner_internal
|
|
|
|
namespace qdesigner_internal {
|
|
namespace Ui {
|
|
class NewActionDialog: public Ui_NewActionDialog {};
|
|
} // namespace Ui
|
|
} // namespace qdesigner_internal
|
|
|
|
QT_END_NAMESPACE
|
|
|
|
#endif // NEWACTIONDIALOG_H
|