summaryrefslogtreecommitdiff
path: root/src/designer/src/lib/shared/qdesigner_command.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/designer/src/lib/shared/qdesigner_command.cpp')
-rw-r--r--src/designer/src/lib/shared/qdesigner_command.cpp41
1 files changed, 22 insertions, 19 deletions
diff --git a/src/designer/src/lib/shared/qdesigner_command.cpp b/src/designer/src/lib/shared/qdesigner_command.cpp
index 6f3aa74b3..91b5bf443 100644
--- a/src/designer/src/lib/shared/qdesigner_command.cpp
+++ b/src/designer/src/lib/shared/qdesigner_command.cpp
@@ -50,10 +50,12 @@ Q_DECLARE_METATYPE(QWidgetList)
QT_BEGIN_NAMESPACE
+using namespace Qt::StringLiterals;
+
static inline void setPropertySheetWindowTitle(const QDesignerFormEditorInterface *core, QObject *o, const QString &t)
{
if (QDesignerPropertySheetExtension *sheet = qt_extension<QDesignerPropertySheetExtension*>(core->extensionManager(), o)) {
- const int idx = sheet->indexOf(QStringLiteral("windowTitle"));
+ const int idx = sheet->indexOf(u"windowTitle"_s);
if (idx != -1) {
sheet->setProperty(idx, t);
sheet->setChanged(idx, true);
@@ -209,7 +211,7 @@ void InsertWidgetCommand::refreshBuddyLabels()
if (label_list.isEmpty())
return;
- const QString buddyProperty = QStringLiteral("buddy");
+ const QString buddyProperty = u"buddy"_s;
const QByteArray objectNameU8 = m_widget->objectName().toUtf8();
// Re-set the buddy (The sheet locates the object by name and sets it)
for (QLabel *label : label_list) {
@@ -957,7 +959,7 @@ void ToolBoxCommand::addPage()
QDesignerPropertySheetExtension *sheet = qt_extension<QDesignerPropertySheetExtension*>(formWindow()->core()->extensionManager(), m_toolBox);
if (sheet) {
qdesigner_internal::PropertySheetStringValue itemText(m_itemText);
- sheet->setProperty(sheet->indexOf(QStringLiteral("currentItemText")), QVariant::fromValue(itemText));
+ sheet->setProperty(sheet->indexOf(u"currentItemText"_s), QVariant::fromValue(itemText));
}
m_widget->show();
@@ -1048,7 +1050,7 @@ void AddToolBoxPageCommand::init(QToolBox *toolBox, InsertionMode mode)
m_widget = new QDesignerWidget(formWindow(), m_toolBox);
m_itemText = QApplication::translate("Command", "Page");
m_itemIcon = QIcon();
- m_widget->setObjectName(QStringLiteral("page"));
+ m_widget->setObjectName(u"page"_s);
formWindow()->ensureUniqueObjectName(m_widget);
setText(QApplication::translate("Command", "Insert Page"));
@@ -1109,7 +1111,8 @@ void TabWidgetCommand::addPage()
QDesignerPropertySheetExtension *sheet = qt_extension<QDesignerPropertySheetExtension*>(formWindow()->core()->extensionManager(), m_tabWidget);
if (sheet) {
qdesigner_internal::PropertySheetStringValue itemText(m_itemText);
- sheet->setProperty(sheet->indexOf(QStringLiteral("currentTabText")), QVariant::fromValue(itemText));
+ sheet->setProperty(sheet->indexOf(u"currentTabText"_s),
+ QVariant::fromValue(itemText));
}
formWindow()->clearSelection();
@@ -1165,7 +1168,7 @@ void AddTabPageCommand::init(QTabWidget *tabWidget, InsertionMode mode)
m_widget = new QDesignerWidget(formWindow(), m_tabWidget);
m_itemText = QApplication::translate("Command", "Page");
m_itemIcon = QIcon();
- m_widget->setObjectName(QStringLiteral("tab"));
+ m_widget->setObjectName(u"tab"_s);
formWindow()->ensureUniqueObjectName(m_widget);
setText(QApplication::translate("Command", "Insert Page"));
@@ -1341,7 +1344,7 @@ void AddStackedWidgetPageCommand::init(QStackedWidget *stackedWidget, InsertionM
if (mode == InsertAfter)
m_index++;
m_widget = new QDesignerWidget(formWindow(), m_stackedWidget);
- m_widget->setObjectName(QStringLiteral("page"));
+ m_widget->setObjectName(u"page"_s);
formWindow()->ensureUniqueObjectName(m_widget);
setText(QApplication::translate("Command", "Insert Page"));
@@ -1400,7 +1403,7 @@ void CreateMenuBarCommand::init(QMainWindow *mainWindow)
{
m_mainWindow = mainWindow;
QDesignerFormEditorInterface *core = formWindow()->core();
- m_menuBar = qobject_cast<QMenuBar*>(core->widgetFactory()->createWidget(QStringLiteral("QMenuBar"), m_mainWindow));
+ m_menuBar = qobject_cast<QMenuBar*>(core->widgetFactory()->createWidget(u"QMenuBar"_s, m_mainWindow));
core->widgetFactory()->initialize(m_menuBar);
}
@@ -1411,7 +1414,7 @@ void CreateMenuBarCommand::redo()
c = qt_extension<QDesignerContainerExtension*>(core->extensionManager(), m_mainWindow);
c->addWidget(m_menuBar);
- m_menuBar->setObjectName(QStringLiteral("menuBar"));
+ m_menuBar->setObjectName(u"menuBar"_s);
formWindow()->ensureUniqueObjectName(m_menuBar);
core->metaDataBase()->add(m_menuBar);
formWindow()->emitSelectionChanged();
@@ -1491,7 +1494,7 @@ void CreateStatusBarCommand::init(QMainWindow *mainWindow)
{
m_mainWindow = mainWindow;
QDesignerFormEditorInterface *core = formWindow()->core();
- m_statusBar = qobject_cast<QStatusBar*>(core->widgetFactory()->createWidget(QStringLiteral("QStatusBar"), m_mainWindow));
+ m_statusBar = qobject_cast<QStatusBar*>(core->widgetFactory()->createWidget(u"QStatusBar"_s, m_mainWindow));
core->widgetFactory()->initialize(m_statusBar);
}
@@ -1502,7 +1505,7 @@ void CreateStatusBarCommand::redo()
c = qt_extension<QDesignerContainerExtension*>(core->extensionManager(), m_mainWindow);
c->addWidget(m_statusBar);
- m_statusBar->setObjectName(QStringLiteral("statusBar"));
+ m_statusBar->setObjectName(u"statusBar"_s);
formWindow()->ensureUniqueObjectName(m_statusBar);
core->metaDataBase()->add(m_statusBar);
formWindow()->emitSelectionChanged();
@@ -1579,7 +1582,7 @@ void AddToolBarCommand::init(QMainWindow *mainWindow, Qt::ToolBarArea area)
m_mainWindow = mainWindow;
QDesignerWidgetFactoryInterface * wf = formWindow()->core()->widgetFactory();
// Pass on 0 parent first to avoid reparenting flicker.
- m_toolBar = qobject_cast<QToolBar*>(wf->createWidget(QStringLiteral("QToolBar"), nullptr));
+ m_toolBar = qobject_cast<QToolBar*>(wf->createWidget(u"QToolBar"_s, nullptr));
m_toolBar->setProperty("_q_desiredArea", QVariant(area));
wf->initialize(m_toolBar);
m_toolBar->hide();
@@ -1593,7 +1596,7 @@ void AddToolBarCommand::redo()
QDesignerContainerExtension *c = qt_extension<QDesignerContainerExtension*>(core->extensionManager(), m_mainWindow);
c->addWidget(m_toolBar);
- m_toolBar->setObjectName(QStringLiteral("toolBar"));
+ m_toolBar->setObjectName(u"toolBar"_s);
formWindow()->ensureUniqueObjectName(m_toolBar);
setPropertySheetWindowTitle(core, m_toolBar, m_toolBar->objectName());
formWindow()->emitSelectionChanged();
@@ -1642,7 +1645,7 @@ void AddDockWidgetCommand::init(QMainWindow *mainWindow)
{
m_mainWindow = mainWindow;
QDesignerFormEditorInterface *core = formWindow()->core();
- m_dockWidget = qobject_cast<QDockWidget*>(core->widgetFactory()->createWidget(QStringLiteral("QDockWidget"), m_mainWindow));
+ m_dockWidget = qobject_cast<QDockWidget*>(core->widgetFactory()->createWidget(u"QDockWidget"_s, m_mainWindow));
}
void AddDockWidgetCommand::redo()
@@ -1651,7 +1654,7 @@ void AddDockWidgetCommand::redo()
QDesignerContainerExtension *c = qt_extension<QDesignerContainerExtension*>(core->extensionManager(), m_mainWindow);
c->addWidget(m_dockWidget);
- m_dockWidget->setObjectName(QStringLiteral("dockWidget"));
+ m_dockWidget->setObjectName(u"dockWidget"_s);
formWindow()->ensureUniqueObjectName(m_dockWidget);
formWindow()->manageWidget(m_dockWidget);
formWindow()->emitSelectionChanged();
@@ -1732,7 +1735,7 @@ void AdjustWidgetSizeCommand::updatePropertyEditor() const
{
if (QDesignerPropertyEditorInterface *propertyEditor = formWindow()->core()->propertyEditor()) {
if (propertyEditor->object() == m_widget)
- propertyEditor->setPropertyValue(QStringLiteral("geometry"), m_widget->geometry(), true);
+ propertyEditor->setPropertyValue(u"geometry"_s, m_widget->geometry(), true);
}
}
// ------------ ChangeFormLayoutItemRoleCommand
@@ -2006,16 +2009,16 @@ void AddContainerWidgetPageCommand::init(QWidget *containerWidget, ContainerType
case PageContainer:
setText(QApplication::translate("Command", "Insert Page"));
m_widget = new QDesignerWidget(formWindow(), m_containerWidget);
- m_widget->setObjectName(QStringLiteral("page"));
+ m_widget->setObjectName(u"page"_s);
break;
case MdiContainer:
setText(QApplication::translate("Command", "Insert Subwindow"));
m_widget = new QDesignerWidget(formWindow(), m_containerWidget);
- m_widget->setObjectName(QStringLiteral("subwindow"));
+ m_widget->setObjectName(u"subwindow"_s);
setPropertySheetWindowTitle(core, m_widget, QApplication::translate("Command", "Subwindow"));
break;
case WizardContainer: // Apply style, don't manage
- m_widget = core->widgetFactory()->createWidget(QStringLiteral("QWizardPage"), nullptr);
+ m_widget = core->widgetFactory()->createWidget(u"QWizardPage"_s, nullptr);
break;
}
formWindow()->ensureUniqueObjectName(m_widget);
View Lorry Controller Status