diff options
56 files changed, 810 insertions, 723 deletions
diff --git a/src/widgets/accessible/complexwidgets.cpp b/src/widgets/accessible/complexwidgets.cpp index ab543a79df..3030208c89 100644 --- a/src/widgets/accessible/complexwidgets.cpp +++ b/src/widgets/accessible/complexwidgets.cpp @@ -76,6 +76,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + QString qt_accStripAmp(const QString &text); QString qt_accHotKey(const QString &text); @@ -517,9 +519,9 @@ QAccessibleAbstractScrollArea::elementType(QWidget *widget) const return Self; if (widget == abstractScrollArea()->viewport()) return Viewport; - if (widget->objectName() == QLatin1String("qt_scrollarea_hcontainer")) + if (widget->objectName() == "qt_scrollarea_hcontainer"_L1) return HorizontalContainer; - if (widget->objectName() == QLatin1String("qt_scrollarea_vcontainer")) + if (widget->objectName() == "qt_scrollarea_vcontainer"_L1) return VerticalContainer; if (widget == abstractScrollArea()->cornerWidget()) return CornerWidget; diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp index 1a8d2febec..28583f9872 100644 --- a/src/widgets/accessible/qaccessiblewidget.cpp +++ b/src/widgets/accessible/qaccessiblewidget.cpp @@ -68,6 +68,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + static QList<QWidget*> childWidgets(const QWidget *widget) { QList<QWidget*> widgets; @@ -78,8 +80,8 @@ static QList<QWidget*> childWidgets(const QWidget *widget) #if QT_CONFIG(menu) && !qobject_cast<QMenu*>(w) #endif - && w->objectName() != QLatin1String("qt_rubberband") - && w->objectName() != QLatin1String("qt_spinbox_lineedit")) + && w->objectName() != "qt_rubberband"_L1 + && w->objectName() != "qt_spinbox_lineedit"_L1) widgets.append(w); } return widgets; @@ -148,7 +150,7 @@ QString qt_accStripAmp(const QString &text) if (ampIndex != -1) newText.remove(ampIndex, 1); - return newText.replace(QLatin1String("&&"), QLatin1String("&")); + return newText.replace("&&"_L1, "&"_L1); } QString qt_accHotKey(const QString &text) diff --git a/src/widgets/accessible/qaccessiblewidgetfactory.cpp b/src/widgets/accessible/qaccessiblewidgetfactory.cpp index 4c6a6fdecb..dc1569cd95 100644 --- a/src/widgets/accessible/qaccessiblewidgetfactory.cpp +++ b/src/widgets/accessible/qaccessiblewidgetfactory.cpp @@ -60,6 +60,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *object) { QAccessibleInterface *iface = nullptr; @@ -77,154 +79,154 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje if (false) { #if QT_CONFIG(lineedit) - } else if (classname == QLatin1String("QLineEdit")) { - if (widget->objectName() == QLatin1String("qt_spinbox_lineedit")) + } else if (classname == "QLineEdit"_L1) { + if (widget->objectName() == "qt_spinbox_lineedit"_L1) iface = nullptr; else iface = new QAccessibleLineEdit(widget); #endif #if QT_CONFIG(combobox) - } else if (classname == QLatin1String("QComboBox")) { + } else if (classname == "QComboBox"_L1) { iface = new QAccessibleComboBox(widget); #endif #if QT_CONFIG(spinbox) - } else if (classname == QLatin1String("QAbstractSpinBox")) { + } else if (classname == "QAbstractSpinBox"_L1) { iface = new QAccessibleAbstractSpinBox(widget); - } else if (classname == QLatin1String("QSpinBox")) { + } else if (classname == "QSpinBox"_L1) { iface = new QAccessibleSpinBox(widget); - } else if (classname == QLatin1String("QDoubleSpinBox")) { + } else if (classname == "QDoubleSpinBox"_L1) { iface = new QAccessibleDoubleSpinBox(widget); #endif #if QT_CONFIG(scrollbar) - } else if (classname == QLatin1String("QScrollBar")) { + } else if (classname == "QScrollBar"_L1) { iface = new QAccessibleScrollBar(widget); #endif #if QT_CONFIG(slider) - } else if (classname == QLatin1String("QAbstractSlider")) { + } else if (classname == "QAbstractSlider"_L1) { iface = new QAccessibleAbstractSlider(widget); - } else if (classname == QLatin1String("QSlider")) { + } else if (classname == "QSlider"_L1) { iface = new QAccessibleSlider(widget); #endif #if QT_CONFIG(toolbutton) - } else if (classname == QLatin1String("QToolButton")) { + } else if (classname == "QToolButton"_L1) { iface = new QAccessibleToolButton(widget); #endif // QT_CONFIG(toolbutton) #if QT_CONFIG(abstractbutton) - } else if (classname == QLatin1String("QCheckBox") - || classname == QLatin1String("QRadioButton") - || classname == QLatin1String("QPushButton") - || classname == QLatin1String("QAbstractButton")) { + } else if (classname == "QCheckBox"_L1 + || classname == "QRadioButton"_L1 + || classname == "QPushButton"_L1 + || classname == "QAbstractButton"_L1) { iface = new QAccessibleButton(widget); #endif - } else if (classname == QLatin1String("QDialog")) { + } else if (classname == "QDialog"_L1) { iface = new QAccessibleWidget(widget, QAccessible::Dialog); - } else if (classname == QLatin1String("QMessageBox")) { + } else if (classname == "QMessageBox"_L1) { iface = new QAccessibleWidget(widget, QAccessible::AlertMessage); #if QT_CONFIG(mainwindow) - } else if (classname == QLatin1String("QMainWindow")) { + } else if (classname == "QMainWindow"_L1) { iface = new QAccessibleMainWindow(widget); #endif - } else if (classname == QLatin1String("QLabel") || classname == QLatin1String("QLCDNumber")) { + } else if (classname == "QLabel"_L1 || classname == "QLCDNumber"_L1) { iface = new QAccessibleDisplay(widget); #if QT_CONFIG(groupbox) - } else if (classname == QLatin1String("QGroupBox")) { + } else if (classname == "QGroupBox"_L1) { iface = new QAccessibleGroupBox(widget); #endif - } else if (classname == QLatin1String("QStatusBar")) { + } else if (classname == "QStatusBar"_L1) { iface = new QAccessibleDisplay(widget); #if QT_CONFIG(progressbar) - } else if (classname == QLatin1String("QProgressBar")) { + } else if (classname == "QProgressBar"_L1) { iface = new QAccessibleProgressBar(widget); #endif - } else if (classname == QLatin1String("QToolBar")) { + } else if (classname == "QToolBar"_L1) { iface = new QAccessibleWidget(widget, QAccessible::ToolBar, widget->windowTitle()); #if QT_CONFIG(menubar) - } else if (classname == QLatin1String("QMenuBar")) { + } else if (classname == "QMenuBar"_L1) { iface = new QAccessibleMenuBar(widget); #endif #if QT_CONFIG(menu) - } else if (classname == QLatin1String("QMenu")) { + } else if (classname == "QMenu"_L1) { iface = new QAccessibleMenu(widget); #endif #if QT_CONFIG(treeview) - } else if (classname == QLatin1String("QTreeView")) { + } else if (classname == "QTreeView"_L1) { iface = new QAccessibleTree(widget); #endif // QT_CONFIG(treeview) #if QT_CONFIG(itemviews) - } else if (classname == QLatin1String("QTableView") || classname == QLatin1String("QListView")) { + } else if (classname == "QTableView"_L1 || classname == "QListView"_L1) { iface = new QAccessibleTable(widget); // ### This should be cleaned up. We return the parent for the scrollarea to hide it. #endif // QT_CONFIG(itemviews) #if QT_CONFIG(tabbar) - } else if (classname == QLatin1String("QTabBar")) { + } else if (classname == "QTabBar"_L1) { iface = new QAccessibleTabBar(widget); #endif - } else if (classname == QLatin1String("QSizeGrip")) { + } else if (classname == "QSizeGrip"_L1) { iface = new QAccessibleWidget(widget, QAccessible::Grip); #if QT_CONFIG(splitter) - } else if (classname == QLatin1String("QSplitter")) { + } else if (classname == "QSplitter"_L1) { iface = new QAccessibleWidget(widget, QAccessible::Splitter); - } else if (classname == QLatin1String("QSplitterHandle")) { + } else if (classname == "QSplitterHandle"_L1) { iface = new QAccessibleWidget(widget, QAccessible::Grip); #endif #if QT_CONFIG(textedit) && !defined(QT_NO_CURSOR) - } else if (classname == QLatin1String("QTextEdit")) { + } else if (classname == "QTextEdit"_L1) { iface = new QAccessibleTextEdit(widget); - } else if (classname == QLatin1String("QPlainTextEdit")) { + } else if (classname == "QPlainTextEdit"_L1) { iface = new QAccessiblePlainTextEdit(widget); #endif - } else if (classname == QLatin1String("QTipLabel")) { + } else if (classname == "QTipLabel"_L1) { iface = new QAccessibleDisplay(widget, QAccessible::ToolTip); - } else if (classname == QLatin1String("QFrame")) { + } else if (classname == "QFrame"_L1) { iface = new QAccessibleWidget(widget, QAccessible::Border); #if QT_CONFIG(stackedwidget) - } else if (classname == QLatin1String("QStackedWidget")) { + } else if (classname == "QStackedWidget"_L1) { iface = new QAccessibleStackedWidget(widget); #endif #if QT_CONFIG(toolbox) - } else if (classname == QLatin1String("QToolBox")) { + } else if (classname == "QToolBox"_L1) { iface = new QAccessibleToolBox(widget); #endif #if QT_CONFIG(mdiarea) - } else if (classname == QLatin1String("QMdiArea")) { + } else if (classname == "QMdiArea"_L1) { iface = new QAccessibleMdiArea(widget); - } else if (classname == QLatin1String("QMdiSubWindow")) { + } else if (classname == "QMdiSubWindow"_L1) { iface = new QAccessibleMdiSubWindow(widget); #endif #if QT_CONFIG(dialogbuttonbox) - } else if (classname == QLatin1String("QDialogButtonBox")) { + } else if (classname == "QDialogButtonBox"_L1) { iface = new QAccessibleDialogButtonBox(widget); #endif #if QT_CONFIG(dial) - } else if (classname == QLatin1String("QDial")) { + } else if (classname == "QDial"_L1) { iface = new QAccessibleDial(widget); #endif #if QT_CONFIG(rubberband) - } else if (classname == QLatin1String("QRubberBand")) { + } else if (classname == "QRubberBand"_L1) { iface = new QAccessibleWidget(widget, QAccessible::Border); #endif #if QT_CONFIG(textbrowser) && !defined(QT_NO_CURSOR) - } else if (classname == QLatin1String("QTextBrowser")) { + } else if (classname == "QTextBrowser"_L1) { iface = new QAccessibleTextBrowser(widget); #endif #if QT_CONFIG(scrollarea) - } else if (classname == QLatin1String("QAbstractScrollArea")) { + } else if (classname == "QAbstractScrollArea"_L1) { iface = new QAccessibleAbstractScrollArea(widget); - } else if (classname == QLatin1String("QScrollArea")) { + } else if (classname == "QScrollArea"_L1) { iface = new QAccessibleScrollArea(widget); #endif #if QT_CONFIG(calendarwidget) - } else if (classname == QLatin1String("QCalendarWidget")) { + } else if (classname == "QCalendarWidget"_L1) { iface = new QAccessibleCalendarWidget(widget); #endif #if QT_CONFIG(dockwidget) - } else if (classname == QLatin1String("QDockWidget")) { + } else if (classname == "QDockWidget"_L1) { iface = new QAccessibleDockWidget(widget); #endif - } else if (classname == QLatin1String("QWidget")) { + } else if (classname == "QWidget"_L1) { iface = new QAccessibleWidget(widget); - } else if (classname == QLatin1String("QWindowContainer")) { + } else if (classname == "QWindowContainer"_L1) { iface = new QAccessibleWindowContainer(widget); } diff --git a/src/widgets/accessible/qaccessiblewidgets.cpp b/src/widgets/accessible/qaccessiblewidgets.cpp index fdabc051c8..7a3a387a87 100644 --- a/src/widgets/accessible/qaccessiblewidgets.cpp +++ b/src/widgets/accessible/qaccessiblewidgets.cpp @@ -96,6 +96,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + QString qt_accStripAmp(const QString &text); QString qt_accHotKey(const QString &text); @@ -114,8 +116,8 @@ QList<QWidget*> childWidgets(const QWidget *widget) #if QT_CONFIG(menu) && !qobject_cast<QMenu*>(w) #endif - && objectName != QLatin1String("qt_rubberband") - && objectName != QLatin1String("qt_qmainwindow_extended_splitter")) { + && objectName != "qt_rubberband"_L1 + && objectName != "qt_qmainwindow_extended_splitter"_L1) { widgets.append(w); } } @@ -432,7 +434,7 @@ QString QAccessibleMdiSubWindow::text(QAccessible::Text textType) const { if (textType == QAccessible::Name) { QString title = mdiSubWindow()->windowTitle(); - title.replace(QLatin1String("[*]"), QLatin1String("")); + title.replace("[*]"_L1, ""_L1); return title; } return QAccessibleWidget::text(textType); @@ -570,7 +572,7 @@ QCalendarWidget *QAccessibleCalendarWidget::calendarWidget() const QAbstractItemView *QAccessibleCalendarWidget::calendarView() const { for (QObject *child : calendarWidget()->children()) { - if (child->objectName() == QLatin1String("qt_calendar_calendarview")) + if (child->objectName() == "qt_calendar_calendarview"_L1) return static_cast<QAbstractItemView *>(child); } return nullptr; @@ -579,7 +581,7 @@ QAbstractItemView *QAccessibleCalendarWidget::calendarView() const QWidget *QAccessibleCalendarWidget::navigationBar() const { for (QObject *child : calendarWidget()->children()) { - if (child->objectName() == QLatin1String("qt_calendar_navigationbar")) + if (child->objectName() == "qt_calendar_navigationbar"_L1) return static_cast<QWidget *>(child); } return nullptr; @@ -852,12 +854,12 @@ QString QAccessibleTextWidget::attributes(int offset, int *startOffset, int *end AttributeFormatter attrs; QString family = charFormatFont.families().value(0, QString()); if (!family.isEmpty()) { - family = family.replace(u'\\', QLatin1String("\\\\")); - family = family.replace(u':', QLatin1String("\\:")); - family = family.replace(u',', QLatin1String("\\,")); - family = family.replace(u'=', QLatin1String("\\=")); - family = family.replace(u';', QLatin1String("\\;")); - family = family.replace(u'\"', QLatin1String("\\\"")); + family = family.replace(u'\\', "\\\\"_L1); + family = family.replace(u':', "\\:"_L1); + family = family.replace(u',', "\\,"_L1); + family = family.replace(u'=', "\\="_L1); + family = family.replace(u';', "\\;"_L1); + family = family.replace(u'\"', "\\\""_L1); attrs["font-family"] = u'"' + family + u'"'; } diff --git a/src/widgets/accessible/rangecontrols.cpp b/src/widgets/accessible/rangecontrols.cpp index 6c12b553b4..a6a91aa245 100644 --- a/src/widgets/accessible/rangecontrols.cpp +++ b/src/widgets/accessible/rangecontrols.cpp @@ -65,6 +65,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + #ifndef QT_NO_ACCESSIBILITY #if QT_CONFIG(spinbox) @@ -253,7 +255,7 @@ QAccessibleSpinBox::QAccessibleSpinBox(QWidget *w) : QAccessibleAbstractSpinBox(w) { Q_ASSERT(spinBox()); - addControllingSignal(QLatin1String("valueChanged(int)")); + addControllingSignal("valueChanged(int)"_L1); } /*! @@ -270,7 +272,7 @@ QAccessibleDoubleSpinBox::QAccessibleDoubleSpinBox(QWidget *widget) : QAccessibleAbstractSpinBox(widget) { Q_ASSERT(qobject_cast<QDoubleSpinBox *>(widget)); - addControllingSignal(QLatin1String("valueChanged(double)")); + addControllingSignal("valueChanged(double)"_L1); } /*! @@ -307,7 +309,7 @@ QAccessibleScrollBar::QAccessibleScrollBar(QWidget *w) : QAccessibleAbstractSlider(w, QAccessible::ScrollBar) { Q_ASSERT(scrollBar()); - addControllingSignal(QLatin1String("valueChanged(int)")); + addControllingSignal("valueChanged(int)"_L1); } /*! Returns the scroll bar. */ @@ -342,7 +344,7 @@ QAccessibleSlider::QAccessibleSlider(QWidget *w) : QAccessibleAbstractSlider(w) { Q_ASSERT(slider()); - addControllingSignal(QLatin1String("valueChanged(int)")); + addControllingSignal("valueChanged(int)"_L1); } /*! Returns the slider. */ @@ -410,7 +412,7 @@ QAccessibleDial::QAccessibleDial(QWidget *widget) : QAccessibleAbstractSlider(widget, QAccessible::Dial) { Q_ASSERT(qobject_cast<QDial *>(widget)); - addControllingSignal(QLatin1String("valueChanged(int)")); + addControllingSignal("valueChanged(int)"_L1); } QString QAccessibleDial::text(QAccessible::Text textType) const diff --git a/src/widgets/accessible/simplewidgets.cpp b/src/widgets/accessible/simplewidgets.cpp index 0d4556adc5..3aab843f64 100644 --- a/src/widgets/accessible/simplewidgets.cpp +++ b/src/widgets/accessible/simplewidgets.cpp @@ -93,6 +93,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + #ifndef QT_NO_ACCESSIBILITY extern QList<QWidget*> childWidgets(const QWidget *widget); @@ -120,9 +122,9 @@ QAccessibleButton::QAccessibleButton(QWidget *w) // FIXME: The checkable state of the button is dynamic, // while we only update the controlling signal once :( if (button()->isCheckable()) - addControllingSignal(QLatin1String("toggled(bool)")); + addControllingSignal("toggled(bool)"_L1); else - addControllingSignal(QLatin1String("clicked()")); + addControllingSignal("clicked()"_L1); } /*! Returns the button. */ @@ -687,8 +689,8 @@ QStringList QAccessibleGroupBox::keyBindingsForAction(const QString &) const QAccessibleLineEdit::QAccessibleLineEdit(QWidget *w, const QString &name) : QAccessibleWidget(w, QAccessible::EditableText, name) { - addControllingSignal(QLatin1String("textChanged(const QString&)")); - addControllingSignal(QLatin1String("returnPressed()")); + addControllingSignal("textChanged(const QString&)"_L1); + addControllingSignal("returnPressed()"_L1); } /*! Returns the line edit. */ diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp index 6e39f76215..1e9147574f 100644 --- a/src/widgets/dialogs/qcolordialog.cpp +++ b/src/widgets/dialogs/qcolordialog.cpp @@ -82,6 +82,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + namespace { class QColorLuminancePicker; class QColorPicker; @@ -1666,7 +1668,7 @@ void QColorDialogPrivate::releaseColorPicking() #endif q->releaseKeyboard(); q->setMouseTracking(false); - lblScreenColorInfo->setText(QLatin1String("\n")); + lblScreenColorInfo->setText("\n"_L1); addCusBt->setDisabled(false); buttons->setDisabled(false); screenColorPickerButton->setDisabled(false); @@ -1734,7 +1736,7 @@ void QColorDialogPrivate::initWidgets() if (supportsColorPicking()) { screenColorPickerButton = new QPushButton(); leftLay->addWidget(screenColorPickerButton); - lblScreenColorInfo = new QLabel(QLatin1String("\n")); + lblScreenColorInfo = new QLabel("\n"_L1); leftLay->addWidget(lblScreenColorInfo); q->connect(screenColorPickerButton, SIGNAL(clicked()), SLOT(_q_pickScreenColor())); } else { diff --git a/src/widgets/dialogs/qerrormessage.cpp b/src/widgets/dialogs/qerrormessage.cpp index e95c92e0aa..8178b873b1 100644 --- a/src/widgets/dialogs/qerrormessage.cpp +++ b/src/widgets/dialogs/qerrormessage.cpp @@ -62,6 +62,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + namespace { struct Message { QString content; @@ -188,11 +190,11 @@ static void jump(QtMsgType t, const QMessageLogContext & /*context*/, const QStr if (!qtMessageHandler) return; - QString rich = QLatin1String("<p><b>") + msgType2i18nString(t) + QLatin1String("</b></p>") + QString rich = "<p><b>"_L1 + msgType2i18nString(t) + "</b></p>"_L1 + Qt::convertFromPlainText(m, Qt::WhiteSpaceNormal); // ### work around text engine quirk - if (rich.endsWith(QLatin1String("</p>"))) + if (rich.endsWith("</p>"_L1)) rich.chop(4); if (!metFatal) { diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index c045513341..fde7104740 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -88,6 +88,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + Q_GLOBAL_STATIC(QUrl, lastVisitedDir) /*! @@ -1351,7 +1353,7 @@ QStringList qt_make_filter_list(const QString &filter) if (filter.isEmpty()) return QStringList(); - QString sep(QLatin1String(";;")); + QString sep(";;"_L1); if (!filter.contains(sep) && filter.contains(u'\n')) sep = u'\n'; @@ -1555,7 +1557,7 @@ static QString nameFilterForMime(const QString &mimeType) return QFileDialog::tr("All files (*)"); } else { const QString patterns = mime.globPatterns().join(u' '); - return mime.comment() + QLatin1String(" (") + patterns + u')'; + return mime.comment() + " ("_L1 + patterns + u')'; } } return QString(); @@ -1898,7 +1900,7 @@ void QFileDialogComboBox::setHistory(const QStringList &paths) //On windows the popup display the "C:\", convert to nativeSeparators const QUrl url = idx.isValid() ? QUrl::fromLocalFile(QDir::toNativeSeparators(idx.data(QFileSystemModel::FilePathRole).toString())) - : QUrl(QLatin1String("file:")); + : QUrl("file:"_L1); if (url.isValid()) list.append(url); urlModel->setUrls(list); @@ -2730,7 +2732,7 @@ void QFileDialog::accept() QString lineEditText = d->lineEdit()->text(); // "hidden feature" type .. and then enter, and it will move up a dir // special case for ".." - if (lineEditText == QLatin1String("..")) { + if (lineEditText == ".."_L1) { d->_q_navigateToParent(); const QSignalBlocker blocker(d->qFileDialogUi->fileNameEdit); d->lineEdit()->selectAll(); @@ -2821,37 +2823,37 @@ void QFileDialog::accept() void QFileDialogPrivate::saveSettings() { Q_Q(QFileDialog); - QSettings settings(QSettings::UserScope, QLatin1String("QtProject")); - settings.beginGroup(QLatin1String("FileDialog")); + QSettings settings(QSettings::UserScope, "QtProject"_L1); + settings.beginGroup("FileDialog"_L1); if (usingWidgets()) { - settings.setValue(QLatin1String("sidebarWidth"), qFileDialogUi->splitter->sizes().constFirst()); - settings.setValue(QLatin1String("shortcuts"), QUrl::toStringList(qFileDialogUi->sidebar->urls())); - settings.setValue(QLatin1String("treeViewHeader"), qFileDialogUi->treeView->header()->saveState()); + settings.setValue("sidebarWidth"_L1, qFileDialogUi->splitter->sizes().constFirst()); + settings.setValue("shortcuts"_L1, QUrl::toStringList(qFileDialogUi->sidebar->urls())); + settings.setValue("treeViewHeader"_L1, qFileDialogUi->treeView->header()->saveState()); } QStringList historyUrls; const QStringList history = q->history(); historyUrls.reserve(history.size()); for (const QString &path : history) historyUrls << QUrl::fromLocalFile(path).toString(); - settings.setValue(QLatin1String("history"), historyUrls); - settings.setValue(QLatin1String("lastVisited"), lastVisitedDir()->toString()); + settings.setValue("history"_L1, historyUrls); + settings.setValue("lastVisited"_L1, lastVisitedDir()->toString()); const QMetaEnum &viewModeMeta = q->metaObject()->enumerator(q->metaObject()->indexOfEnumerator("ViewMode")); - settings.setValue(QLatin1String("viewMode"), QLatin1String(viewModeMeta.key(q->viewMode()))); - settings.setValue(QLatin1String("qtVersion"), QLatin1String(QT_VERSION_STR)); + settings.setValue("viewMode"_L1, QLatin1String(viewModeMeta.key(q->viewMode()))); + settings.setValue("qtVersion"_L1, QT_VERSION_STR ""_L1); } bool QFileDialogPrivate::restoreFromSettings() { Q_Q(QFileDialog); - QSettings settings(QSettings::UserScope, QLatin1String("QtProject")); - if (!settings.childGroups().contains(QLatin1String("FileDialog"))) + QSettings settings(QSettings::UserScope, "QtProject"_L1); + if (!settings.childGroups().contains("FileDialog"_L1)) return false; - settings.beginGroup(QLatin1String("FileDialog")); + settings.beginGroup("FileDialog"_L1); - q->setDirectoryUrl(lastVisitedDir()->isEmpty() ? settings.value(QLatin1String("lastVisited")).toUrl() : *lastVisitedDir()); + q->setDirectoryUrl(lastVisitedDir()->isEmpty() ? settings.value("lastVisited"_L1).toUrl() : *lastVisitedDir()); - QByteArray viewModeStr = settings.value(QLatin1String("viewMode")).toString().toLatin1(); + QByteArray viewModeStr = settings.value("viewMode"_L1).toString().toLatin1(); const QMetaEnum &viewModeMeta = q->metaObject()->enumerator(q->metaObject()->indexOfEnumerator("ViewMode")); bool ok = false; int viewMode = viewModeMeta.keyToValue(viewModeStr.constData(), &ok); @@ -2859,21 +2861,21 @@ bool QFileDialogPrivate::restoreFromSettings() viewMode = QFileDialog::List; q->setViewMode(static_cast<QFileDialog::ViewMode>(viewMode)); - sidebarUrls = QUrl::fromStringList(settings.value(QLatin1String("shortcuts")).toStringList()); - headerData = settings.value(QLatin1String("treeViewHeader")).toByteArray(); + sidebarUrls = QUrl::fromStringList(settings.value("shortcuts"_L1).toStringList()); + headerData = settings.value("treeViewHeader"_L1).toByteArray(); if (!usingWidgets()) return true; QStringList history; - const auto urlStrings = settings.value(QLatin1String("history")).toStringList(); + const auto urlStrings = settings.value("history"_L1).toStringList(); for (const QString &urlStr : urlStrings) { QUrl url(urlStr); if (url.isLocalFile()) history << url.toLocalFile(); } - return restoreWidgetState(history, settings.value(QLatin1String("sidebarWidth"), -1).toInt()); + return restoreWidgetState(history, settings.value("sidebarWidth"_L1, -1).toInt()); } #endif // settings @@ -2955,8 +2957,8 @@ void QFileDialogPrivate::init(const QFileDialogArgs &args) // Try to restore from the FileDialog settings group; if it fails, fall back // to the pre-5.5 QByteArray serialized settings. if (!restoreFromSettings()) { - const QSettings settings(QSettings::UserScope, QLatin1String("QtProject")); - q->restoreState(settings.value(QLatin1String("Qt/filedialog")).toByteArray()); + const QSettings settings(QSettings::UserScope, "QtProject"_L1); + q->restoreState(settings.value("Qt/filedialog"_L1).toByteArray()); } #endif @@ -2992,7 +2994,7 @@ void QFileDialogPrivate::createWidgets() model = new QFileSystemModel(q); model->setIconProvider(&defaultIconProvider); model->setFilter(options->filter()); - model->setObjectName(QLatin1String("qt_filesystem_model")); + model->setObjectName("qt_filesystem_model"_L1); if (QPlatformFileDialogHelper *helper = platformFileDialogHelper()) model->setNameFilterDisables(helper->defaultNameFilterDisables()); else @@ -3011,7 +3013,7 @@ void QFileDialogPrivate::createWidgets() qFileDialogUi->setupUi(q); QList<QUrl> initialBookmarks; - initialBookmarks << QUrl(QLatin1String("file:")) + initialBookmarks << QUrl("file:"_L1) << QUrl::fromLocalFile(QDir::homePath()); qFileDialogUi->sidebar->setModelAndUrls(model, initialBookmarks); QFileDialog::connect(qFileDialogUi->sidebar, SIGNAL(goToUrl(QUrl)), @@ -3069,10 +3071,10 @@ void QFileDialogPrivate::createWidgets() qFileDialogUi->treeView->setModel(model); QHeaderView *treeHeader = qFileDialogUi->treeView->header(); QFontMetrics fm(q->font()); - treeHeader->resizeSection(0, fm.horizontalAdvance(QLatin1String("wwwwwwwwwwwwwwwwwwwwwwwwww"))); - treeHeader->resizeSection(1, fm.horizontalAdvance(QLatin1String("128.88 GB"))); - treeHeader->resizeSection(2, fm.horizontalAdvance(QLatin1String("mp3Folder"))); - treeHeader->resizeSection(3, fm.horizontalAdvance(QLatin1String("10/29/81 02:02PM"))); + treeHeader->resizeSection(0, fm.horizontalAdvance("wwwwwwwwwwwwwwwwwwwwwwwwww"_L1)); + treeHeader->resizeSection(1, fm.horizontalAdvance("128.88 GB"_L1)); + treeHeader->resizeSection(2, fm.horizontalAdvance("mp3Folder"_L1)); + treeHeader->resizeSection(3, fm.horizontalAdvance("10/29/81 02:02PM"_L1)); treeHeader->setContextMenuPolicy(Qt::ActionsContextMenu); QActionGroup *showActionGroup = new QActionGroup(q); @@ -3119,8 +3121,8 @@ void QFileDialogPrivate::createWidgets() // Try to restore from the FileDialog settings group; if it fails, fall back // to the pre-5.5 QByteArray serialized settings. if (!restoreFromSettings()) { - const QSettings settings(QSettings::UserScope, QLatin1String("QtProject")); - q->restoreState(settings.value(QLatin1String("Qt/filedialog")).toByteArray()); + const QSettings settings(QSettings::UserScope, "QtProject"_L1); + q->restoreState(settings.value("Qt/filedialog"_L1).toByteArray()); } #endif @@ -3306,7 +3308,7 @@ void QFileDialogPrivate::createMenuActions() // ### TODO add Desktop & Computer actions QAction *goToParent = new QAction(q); - goToParent->setObjectName(QLatin1String("qt_goto_parent_action")); + goToParent->setObjectName("qt_goto_parent_action"_L1); #ifndef QT_NO_SHORTCUT goToParent->setShortcut(Qt::CTRL | Qt::Key_Up); #endif @@ -3315,21 +3317,21 @@ void QFileDialogPrivate::createMenuActions() renameAction = new QAction(q); renameAction->setEnabled(false); - renameAction->setObjectName(QLatin1String("qt_rename_action")); + renameAction->setObjectName("qt_rename_action"_L1); QObject::connect(renameAction, SIGNAL(triggered()), q, SLOT(_q_renameCurrent())); deleteAction = new QAction(q); deleteAction->setEnabled(false); - deleteAction->setObjectName(QLatin1String("qt_delete_action")); + deleteAction->setObjectName("qt_delete_action"_L1); QObject::connect(deleteAction, SIGNAL(triggered()), q, SLOT(_q_deleteCurrent())); showHiddenAction = new QAction(q); - showHiddenAction->setObjectName(QLatin1String("qt_show_hidden_action")); + showHiddenAction->setObjectName("qt_show_hidden_action"_L1); showHiddenAction->setCheckable(true); QObject::connect(showHiddenAction, SIGNAL(triggered()), q, SLOT(_q_showHidden())); newFolderAction = new QAction(q); - newFolderAction->setObjectName(QLatin1String("qt_new_folder_action")); + newFolderAction->setObjectName("qt_new_folder_action"_L1); QObject::connect(newFolderAction, SIGNAL(triggered()), q, SLOT(_q_createDirectory())); } @@ -3625,7 +3627,7 @@ void QFileDialogPrivate::_q_deleteCurrent() void QFileDialogPrivate::_q_autoCompleteFileName(const QString &text) { - if (text.startsWith(QLatin1String("//")) || text.startsWith(u'\\')) { + if (text.startsWith("//"_L1) || text.startsWith(u'\\')) { qFileDialogUi->listView->selectionModel()->clearSelection(); return; } @@ -3667,7 +3669,7 @@ void QFileDialogPrivate::_q_updateOkButton() const QStringList files = q->selectedFiles(); QString lineEditText = lineEdit()->text(); - if (lineEditText.startsWith(QLatin1String("//")) || lineEditText.startsWith(u'\\')) { + if (lineEditText.startsWith("//"_L1) || lineEditText.startsWith(u'\\')) { button->setEnabled(true); updateOkButtonText(); return; @@ -3675,7 +3677,7 @@ void QFileDialogPrivate::_q_updateOkButton() if (files.isEmpty()) { enableButton = false; - } else if (lineEditText == QLatin1String("..")) { + } else if (lineEditText == ".."_L1) { isOpenDirectory = true; } else { switch (fileMode) { @@ -3700,7 +3702,7 @@ void QFileDialogPrivate::_q_updateOkButton() fileDir = fn.mid(0, fn.lastIndexOf(u'/')); fileName = fn.mid(fileDir.length() + 1); } - if (lineEditText.contains(QLatin1String(".."))) { + if (lineEditText.contains(".."_L1)) { fileDir = info.canonicalFilePath(); fileName = info.fileName(); } @@ -4037,7 +4039,7 @@ void QFileDialogComboBox::showPopup() idx = idx.parent(); } // add "my computer" - list.append(QUrl(QLatin1String("file:"))); + list.append(QUrl("file:"_L1)); urlModel->addUrls(list, 0); idx = model()->index(model()->rowCount() - 1, 0); @@ -4212,9 +4214,9 @@ QStringList QFSCompleter::splitPath(const QString &path) const QString pathCopy = QDir::toNativeSeparators(path); QChar sep = QDir::separator(); #if defined(Q_OS_WIN) - if (pathCopy == QLatin1String("\\") || pathCopy == QLatin1String("\\\\")) + if (pathCopy == "\\"_L1 || pathCopy == "\\\\"_L1) return QStringList(pathCopy); - QString doubleSlash(QLatin1String("\\\\")); + QString doubleSlash("\\\\"_L1); if (pathCopy.startsWith(doubleSlash)) pathCopy = pathCopy.mid(2); else @@ -4264,9 +4266,7 @@ QStringList QFSCompleter::splitPath(const QString &path) const #endif if (currentLocation.contains(sep) && path != currentLocation) { QStringList currentLocationList = splitPath(currentLocation); - while (!currentLocationList.isEmpty() - && parts.count() > 0 - && parts.at(0) == QLatin1String("..")) { + while (!currentLocationList.isEmpty() && parts.count() > 0 && parts.at(0) == ".."_L1) { parts.removeFirst(); currentLocationList.removeLast(); } diff --git a/src/widgets/dialogs/qfontdialog.cpp b/src/widgets/dialogs/qfontdialog.cpp index f1c844df5e..21055cb886 100644 --- a/src/widgets/dialogs/qfontdialog.cpp +++ b/src/widgets/dialogs/qfontdialog.cpp @@ -63,6 +63,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + class QFontListView : public QListView { Q_OBJECT @@ -228,7 +230,7 @@ void QFontDialogPrivate::init() sampleEdit->setAlignment(Qt::AlignCenter); // Note that the sample text is *not* translated with tr(), as the // characters used depend on the charset encoding. - sampleEdit->setText(QLatin1String("AaBbYyZz")); + sampleEdit->setText("AaBbYyZz"_L1); hbox->addWidget(sampleEdit); writingSystemCombo = new QComboBox(q); @@ -326,7 +328,7 @@ void QFontDialogPrivate::init() familyList->setFocus(); retranslateStrings(); - sampleEdit->setObjectName(QLatin1String("qt_fontDialog_sampleEdit")); + sampleEdit->setObjectName("qt_fontDialog_sampleEdit"_L1); } /*! @@ -583,20 +585,20 @@ void QFontDialogPrivate::updateStyles() } } if (!found && first) { - if (cstyle.contains(QLatin1String("Italic"))) { - cstyle.replace(QLatin1String("Italic"), QLatin1String("Oblique")); + if (cstyle.contains("Italic"_L1)) { + cstyle.replace("Italic"_L1, "Oblique"_L1); first = false; goto redo; - } else if (cstyle.contains(QLatin1String("Oblique"))) { - cstyle.replace(QLatin1String("Oblique"), QLatin1String("Italic")); + } else if (cstyle.contains("Oblique"_L1)) { + cstyle.replace("Oblique"_L1, "Italic"_L1); first = false; goto redo; - } else if (cstyle.contains(QLatin1String("Regular"))) { - cstyle.replace(QLatin1String("Regular"), QLatin1String("Normal")); + } else if (cstyle.contains("Regular"_L1)) { + cstyle.replace("Regular"_L1, "Normal"_L1); first = false; goto redo; - } else if (cstyle.contains(QLatin1String("Normal"))) { - cstyle.replace(QLatin1String("Normal"), QLatin1String("Regular")); + } else if (cstyle.contains("Normal"_L1)) { + cstyle.replace("Normal"_L1, "Regular"_L1); first = false; goto redo; } diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index ab12a9b2ee..a6707fa0d5 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -72,6 +72,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + #if defined(Q_OS_WIN) HMENU qt_getWindowsSystemMenu(const QWidget *w) { @@ -270,16 +272,16 @@ void QMessageBoxPrivate::init(const QString &title, const QString &text) Q_Q(QMessageBox); label = new QLabel; - label->setObjectName(QLatin1String("qt_msgbox_label")); + label->setObjectName("qt_msgbox_label"_L1); label->setTextInteractionFlags(Qt::TextInteractionFlags(q->style()->styleHint(QStyle::SH_MessageBox_TextInteractionFlags, nullptr, q))); label->setAlignment(Qt::AlignVCenter | Qt::AlignLeft); label->setOpenExternalLinks(true); iconLabel = new QLabel(q); - iconLabel->setObjectName(QLatin1String("qt_msgboxex_icon_label")); + iconLabel->setObjectName("qt_msgboxex_icon_label"_L1); iconLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); buttonBox = new QDialogButtonBox; - buttonBox->setObjectName(QLatin1String("qt_msgbox_buttonbox")); + buttonBox->setObjectName("qt_msgbox_buttonbox"_L1); buttonBox->setCenterButtons(q->style()->styleHint(QStyle::SH_MessageBox_CenterButtons, nullptr, q)); QObject::connect(buttonBox, SIGNAL(clicked(QAbstractButton*)), q, SLOT(_q_buttonClicked(QAbstractButton*))); @@ -1495,7 +1497,7 @@ void QMessageBox::keyPressEvent(QKeyEvent *e) #if defined(Q_OS_WIN) if (e == QKeySequence::Copy) { - const QLatin1String separator("---------------------------\n"); + const auto separator = "---------------------------\n"_L1; QString textToCopy; textToCopy += separator + windowTitle() + u'\n' + separator // title + d->label->text() + u'\n' + separator; // text @@ -1505,7 +1507,7 @@ void QMessageBox::keyPressEvent(QKeyEvent *e) const QList<QAbstractButton *> buttons = d->buttonBox->buttons(); for (const auto *button : buttons) - textToCopy += button->text() + QLatin1String(" "); + textToCopy += button->text() + " "_L1; textToCopy += u'\n' + separator; #if QT_CONFIG(textedit) if (d->detailsText) @@ -1870,7 +1872,7 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title) translatedTextAboutQtCaption = QMessageBox::tr( "<h3>About Qt</h3>" "<p>This program uses Qt version %1.</p>" - ).arg(QLatin1String(QT_VERSION_STR)); + ).arg(QT_VERSION_STR ""_L1); //: Leave this text untranslated or include a verbatim copy of it below //: and note that it is the authoritative version in case of doubt. const QString translatedTextAboutQtText = QMessageBox::tr( @@ -1904,7 +1906,7 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title) msgBox->setText(translatedTextAboutQtCaption); msgBox->setInformativeText(translatedTextAboutQtText); - QPixmap pm(QLatin1String(":/qt-project.org/qmessagebox/images/qtlogo-64.png")); + QPixmap pm(":/qt-project.org/qmessagebox/images/qtlogo-64.png"_L1); if (!pm.isNull()) msgBox->setIconPixmap(pm); @@ -2565,7 +2567,7 @@ void QMessageBox::setInformativeText(const QString &text) } else { if (!d->informativeLabel) { QLabel *label = new QLabel; - label->setObjectName(QLatin1String("qt_msgbox_informativelabel")); + label->setObjectName("qt_msgbox_informativelabel"_L1); label->setTextInteractionFlags(Qt::TextInteractionFlags(style()->styleHint(QStyle::SH_MessageBox_TextInteractionFlags, nullptr, this))); label->setAlignment(Qt::AlignTop | Qt::AlignLeft); label->setOpenExternalLinks(true); diff --git a/src/widgets/dialogs/qsidebar.cpp b/src/widgets/dialogs/qsidebar.cpp index 296542a187..788b1fb6cf 100644 --- a/src/widgets/dialogs/qsidebar.cpp +++ b/src/widgets/dialogs/qsidebar.cpp @@ -53,6 +53,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + void QSideBarDelegate::initStyleOption(QStyleOptionViewItem *option, const QModelIndex &index) const { @@ -82,7 +84,7 @@ QUrlModel::QUrlModel(QObject *parent) : QStandardItemModel(parent), showFullPath */ QStringList QUrlModel::mimeTypes() const { - return QStringList(QLatin1String("text/uri-list")); + return QStringList("text/uri-list"_L1); } /*! @@ -247,7 +249,7 @@ void QUrlModel::addUrls(const QList<QUrl> &list, int row, bool move) row = qMin(row, rowCount()); for (int i = list.count() - 1; i >= 0; --i) { QUrl url = list.at(i); - if (!url.isValid() || url.scheme() != QLatin1String("file")) + if (!url.isValid() || url.scheme() != "file"_L1) continue; //this makes sure the url is clean const QString cleanUrl = QDir::cleanPath(url.toLocalFile()); diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index 7e476eb4ec..2d5ae19742 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -81,6 +81,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + // These fudge terms were needed a few places to obtain pixel-perfect results const int GapBetweenLogoAndRightEdge = 5; const int ModernHeaderTopMargin = 2; @@ -383,7 +385,7 @@ void QWizardHeader::setup(const QWizardLayoutInfo &info, const QString &title, logoLabel->setPixmap(logo); subTitleLabel->setTextFormat(subTitleFormat); - subTitleLabel->setText(QLatin1String("Pq\nPq")); + subTitleLabel->setText("Pq\nPq"_L1); int desiredSubTitleHeight = subTitleLabel->sizeHint().height(); subTitleLabel->setText(subTitle); @@ -1049,7 +1051,7 @@ void QWizardPrivate::recreateLayout(const QWizardLayoutInfo &info) if (aero) { // ### hardcoded for now: - titleFont = QFont(QLatin1String("Segoe UI"), 12); + titleFont = QFont("Segoe UI"_L1, 12); QPalette pal(titleLabel->palette()); pal.setColor(QPalette::Text, QColor(0x00, 0x33, 0x99)); titleLabel->setPalette(pal); @@ -1365,11 +1367,11 @@ static QString object_name_for_button(QWizard::WizardButton which) { switch (which) { case QWizard::CommitButton: - return QLatin1String("qt_wizard_") + QLatin1String("commit"); + return "qt_wizard_commit"_L1; case QWizard::FinishButton: - return QLatin1String("qt_wizard_") + QLatin1String("finish"); + return "qt_wizard_finish"_L1; case QWizard::CancelButton: - return QLatin1String("qt_wizard_") + QLatin1String("cancel"); + return "qt_wizard_cancel"_L1; case QWizard::BackButton: case QWizard::NextButton: case QWizard::HelpButton: @@ -1377,7 +1379,7 @@ static QString object_name_for_button(QWizard::WizardButton which) case QWizard::CustomButton2: case QWizard::CustomButton3: // Make navigation buttons detectable as passive interactor in designer - return QLatin1String("__qt__passive_wizardbutton") + QString::number(which); + return "__qt__passive_wizardbutton"_L1 + QString::number(which); case QWizard::Stretch: case QWizard::NoButton: //case QWizard::NStandardButtons: diff --git a/src/widgets/doc/snippets/styles/qcustompixmapstyle.cpp b/src/widgets/doc/snippets/styles/qcustompixmapstyle.cpp index e1233a3afd..1fff87f8f2 100644 --- a/src/widgets/doc/snippets/styles/qcustompixmapstyle.cpp +++ b/src/widgets/doc/snippets/styles/qcustompixmapstyle.cpp @@ -41,42 +41,44 @@ #include <QtGui> +using namespace Qt::StringLiterals; + //! [0] QCustomPixmapStyle::QCustomPixmapStyle() : QPixmapStyle() { //! [1] addDescriptor(PB_Enabled, - QLatin1String("://button/core_button_inactive.png"), + "://button/core_button_inactive.png"_L1, QMargins(13, 13, 13, 13), QTileRules(Qt::RepeatTile, Qt::StretchTile)); //! [1] addDescriptor(PB_Checked, - QLatin1String("://button/core_button_enabled_selected.png"), + "://button/core_button_enabled_selected.png"_L1, QMargins(13, 13, 13, 13), QTileRules(Qt::RepeatTile, Qt::StretchTile)); addDescriptor(PB_Pressed, - QLatin1String("://button/core_button_pressed.png"), + "://button/core_button_pressed.png"_L1, QMargins(13, 13, 13, 13), QTileRules(Qt::RepeatTile, Qt::StretchTile)); addDescriptor(PB_Disabled, - QLatin1String("://button/core_button_disabled.png"), + "://button/core_button_disabled.png"_L1, QMargins(13, 13, 13, 13), QTileRules(Qt::RepeatTile, Qt::StretchTile)); addDescriptor(PB_PressedDisabled, - QLatin1String("://button/core_button_disabled_selected.png"), + "://button/core_button_disabled_selected.png"_L1, QMargins(13, 13, 13, 13), QTileRules(Qt::RepeatTile, Qt::StretchTile)); //! [2] addDescriptor(LE_Enabled, - QLatin1String("://lineedit/core_textinput_bg.png"), + "://lineedit/core_textinput_bg.png"_L1, QMargins(8, 8, 8, 8)); addDescriptor(LE_Disabled, - QLatin1String("://lineedit/core_textinput_bg_disabled.png"), + "://lineedit/core_textinput_bg_disabled.png"_L1, QMargins(8, 8, 8, 8)); addDescriptor(LE_Focused, - QLatin1String("://lineedit/core_textinput_bg_highlight.png"), + "://lineedit/core_textinput_bg_highlight.png"_L1, QMargins(8, 8, 8, 8)); copyDescriptor(LE_Enabled, TE_Enabled); diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp b/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp index 232599c561..9e4a7d4041 100644 --- a/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp +++ b/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp @@ -51,6 +51,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + // To ensure that all variables inside the simplex solver are non-negative, // we limit the size of anchors in the interval [-limit, limit]. Then before // sending them to the simplex solver we add "limit" as an offset, so that @@ -609,7 +611,7 @@ QSimplexConstraint *GraphPath::constraint(const GraphPath &path) const #ifdef QT_DEBUG QString GraphPath::toString() const { - QString string(QLatin1String("Path: ")); + QString string("Path: "_L1); for (AnchorData *edge : positives) string += QString::fromLatin1(" (+++) %1").arg(edge->toString()); diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout_p.h b/src/widgets/graphicsview/qgraphicsanchorlayout_p.h index 9fa14a3f90..f6373aad12 100644 --- a/src/widgets/graphicsview/qgraphicsanchorlayout_p.h +++ b/src/widgets/graphicsview/qgraphicsanchorlayout_p.h @@ -269,42 +269,44 @@ struct AnchorVertexPair : public AnchorVertex { #ifdef QT_DEBUG inline QString AnchorVertex::toString() const { + using namespace Qt::StringLiterals; + if (!m_item) return QString::fromLatin1("NULL_%1").arg(quintptr(this)); QString edge; switch (m_edge) { case Qt::AnchorLeft: - edge = QLatin1String("Left"); + edge = "Left"_L1; break; case Qt::AnchorHorizontalCenter: - edge = QLatin1String("HorizontalCenter"); + edge = "HorizontalCenter"_L1; break; case Qt::AnchorRight: - edge = QLatin1String("Right"); + edge = "Right"_L1; break; case Qt::AnchorTop: - edge = QLatin1String("Top"); + edge = "Top"_L1; break; case Qt::AnchorVerticalCenter: - edge = QLatin1String("VerticalCenter"); + edge = "VerticalCenter"_L1; break; case Qt::AnchorBottom: - edge = QLatin1String("Bottom"); + edge = "Bottom"_L1; break; default: - edge = QLatin1String("None"); + edge = "None"_L1; break; } QString itemName; if (m_item->isLayout()) { - itemName = QLatin1String("layout"); + itemName = "layout"_L1; } else { if (QGraphicsItem *item = m_item->graphicsItem()) { itemName = item->data(0).toString(); } } - edge.insert(0, QLatin1String("%1_")); + edge.insert(0, "%1_"_L1); return edge.arg(itemName); } #endif diff --git a/src/widgets/graphicsview/qgraphicswidget.cpp b/src/widgets/graphicsview/qgraphicswidget.cpp index c857d5dc5a..e7b41fed50 100644 --- a/src/widgets/graphicsview/qgraphicswidget.cpp +++ b/src/widgets/graphicsview/qgraphicswidget.cpp @@ -67,6 +67,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + /*! \class QGraphicsWidget \brief The QGraphicsWidget class is the base class for all widget @@ -2401,7 +2403,7 @@ void QGraphicsWidget::dumpFocusChain() qWarning("Found a focus chain that is not circular, (next == 0)"); break; } - qDebug() << i++ << QString::number(uint(next), 16) << next->className() << next->data(0) << QString::fromLatin1("focusItem:%1").arg(next->hasFocus() ? '1' : '0') << QLatin1String("next:") << next->d_func()->focusNext->data(0) << QLatin1String("prev:") << next->d_func()->focusPrev->data(0); + qDebug() << i++ << QString::number(uint(next), 16) << next->className() << next->data(0) << QString::fromLatin1("focusItem:%1").arg(next->hasFocus() ? '1' : '0') << "next:"_L1 << next->d_func()->focusNext->data(0) << "prev:"_L1 << next->d_func()->focusPrev->data(0); if (visited.contains(next)) { qWarning("Already visited this node. However, I expected to dump until I found myself."); break; diff --git a/src/widgets/graphicsview/qsimplex_p.cpp b/src/widgets/graphicsview/qsimplex_p.cpp index b9f7275d00..b2a2fad697 100644 --- a/src/widgets/graphicsview/qsimplex_p.cpp +++ b/src/widgets/graphicsview/qsimplex_p.cpp @@ -46,6 +46,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + /*! \internal \class QSimplex @@ -354,7 +356,7 @@ void QSimplex::dumpMatrix() { qDebug("---- Simplex Matrix ----\n"); - QString str(QLatin1String(" ")); + QString str(" "_L1); for (int j = 0; j < columns; ++j) str += QString::fromLatin1(" <%1 >").arg(j, 2); qDebug("%s", qPrintable(str)); diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 91c08de41f..9cc7cccdcf 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -132,6 +132,8 @@ static void initResources() QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + // Helper macro for static functions to check on the existence of the application class. #define CHECK_QAPP_INSTANCE(...) \ if (Q_LIKELY(QCoreApplication::instance())) { \ @@ -411,10 +413,10 @@ void QApplicationPrivate::process_cmdline() // obsolete argument #ifndef QT_NO_STYLE_STYLESHEET } else if (strcmp(arg, "-stylesheet") == 0 && i < argc -1) { - styleSheet = QLatin1String("file:///"); + styleSheet = "file:///"_L1; styleSheet.append(QString::fromLocal8Bit(argv[++i])); } else if (strncmp(arg, "-stylesheet=", 12) == 0) { - styleSheet = QLatin1String("file:///"); + styleSheet = "file:///"_L1; styleSheet.append(QString::fromLocal8Bit(arg + 12)); #endif } else if (qstrcmp(arg, "-widgetcount") == 0) { @@ -551,7 +553,7 @@ void QApplicationPrivate::initialize() } else { qWarning("QApplication: invalid style override '%s' passed, ignoring it.\n" "\tAvailable styles: %s", qPrintable(styleOverride), - qPrintable(QStyleFactory::keys().join(QLatin1String(", ")))); + qPrintable(QStyleFactory::keys().join(", "_L1))); } } diff --git a/src/widgets/kernel/qtooltip.cpp b/src/widgets/kernel/qtooltip.cpp index 49de9e0c6a..3cfd7aa68c 100644 --- a/src/widgets/kernel/qtooltip.cpp +++ b/src/widgets/kernel/qtooltip.cpp @@ -62,6 +62,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + /*! \class QToolTip @@ -372,7 +374,7 @@ void QTipLabel::placeTip(const QPoint &pos, QWidget *w) //the stylesheet need to know the real parent QTipLabel::instance->setProperty("_q_stylesheet_parent", QVariant::fromValue(w)); //we force the style to be the QStyleSheetStyle, and force to clear the cache as well. - QTipLabel::instance->setStyleSheet(QLatin1String("/* */")); + QTipLabel::instance->setStyleSheet("/* */"_L1); // Set up for cleaning up this later... QTipLabel::instance->styleSheetParent = w; @@ -492,7 +494,7 @@ void QToolTip::showText(const QPoint &pos, const QString &text, QWidget *w, cons QWidgetPrivate::get(QTipLabel::instance)->setScreen(QTipLabel::getTipScreen(pos, w)); QTipLabel::instance->setTipRect(w, rect); QTipLabel::instance->placeTip(pos, w); - QTipLabel::instance->setObjectName(QLatin1String("qtooltip_label")); + QTipLabel::instance->setObjectName("qtooltip_label"_L1); #if QT_CONFIG(effects) if (QApplication::isEffectEnabled(Qt::UI_FadeTooltip)) diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 2adbffa99b..d3a742acea 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -119,6 +119,7 @@ QT_BEGIN_NAMESPACE using namespace QNativeInterface::Private; +using namespace Qt::StringLiterals; Q_LOGGING_CATEGORY(lcWidgetPainting, "qt.widgets.painting", QtWarningMsg); @@ -6021,7 +6022,7 @@ QString QWidget::windowTitle() const if (!d->extra->topextra->caption.isEmpty()) return d->extra->topextra->caption; if (!d->extra->topextra->filePath.isEmpty()) - return QFileInfo(d->extra->topextra->filePath).fileName() + QLatin1String("[*]"); + return QFileInfo(d->extra->topextra->filePath).fileName() + "[*]"_L1; } return QString(); } @@ -6045,7 +6046,7 @@ QString qt_setWindowTitle_helperHelper(const QString &title, const QWidget *widg if (cap.isEmpty()) return cap; - QLatin1String placeHolder("[*]"); + const auto placeHolder = "[*]"_L1; int index = cap.indexOf(placeHolder); // here the magic begins @@ -6069,7 +6070,7 @@ QString qt_setWindowTitle_helperHelper(const QString &title, const QWidget *widg index = cap.indexOf(placeHolder, index); } - cap.replace(QLatin1String("[*][*]"), placeHolder); + cap.replace("[*][*]"_L1, placeHolder); return cap; } @@ -11456,7 +11457,7 @@ void QWidgetPrivate::setWindowModified_helper() return; bool on = q->testAttribute(Qt::WA_WindowModified); if (!platformWindow->setWindowModified(on)) { - if (Q_UNLIKELY(on && !q->windowTitle().contains(QLatin1String("[*]")))) + if (Q_UNLIKELY(on && !q->windowTitle().contains("[*]"_L1))) qWarning("QWidget::setWindowModified: The window title does not contain a '[*]' placeholder"); setWindowTitle_helper(q->windowTitle()); setWindowIconText_helper(q->windowIconText()); diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp index 6524393ee1..3b32268c06 100644 --- a/src/widgets/kernel/qwidgetwindow.cpp +++ b/src/widgets/kernel/qwidgetwindow.cpp @@ -55,6 +55,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + Q_WIDGETS_EXPORT extern bool qt_tab_all_widgets(); Q_WIDGETS_EXPORT QWidget *qt_button_down = nullptr; // widget got last button-down @@ -1159,8 +1161,8 @@ void QWidgetWindow::updateObjectName() { QString name = m_widget->objectName(); if (name.isEmpty()) - name = QString::fromUtf8(m_widget->metaObject()->className()) + QLatin1String("Class"); - name += QLatin1String("Window"); + name = QString::fromUtf8(m_widget->metaObject()->className()) + "Class"_L1; + name += "Window"_L1; setObjectName(name); } diff --git a/src/widgets/kernel/qwindowcontainer.cpp b/src/widgets/kernel/qwindowcontainer.cpp index b26bc68d19..adeebc52dc 100644 --- a/src/widgets/kernel/qwindowcontainer.cpp +++ b/src/widgets/kernel/qwindowcontainer.cpp @@ -52,6 +52,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + class QWindowContainerPrivate : public QWidgetPrivate { public: @@ -222,7 +224,7 @@ QWindowContainer::QWindowContainer(QWindow *embeddedWindow, QWidget *parent, Qt: QString windowName = d->window->objectName(); if (windowName.isEmpty()) windowName = QString::fromUtf8(d->window->metaObject()->className()); - d->fakeParent.setObjectName(windowName + QLatin1String("ContainerFakeParent")); + d->fakeParent.setObjectName(windowName + "ContainerFakeParent"_L1); d->window->setParent(&d->fakeParent); d->window->setFlag(Qt::SubWindow); diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index 22f7746c93..e286895b59 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -121,6 +121,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + static qreal qt_getDevicePixelRatio(const QWidget *widget) { return widget ? widget->devicePixelRatio() : qApp->devicePixelRatio(); @@ -732,7 +734,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q QRect r = opt->rect; int size = qMin(r.height(), r.width()); QPixmap pixmap; - QString pixmapName = QStyleHelper::uniqueName(QLatin1String("$qt_ia-") + QString pixmapName = QStyleHelper::uniqueName("$qt_ia-"_L1 % QLatin1String(metaObject()->className()), opt, QSize(size, size)) % HexString<uint>(pe); if (!QPixmapCache::find(pixmapName, &pixmap)) { @@ -2586,7 +2588,7 @@ QRect QCommonStyle::subElementRect(SubElement sr, const QStyleOption *opt, const bool vertical = !(pb->state & QStyle::State_Horizontal); if (!vertical) { if (pb->textVisible) - textw = qMax(pb->fontMetrics.horizontalAdvance(pb->text), pb->fontMetrics.horizontalAdvance(QLatin1String("100%"))) + 6; + textw = qMax(pb->fontMetrics.horizontalAdvance(pb->text), pb->fontMetrics.horizontalAdvance("100%"_L1)) + 6; } if ((pb->textAlignment & Qt::AlignCenter) == 0) { @@ -5468,145 +5470,139 @@ QPixmap QCommonStyle::standardPixmap(StandardPixmap sp, const QStyleOption *opti switch (sp) { case SP_DialogYesButton: case SP_DialogOkButton: - pixmap = QIcon::fromTheme(QLatin1String("dialog-ok")).pixmap(16); + pixmap = QIcon::fromTheme("dialog-ok"_L1).pixmap(16); break; case SP_DialogApplyButton: - pixmap = QIcon::fromTheme(QLatin1String("dialog-ok-apply")).pixmap(16); + pixmap = QIcon::fromTheme("dialog-ok-apply"_L1).pixmap(16); break; case SP_DialogDiscardButton: - pixmap = QIcon::fromTheme(QLatin1String("edit-delete")).pixmap(16); + pixmap = QIcon::fromTheme("edit-delete"_L1).pixmap(16); break; case SP_DialogCloseButton: - pixmap = QIcon::fromTheme(QLatin1String("dialog-close")).pixmap(16); + pixmap = QIcon::fromTheme("dialog-close"_L1).pixmap(16); break; case SP_DirHomeIcon: - pixmap = QIcon::fromTheme(QLatin1String("user-home")).pixmap(16); + pixmap = QIcon::fromTheme("user-home"_L1).pixmap(16); break; case SP_MessageBoxInformation: - pixmap = QIcon::fromTheme(QLatin1String("messagebox_info")).pixmap(16); + pixmap = QIcon::fromTheme("messagebox_info"_L1).pixmap(16); break; case SP_MessageBoxWarning: - pixmap = QIcon::fromTheme(QLatin1String("messagebox_warning")).pixmap(16); + pixmap = QIcon::fromTheme("messagebox_warning"_L1).pixmap(16); break; case SP_MessageBoxCritical: - pixmap = QIcon::fromTheme(QLatin1String("messagebox_critical")).pixmap(16); + pixmap = QIcon::fromTheme("messagebox_critical"_L1).pixmap(16); break; case SP_MessageBoxQuestion: - pixmap = QIcon::fromTheme(QLatin1String("help")).pixmap(16); + pixmap = QIcon::fromTheme("help"_L1).pixmap(16); break; case SP_DialogOpenButton: case SP_DirOpenIcon: - pixmap = QIcon::fromTheme(QLatin1String("folder-open")).pixmap(16); + pixmap = QIcon::fromTheme("folder-open"_L1).pixmap(16); break; case SP_FileIcon: - pixmap = QIcon::fromTheme(QLatin1String("text-x-generic"), - QIcon::fromTheme(QLatin1String("empty"))).pixmap(16); + pixmap = QIcon::fromTheme("text-x-generic"_L1, QIcon::fromTheme("empty"_L1)).pixmap(16); break; case SP_DirClosedIcon: case SP_DirIcon: - pixmap = QIcon::fromTheme(QLatin1String("folder")).pixmap(16); + pixmap = QIcon::fromTheme("folder"_L1).pixmap(16); break; case SP_DriveFDIcon: - pixmap = QIcon::fromTheme(QLatin1String("media-floppy"), - QIcon::fromTheme(QLatin1String("3floppy_unmount"))).pixmap(16); + pixmap = QIcon::fromTheme("media-floppy"_L1, + QIcon::fromTheme("3floppy_unmount"_L1)).pixmap(16); break; case SP_ComputerIcon: - pixmap = QIcon::fromTheme(QLatin1String("computer"), - QIcon::fromTheme(QLatin1String("system"))).pixmap(16); + pixmap = QIcon::fromTheme("computer"_L1, QIcon::fromTheme("system"_L1)).pixmap(16); break; case SP_DesktopIcon: - pixmap = QIcon::fromTheme(QLatin1String("user-desktop"), - QIcon::fromTheme(QLatin1String("desktop"))).pixmap(16); + pixmap = QIcon::fromTheme("user-desktop"_L1, + QIcon::fromTheme("desktop"_L1)).pixmap(16); break; case SP_TrashIcon: - pixmap = QIcon::fromTheme(QLatin1String("user-trash"), - QIcon::fromTheme(QLatin1String("trashcan_empty"))).pixmap(16); + pixmap = QIcon::fromTheme("user-trash"_L1, + QIcon::fromTheme("trashcan_empty"_L1)).pixmap(16); break; case SP_DriveCDIcon: case SP_DriveDVDIcon: - pixmap = QIcon::fromTheme(QLatin1String("media-optical"), - QIcon::fromTheme(QLatin1String("cdrom_unmount"))).pixmap(16); + pixmap = QIcon::fromTheme("media-optical"_L1, + QIcon::fromTheme("cdrom_unmount"_L1)).pixmap(16); break; case SP_DriveHDIcon: - pixmap = QIcon::fromTheme(QLatin1String("drive-harddisk"), - QIcon::fromTheme(QLatin1String("hdd_unmount"))).pixmap(16); + pixmap = QIcon::fromTheme("drive-harddisk"_L1, + QIcon::fromTheme("hdd_unmount"_L1)).pixmap(16); break; case SP_FileDialogToParent: - pixmap = QIcon::fromTheme(QLatin1String("go-up"), - QIcon::fromTheme(QLatin1String("up"))).pixmap(16); + pixmap = QIcon::fromTheme("go-up"_L1, QIcon::fromTheme("up"_L1)).pixmap(16); break; case SP_FileDialogNewFolder: - pixmap = QIcon::fromTheme(QLatin1String("folder_new")).pixmap(16); + pixmap = QIcon::fromTheme("folder_new"_L1).pixmap(16); break; case SP_ArrowUp: - pixmap = QIcon::fromTheme(QLatin1String("go-up"), - QIcon::fromTheme(QLatin1String("up"))).pixmap(16); + pixmap = QIcon::fromTheme("go-up"_L1, + QIcon::fromTheme("up"_L1)).pixmap(16); break; case SP_ArrowDown: - pixmap = QIcon::fromTheme(QLatin1String("go-down"), - QIcon::fromTheme(QLatin1String("down"))).pixmap(16); + pixmap = QIcon::fromTheme("go-down"_L1, QIcon::fromTheme("down"_L1)).pixmap(16); break; case SP_ArrowRight: - pixmap = QIcon::fromTheme(QLatin1String("go-next"), - QIcon::fromTheme(QLatin1String("forward"))).pixmap(16); + pixmap = QIcon::fromTheme("go-next"_L1, QIcon::fromTheme("forward"_L1)).pixmap(16); break; case SP_ArrowLeft: - pixmap = QIcon::fromTheme(QLatin1String("go-previous"), - QIcon::fromTheme(QLatin1String("back"))).pixmap(16); + pixmap = QIcon::fromTheme("go-previous"_L1, QIcon::fromTheme("back"_L1)).pixmap(16); break; case SP_FileDialogDetailedView: - pixmap = QIcon::fromTheme(QLatin1String("view_detailed")).pixmap(16); + pixmap = QIcon::fromTheme("view_detailed"_L1).pixmap(16); break; case SP_FileDialogListView: - pixmap = QIcon::fromTheme(QLatin1String("view_icon")).pixmap(16); + pixmap = QIcon::fromTheme("view_icon"_L1).pixmap(16); break; case SP_BrowserReload: - pixmap = QIcon::fromTheme(QLatin1String("reload")).pixmap(16); + pixmap = QIcon::fromTheme("reload"_L1).pixmap(16); break; case SP_BrowserStop: - pixmap = QIcon::fromTheme(QLatin1String("process-stop")).pixmap(16); + pixmap = QIcon::fromTheme("process-stop"_L1).pixmap(16); break; case SP_MediaPlay: - pixmap = QIcon::fromTheme(QLatin1String("media-playback-start")).pixmap(16); + pixmap = QIcon::fromTheme("media-playback-start"_L1).pixmap(16); break; case SP_MediaPause: - pixmap = QIcon::fromTheme(QLatin1String("media-playback-pause")).pixmap(16); + pixmap = QIcon::fromTheme("media-playback-pause"_L1).pixmap(16); break; case SP_MediaStop: - pixmap = QIcon::fromTheme(QLatin1String("media-playback-stop")).pixmap(16); + pixmap = QIcon::fromTheme("media-playback-stop"_L1).pixmap(16); break; case SP_MediaSeekForward: - pixmap = QIcon::fromTheme(QLatin1String("media-seek-forward")).pixmap(16); + pixmap = QIcon::fromTheme("media-seek-forward"_L1).pixmap(16); break; case SP_MediaSeekBackward: - pixmap = QIcon::fromTheme(QLatin1String("media-seek-backward")).pixmap(16); + pixmap = QIcon::fromTheme("media-seek-backward"_L1).pixmap(16); break; case SP_MediaSkipForward: - pixmap = QIcon::fromTheme(QLatin1String("media-skip-forward")).pixmap(16); + pixmap = QIcon::fromTheme("media-skip-forward"_L1).pixmap(16); break; case SP_MediaSkipBackward: - pixmap = QIcon::fromTheme(QLatin1String("media-skip-backward")).pixmap(16); + pixmap = QIcon::fromTheme("media-skip-backward"_L1).pixmap(16); break; case SP_DialogResetButton: - pixmap = QIcon::fromTheme(QLatin1String("edit-clear")).pixmap(24); + pixmap = QIcon::fromTheme("edit-clear"_L1).pixmap(24); break; case SP_DialogHelpButton: - pixmap = QIcon::fromTheme(QLatin1String("help-contents")).pixmap(24); + pixmap = QIcon::fromTheme("help-contents"_L1).pixmap(24); break; case SP_DialogNoButton: case SP_DialogCancelButton: - pixmap = QIcon::fromTheme(QLatin1String("dialog-cancel"), - QIcon::fromTheme(QLatin1String("process-stop"))).pixmap(24); + pixmap = QIcon::fromTheme("dialog-cancel"_L1, + QIcon::fromTheme("process-stop"_L1)).pixmap(24); break; case SP_DialogSaveButton: - pixmap = QIcon::fromTheme(QLatin1String("document-save")).pixmap(24); + pixmap = QIcon::fromTheme("document-save"_L1).pixmap(24); break; case SP_FileLinkIcon: - pixmap = QIcon::fromTheme(QLatin1String("emblem-symbolic-link")).pixmap(16); + pixmap = QIcon::fromTheme("emblem-symbolic-link"_L1).pixmap(16); if (!pixmap.isNull()) { - QPixmap fileIcon = QIcon::fromTheme(QLatin1String("text-x-generic")).pixmap(16); + QPixmap fileIcon = QIcon::fromTheme("text-x-generic"_L1).pixmap(16); if (fileIcon.isNull()) - fileIcon = QIcon::fromTheme(QLatin1String("empty")).pixmap(16); + fileIcon = QIcon::fromTheme("empty"_L1).pixmap(16); if (!fileIcon.isNull()) { QPainter painter(&fileIcon); painter.drawPixmap(0, 0, 16, 16, pixmap); @@ -5615,9 +5611,9 @@ QPixmap QCommonStyle::standardPixmap(StandardPixmap sp, const QStyleOption *opti } break; case SP_DirLinkIcon: - pixmap = QIcon::fromTheme(QLatin1String("emblem-symbolic-link")).pixmap(16); + pixmap = QIcon::fromTheme("emblem-symbolic-link"_L1).pixmap(16); if (!pixmap.isNull()) { - QPixmap dirIcon = QIcon::fromTheme(QLatin1String("folder")).pixmap(16); + QPixmap dirIcon = QIcon::fromTheme("folder"_L1).pixmap(16); if (!dirIcon.isNull()) { QPainter painter(&dirIcon); painter.drawPixmap(0, 0, 16, 16, pixmap); @@ -5663,103 +5659,103 @@ QPixmap QCommonStyle::standardPixmap(StandardPixmap sp, const QStyleOption *opti return proxy()->standardPixmap(SP_ArrowRight, option, widget); return proxy()->standardPixmap(SP_ArrowLeft, option, widget); case SP_ArrowLeft: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/left-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/left-16.png"_L1); case SP_ArrowRight: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/right-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/right-16.png"_L1); case SP_ArrowUp: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/up-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/up-16.png"_L1); case SP_ArrowDown: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/down-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/down-16.png"_L1); case SP_FileDialogToParent: return proxy()->standardPixmap(SP_ArrowUp, option, widget); case SP_FileDialogNewFolder: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/newdirectory-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/newdirectory-16.png"_L1); case SP_FileDialogDetailedView: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/viewdetailed-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/viewdetailed-16.png"_L1); case SP_FileDialogInfoView: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/fileinfo-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/fileinfo-16.png"_L1); case SP_FileDialogContentsView: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/filecontents-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/filecontents-16.png"_L1); case SP_FileDialogListView: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/viewlist-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/viewlist-16.png"_L1); case SP_FileDialogBack: return proxy()->standardPixmap(SP_ArrowBack, option, widget); case SP_DriveHDIcon: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/harddrive-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/harddrive-16.png"_L1); case SP_TrashIcon: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/trash-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/trash-16.png"_L1); case SP_DriveFDIcon: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/floppy-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/floppy-16.png"_L1); case SP_DriveNetIcon: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/networkdrive-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/networkdrive-16.png"_L1); case SP_DesktopIcon: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/desktop-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/desktop-16.png"_L1); case SP_ComputerIcon: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/computer-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/computer-16.png"_L1); case SP_DriveCDIcon: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/cdr-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/cdr-16.png"_L1); case SP_DriveDVDIcon: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/dvd-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/dvd-16.png"_L1); case SP_DirHomeIcon: case SP_DirOpenIcon: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/diropen-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/diropen-16.png"_L1); case SP_DirIcon: case SP_DirClosedIcon: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/dirclosed-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/dirclosed-16.png"_L1); case SP_DirLinkIcon: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/dirlink-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/dirlink-16.png"_L1); case SP_FileIcon: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/file-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/file-16.png"_L1); case SP_FileLinkIcon: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/filelink-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/filelink-16.png"_L1); case SP_DialogOkButton: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-ok-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/standardbutton-ok-16.png"_L1); case SP_DialogCancelButton: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-cancel-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/standardbutton-cancel-16.png"_L1); case SP_DialogHelpButton: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-help-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/standardbutton-help-16.png"_L1); case SP_DialogOpenButton: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png"_L1); case SP_DialogSaveButton: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/standardbutton-save-16.png"_L1); case SP_DialogCloseButton: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-close-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/standardbutton-close-16.png"_L1); case SP_DialogApplyButton: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-apply-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/standardbutton-apply-16.png"_L1); case SP_DialogResetButton: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-clear-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/standardbutton-clear-16.png"_L1); case SP_DialogDiscardButton: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-delete-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/standardbutton-delete-16.png"_L1); case SP_DialogYesButton: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-yes-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/standardbutton-yes-16.png"_L1); case SP_DialogNoButton: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-no-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/standardbutton-no-16.png"_L1); case SP_BrowserReload: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/refresh-24.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/refresh-24.png"_L1); case SP_BrowserStop: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/stop-24.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/stop-24.png"_L1); case SP_MediaPlay: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-play-32.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/media-play-32.png"_L1); case SP_MediaPause: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-pause-32.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/media-pause-32.png"_L1); case SP_MediaStop: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-stop-32.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/media-stop-32.png"_L1); case SP_MediaSeekForward: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-seek-forward-32.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/media-seek-forward-32.png"_L1); case SP_MediaSeekBackward: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-seek-backward-32.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/media-seek-backward-32.png"_L1); case SP_MediaSkipForward: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-skip-forward-32.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/media-skip-forward-32.png"_L1); case SP_MediaSkipBackward: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-skip-backward-32.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/media-skip-backward-32.png"_L1); case SP_MediaVolume: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-volume-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/media-volume-16.png"_L1); case SP_MediaVolumeMuted: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-volume-muted-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/media-volume-muted-16.png"_L1); case SP_LineEditClearButton: return QPixmap(clearText16IconPath()); case SP_TabCloseButton: - return QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-closetab-16.png")); + return QPixmap(":/qt-project.org/styles/commonstyle/images/standardbutton-closetab-16.png"_L1); #endif // QT_NO_IMAGEFORMAT_PNG default: break; @@ -5883,134 +5879,132 @@ QIcon QCommonStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption if (QGuiApplication::desktopSettingsAware() && !QIcon::themeName().isEmpty()) { switch (standardIcon) { case SP_DirHomeIcon: - icon = QIcon::fromTheme(QLatin1String("user-home")); + icon = QIcon::fromTheme("user-home"_L1); break; case SP_MessageBoxInformation: - icon = QIcon::fromTheme(QLatin1String("dialog-information")); + icon = QIcon::fromTheme("dialog-information"_L1); break; case SP_MessageBoxWarning: - icon = QIcon::fromTheme(QLatin1String("dialog-warning")); + icon = QIcon::fromTheme("dialog-warning"_L1); break; case SP_MessageBoxCritical: - icon = QIcon::fromTheme(QLatin1String("dialog-error")); + icon = QIcon::fromTheme("dialog-error"_L1); break; case SP_MessageBoxQuestion: - icon = QIcon::fromTheme(QLatin1String("dialog-question")); + icon = QIcon::fromTheme("dialog-question"_L1); break; case SP_DialogOpenButton: case SP_DirOpenIcon: - icon = QIcon::fromTheme(QLatin1String("folder-open")); + icon = QIcon::fromTheme("folder-open"_L1); break; case SP_DialogSaveButton: - icon = QIcon::fromTheme(QLatin1String("document-save")); + icon = QIcon::fromTheme("document-save"_L1); break; case SP_DialogApplyButton: - icon = QIcon::fromTheme(QLatin1String("dialog-ok-apply")); + icon = QIcon::fromTheme("dialog-ok-apply"_L1); break; case SP_DialogYesButton: case SP_DialogOkButton: - icon = QIcon::fromTheme(QLatin1String("dialog-ok")); + icon = QIcon::fromTheme("dialog-ok"_L1); break; case SP_DialogDiscardButton: - icon = QIcon::fromTheme(QLatin1String("edit-delete")); + icon = QIcon::fromTheme("edit-delete"_L1); break; case SP_DialogResetButton: - icon = QIcon::fromTheme(QLatin1String("edit-clear")); + icon = QIcon::fromTheme("edit-clear"_L1); break; case SP_DialogHelpButton: - icon = QIcon::fromTheme(QLatin1String("help-contents")); + icon = QIcon::fromTheme("help-contents"_L1); break; case SP_FileIcon: - icon = QIcon::fromTheme(QLatin1String("text-x-generic")); + icon = QIcon::fromTheme("text-x-generic"_L1); break; case SP_DirClosedIcon: case SP_DirIcon: - icon = QIcon::fromTheme(QLatin1String("folder")); + icon = QIcon::fromTheme("folder"_L1); break; case SP_DriveFDIcon: - icon = QIcon::fromTheme(QLatin1String("floppy_unmount")); + icon = QIcon::fromTheme("floppy_unmount"_L1); break; case SP_ComputerIcon: - icon = QIcon::fromTheme(QLatin1String("computer"), - QIcon::fromTheme(QLatin1String("system"))); + icon = QIcon::fromTheme("computer"_L1, QIcon::fromTheme("system"_L1)); break; case SP_DesktopIcon: - icon = QIcon::fromTheme(QLatin1String("user-desktop")); + icon = QIcon::fromTheme("user-desktop"_L1); break; case SP_TrashIcon: - icon = QIcon::fromTheme(QLatin1String("user-trash")); + icon = QIcon::fromTheme("user-trash"_L1); break; case SP_DriveCDIcon: case SP_DriveDVDIcon: - icon = QIcon::fromTheme(QLatin1String("media-optical")); + icon = QIcon::fromTheme("media-optical"_L1); break; case SP_DriveHDIcon: - icon = QIcon::fromTheme(QLatin1String("drive-harddisk")); + icon = QIcon::fromTheme("drive-harddisk"_L1); break; case SP_FileDialogToParent: - icon = QIcon::fromTheme(QLatin1String("go-up")); + icon = QIcon::fromTheme("go-up"_L1); break; case SP_FileDialogNewFolder: - icon = QIcon::fromTheme(QLatin1String("folder-new")); + icon = QIcon::fromTheme("folder-new"_L1); break; case SP_ArrowUp: - icon = QIcon::fromTheme(QLatin1String("go-up")); + icon = QIcon::fromTheme("go-up"_L1); break; case SP_ArrowDown: - icon = QIcon::fromTheme(QLatin1String("go-down")); + icon = QIcon::fromTheme("go-down"_L1); break; case SP_ArrowRight: - icon = QIcon::fromTheme(QLatin1String("go-next")); + icon = QIcon::fromTheme("go-next"_L1); break; case SP_ArrowLeft: - icon = QIcon::fromTheme(QLatin1String("go-previous")); + icon = QIcon::fromTheme("go-previous"_L1); break; case SP_DialogNoButton: case SP_DialogCancelButton: - icon = QIcon::fromTheme(QLatin1String("dialog-cancel"), - QIcon::fromTheme(QLatin1String("process-stop"))); + icon = QIcon::fromTheme("dialog-cancel"_L1, QIcon::fromTheme("process-stop"_L1)); break; case SP_DialogCloseButton: - icon = QIcon::fromTheme(QLatin1String("window-close")); + icon = QIcon::fromTheme("window-close"_L1); break; case SP_FileDialogDetailedView: - icon = QIcon::fromTheme(QLatin1String("view-list-details")); + icon = QIcon::fromTheme("view-list-details"_L1); break; case SP_FileDialogListView: - icon = QIcon::fromTheme(QLatin1String("view-list-icons")); + icon = QIcon::fromTheme("view-list-icons"_L1); break; case SP_BrowserReload: - icon = QIcon::fromTheme(QLatin1String("view-refresh")); + icon = QIcon::fromTheme("view-refresh"_L1); break; case SP_BrowserStop: - icon = QIcon::fromTheme(QLatin1String("process-stop")); + icon = QIcon::fromTheme("process-stop"_L1); break; case SP_MediaPlay: - icon = QIcon::fromTheme(QLatin1String("media-playback-start")); + icon = QIcon::fromTheme("media-playback-start"_L1); break; case SP_MediaPause: - icon = QIcon::fromTheme(QLatin1String("media-playback-pause")); + icon = QIcon::fromTheme("media-playback-pause"_L1); break; case SP_MediaStop: - icon = QIcon::fromTheme(QLatin1String("media-playback-stop")); + icon = QIcon::fromTheme("media-playback-stop"_L1); break; case SP_MediaSeekForward: - icon = QIcon::fromTheme(QLatin1String("media-seek-forward")); + icon = QIcon::fromTheme("media-seek-forward"_L1); break; case SP_MediaSeekBackward: - icon = QIcon::fromTheme(QLatin1String("media-seek-backward")); + icon = QIcon::fromTheme("media-seek-backward"_L1); break; case SP_MediaSkipForward: - icon = QIcon::fromTheme(QLatin1String("media-skip-forward")); + icon = QIcon::fromTheme("media-skip-forward"_L1); break; case SP_MediaSkipBackward: - icon = QIcon::fromTheme(QLatin1String("media-skip-backward")); + icon = QIcon::fromTheme("media-skip-backward"_L1); break; case SP_MediaVolume: - icon = QIcon::fromTheme(QLatin1String("audio-volume-medium")); + icon = QIcon::fromTheme("audio-volume-medium"_L1); break; case SP_MediaVolumeMuted: - icon = QIcon::fromTheme(QLatin1String("audio-volume-muted")); + icon = QIcon::fromTheme("audio-volume-muted"_L1); break; case SP_ArrowForward: if (rtl) @@ -6022,7 +6016,7 @@ QIcon QCommonStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption return QCommonStyle::standardIcon(SP_ArrowLeft, option, widget); case SP_FileLinkIcon: { - QIcon linkIcon = QIcon::fromTheme(QLatin1String("emblem-symbolic-link")); + QIcon linkIcon = QIcon::fromTheme("emblem-symbolic-link"_L1); if (!linkIcon.isNull()) { QIcon baseIcon = QCommonStyle::standardIcon(SP_FileIcon, option, widget); const QList<QSize> sizes = baseIcon.availableSizes(QIcon::Normal, QIcon::Off); @@ -6039,7 +6033,7 @@ QIcon QCommonStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption break; case SP_DirLinkIcon: { - QIcon linkIcon = QIcon::fromTheme(QLatin1String("emblem-symbolic-link")); + QIcon linkIcon = QIcon::fromTheme("emblem-symbolic-link"_L1); if (!linkIcon.isNull()) { QIcon baseIcon = QCommonStyle::standardIcon(SP_DirIcon, option, widget); const QList<QSize> sizes = baseIcon.availableSizes(QIcon::Normal, QIcon::Off); @@ -6114,7 +6108,7 @@ QIcon QCommonStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption const QList<QSize> sizes = theme->themeHint(QPlatformTheme::IconPixmapSizes).value<QList<QSize> >(); for (const QSize &size : sizes) { QPixmap mainIcon; - const QString cacheKey = QLatin1String("qt_mac_constructQIconFromIconRef") + QString::number(standardIcon) + QString::number(size.width()); + const QString cacheKey = "qt_mac_constructQIconFromIconRef"_L1 + QString::number(standardIcon) + QString::number(size.width()); if (standardIcon >= QStyle::SP_CustomBase) { mainIcon = theme->standardPixmap(sp, QSizeF(size)); } else if (QPixmapCache::find(cacheKey, &mainIcon) == false) { @@ -6158,88 +6152,88 @@ QIcon QCommonStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption titleBarSizes, sizeof(titleBarSizes)/sizeof(titleBarSizes[0]), icon); break; case SP_FileDialogNewFolder: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/newdirectory-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/newdirectory-32.png"), QSize(32, 32)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/newdirectory-128.png"), QSize(128, 128)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/newdirectory-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/newdirectory-32.png"_L1, QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/newdirectory-128.png"_L1, QSize(128, 128)); break; case SP_FileDialogBack: return QCommonStyle::standardIcon(SP_ArrowBack, option, widget); case SP_FileDialogToParent: return QCommonStyle::standardIcon(SP_ArrowUp, option, widget); case SP_FileDialogDetailedView: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/viewdetailed-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/viewdetailed-32.png"), QSize(32, 32)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/viewdetailed-128.png"), QSize(128, 128)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/viewdetailed-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/viewdetailed-32.png"_L1, QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/viewdetailed-128.png"_L1, QSize(128, 128)); break; case SP_FileDialogInfoView: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/fileinfo-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/fileinfo-32.png"), QSize(32, 32)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/fileinfo-128.png"), QSize(128, 128)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/fileinfo-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/fileinfo-32.png"_L1, QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/fileinfo-128.png"_L1, QSize(128, 128)); break; case SP_FileDialogContentsView: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/filecontents-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/filecontents-32.png"), QSize(32, 32)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/filecontents-128.png"), QSize(128, 128)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/filecontents-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/filecontents-32.png"_L1, QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/filecontents-128.png"_L1, QSize(128, 128)); break; case SP_FileDialogListView: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/viewlist-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/viewlist-32.png"), QSize(32, 32)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/viewlist-128.png"), QSize(128, 128)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/viewlist-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/viewlist-32.png"_L1, QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/viewlist-128.png"_L1, QSize(128, 128)); break; case SP_DialogOkButton: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-ok-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-ok-32.png"), QSize(32, 32)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-ok-128.png"), QSize(128, 128)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-ok-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-ok-32.png"_L1, QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-ok-128.png"_L1, QSize(128, 128)); break; case SP_DialogCancelButton: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-cancel-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-cancel-32.png"), QSize(32, 32)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-cancel-128.png"), QSize(128, 128)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-cancel-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-cancel-32.png"_L1, QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-cancel-128.png"_L1, QSize(128, 128)); break; case SP_DialogHelpButton: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-help-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-help-32.png"), QSize(32, 32)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-help-128.png"), QSize(128, 128)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-help-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-help-32.png"_L1, QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-help-128.png"_L1, QSize(128, 128)); break; case SP_DialogOpenButton: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-32.png"), QSize(32, 32)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-128.png"), QSize(128, 128)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-open-32.png"_L1, QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-open-128.png"_L1, QSize(128, 128)); break; case SP_DialogSaveButton: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-32.png"), QSize(32, 32)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-128.png"), QSize(128, 128)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-save-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-save-32.png"_L1, QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-save-128.png"_L1, QSize(128, 128)); break; case SP_DialogCloseButton: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-close-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-close-32.png"), QSize(32, 32)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-close-128.png"), QSize(128, 128)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-close-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-close-32.png"_L1, QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-close-128.png"_L1, QSize(128, 128)); break; case SP_DialogApplyButton: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-apply-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-apply-32.png"), QSize(32, 32)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-apply-128.png"), QSize(128, 128)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-apply-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-apply-32.png"_L1, QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-apply-128.png"_L1, QSize(128, 128)); break; case SP_DialogResetButton: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-clear-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-clear-32.png"), QSize(32, 32)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-clear-128.png"), QSize(128, 128)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-clear-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-clear-32.png"_L1, QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-clear-128.png"_L1, QSize(128, 128)); break; case SP_DialogDiscardButton: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-delete-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-delete-32.png"), QSize(32, 32)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-delete-128.png"), QSize(128, 128)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-delete-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-delete-32.png"_L1, QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-delete-128.png"_L1, QSize(128, 128)); break; case SP_DialogYesButton: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-yes-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-yes-32.png"), QSize(32, 32)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-yes-128.png"), QSize(128, 128)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-yes-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-yes-32.png"_L1, QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-yes-128.png"_L1, QSize(128, 128)); break; case SP_DialogNoButton: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-no-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-no-32.png"), QSize(32, 32)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-no-128.png"), QSize(128, 128)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-no-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-no-32.png"_L1, QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/standardbutton-no-128.png"_L1, QSize(128, 128)); break; case SP_ArrowForward: if (rtl) @@ -6250,106 +6244,106 @@ QIcon QCommonStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption return QCommonStyle::standardIcon(SP_ArrowRight, option, widget); return QCommonStyle::standardIcon(SP_ArrowLeft, option, widget); case SP_ArrowLeft: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/left-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/left-32.png"), QSize(32, 32)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/left-128.png"), QSize(128, 128)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/left-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/left-32.png"_L1, QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/left-128.png"_L1, QSize(128, 128)); break; case SP_ArrowRight: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/right-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/right-32.png"), QSize(32, 32)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/right-128.png"), QSize(128, 128)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/right-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/right-32.png"_L1, QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/right-128.png"_L1, QSize(128, 128)); break; case SP_ArrowUp: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/up-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/up-32.png"), QSize(32, 32)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/up-128.png"), QSize(128, 128)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/up-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/up-32.png"_L1, QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/up-128.png"_L1, QSize(128, 128)); break; case SP_ArrowDown: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/down-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/down-32.png"), QSize(32, 32)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/down-128.png"), QSize(128, 128)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/down-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/down-32.png"_L1, QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/down-128.png"_L1, QSize(128, 128)); break; case SP_DirHomeIcon: case SP_DirIcon: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/dirclosed-16.png"), + icon.addFile(":/qt-project.org/styles/commonstyle/images/dirclosed-16.png"_L1, QSize(), QIcon::Normal, QIcon::Off); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/diropen-16.png"), + icon.addFile(":/qt-project.org/styles/commonstyle/images/diropen-16.png"_L1, QSize(), QIcon::Normal, QIcon::On); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/dirclosed-32.png"), + icon.addFile(":/qt-project.org/styles/commonstyle/images/dirclosed-32.png"_L1, QSize(32, 32), QIcon::Normal, QIcon::Off); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/diropen-32.png"), + icon.addFile(":/qt-project.org/styles/commonstyle/images/diropen-32.png"_L1, QSize(32, 32), QIcon::Normal, QIcon::On); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/dirclosed-128.png"), + icon.addFile(":/qt-project.org/styles/commonstyle/images/dirclosed-128.png"_L1, QSize(128, 128), QIcon::Normal, QIcon::Off); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/diropen-128.png"), + icon.addFile(":/qt-project.org/styles/commonstyle/images/diropen-128.png"_L1, QSize(128, 128), QIcon::Normal, QIcon::On); break; case SP_DriveCDIcon: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/cdr-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/cdr-32.png"), QSize(32, 32)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/cdr-128.png"), QSize(128, 128)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/cdr-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/cdr-32.png"_L1, QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/cdr-128.png"_L1, QSize(128, 128)); break; case SP_DriveDVDIcon: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/dvd-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/dvd-32.png"), QSize(32, 32)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/dvd-128.png"), QSize(128, 128)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/dvd-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/dvd-32.png"_L1, QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/dvd-128.png"_L1, QSize(128, 128)); break; case SP_FileIcon: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/file-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/file-32.png"), QSize(32, 32)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/file-128.png"), QSize(128, 128)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/file-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/file-32.png"_L1, QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/file-128.png"_L1, QSize(128, 128)); break; case SP_FileLinkIcon: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/filelink-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/filelink-32.png"), QSize(32, 32)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/filelink-128.png"), QSize(128, 128)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/filelink-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/filelink-32.png"_L1, QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/filelink-128.png"_L1, QSize(128, 128)); break; case SP_TrashIcon: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/trash-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/trash-32.png"), QSize(32, 32)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/trash-128.png"), QSize(128, 128)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/trash-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/trash-32.png"_L1, QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/trash-128.png"_L1, QSize(128, 128)); break; case SP_BrowserReload: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/refresh-24.png"), QSize(24, 24)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/refresh-32.png"), QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/refresh-24.png"_L1, QSize(24, 24)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/refresh-32.png"_L1, QSize(32, 32)); break; case SP_BrowserStop: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/stop-24.png"), QSize(24, 24)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/stop-32.png"), QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/stop-24.png"_L1, QSize(24, 24)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/stop-32.png"_L1, QSize(32, 32)); break; case SP_MediaPlay: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-play-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-play-32.png"), QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/media-play-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/media-play-32.png"_L1, QSize(32, 32)); break; case SP_MediaPause: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-pause-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-pause-32.png"), QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/media-pause-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/media-pause-32.png"_L1, QSize(32, 32)); break; case SP_MediaStop: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-stop-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-stop-32.png"), QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/media-stop-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/media-stop-32.png"_L1, QSize(32, 32)); break; case SP_MediaSeekForward: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-seek-forward-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-seek-forward-32.png"), QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/media-seek-forward-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/media-seek-forward-32.png"_L1, QSize(32, 32)); break; case SP_MediaSeekBackward: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-seek-backward-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-seek-backward-32.png"), QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/media-seek-backward-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/media-seek-backward-32.png"_L1, QSize(32, 32)); break; case SP_MediaSkipForward: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-skip-forward-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-skip-forward-32.png"), QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/media-skip-forward-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/media-skip-forward-32.png"_L1, QSize(32, 32)); break; case SP_MediaSkipBackward: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-skip-backward-16.png"), QSize(16, 16)); - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-skip-backward-32.png"), QSize(32, 32)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/media-skip-backward-16.png"_L1, QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/media-skip-backward-32.png"_L1, QSize(32, 32)); break; case SP_MediaVolume: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-volume-16.png"), QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/media-volume-16.png"_L1, QSize(16, 16)); break; case SP_MediaVolumeMuted: - icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/media-volume-muted-16.png"), QSize(16, 16)); + icon.addFile(":/qt-project.org/styles/commonstyle/images/media-volume-muted-16.png"_L1, QSize(16, 16)); break; case SP_TitleBarCloseButton: addIconFiles(iconResourcePrefix() + QStringLiteral("closedock-"), @@ -6359,7 +6353,7 @@ QIcon QCommonStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption # ifndef QT_NO_IMAGEFORMAT_XPM icon.addPixmap(titleBarMenuCachedPixmapFromXPM()); # endif - icon.addFile(QLatin1String(":/qt-project.org/qmessagebox/images/qtlogo-64.png")); + icon.addFile(":/qt-project.org/qmessagebox/images/qtlogo-64.png"_L1); break; case SP_TitleBarNormalButton: addIconFiles(iconResourcePrefix() + QStringLiteral("normalizedockup-"), diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp index 396f5626fa..0473351f89 100644 --- a/src/widgets/styles/qfusionstyle.cpp +++ b/src/widgets/styles/qfusionstyle.cpp @@ -93,6 +93,7 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; using namespace QStyleHelper; enum Direction { @@ -259,7 +260,7 @@ static void qt_fusion_draw_arrow(Qt::ArrowType type, QPainter *painter, const QS const int size = qMin(arrowMax, rectMax); QPixmap cachePixmap; - QString cacheKey = QStyleHelper::uniqueName(QLatin1String("fusion-arrow"), option, rect.size()) + QString cacheKey = QStyleHelper::uniqueName("fusion-arrow"_L1, option, rect.size()) % HexString<uint>(type) % HexString<uint>(color.rgba()); if (!QPixmapCache::find(cacheKey, &cachePixmap)) { @@ -390,7 +391,7 @@ QFusionStylePrivate::QFusionStylePrivate() */ QFusionStyle::QFusionStyle() : QCommonStyle(*new QFusionStylePrivate) { - setObjectName(QLatin1String("Fusion")); + setObjectName("Fusion"_L1); } /*! @@ -470,7 +471,7 @@ void QFusionStyle::drawPrimitive(PrimitiveElement elem, // No frame drawn case PE_FrameGroupBox: { - QPixmap pixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/fusion_groupbox.png")); + QPixmap pixmap(":/qt-project.org/styles/commonstyle/images/fusion_groupbox.png"_L1); int topMargin = 0; auto control = qobject_cast<const QGroupBox *>(widget); if (control && !control->isCheckable() && control->title().isEmpty()) { @@ -1271,7 +1272,7 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio // Draws the header in tables. if (const QStyleOptionHeader *header = qstyleoption_cast<const QStyleOptionHeader *>(option)) { const QStyleOptionHeaderV2 *headerV2 = qstyleoption_cast<const QStyleOptionHeaderV2 *>(option); - QString pixmapName = QStyleHelper::uniqueName(QLatin1String("headersection"), option, option->rect.size()); + QString pixmapName = QStyleHelper::uniqueName("headersection"_L1, option, option->rect.size()); pixmapName += QString::number(- int(header->position)); pixmapName += QString::number(- int(header->orientation)); if (headerV2) @@ -1988,7 +1989,7 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption case CC_SpinBox: if (const QStyleOptionSpinBox *spinBox = qstyleoption_cast<const QStyleOptionSpinBox *>(option)) { QPixmap cache; - QString pixmapName = QStyleHelper::uniqueName(QLatin1String("spinbox"), spinBox, spinBox->rect.size()); + QString pixmapName = QStyleHelper::uniqueName("spinbox"_L1, spinBox, spinBox->rect.size()); if (!QPixmapCache::find(pixmapName, &cache)) { cache = styleCachePixmap(spinBox->rect.size()); @@ -2698,15 +2699,15 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption bool sunken = comboBox->state & State_On; // play dead, if combobox has no items bool isEnabled = (comboBox->state & State_Enabled); QPixmap cache; - QString pixmapName = QStyleHelper::uniqueName(QLatin1String("combobox"), option, comboBox->rect.size()); + QString pixmapName = QStyleHelper::uniqueName("combobox"_L1, option, comboBox->rect.size()); if (sunken) - pixmapName += QLatin1String("-sunken"); + pixmapName += "-sunken"_L1; if (comboBox->editable) - pixmapName += QLatin1String("-editable"); + pixmapName += "-editable"_L1; if (isEnabled) - pixmapName += QLatin1String("-enabled"); + pixmapName += "-enabled"_L1; if (!comboBox->frame) - pixmapName += QLatin1String("-frameless"); + pixmapName += "-frameless"_L1; if (!QPixmapCache::find(pixmapName, &cache)) { cache = styleCachePixmap(comboBox->rect.size()); @@ -2819,7 +2820,7 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption grooveColor.setHsv(buttonColor.hue(), qMin(255, (int)(buttonColor.saturation())), qMin(255, (int)(buttonColor.value()*0.9))); - QString groovePixmapName = QStyleHelper::uniqueName(QLatin1String("slider_groove"), option, groove.size()); + QString groovePixmapName = QStyleHelper::uniqueName("slider_groove"_L1, option, groove.size()); QRect pixmapRect(0, 0, groove.width(), groove.height()); // draw background groove @@ -2850,7 +2851,7 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption // draw blue groove highlight QRect clipRect; - groovePixmapName += QLatin1String("_blue"); + groovePixmapName += "_blue"_L1; if (!QPixmapCache::find(groovePixmapName, &cache)) { cache = styleCachePixmap(pixmapRect.size()); cache.fill(Qt::transparent); @@ -2957,7 +2958,7 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption } // draw handle if ((option->subControls & SC_SliderHandle) ) { - QString handlePixmapName = QStyleHelper::uniqueName(QLatin1String("slider_handle"), option, handle.size()); + QString handlePixmapName = QStyleHelper::uniqueName("slider_handle"_L1, option, handle.size()); if (!QPixmapCache::find(handlePixmapName, &cache)) { cache = styleCachePixmap(handle.size()); cache.fill(Qt::transparent); diff --git a/src/widgets/styles/qproxystyle.cpp b/src/widgets/styles/qproxystyle.cpp index 585177c30d..67dcc97f54 100644 --- a/src/widgets/styles/qproxystyle.cpp +++ b/src/widgets/styles/qproxystyle.cpp @@ -48,6 +48,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + /*! \class QProxyStyle @@ -106,7 +108,7 @@ void QProxyStylePrivate::ensureBaseStyle() const baseStyle = QStyleFactory::create(QApplicationPrivate::desktopStyleKey()); if (!baseStyle) // Fallback to windows style - baseStyle = QStyleFactory::create(QLatin1String("windows")); + baseStyle = QStyleFactory::create("windows"_L1); baseStyle->setProxy(const_cast<QProxyStyle*>(q)); baseStyle->setParent(const_cast<QProxyStyle*>(q)); // Take ownership diff --git a/src/widgets/styles/qstylefactory.cpp b/src/widgets/styles/qstylefactory.cpp index 70d08468ca..d415e49ec8 100644 --- a/src/widgets/styles/qstylefactory.cpp +++ b/src/widgets/styles/qstylefactory.cpp @@ -50,8 +50,10 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, - (QStyleFactoryInterface_iid, QLatin1String("/styles"), Qt::CaseInsensitive)) + (QStyleFactoryInterface_iid, "/styles"_L1, Qt::CaseInsensitive)) /*! \class QStyleFactory @@ -91,17 +93,17 @@ QStyle *QStyleFactory::create(const QString& key) QStyle *ret = nullptr; QString style = key.toLower(); #if QT_CONFIG(style_windows) - if (style == QLatin1String("windows")) + if (style == "windows"_L1) ret = new QWindowsStyle; else #endif #if QT_CONFIG(style_fusion) - if (style == QLatin1String("fusion")) + if (style == "fusion"_L1) ret = new QFusionStyle; else #endif #if defined(Q_OS_MACOS) && QT_DEPRECATED_SINCE(6, 0) - if (style == QLatin1String("macintosh")) { + if (style == "macintosh"_L1) { qWarning() << "The style key 'macintosh' is deprecated. Please use 'macos' instead."; style = QStringLiteral("macos"); } else @@ -132,12 +134,12 @@ QStringList QStyleFactory::keys() for (PluginKeyMap::const_iterator it = keyMap.constBegin(); it != cend; ++it) list.append(it.value()); #if QT_CONFIG(style_windows) - if (!list.contains(QLatin1String("Windows"))) - list << QLatin1String("Windows"); + if (!list.contains("Windows"_L1)) + list << "Windows"_L1; #endif #if QT_CONFIG(style_fusion) - if (!list.contains(QLatin1String("Fusion"))) - list << QLatin1String("Fusion"); + if (!list.contains("Fusion"_L1)) + list << "Fusion"_L1; #endif return list; } diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index 4575d5a299..c7e77a2d56 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -806,9 +806,9 @@ QHash<QStyle::SubControl, QRect> QStyleSheetStyle::titleBarLayout(const QWidget const bool isMaximized = tb->titleBarState & Qt::WindowMaximized; QRenderRule subRule = renderRule(w, tb); QRect cr = subRule.contentsRect(tb->rect); - QList<QVariant> layout = subRule.styleHint(QLatin1String("button-layout")).toList(); + QList<QVariant> layout = subRule.styleHint("button-layout"_L1).toList(); if (layout.isEmpty()) - layout = subControlLayout(QLatin1String("I(T)HSmMX")); + layout = subControlLayout("I(T)HSmMX"_L1); int offsets[3] = { 0, 0, 0 }; enum Where { Left, Right, Center, NoWhere } where = Left; @@ -1024,7 +1024,7 @@ QRenderRule::QRenderRule(const QList<Declaration> &declarations, const QObject * int cuts[4]; decl.borderImageValue(&uri, cuts, &horizStretch, &vertStretch); - if (uri.isEmpty() || uri == QLatin1String("none")) { + if (uri.isEmpty() || uri == "none"_L1) { if (bd && bd->bi) bd->bi->pixmap = QPixmap(); } else { @@ -1046,7 +1046,7 @@ QRenderRule::QRenderRule(const QList<Declaration> &declarations, const QObject * int role = decl.d->values.at(0).variant.toInt(); if (role >= Value_FirstColorRole && role <= Value_LastColorRole) defaultBackground = palette.color((QPalette::ColorRole)(role-Value_FirstColorRole)); - } else if (decl.d->property.startsWith(QLatin1String("qproperty-"), Qt::CaseInsensitive)) { + } else if (decl.d->property.startsWith("qproperty-"_L1, Qt::CaseInsensitive)) { // intentionally left blank... } else if (decl.d->propertyId == UnknownProperty) { bool knownStyleHint = false; @@ -1055,11 +1055,11 @@ QRenderRule::QRenderRule(const QList<Declaration> &declarations, const QObject * if (decl.d->property.compare(styleHint) == 0) { QString hintName = QString(styleHint); QVariant hintValue; - if (hintName.endsWith(QLatin1String("alignment"))) { + if (hintName.endsWith("alignment"_L1)) { hintValue = (int) decl.alignmentValue(); - } else if (hintName.endsWith(QLatin1String("color"))) { + } else if (hintName.endsWith("color"_L1)) { hintValue = (int) decl.colorValue().rgba(); - } else if (hintName.endsWith(QLatin1String("size"))) { + } else if (hintName.endsWith("size"_L1)) { // Check only for the 'em' case const QString valueString = decl.d->values.at(0).variant.toString(); const bool isEmSize = valueString.endsWith(u"em", Qt::CaseInsensitive); @@ -1089,9 +1089,9 @@ QRenderRule::QRenderRule(const QList<Declaration> &declarations, const QObject * // Normal case where we receive a 'px' or 'pt' unit hintValue = decl.sizeValue(); } - } else if (hintName.endsWith(QLatin1String("icon"))) { + } else if (hintName.endsWith("icon"_L1)) { hintValue = decl.iconValue(); - } else if (hintName == QLatin1String("button-layout") + } else if (hintName == "button-layout"_L1 && decl.d->values.count() != 0 && decl.d->values.at(0).type == Value::String) { hintValue = subControlLayout(decl.d->values.at(0).variant.toString()); } else { @@ -1563,7 +1563,7 @@ public: const QMetaObject *metaObject = OBJECT_PTR(node)->metaObject(); #if QT_CONFIG(tooltip) if (qstrcmp(metaObject->className(), "QTipLabel") == 0) - return QStringList(QLatin1String("QToolTip")); + return QStringList("QToolTip"_L1); #endif QStringList result; do { @@ -1629,7 +1629,7 @@ public: const QMetaObject *metaObject = OBJECT_PTR(node)->metaObject(); #if QT_CONFIG(tooltip) if (qstrcmp(metaObject->className(), "QTipLabel") == 0) - return nodeName == QLatin1String("QToolTip"); + return nodeName == "QToolTip"_L1; #endif do { const ushort *uc = (const ushort *)nodeName.constData(); @@ -1694,7 +1694,7 @@ QList<QCss::StyleRule> QStyleSheetStyle::styleRules(const QObject *obj) const QHash<const void *, StyleSheet>::const_iterator appCacheIt = styleSheetCaches->styleSheetCache.constFind(qApp); if (appCacheIt == styleSheetCaches->styleSheetCache.constEnd()) { QString ss = qApp->styleSheet(); - if (ss.startsWith(QLatin1String("file:///"))) + if (ss.startsWith("file:///"_L1)) ss.remove(0, 8); parser.init(ss, qApp->styleSheet() != ss); if (Q_UNLIKELY(!parser.parse(&appSs))) @@ -1718,7 +1718,7 @@ QList<QCss::StyleRule> QStyleSheetStyle::styleRules(const QObject *obj) const if (objCacheIt == styleSheetCaches->styleSheetCache.constEnd()) { parser.init(styleSheet); if (!parser.parse(&ss)) { - parser.init(QLatin1String("* {") + styleSheet + u'}'); + parser.init("* {"_L1 + styleSheet + u'}'); if (Q_UNLIKELY(!parser.parse(&ss))) qWarning() << "Could not parse stylesheet of object" << o; } @@ -1855,9 +1855,9 @@ static void qt_check_if_internal_object(const QObject **obj, int *element) Q_UNUSED(element); #else if (*obj && qstrcmp((*obj)->metaObject()->className(), "QDockWidgetTitleButton") == 0) { - if ((*obj)->objectName() == QLatin1String("qt_dockwidget_closebutton")) { + if ((*obj)->objectName() == "qt_dockwidget_closebutton"_L1) { *element = PseudoElement_DockWidgetCloseButton; - } else if ((*obj)->objectName() == QLatin1String("qt_dockwidget_floatbutton")) { + } else if ((*obj)->objectName() == "qt_dockwidget_floatbutton"_L1) { *element = PseudoElement_DockWidgetFloatButton; } *obj = (*obj)->parent(); @@ -2673,7 +2673,7 @@ void QStyleSheetStyle::setProperties(QWidget *w) QDuplicateTracker<QString> propertySet(decls.size()); for (int i = decls.count() - 1; i >= 0; --i) { const QString property = decls.at(i).d->property; - if (!property.startsWith(QLatin1String("qproperty-"), Qt::CaseInsensitive)) + if (!property.startsWith("qproperty-"_L1, Qt::CaseInsensitive)) continue; if (!propertySet.hasSeen(property)) finals.append(i); @@ -3510,9 +3510,9 @@ void QStyleSheetStyle::drawComplexControl(ComplexControl cc, const QStyleOptionC if (hasStyleRule(w, PseudoElement_MdiCloseButton) || hasStyleRule(w, PseudoElement_MdiNormalButton) || hasStyleRule(w, PseudoElement_MdiMinButton)) { - QList<QVariant> layout = rule.styleHint(QLatin1String("button-layout")).toList(); + QList<QVariant> layout = rule.styleHint("button-layout"_L1).toList(); if (layout.isEmpty()) - layout = subControlLayout(QLatin1String("mNX")); + layout = subControlLayout("mNX"_L1); QStyleOptionComplex optCopy(*opt); optCopy.subControls = { }; @@ -5170,9 +5170,8 @@ int QStyleSheetStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const case PM_MessageBoxIconSize: case PM_ButtonIconSize: case PM_SmallIconSize: - if (rule.hasStyleHint(QLatin1String("icon-size"))) { - return rule.styleHint(QLatin1String("icon-size")).toSize().width(); - } + if (rule.hasStyleHint("icon-size"_L1)) + return rule.styleHint("icon-size"_L1).toSize().width(); break; case PM_DockWidgetTitleMargin: { @@ -5458,9 +5457,9 @@ QSize QStyleSheetStyle::sizeFromContents(ContentsType ct, const QStyleOption *op && !hasStyleRule(w, PseudoElement_MdiMinButton)) break; - QList<QVariant> layout = rule.styleHint(QLatin1String("button-layout")).toList(); + QList<QVariant> layout = rule.styleHint("button-layout"_L1).toList(); if (layout.isEmpty()) - layout = subControlLayout(QLatin1String("mNX")); + layout = subControlLayout("mNX"_L1); int width = 0, height = 0; for (int i = 0; i < layout.count(); i++) { @@ -5505,62 +5504,62 @@ QSize QStyleSheetStyle::sizeFromContents(ContentsType ct, const QStyleOption *op static QLatin1String propertyNameForStandardPixmap(QStyle::StandardPixmap sp) { switch (sp) { - case QStyle::SP_TitleBarMenuButton: return QLatin1String("titlebar-menu-icon"); - case QStyle::SP_TitleBarMinButton: return QLatin1String("titlebar-minimize-icon"); - case QStyle::SP_TitleBarMaxButton: return QLatin1String("titlebar-maximize-icon"); - case QStyle::SP_TitleBarCloseButton: return QLatin1String("titlebar-close-icon"); - case QStyle::SP_TitleBarNormalButton: return QLatin1String("titlebar-normal-icon"); - case QStyle::SP_TitleBarShadeButton: return QLatin1String("titlebar-shade-icon"); - case QStyle::SP_TitleBarUnshadeButton: return QLatin1String("titlebar-unshade-icon"); - case QStyle::SP_TitleBarContextHelpButton: return QLatin1String("titlebar-contexthelp-icon"); - case QStyle::SP_DockWidgetCloseButton: return QLatin1String("dockwidget-close-icon"); - case QStyle::SP_MessageBoxInformation: return QLatin1String("messagebox-information-icon"); - case QStyle::SP_MessageBoxWarning: return QLatin1String("messagebox-warning-icon"); - case QStyle::SP_MessageBoxCritical: return QLatin1String("messagebox-critical-icon"); - case QStyle::SP_MessageBoxQuestion: return QLatin1String("messagebox-question-icon"); - case QStyle::SP_DesktopIcon: return QLatin1String("desktop-icon"); - case QStyle::SP_TrashIcon: return QLatin1String("trash-icon"); - case QStyle::SP_ComputerIcon: return QLatin1String("computer-icon"); - case QStyle::SP_DriveFDIcon: return QLatin1String("floppy-icon"); - case QStyle::SP_DriveHDIcon: return QLatin1String("harddisk-icon"); - case QStyle::SP_DriveCDIcon: return QLatin1String("cd-icon"); - case QStyle::SP_DriveDVDIcon: return QLatin1String("dvd-icon"); - case QStyle::SP_DriveNetIcon: return QLatin1String("network-icon"); - case QStyle::SP_DirOpenIcon: return QLatin1String("directory-open-icon"); - case QStyle::SP_DirClosedIcon: return QLatin1String("directory-closed-icon"); - case QStyle::SP_DirLinkIcon: return QLatin1String("directory-link-icon"); - case QStyle::SP_FileIcon: return QLatin1String("file-icon"); - case QStyle::SP_FileLinkIcon: return QLatin1String("file-link-icon"); - case QStyle::SP_FileDialogStart: return QLatin1String("filedialog-start-icon"); - case QStyle::SP_FileDialogEnd: return QLatin1String("filedialog-end-icon"); - case QStyle::SP_FileDialogToParent: return QLatin1String("filedialog-parent-directory-icon"); - case QStyle::SP_FileDialogNewFolder: return QLatin1String("filedialog-new-directory-icon"); - case QStyle::SP_FileDialogDetailedView: return QLatin1String("filedialog-detailedview-icon"); - case QStyle::SP_FileDialogInfoView: return QLatin1String("filedialog-infoview-icon"); - case QStyle::SP_FileDialogContentsView: return QLatin1String("filedialog-contentsview-icon"); - case QStyle::SP_FileDialogListView: return QLatin1String("filedialog-listview-icon"); - case QStyle::SP_FileDialogBack: return QLatin1String("filedialog-backward-icon"); - case QStyle::SP_DirIcon: return QLatin1String("directory-icon"); - case QStyle::SP_DialogOkButton: return QLatin1String("dialog-ok-icon"); - case QStyle::SP_DialogCancelButton: return QLatin1String("dialog-cancel-icon"); - case QStyle::SP_DialogHelpButton: return QLatin1String("dialog-help-icon"); - case QStyle::SP_DialogOpenButton: return QLatin1String("dialog-open-icon"); - case QStyle::SP_DialogSaveButton: return QLatin1String("dialog-save-icon"); - case QStyle::SP_DialogCloseButton: return QLatin1String("dialog-close-icon"); - case QStyle::SP_DialogApplyButton: return QLatin1String("dialog-apply-icon"); - case QStyle::SP_DialogResetButton: return QLatin1String("dialog-reset-icon"); - case QStyle::SP_DialogDiscardButton: return QLatin1String("dialog-discard-icon"); - case QStyle::SP_DialogYesButton: return QLatin1String("dialog-yes-icon"); - case QStyle::SP_DialogNoButton: return QLatin1String("dialog-no-icon"); - case QStyle::SP_ArrowUp: return QLatin1String("uparrow-icon"); - case QStyle::SP_ArrowDown: return QLatin1String("downarrow-icon"); - case QStyle::SP_ArrowLeft: return QLatin1String("leftarrow-icon"); - case QStyle::SP_ArrowRight: return QLatin1String("rightarrow-icon"); - case QStyle::SP_ArrowBack: return QLatin1String("backward-icon"); - case QStyle::SP_ArrowForward: return QLatin1String("forward-icon"); - case QStyle::SP_DirHomeIcon: return QLatin1String("home-icon"); - case QStyle::SP_LineEditClearButton: return QLatin1String("lineedit-clear-button-icon"); - default: return QLatin1String(""); + case QStyle::SP_TitleBarMenuButton: return "titlebar-menu-icon"_L1; + case QStyle::SP_TitleBarMinButton: return "titlebar-minimize-icon"_L1; + case QStyle::SP_TitleBarMaxButton: return "titlebar-maximize-icon"_L1; + case QStyle::SP_TitleBarCloseButton: return "titlebar-close-icon"_L1; + case QStyle::SP_TitleBarNormalButton: return "titlebar-normal-icon"_L1; + case QStyle::SP_TitleBarShadeButton: return "titlebar-shade-icon"_L1; + case QStyle::SP_TitleBarUnshadeButton: return "titlebar-unshade-icon"_L1; + case QStyle::SP_TitleBarContextHelpButton: return "titlebar-contexthelp-icon"_L1; + case QStyle::SP_DockWidgetCloseButton: return "dockwidget-close-icon"_L1; + case QStyle::SP_MessageBoxInformation: return "messagebox-information-icon"_L1; + case QStyle::SP_MessageBoxWarning: return "messagebox-warning-icon"_L1; + case QStyle::SP_MessageBoxCritical: return "messagebox-critical-icon"_L1; + case QStyle::SP_MessageBoxQuestion: return "messagebox-question-icon"_L1; + case QStyle::SP_DesktopIcon: return "desktop-icon"_L1; + case QStyle::SP_TrashIcon: return "trash-icon"_L1; + case QStyle::SP_ComputerIcon: return "computer-icon"_L1; + case QStyle::SP_DriveFDIcon: return "floppy-icon"_L1; + case QStyle::SP_DriveHDIcon: return "harddisk-icon"_L1; + case QStyle::SP_DriveCDIcon: return "cd-icon"_L1; + case QStyle::SP_DriveDVDIcon: return "dvd-icon"_L1; + case QStyle::SP_DriveNetIcon: return "network-icon"_L1; + case QStyle::SP_DirOpenIcon: return "directory-open-icon"_L1; + case QStyle::SP_DirClosedIcon: return "directory-closed-icon"_L1; + case QStyle::SP_DirLinkIcon: return "directory-link-icon"_L1; + case QStyle::SP_FileIcon: return "file-icon"_L1; + case QStyle::SP_FileLinkIcon: return "file-link-icon"_L1; + case QStyle::SP_FileDialogStart: return "filedialog-start-icon"_L1; + case QStyle::SP_FileDialogEnd: return "filedialog-end-icon"_L1; + case QStyle::SP_FileDialogToParent: return "filedialog-parent-directory-icon"_L1; + case QStyle::SP_FileDialogNewFolder: return "filedialog-new-directory-icon"_L1; + case QStyle::SP_FileDialogDetailedView: return "filedialog-detailedview-icon"_L1; + case QStyle::SP_FileDialogInfoView: return "filedialog-infoview-icon"_L1; + case QStyle::SP_FileDialogContentsView: return "filedialog-contentsview-icon"_L1; + case QStyle::SP_FileDialogListView: return "filedialog-listview-icon"_L1; + case QStyle::SP_FileDialogBack: return "filedialog-backward-icon"_L1; + case QStyle::SP_DirIcon: return "directory-icon"_L1; + case QStyle::SP_DialogOkButton: return "dialog-ok-icon"_L1; + case QStyle::SP_DialogCancelButton: return "dialog-cancel-icon"_L1; + case QStyle::SP_DialogHelpButton: return "dialog-help-icon"_L1; + case QStyle::SP_DialogOpenButton: return "dialog-open-icon"_L1; + case QStyle::SP_DialogSaveButton: return "dialog-save-icon"_L1; + case QStyle::SP_DialogCloseButton: return "dialog-close-icon"_L1; + case QStyle::SP_DialogApplyButton: return "dialog-apply-icon"_L1; + case QStyle::SP_DialogResetButton: return "dialog-reset-icon"_L1; + case QStyle::SP_DialogDiscardButton: return "dialog-discard-icon"_L1; + case QStyle::SP_DialogYesButton: return "dialog-yes-icon"_L1; + case QStyle::SP_DialogNoButton: return "dialog-no-icon"_L1; + case QStyle::SP_ArrowUp: return "uparrow-icon"_L1; + case QStyle::SP_ArrowDown: return "downarrow-icon"_L1; + case QStyle::SP_ArrowLeft: return "leftarrow-icon"_L1; + case QStyle::SP_ArrowRight: return "rightarrow-icon"_L1; + case QStyle::SP_ArrowBack: return "backward-icon"_L1; + case QStyle::SP_ArrowForward: return "forward-icon"_L1; + case QStyle::SP_DirHomeIcon: return "home-icon"_L1; + case QStyle::SP_LineEditClearButton: return "lineedit-clear-button-icon"_L1; + default: return ""_L1; } } @@ -5616,25 +5615,25 @@ int QStyleSheetStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWi QRenderRule rule = renderRule(w, opt); QString s; switch (sh) { - case SH_LineEdit_PasswordCharacter: s = QLatin1String("lineedit-password-character"); break; - case SH_LineEdit_PasswordMaskDelay: s = QLatin1String("lineedit-password-mask-delay"); break; - case SH_DitherDisabledText: s = QLatin1String("dither-disabled-text"); break; - case SH_EtchDisabledText: s = QLatin1String("etch-disabled-text"); break; - case SH_ItemView_ActivateItemOnSingleClick: s = QLatin1String("activate-on-singleclick"); break; - case SH_ItemView_ShowDecorationSelected: s = QLatin1String("show-decoration-selected"); break; - case SH_Table_GridLineColor: s = QLatin1String("gridline-color"); break; - case SH_DialogButtonLayout: s = QLatin1String("button-layout"); break; - case SH_ToolTipLabel_Opacity: s = QLatin1String("opacity"); break; - case SH_ComboBox_Popup: s = QLatin1String("combobox-popup"); break; - case SH_ComboBox_ListMouseTracking: s = QLatin1String("combobox-list-mousetracking"); break; - case SH_MenuBar_AltKeyNavigation: s = QLatin1String("menubar-altkey-navigation"); break; - case SH_Menu_Scrollable: s = QLatin1String("menu-scrollable"); break; - case SH_DrawMenuBarSeparator: s = QLatin1String("menubar-separator"); break; - case SH_MenuBar_MouseTracking: s = QLatin1String("mouse-tracking"); break; - case SH_SpinBox_ClickAutoRepeatRate: s = QLatin1String("spinbox-click-autorepeat-rate"); break; - case SH_SpinControls_DisableOnBounds: s = QLatin1String("spincontrol-disable-on-bounds"); break; - case SH_MessageBox_TextInteractionFlags: s = QLatin1String("messagebox-text-interaction-flags"); break; - case SH_ToolButton_PopupDelay: s = QLatin1String("toolbutton-popup-delay"); break; + case SH_LineEdit_PasswordCharacter: s = "lineedit-password-character"_L1; break; + case SH_LineEdit_PasswordMaskDelay: s = "lineedit-password-mask-delay"_L1; break; + case SH_DitherDisabledText: s = "dither-disabled-text"_L1; break; + case SH_EtchDisabledText: s = "etch-disabled-text"_L1; break; + case SH_ItemView_ActivateItemOnSingleClick: s = "activate-on-singleclick"_L1; break; + case SH_ItemView_ShowDecorationSelected: s = "show-decoration-selected"_L1; break; + case SH_Table_GridLineColor: s = "gridline-color"_L1; break; + case SH_DialogButtonLayout: s = "button-layout"_L1; break; + case SH_ToolTipLabel_Opacity: s = "opacity"_L1; break; + case SH_ComboBox_Popup: s = "combobox-popup"_L1; break; + case SH_ComboBox_ListMouseTracking: s = "combobox-list-mousetracking"_L1; break; + case SH_MenuBar_AltKeyNavigation: s = "menubar-altkey-navigation"_L1; break; + case SH_Menu_Scrollable: s = "menu-scrollable"_L1; break; + case SH_DrawMenuBarSeparator: s = "menubar-separator"_L1; break; + case SH_MenuBar_MouseTracking: s = "mouse-tracking"_L1; break; + case SH_SpinBox_ClickAutoRepeatRate: s = "spinbox-click-autorepeat-rate"_L1; break; + case SH_SpinControls_DisableOnBounds: s = "spincontrol-disable-on-bounds"_L1; break; + case SH_MessageBox_TextInteractionFlags: s = "messagebox-text-interaction-flags"_L1; break; + case SH_ToolButton_PopupDelay: s = "toolbutton-popup-delay"_L1; break; case SH_ToolBox_SelectedPageTitleBold: if (renderRule(w, opt, PseudoElement_ToolBoxTab).hasFont) return 0; @@ -5643,12 +5642,12 @@ int QStyleSheetStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWi if (rule.hasPalette() && rule.palette()->foreground.style() != Qt::NoBrush) return rule.palette()->foreground.color().rgba(); break; - case SH_ScrollView_FrameOnlyAroundContents: s = QLatin1String("scrollview-frame-around-contents"); break; - case SH_ScrollBar_ContextMenu: s = QLatin1String("scrollbar-contextmenu"); break; - case SH_ScrollBar_LeftClickAbsolutePosition: s = QLatin1String("scrollbar-leftclick-absolute-position"); break; - case SH_ScrollBar_MiddleClickAbsolutePosition: s = QLatin1String("scrollbar-middleclick-absolute-position"); break; - case SH_ScrollBar_RollBetweenButtons: s = QLatin1String("scrollbar-roll-between-buttons"); break; - case SH_ScrollBar_ScrollWhenPointerLeavesControl: s = QLatin1String("scrollbar-scroll-when-pointer-leaves-control"); break; + case SH_ScrollView_FrameOnlyAroundContents: s = "scrollview-frame-around-contents"_L1; break; + case SH_ScrollBar_ContextMenu: s = "scrollbar-contextmenu"_L1; break; + case SH_ScrollBar_LeftClickAbsolutePosition: s = "scrollbar-leftclick-absolute-position"_L1; break; + case SH_ScrollBar_MiddleClickAbsolutePosition: s = "scrollbar-middleclick-absolute-position"_L1; break; + case SH_ScrollBar_RollBetweenButtons: s = "scrollbar-roll-between-buttons"_L1; break; + case SH_ScrollBar_ScrollWhenPointerLeavesControl: s = "scrollbar-scroll-when-pointer-leaves-control"_L1; break; case SH_TabBar_Alignment: #if QT_CONFIG(tabwidget) if (qobject_cast<const QTabWidget *>(w)) { @@ -5657,7 +5656,7 @@ int QStyleSheetStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWi return rule.position()->position; } #endif // QT_CONFIG(tabwidget) - s = QLatin1String("alignment"); + s = "alignment"_L1; break; #if QT_CONFIG(tabbar) case SH_TabBar_CloseButtonPosition: @@ -5671,8 +5670,8 @@ int QStyleSheetStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWi } break; #endif - case SH_TabBar_ElideMode: s = QLatin1String("tabbar-elide-mode"); break; - case SH_TabBar_PreferNoArrows: s = QLatin1String("tabbar-prefer-no-arrows"); break; + case SH_TabBar_ElideMode: s = "tabbar-elide-mode"_L1; break; + case SH_TabBar_PreferNoArrows: s = "tabbar-prefer-no-arrows"_L1; break; case SH_ComboBox_PopupFrameStyle: #if QT_CONFIG(combobox) if (qobject_cast<const QComboBox *>(w)) { @@ -5686,8 +5685,8 @@ int QStyleSheetStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWi } #endif // QT_CONFIG(combobox) break; - case SH_DialogButtonBox_ButtonsHaveIcons: s = QLatin1String("dialogbuttonbox-buttons-have-icons"); break; - case SH_Workspace_FillSpaceOnMaximize: s = QLatin1String("mdi-fill-space-on-maximize"); break; + case SH_DialogButtonBox_ButtonsHaveIcons: s = "dialogbuttonbox-buttons-have-icons"_L1; break; + case SH_Workspace_FillSpaceOnMaximize: s = "mdi-fill-space-on-maximize"_L1; break; case SH_TitleBar_NoBorder: if (rule.hasBorder()) return !rule.border()->borders[LeftEdge]; @@ -5698,10 +5697,10 @@ int QStyleSheetStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWi return 1; break; } - case SH_ItemView_ArrowKeysNavigateIntoChildren: s = QLatin1String("arrow-keys-navigate-into-children"); break; - case SH_ItemView_PaintAlternatingRowColorsForEmptyArea: s = QLatin1String("paint-alternating-row-colors-for-empty-area"); break; - case SH_TitleBar_ShowToolTipsOnButtons: s = QLatin1String("titlebar-show-tooltips-on-buttons"); break; - case SH_Widget_Animation_Duration: s = QLatin1String("widget-animation-duration"); break; + case SH_ItemView_ArrowKeysNavigateIntoChildren: s = "arrow-keys-navigate-into-children"_L1; break; + case SH_ItemView_PaintAlternatingRowColorsForEmptyArea: s = "paint-alternating-row-colors-for-empty-area"_L1; break; + case SH_TitleBar_ShowToolTipsOnButtons: s = "titlebar-show-tooltips-on-buttons"_L1; break; + case SH_Widget_Animation_Duration: s = "widget-animation-duration"_L1; break; case SH_ScrollBar_Transient: if (!rule.hasNativeBorder() || rule.hasBox()) return 0; @@ -6024,9 +6023,9 @@ QRect QStyleSheetStyle::subControlRect(ComplexControl cc, const QStyleOptionComp if (hasStyleRule(w, PseudoElement_MdiCloseButton) || hasStyleRule(w, PseudoElement_MdiNormalButton) || hasStyleRule(w, PseudoElement_MdiMinButton)) { - QList<QVariant> layout = rule.styleHint(QLatin1String("button-layout")).toList(); + QList<QVariant> layout = rule.styleHint("button-layout"_L1).toList(); if (layout.isEmpty()) - layout = subControlLayout(QLatin1String("mNX")); + layout = subControlLayout("mNX"_L1); int x = 0, width = 0; QRenderRule subRule; @@ -6350,7 +6349,7 @@ void QStyleSheetStyle::updateStyleSheetFont(QWidget* w) const { // Qt's fontDialog relies on the font of the sample edit for its selection, // we should never override it. - if (w->objectName() == QLatin1String("qt_fontDialog_sampleEdit")) + if (w->objectName() == "qt_fontDialog_sampleEdit"_L1) return; QWidget *container = containerWidget(w); @@ -6448,7 +6447,7 @@ Qt::Alignment QStyleSheetStyle::resolveAlignment(Qt::LayoutDirection layDir, Qt: // (and hence has the correct object name). bool QStyleSheetStyle::isNaturalChild(const QObject *obj) { - if (obj->objectName().startsWith(QLatin1String("qt_"))) + if (obj->objectName().startsWith("qt_"_L1)) return true; return false; diff --git a/src/widgets/styles/qstylesheetstyle_default.cpp b/src/widgets/styles/qstylesheetstyle_default.cpp index 25a00e1852..d9405c3a7b 100644 --- a/src/widgets/styles/qstylesheetstyle_default.cpp +++ b/src/widgets/styles/qstylesheetstyle_default.cpp @@ -54,6 +54,7 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; using namespace QCss; // This is the class name of the selector. @@ -164,19 +165,19 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const -qt-style-features: background-color; }*/ { - SET_ELEMENT_NAME(QLatin1String("QLineEdit")); + SET_ELEMENT_NAME("QLineEdit"_L1); ADD_BASIC_SELECTOR; ADD_SELECTOR; - SET_PROPERTY(QLatin1String("-qt-background-role"), QtBackgroundRole); + SET_PROPERTY("-qt-background-role"_L1, QtBackgroundRole); ADD_VALUE(Value::KnownIdentifier, Value_Base); ADD_DECLARATION; - SET_PROPERTY(QLatin1String("border"), Border); + SET_PROPERTY("border"_L1, Border); ADD_VALUE(Value::KnownIdentifier, Value_Native); ADD_DECLARATION; - SET_PROPERTY(QLatin1String("-qt-style-features"), QtStyleFeatures); + SET_PROPERTY("-qt-style-features"_L1, QtStyleFeatures); ADD_VALUE(Value::Identifier, QString::fromLatin1("background-color")); ADD_DECLARATION; @@ -187,12 +188,12 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const border: none; }*/ { - SET_ELEMENT_NAME(QLatin1String("QLineEdit")); - ADD_PSEUDO(QLatin1String("no-frame"), PseudoClass_Frameless); + SET_ELEMENT_NAME("QLineEdit"_L1); + ADD_PSEUDO("no-frame"_L1, PseudoClass_Frameless); ADD_BASIC_SELECTOR; ADD_SELECTOR; - SET_PROPERTY(QLatin1String("border"), Border); + SET_PROPERTY("border"_L1, Border); ADD_VALUE(Value::KnownIdentifier, Value_None); ADD_DECLARATION; @@ -203,11 +204,11 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const border: native; }*/ { - SET_ELEMENT_NAME(QLatin1String("QFrame")); + SET_ELEMENT_NAME("QFrame"_L1); ADD_BASIC_SELECTOR; ADD_SELECTOR; - SET_PROPERTY(QLatin1String("border"), Border); + SET_PROPERTY("border"_L1, Border); ADD_VALUE(Value::KnownIdentifier, Value_Native); ADD_DECLARATION; @@ -219,19 +220,19 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const border-image: none; }*/ { - SET_ELEMENT_NAME(QLatin1String("QLabel")); + SET_ELEMENT_NAME("QLabel"_L1); ADD_BASIC_SELECTOR; ADD_SELECTOR; - SET_ELEMENT_NAME(QLatin1String("QToolBox")); + SET_ELEMENT_NAME("QToolBox"_L1); ADD_BASIC_SELECTOR; ADD_SELECTOR; - SET_PROPERTY(QLatin1String("background"), Background); + SET_PROPERTY("background"_L1, Background); ADD_VALUE(Value::KnownIdentifier, Value_None); ADD_DECLARATION; - SET_PROPERTY(QLatin1String("border-image"), BorderImage); + SET_PROPERTY("border-image"_L1, BorderImage); ADD_VALUE(Value::KnownIdentifier, Value_None); ADD_DECLARATION; @@ -242,11 +243,11 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const border: native; }*/ { - SET_ELEMENT_NAME(QLatin1String("QGroupBox")); + SET_ELEMENT_NAME("QGroupBox"_L1); ADD_BASIC_SELECTOR; ADD_SELECTOR; - SET_PROPERTY(QLatin1String("border"), Border); + SET_PROPERTY("border"_L1, Border); ADD_VALUE(Value::KnownIdentifier, Value_Native); ADD_DECLARATION; @@ -259,15 +260,15 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const border: native; }*/ { - SET_ELEMENT_NAME(QLatin1String("QToolTip")); + SET_ELEMENT_NAME("QToolTip"_L1); ADD_BASIC_SELECTOR; ADD_SELECTOR; - SET_PROPERTY(QLatin1String("-qt-background-role"), QtBackgroundRole); + SET_PROPERTY("-qt-background-role"_L1, QtBackgroundRole); ADD_VALUE(Value::KnownIdentifier, Value_Window); ADD_DECLARATION; - SET_PROPERTY(QLatin1String("border"), Border); + SET_PROPERTY("border"_L1, Border); ADD_VALUE(Value::KnownIdentifier, Value_Native); ADD_DECLARATION; @@ -279,20 +280,20 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const -qt-style-features: background-color; //only for not pixmap based styles }*/ { - SET_ELEMENT_NAME(QLatin1String("QPushButton")); + SET_ELEMENT_NAME("QPushButton"_L1); ADD_BASIC_SELECTOR; ADD_SELECTOR; - SET_ELEMENT_NAME(QLatin1String("QToolButton")); + SET_ELEMENT_NAME("QToolButton"_L1); ADD_BASIC_SELECTOR; ADD_SELECTOR; - SET_PROPERTY(QLatin1String("border-style"), BorderStyles); + SET_PROPERTY("border-style"_L1, BorderStyles); ADD_VALUE(Value::KnownIdentifier, Value_Native); ADD_DECLARATION; if (!styleIsPixmapBased) { - SET_PROPERTY(QLatin1String("-qt-style-features"), QtStyleFeatures); + SET_PROPERTY("-qt-style-features"_L1, QtStyleFeatures); ADD_VALUE(Value::Identifier, QString::fromLatin1("background-color")); ADD_DECLARATION; } @@ -309,22 +310,22 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const }*/ { - SET_ELEMENT_NAME(QLatin1String("QComboBox")); + SET_ELEMENT_NAME("QComboBox"_L1); ADD_BASIC_SELECTOR; ADD_SELECTOR; - SET_PROPERTY(QLatin1String("border"), Border); + SET_PROPERTY("border"_L1, Border); ADD_VALUE(Value::KnownIdentifier, Value_Native); ADD_DECLARATION; if (!styleIsPixmapBased) { - SET_PROPERTY(QLatin1String("-qt-style-features"), QtStyleFeatures); + SET_PROPERTY("-qt-style-features"_L1, QtStyleFeatures); ADD_VALUE(Value::Identifier, QString::fromLatin1("background-color")); ADD_VALUE(Value::Identifier, QString::fromLatin1("background-gradient")); ADD_DECLARATION; } - SET_PROPERTY(QLatin1String("-qt-background-role"), QtBackgroundRole); + SET_PROPERTY("-qt-background-role"_L1, QtBackgroundRole); ADD_VALUE(Value::KnownIdentifier, Value_Base); ADD_DECLARATION; @@ -339,12 +340,12 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const }*/ if (baseStyle()->inherits("QPlastiqueStyle") || baseStyle()->inherits("QCleanlooksStyle") || baseStyle()->inherits("QFusionStyle")) { - SET_ELEMENT_NAME(QLatin1String("QComboBox")); - ADD_ATTRIBUTE_SELECTOR(QLatin1String("readOnly"), QLatin1String("true"), AttributeSelector::MatchEqual); + SET_ELEMENT_NAME("QComboBox"_L1); + ADD_ATTRIBUTE_SELECTOR("readOnly"_L1, "true"_L1, AttributeSelector::MatchEqual); ADD_BASIC_SELECTOR; ADD_SELECTOR; - SET_PROPERTY(QLatin1String("-qt-background-role"), QtBackgroundRole); + SET_PROPERTY("-qt-background-role"_L1, QtBackgroundRole); ADD_VALUE(Value::KnownIdentifier, Value_Button); ADD_DECLARATION; @@ -357,19 +358,19 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const -qt-background-role: base; }*/ { - SET_ELEMENT_NAME(QLatin1String("QAbstractSpinBox")); + SET_ELEMENT_NAME("QAbstractSpinBox"_L1); ADD_BASIC_SELECTOR; ADD_SELECTOR; - SET_PROPERTY(QLatin1String("border"), Border); + SET_PROPERTY("border"_L1, Border); ADD_VALUE(Value::KnownIdentifier, Value_Native); ADD_DECLARATION; - SET_PROPERTY(QLatin1String("-qt-style-features"), QtStyleFeatures); + SET_PROPERTY("-qt-style-features"_L1, QtStyleFeatures); ADD_VALUE(Value::Identifier, QString::fromLatin1("background-color")); ADD_DECLARATION; - SET_PROPERTY(QLatin1String("-qt-background-role"), QtBackgroundRole); + SET_PROPERTY("-qt-background-role"_L1, QtBackgroundRole); ADD_VALUE(Value::KnownIdentifier, Value_Base); ADD_DECLARATION; @@ -380,11 +381,11 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const -qt-background-role: window; }*/ { - SET_ELEMENT_NAME(QLatin1String("QMenu")); + SET_ELEMENT_NAME("QMenu"_L1); ADD_BASIC_SELECTOR; ADD_SELECTOR; - SET_PROPERTY(QLatin1String("-qt-background-role"), QtBackgroundRole); + SET_PROPERTY("-qt-background-role"_L1, QtBackgroundRole); ADD_VALUE(Value::KnownIdentifier, Value_Window); ADD_DECLARATION; @@ -394,12 +395,12 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const -qt-style-features: background-color; }*/ if (!styleIsPixmapBased) { - SET_ELEMENT_NAME(QLatin1String("QMenu")); - ADD_PSEUDO(QLatin1String("item"), PseudoClass_Unknown); + SET_ELEMENT_NAME("QMenu"_L1); + ADD_PSEUDO("item"_L1, PseudoClass_Unknown); ADD_BASIC_SELECTOR; ADD_SELECTOR; - SET_PROPERTY(QLatin1String("-qt-style-features"), QtStyleFeatures); + SET_PROPERTY("-qt-style-features"_L1, QtStyleFeatures); ADD_VALUE(Value::Identifier, QString::fromLatin1("background-color")); ADD_DECLARATION; @@ -410,11 +411,11 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const -qt-background-role: window; }*/ { - SET_ELEMENT_NAME(QLatin1String("QHeaderView")); + SET_ELEMENT_NAME("QHeaderView"_L1); ADD_BASIC_SELECTOR; ADD_SELECTOR; - SET_PROPERTY(QLatin1String("-qt-background-role"), QtBackgroundRole); + SET_PROPERTY("-qt-background-role"_L1, QtBackgroundRole); ADD_VALUE(Value::KnownIdentifier, Value_Window); ADD_DECLARATION; @@ -427,27 +428,27 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const border: native; }*/ { - SET_ELEMENT_NAME(QLatin1String("QTableCornerButton")); - ADD_PSEUDO(QLatin1String("section"), PseudoClass_Unknown); + SET_ELEMENT_NAME("QTableCornerButton"_L1); + ADD_PSEUDO("section"_L1, PseudoClass_Unknown); ADD_BASIC_SELECTOR; ADD_SELECTOR; - SET_ELEMENT_NAME(QLatin1String("QHeaderView")); - ADD_PSEUDO(QLatin1String("section"), PseudoClass_Unknown); + SET_ELEMENT_NAME("QHeaderView"_L1); + ADD_PSEUDO("section"_L1, PseudoClass_Unknown); ADD_BASIC_SELECTOR; ADD_SELECTOR; - SET_PROPERTY(QLatin1String("-qt-background-role"), QtBackgroundRole); + SET_PROPERTY("-qt-background-role"_L1, QtBackgroundRole); ADD_VALUE(Value::KnownIdentifier, Value_Button); ADD_DECLARATION; if (!styleIsPixmapBased) { - SET_PROPERTY(QLatin1String("-qt-style-features"), QtStyleFeatures); + SET_PROPERTY("-qt-style-features"_L1, QtStyleFeatures); ADD_VALUE(Value::Identifier, QString::fromLatin1("background-color")); ADD_DECLARATION; } - SET_PROPERTY(QLatin1String("border"), Border); + SET_PROPERTY("border"_L1, Border); ADD_VALUE(Value::KnownIdentifier, Value_Native); ADD_DECLARATION; @@ -458,11 +459,11 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const -qt-background-role: base; }*/ { - SET_ELEMENT_NAME(QLatin1String("QProgressBar")); + SET_ELEMENT_NAME("QProgressBar"_L1); ADD_BASIC_SELECTOR; ADD_SELECTOR; - SET_PROPERTY(QLatin1String("-qt-background-role"), QtBackgroundRole); + SET_PROPERTY("-qt-background-role"_L1, QtBackgroundRole); ADD_VALUE(Value::KnownIdentifier, Value_Base); ADD_DECLARATION; @@ -473,11 +474,11 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const -qt-background-role: window; }*/ { - SET_ELEMENT_NAME(QLatin1String("QScrollBar")); + SET_ELEMENT_NAME("QScrollBar"_L1); ADD_BASIC_SELECTOR; ADD_SELECTOR; - SET_PROPERTY(QLatin1String("-qt-background-role"), QtBackgroundRole); + SET_PROPERTY("-qt-background-role"_L1, QtBackgroundRole); ADD_VALUE(Value::KnownIdentifier, Value_Window); ADD_DECLARATION; @@ -488,11 +489,11 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const border: native; }*/ { - SET_ELEMENT_NAME(QLatin1String("QDockWidget")); + SET_ELEMENT_NAME("QDockWidget"_L1); ADD_BASIC_SELECTOR; ADD_SELECTOR; - SET_PROPERTY(QLatin1String("border"), Border); + SET_PROPERTY("border"_L1, Border); ADD_VALUE(Value::KnownIdentifier, Value_Native); ADD_DECLARATION; diff --git a/src/widgets/util/qcompleter.cpp b/src/widgets/util/qcompleter.cpp index d4911912d0..6ef0791ce1 100644 --- a/src/widgets/util/qcompleter.cpp +++ b/src/widgets/util/qcompleter.cpp @@ -166,6 +166,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + QCompletionModel::QCompletionModel(QCompleterPrivate *c, QObject *parent) : QAbstractProxyModel(*new QCompletionModelPrivate, parent), c(c), showAll(false) @@ -1878,9 +1880,9 @@ QStringList QCompleter::splitPath(const QString& path) const QString pathCopy = QDir::toNativeSeparators(path); #if defined(Q_OS_WIN) - if (pathCopy == QLatin1String("\\") || pathCopy == QLatin1String("\\\\")) + if (pathCopy == "\\"_L1 || pathCopy == "\\\\"_L1) return QStringList(pathCopy); - const bool startsWithDoubleSlash = pathCopy.startsWith(QLatin1String("\\\\")); + const bool startsWithDoubleSlash = pathCopy.startsWith("\\\\"_L1); if (startsWithDoubleSlash) pathCopy = pathCopy.mid(2); #endif @@ -1890,7 +1892,7 @@ QStringList QCompleter::splitPath(const QString& path) const #if defined(Q_OS_WIN) if (startsWithDoubleSlash) - parts[0].prepend(QLatin1String("\\\\")); + parts[0].prepend("\\\\"_L1); #else if (pathCopy[0] == sep) // readd the "/" at the beginning as the split removed it parts[0] = u'/'; diff --git a/src/widgets/util/qsystemtrayicon_x11.cpp b/src/widgets/util/qsystemtrayicon_x11.cpp index 3099b0b3e7..c4da56a08c 100644 --- a/src/widgets/util/qsystemtrayicon_x11.cpp +++ b/src/widgets/util/qsystemtrayicon_x11.cpp @@ -66,6 +66,8 @@ #ifndef QT_NO_SYSTEMTRAYICON QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + static inline unsigned long locateSystemTray() { return (unsigned long)QGuiApplication::platformNativeInterface()->nativeResourceForScreen(QByteArrayLiteral("traywindow"), QGuiApplication::primaryScreen()); @@ -321,7 +323,7 @@ bool QSystemTrayIconPrivate::isSystemTrayAvailable_sys() // no QPlatformSystemTrayIcon so fall back to default xcb platform behavior const QString platform = QGuiApplication::platformName(); - if (platform.compare(QLatin1String("xcb"), Qt::CaseInsensitive) == 0) + if (platform.compare("xcb"_L1, Qt::CaseInsensitive) == 0) return locateSystemTray(); return false; } diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp index 627dbaa1d6..5ac9988a36 100644 --- a/src/widgets/widgets/qabstractscrollarea.cpp +++ b/src/widgets/widgets/qabstractscrollarea.cpp @@ -68,6 +68,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + /*! \class QAbstractScrollArea \brief The QAbstractScrollArea widget provides a scrolling area with @@ -282,11 +284,11 @@ void QAbstractScrollAreaPrivate::init() { Q_Q(QAbstractScrollArea); viewport = new QWidget(q); - viewport->setObjectName(QLatin1String("qt_scrollarea_viewport")); + viewport->setObjectName("qt_scrollarea_viewport"_L1); viewport->setBackgroundRole(QPalette::Base); viewport->setAutoFillBackground(true); scrollBarContainers[Qt::Horizontal] = new QAbstractScrollAreaScrollBarContainer(Qt::Horizontal, q); - scrollBarContainers[Qt::Horizontal]->setObjectName(QLatin1String("qt_scrollarea_hcontainer")); + scrollBarContainers[Qt::Horizontal]->setObjectName("qt_scrollarea_hcontainer"_L1); hbar = scrollBarContainers[Qt::Horizontal]->scrollBar; hbar->setRange(0,0); scrollBarContainers[Qt::Horizontal]->setVisible(false); @@ -294,7 +296,7 @@ void QAbstractScrollAreaPrivate::init() QObject::connect(hbar, SIGNAL(valueChanged(int)), q, SLOT(_q_hslide(int))); QObject::connect(hbar, SIGNAL(rangeChanged(int,int)), q, SLOT(_q_showOrHideScrollBars()), Qt::QueuedConnection); scrollBarContainers[Qt::Vertical] = new QAbstractScrollAreaScrollBarContainer(Qt::Vertical, q); - scrollBarContainers[Qt::Vertical]->setObjectName(QLatin1String("qt_scrollarea_vcontainer")); + scrollBarContainers[Qt::Vertical]->setObjectName("qt_scrollarea_vcontainer"_L1); vbar = scrollBarContainers[Qt::Vertical]->scrollBar; vbar->setRange(0,0); scrollBarContainers[Qt::Vertical]->setVisible(false); diff --git a/src/widgets/widgets/qabstractspinbox.cpp b/src/widgets/widgets/qabstractspinbox.cpp index 1850487a8a..09d4c0de35 100644 --- a/src/widgets/widgets/qabstractspinbox.cpp +++ b/src/widgets/widgets/qabstractspinbox.cpp @@ -72,6 +72,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + /*! \class QAbstractSpinBox \brief The QAbstractSpinBox class provides a spinbox and a line edit to @@ -1096,7 +1098,7 @@ void QAbstractSpinBox::keyPressEvent(QKeyEvent *event) case Qt::Key_U: if (event->modifiers() & Qt::ControlModifier - && QGuiApplication::platformName() == QLatin1String("xcb")) { // only X11 + && QGuiApplication::platformName() == "xcb"_L1) { // only X11 event->accept(); if (!isReadOnly()) clear(); @@ -1625,7 +1627,7 @@ void QAbstractSpinBoxPrivate::init() Q_Q(QAbstractSpinBox); q->setLineEdit(new QLineEdit(q)); - edit->setObjectName(QLatin1String("qt_spinbox_lineedit")); + edit->setObjectName("qt_spinbox_lineedit"_L1); validator = new QSpinBoxValidator(q, this); edit->setValidator(validator); @@ -1969,7 +1971,7 @@ QVariant QAbstractSpinBoxPrivate::calculateAdaptiveDecimalStep(int steps) const QSpinBoxValidator::QSpinBoxValidator(QAbstractSpinBox *qp, QAbstractSpinBoxPrivate *dp) : QValidator(qp), qptr(qp), dptr(dp) { - setObjectName(QLatin1String("qt_spinboxvalidator")); + setObjectName("qt_spinboxvalidator"_L1); } /*! diff --git a/src/widgets/widgets/qabstractspinbox_p.h b/src/widgets/widgets/qabstractspinbox_p.h index bfde96372c..8aca45b98b 100644 --- a/src/widgets/widgets/qabstractspinbox_p.h +++ b/src/widgets/widgets/qabstractspinbox_p.h @@ -128,7 +128,7 @@ public: QVariant value, minimum, maximum, singleStep; QRect hoverRect; - mutable QString cachedText = QLatin1String("\x01"); + mutable QString cachedText = { u'\x01' }; mutable QVariant cachedValue; mutable QSize cachedSizeHint, cachedMinimumSizeHint; QLineEdit *edit = nullptr; diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp index 42fe33904b..86ce44520f 100644 --- a/src/widgets/widgets/qcalendarwidget.cpp +++ b/src/widgets/widgets/qcalendarwidget.cpp @@ -63,6 +63,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + enum { RowCount = 6, ColumnCount = 7, @@ -105,9 +107,9 @@ protected: QString QCalendarDateSectionValidator::highlightString(const QString &str, int pos) { if (pos == 0) - return QLatin1String("<b>") + str + QLatin1String("</b>"); + return "<b>"_L1 + str + "</b>"_L1; int startPos = str.length() - pos; - return QStringView{str}.mid(0, startPos) + QLatin1String("<b>") + QStringView{str}.mid(startPos, pos) + QLatin1String("</b>"); + return QStringView{str}.mid(0, startPos) + "<b>"_L1 + QStringView{str}.mid(startPos, pos) + "</b>"_L1; } @@ -1758,7 +1760,7 @@ void QCalendarWidgetPrivate::createNavigationBar(QWidget *widget) { Q_Q(QCalendarWidget); navBarBackground = new QWidget(widget); - navBarBackground->setObjectName(QLatin1String("qt_calendar_navigationbar")); + navBarBackground->setObjectName("qt_calendar_navigationbar"_L1); navBarBackground->setAutoFillBackground(true); navBarBackground->setBackgroundRole(QPalette::Highlight); @@ -1819,11 +1821,11 @@ void QCalendarWidgetPrivate::createNavigationBar(QWidget *widget) monthButton->setFocusPolicy(Qt::NoFocus); //set names for the header controls. - prevMonth->setObjectName(QLatin1String("qt_calendar_prevmonth")); - nextMonth->setObjectName(QLatin1String("qt_calendar_nextmonth")); - monthButton->setObjectName(QLatin1String("qt_calendar_monthbutton")); - yearButton->setObjectName(QLatin1String("qt_calendar_yearbutton")); - yearEdit->setObjectName(QLatin1String("qt_calendar_yearedit")); + prevMonth->setObjectName("qt_calendar_prevmonth"_L1); + nextMonth->setObjectName("qt_calendar_nextmonth"_L1); + monthButton->setObjectName("qt_calendar_monthbutton"_L1); + yearButton->setObjectName("qt_calendar_yearbutton"_L1); + yearEdit->setObjectName("qt_calendar_yearedit"_L1); updateMonthMenu(); showMonth(m_model->m_date.year(m_model->m_calendar), m_model->m_date.month(m_model->m_calendar)); @@ -2135,7 +2137,7 @@ QCalendarWidget::QCalendarWidget(QWidget *parent) d->m_model->m_dayFormats.insert(Qt::Saturday, fmt); d->m_model->m_dayFormats.insert(Qt::Sunday, fmt); d->m_view = new QCalendarView(this); - d->m_view->setObjectName(QLatin1String("qt_calendar_calendarview")); + d->m_view->setObjectName("qt_calendar_calendarview"_L1); d->m_view->setModel(d->m_model); d->m_model->setView(d->m_view); d->m_view->setSelectionBehavior(QAbstractItemView::SelectItems); @@ -2278,7 +2280,7 @@ QSize QCalendarWidget::minimumSizeHint() const headerW += monthW + buttonDecoMargin; fm = d->yearButton->fontMetrics(); - headerW += fm.boundingRect(QLatin1String("5555")).width() + buttonDecoMargin; + headerW += fm.boundingRect("5555"_L1).width() + buttonDecoMargin; headerSize = QSize(headerW, headerH); } diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index 9a097c4672..d381deae33 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -87,6 +87,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + QComboBoxPrivate::QComboBoxPrivate() : QWidgetPrivate(), shownOnce(false), @@ -158,8 +160,7 @@ QStyleOptionMenuItem QComboMenuDelegate::getStyleOption(const QStyleOptionViewIt menuOption.palette.setBrush(QPalette::All, QPalette::Window, qvariant_cast<QBrush>(index.data(Qt::BackgroundRole))); } - menuOption.text = index.model()->data(index, Qt::DisplayRole).toString() - .replace(u'&', QLatin1String("&&")); + menuOption.text = index.model()->data(index, Qt::DisplayRole).toString().replace(u'&', "&&"_L1); menuOption.reservedShortcutWidth = 0; menuOption.maxIconWidth = option.decorationSize.width() + 4; menuOption.menuRect = option.rect; diff --git a/src/widgets/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp index cc58eb165d..8c6080e3ae 100644 --- a/src/widgets/widgets/qdatetimeedit.cpp +++ b/src/widgets/widgets/qdatetimeedit.cpp @@ -69,6 +69,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + // --- QDateTimeEdit --- /*! @@ -2518,21 +2520,21 @@ void QDateTimeEditPrivate::init(const QVariant &var) updateTimeSpec(); q->setDisplayFormat(defaultDateFormat); if (sectionNodes.isEmpty()) // ### safeguard for broken locale - q->setDisplayFormat(QLatin1String("dd/MM/yyyy")); + q->setDisplayFormat("dd/MM/yyyy"_L1); break; case QMetaType::QDateTime: value = var; updateTimeSpec(); q->setDisplayFormat(defaultDateTimeFormat); if (sectionNodes.isEmpty()) // ### safeguard for broken locale - q->setDisplayFormat(QLatin1String("dd/MM/yyyy hh:mm:ss")); + q->setDisplayFormat("dd/MM/yyyy hh:mm:ss"_L1); break; case QMetaType::QTime: value = QDateTime(QDATETIMEEDIT_DATE_INITIAL, var.toTime()); updateTimeSpec(); q->setDisplayFormat(defaultTimeFormat); if (sectionNodes.isEmpty()) // ### safeguard for broken locale - q->setDisplayFormat(QLatin1String("hh:mm:ss")); + q->setDisplayFormat("hh:mm:ss"_L1); break; default: Q_ASSERT_X(0, "QDateTimeEditPrivate::init", "Internal error"); @@ -2636,7 +2638,7 @@ void QDateTimeEditPrivate::initCalendarPopup(QCalendarWidget *cw) Q_Q(QDateTimeEdit); if (!monthCalendar) { monthCalendar = new QCalendarPopup(q, cw, calendar); - monthCalendar->setObjectName(QLatin1String("qt_datetimedit_calendar")); + monthCalendar->setObjectName("qt_datetimedit_calendar"_L1); QObject::connect(monthCalendar, SIGNAL(newDateSelected(QDate)), q, SLOT(setDate(QDate))); QObject::connect(monthCalendar, SIGNAL(hidingCalendar(QDate)), q, SLOT(setDate(QDate))); QObject::connect(monthCalendar, SIGNAL(activated(QDate)), q, SLOT(setDate(QDate))); diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp index 66f92af051..c1aaa94771 100644 --- a/src/widgets/widgets/qdockwidget.cpp +++ b/src/widgets/widgets/qdockwidget.cpp @@ -61,6 +61,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + extern QString qt_setWindowTitle_helperHelper(const QString&, const QWidget*); // qwidget.cpp // qmainwindow.cpp @@ -285,7 +287,7 @@ bool QDockWidgetLayout::wmSupportsNativeWindowDeco() #if defined(Q_OS_ANDROID) return false; #else - static const bool xcb = !QGuiApplication::platformName().compare(QLatin1String("xcb"), Qt::CaseInsensitive); + static const bool xcb = !QGuiApplication::platformName().compare("xcb"_L1, Qt::CaseInsensitive); return !xcb; #endif } @@ -659,12 +661,12 @@ void QDockWidgetPrivate::init() layout->setSizeConstraint(QLayout::SetMinAndMaxSize); QAbstractButton *button = new QDockWidgetTitleButton(q); - button->setObjectName(QLatin1String("qt_dockwidget_floatbutton")); + button->setObjectName("qt_dockwidget_floatbutton"_L1); QObject::connect(button, SIGNAL(clicked()), q, SLOT(_q_toggleTopLevel())); layout->setWidgetForRole(QDockWidgetLayout::FloatButton, button); button = new QDockWidgetTitleButton(q); - button->setObjectName(QLatin1String("qt_dockwidget_closebutton")); + button->setObjectName("qt_dockwidget_closebutton"_L1); QObject::connect(button, SIGNAL(clicked()), q, SLOT(close())); layout->setWidgetForRole(QDockWidgetLayout::CloseButton, button); diff --git a/src/widgets/widgets/qfontcombobox.cpp b/src/widgets/widgets/qfontcombobox.cpp index 1becfafa6b..93fa77006b 100644 --- a/src/widgets/widgets/qfontcombobox.cpp +++ b/src/widgets/widgets/qfontcombobox.cpp @@ -50,6 +50,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + static QFontDatabase::WritingSystem writingSystemFromScript(QLocale::Script script) { switch (script) { @@ -287,7 +289,7 @@ void QFontFamilyDelegate::paint(QPainter *painter, const QString sampleText = comboPrivate->sampleTextForFontFamily.value(text, comboPrivate->sampleTextForWritingSystem.value(system)); if (system != QFontDatabase::Any || !sampleText.isEmpty()) { - int w = painter->fontMetrics().horizontalAdvance(text + QLatin1String(" ")); + int w = painter->fontMetrics().horizontalAdvance(text + " "_L1); painter->setFont(font2); const QString sample = !sampleText.isEmpty() ? sampleText : QFontDatabase::writingSystemSample(system); if (option.direction == Qt::RightToLeft) @@ -350,7 +352,7 @@ void QFontComboBoxPrivate::_q_updateModel() continue; } result += list.at(i); - if (list.at(i) == fi.family() || list.at(i).startsWith(fi.family() + QLatin1String(" ["))) + if (list.at(i) == fi.family() || list.at(i).startsWith(fi.family() + " ["_L1)) offset = result.count() - 1; } list = result; diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp index 55cf8c0b41..9586151f0d 100644 --- a/src/widgets/widgets/qlabel.cpp +++ b/src/widgets/widgets/qlabel.cpp @@ -60,6 +60,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + QLabelPrivate::QLabelPrivate() : QFramePrivate(), sh(), @@ -1555,11 +1557,11 @@ void QLabelPrivate::ensureTextPopulated() const int from = 0; bool found = false; QTextCursor cursor; - while (!(cursor = control->document()->find((QLatin1String("&")), from)).isNull()) { + while (!(cursor = control->document()->find(("&"_L1), from)).isNull()) { cursor.deleteChar(); // remove the ampersand cursor.movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor); from = cursor.position(); - if (!found && cursor.selectedText() != QLatin1String("&")) { //not a second & + if (!found && cursor.selectedText() != "&"_L1) { //not a second & found = true; shortcutCursor = cursor; } diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp index 7e1dea14f5..05a23ec101 100644 --- a/src/widgets/widgets/qlineedit.cpp +++ b/src/widgets/widgets/qlineedit.cpp @@ -97,6 +97,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + /*! Initialize \a option with the values from this QLineEdit. This method is useful for subclasses when they need a QStyleOptionFrame, but don't want @@ -2111,7 +2113,7 @@ void QLineEdit::paintEvent(QPaintEvent *) void QLineEdit::dragMoveEvent(QDragMoveEvent *e) { Q_D(QLineEdit); - if (!d->control->isReadOnly() && e->mimeData()->hasFormat(QLatin1String("text/plain"))) { + if (!d->control->isReadOnly() && e->mimeData()->hasFormat("text/plain"_L1)) { e->acceptProposedAction(); d->control->moveCursor(d->xToPos(e->position().toPoint().x()), false); d->cursorVisible = true; @@ -2215,7 +2217,7 @@ QMenu *QLineEdit::createStandardContextMenu() { Q_D(QLineEdit); QMenu *popup = new QMenu(this); - popup->setObjectName(QLatin1String("qt_edit_menu")); + popup->setObjectName("qt_edit_menu"_L1); QAction *action = nullptr; if (!isReadOnly()) { diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp index 06a252bb95..d0e513bb8a 100644 --- a/src/widgets/widgets/qmainwindowlayout.cpp +++ b/src/widgets/widgets/qmainwindowlayout.cpp @@ -84,6 +84,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + extern QMainWindowLayout *qt_mainwindow_layout(const QMainWindow *window); /****************************************************************************** @@ -100,14 +102,14 @@ static void dumpLayout(QTextStream &qout, const QDockAreaLayoutItem &item, QStri << "pos: " << item.pos << " size:" << item.size << " gap:" << (item.flags & QDockAreaLayoutItem::GapItem) << " keepSize:" << (item.flags & QDockAreaLayoutItem::KeepSize) << '\n'; - indent += QLatin1String(" "); + indent += " "_L1; if (item.widgetItem != nullptr) { qout << indent << "widget: " << item.widgetItem->widget()->metaObject()->className() << " \"" << item.widgetItem->widget()->windowTitle() << "\"\n"; } else if (item.subinfo != nullptr) { qout << indent << "subinfo:\n"; - dumpLayout(qout, *item.subinfo, indent + QLatin1String(" ")); + dumpLayout(qout, *item.subinfo, indent + " "_L1); } else if (item.placeHolderItem != nullptr) { QRect r = item.placeHolderItem->topLevelRect; qout << indent << "placeHolder: " @@ -138,11 +140,11 @@ static void dumpLayout(QTextStream &qout, const QDockAreaLayoutInfo &layout, QSt #endif << '\n'; - indent += QLatin1String(" "); + indent += " "_L1; for (int i = 0; i < layout.item_list.count(); ++i) { qout << indent << "Item: " << i << '\n'; - dumpLayout(qout, layout.item_list.at(i), indent + QLatin1String(" ")); + dumpLayout(qout, layout.item_list.at(i), indent + " "_L1); } } @@ -155,13 +157,13 @@ static void dumpLayout(QTextStream &qout, const QDockAreaLayout &layout) << layout.rect.height() << '\n'; qout << "TopDockArea:\n"; - dumpLayout(qout, layout.docks[QInternal::TopDock], QLatin1String(" ")); + dumpLayout(qout, layout.docks[QInternal::TopDock], " "_L1); qout << "LeftDockArea:\n"; - dumpLayout(qout, layout.docks[QInternal::LeftDock], QLatin1String(" ")); + dumpLayout(qout, layout.docks[QInternal::LeftDock], " "_L1); qout << "RightDockArea:\n"; - dumpLayout(qout, layout.docks[QInternal::RightDock], QLatin1String(" ")); + dumpLayout(qout, layout.docks[QInternal::RightDock], " "_L1); qout << "BottomDockArea:\n"; - dumpLayout(qout, layout.docks[QInternal::BottomDock], QLatin1String(" ")); + dumpLayout(qout, layout.docks[QInternal::BottomDock], " "_L1); } QDebug operator<<(QDebug debug, const QDockAreaLayout &layout) @@ -1893,7 +1895,7 @@ QWidget *QMainWindowLayout::getSeparatorWidget() result = new QWidget(parentWidget()); result->setAttribute(Qt::WA_MouseNoMask, true); result->setAutoFillBackground(false); - result->setObjectName(QLatin1String("qt_qmainwindow_extended_splitter")); + result->setObjectName("qt_qmainwindow_extended_splitter"_L1); } usedSeparatorWidgets.insert(result); return result; @@ -2444,7 +2446,7 @@ QMainWindowLayout::QMainWindowLayout(QMainWindow *mainwindow, QLayout *parentLay #endif // QT_CONFIG(dockwidget) pluggingWidget = nullptr; - setObjectName(mainwindow->objectName() + QLatin1String("_layout")); + setObjectName(mainwindow->objectName() + "_layout"_L1); } QMainWindowLayout::~QMainWindowLayout() @@ -2727,7 +2729,7 @@ void QMainWindowLayout::updateGapIndicator() if (!gapIndicator) { gapIndicator = new QRubberBand(QRubberBand::Rectangle, expectedParent); // For accessibility to identify this special widget. - gapIndicator->setObjectName(QLatin1String("qt_rubberband")); + gapIndicator->setObjectName("qt_rubberband"_L1); } else if (gapIndicator->parent() != expectedParent) { gapIndicator->setParent(expectedParent); } diff --git a/src/widgets/widgets/qmdiarea.cpp b/src/widgets/widgets/qmdiarea.cpp index 1167524a0a..51a9b54979 100644 --- a/src/widgets/widgets/qmdiarea.cpp +++ b/src/widgets/widgets/qmdiarea.cpp @@ -176,6 +176,7 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; using namespace QMdi; // Asserts in debug mode, gives warning otherwise. @@ -277,7 +278,7 @@ static inline QString tabTextFor(QMdiSubWindow *subWindow) QString title = subWindow->windowTitle(); if (subWindow->isWindowModified()) { - title.replace(QLatin1String("[*]"), QLatin1String("*")); + title.replace("[*]"_L1, "*"_L1); } else { extern QString qt_setWindowTitle_helperHelper(const QString&, const QWidget*); title = qt_setWindowTitle_helperHelper(title, subWindow); @@ -1515,7 +1516,7 @@ void QMdiAreaPrivate::highlightNextSubWindow(int increaseFactor) if (!rubberBand) { rubberBand = new QRubberBand(QRubberBand::Rectangle, q); // For accessibility to identify this special widget. - rubberBand->setObjectName(QLatin1String("qt_rubberband")); + rubberBand->setObjectName("qt_rubberband"_L1); rubberBand->setWindowFlags(rubberBand->windowFlags() | Qt::WindowStaysOnTopHint); } #endif diff --git a/src/widgets/widgets/qmdisubwindow.cpp b/src/widgets/widgets/qmdisubwindow.cpp index 120bf590b9..8d0189a2ed 100644 --- a/src/widgets/widgets/qmdisubwindow.cpp +++ b/src/widgets/widgets/qmdisubwindow.cpp @@ -174,6 +174,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + using namespace QMdi; static const QStyle::SubControl SubControls[] = @@ -286,7 +288,7 @@ QString QMdiSubWindowPrivate::originalWindowTitle() if (originalTitle.isNull()) { originalTitle = originalWindowTitleHelper(); if (originalTitle.isNull()) - originalTitle = QLatin1String(""); + originalTitle = ""_L1; } return originalTitle; } @@ -1919,7 +1921,7 @@ void QMdiSubWindowPrivate::enterRubberBandMode() if (!rubberBand) { rubberBand = new QRubberBand(QRubberBand::Rectangle, q->parentWidget()); // For accessibility to identify this special widget. - rubberBand->setObjectName(QLatin1String("qt_rubberband")); + rubberBand->setObjectName("qt_rubberband"_L1); } QPoint rubberBandPos = q->mapToParent(QPoint(0, 0)); rubberBand->setGeometry(rubberBandPos.x(), rubberBandPos.y(), @@ -2216,7 +2218,7 @@ void QMdiSubWindowPrivate::updateInternalWindowTitle() Q_Q(QMdiSubWindow); if (q->isWindowModified()) { windowTitle = q->windowTitle(); - windowTitle.replace(QLatin1String("[*]"), QLatin1String("*")); + windowTitle.replace("[*]"_L1, "*"_L1); } else { windowTitle = qt_setWindowTitle_helperHelper(q->windowTitle(), q); } @@ -2334,10 +2336,8 @@ void QMdiSubWindow::setWidget(QWidget *widget) d->updateWindowTitle(true); isWindowModified = d->baseWidget->isWindowModified(); } - if (!this->isWindowModified() && isWindowModified - && windowTitle().contains(QLatin1String("[*]"))) { + if (!this->isWindowModified() && isWindowModified && windowTitle().contains("[*]"_L1)) setWindowModified(isWindowModified); - } d->lastChildWindowTitle = d->baseWidget->windowTitle(); d->ignoreWindowTitleChange = false; @@ -2770,7 +2770,7 @@ bool QMdiSubWindow::eventFilter(QObject *object, QEvent *event) bool windowModified = d->baseWidget->isWindowModified(); if (!windowModified && d->baseWidget->windowTitle() != windowTitle()) break; - if (windowTitle().contains(QLatin1String("[*]"))) + if (windowTitle().contains("[*]"_L1)) setWindowModified(windowModified); break; } @@ -2871,7 +2871,7 @@ bool QMdiSubWindow::event(QEvent *event) d->updateInternalWindowTitle(); break; case QEvent::ModifiedChange: - if (!windowTitle().contains(QLatin1String("[*]"))) + if (!windowTitle().contains("[*]"_L1)) break; #if QT_CONFIG(menubar) if (maximizedButtonsWidget() && d->controlContainer->menuBar() && d->controlContainer->menuBar() diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp index c9df8c50eb..4c66267b7d 100644 --- a/src/widgets/widgets/qmenubar.cpp +++ b/src/widgets/widgets/qmenubar.cpp @@ -71,6 +71,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + class QMenuBarExtension : public QToolButton { public: @@ -83,7 +85,7 @@ public: QMenuBarExtension::QMenuBarExtension(QWidget *parent) : QToolButton(parent) { - setObjectName(QLatin1String("qt_menubar_ext_button")); + setObjectName("qt_menubar_ext_button"_L1); setAutoRaise(true); #if QT_CONFIG(menu) setPopupMode(QToolButton::InstantPopup); diff --git a/src/widgets/widgets/qprogressbar.cpp b/src/widgets/widgets/qprogressbar.cpp index 89c0990002..4440909c26 100644 --- a/src/widgets/widgets/qprogressbar.cpp +++ b/src/widgets/widgets/qprogressbar.cpp @@ -52,6 +52,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + class QProgressBarPrivate : public QWidgetPrivate { Q_DECLARE_PUBLIC(QProgressBar) @@ -89,7 +91,7 @@ QProgressBarPrivate::QProgressBarPrivate() void QProgressBarPrivate::initDefaultFormat() { if (defaultFormat) - format = QLatin1String("%p") + locale.percent(); + format = "%p"_L1 + locale.percent(); } void QProgressBarPrivate::init() @@ -152,10 +154,9 @@ bool QProgressBarPrivate::repaintRequired() const const auto totalSteps = qint64(maximum) - minimum; if (textVisible) { - if ((format.contains(QLatin1String("%v")))) + if (format.contains("%v"_L1)) return true; - if ((format.contains(QLatin1String("%p")) - && valueDifference >= qAbs(totalSteps / 100))) + if (format.contains("%p"_L1) && valueDifference >= qAbs(totalSteps / 100)) return true; } @@ -468,19 +469,19 @@ QString QProgressBar::text() const QString result = d->format; QLocale locale = d->locale; // Omit group separators for compatibility with previous versions that were non-localized. locale.setNumberOptions(locale.numberOptions() | QLocale::OmitGroupSeparator); - result.replace(QLatin1String("%m"), locale.toString(totalSteps)); - result.replace(QLatin1String("%v"), locale.toString(d->value)); + result.replace("%m"_L1, locale.toString(totalSteps)); + result.replace("%v"_L1, locale.toString(d->value)); // If max and min are equal and we get this far, it means that the // progress bar has one step and that we are on that step. Return // 100% here in order to avoid division by zero further down. if (totalSteps == 0) { - result.replace(QLatin1String("%p"), locale.toString(100)); + result.replace("%p"_L1, locale.toString(100)); return result; } const auto progress = static_cast<int>((qint64(d->value) - d->minimum) * 100.0 / totalSteps); - result.replace(QLatin1String("%p"), locale.toString(progress)); + result.replace("%p"_L1, locale.toString(progress)); return result; } diff --git a/src/widgets/widgets/qspinbox.cpp b/src/widgets/widgets/qspinbox.cpp index a5ce8f658a..b6308eda76 100644 --- a/src/widgets/widgets/qspinbox.cpp +++ b/src/widgets/widgets/qspinbox.cpp @@ -51,6 +51,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + //#define QSPINBOX_QSBDEBUG #ifdef QSPINBOX_QSBDEBUG # define QSBDEBUG qDebug @@ -518,7 +520,7 @@ QString QSpinBox::textFromValue(int value) const QString str; if (d->displayIntegerBase != 10) { - const QLatin1String prefix = value < 0 ? QLatin1String("-") : QLatin1String(); + const auto prefix = value < 0 ? "-"_L1 : ""_L1; str = prefix + QString::number(qAbs(value), d->displayIntegerBase); } else { str = locale().toString(value); @@ -1126,8 +1128,8 @@ QVariant QSpinBoxPrivate::validateAndInterpret(QString &input, int &pos, int num = min; if (max != min && (copy.isEmpty() - || (min < 0 && copy == QLatin1String("-")) - || (max >= 0 && copy == QLatin1String("+")))) { + || (min < 0 && copy == "-"_L1) + || (max >= 0 && copy == "+"_L1))) { state = QValidator::Intermediate; QSBDEBUG() << __FILE__ << __LINE__<< "num is set to" << num; } else if (copy.startsWith(u'-') && min >= 0) { diff --git a/src/widgets/widgets/qsplitter.cpp b/src/widgets/widgets/qsplitter.cpp index 5ff1cc5c9f..174c5b4df9 100644 --- a/src/widgets/widgets/qsplitter.cpp +++ b/src/widgets/widgets/qsplitter.cpp @@ -62,6 +62,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + //#define QSPLITTER_DEBUG QSplitterPrivate::~QSplitterPrivate() @@ -873,7 +875,7 @@ QSplitterLayoutStruct *QSplitterPrivate::insertWidget(int index, QWidget *w) } else { sls = new QSplitterLayoutStruct; QSplitterHandle *newHandle = q->createHandle(); - newHandle->setObjectName(QLatin1String("qt_splithandle_") + w->objectName()); + newHandle->setObjectName("qt_splithandle_"_L1 + w->objectName()); sls->handle = newHandle; sls->widget = w; w->lower(); @@ -1340,7 +1342,7 @@ void QSplitter::setRubberBand(int pos) QBoolBlocker b(d->blockChildAdd); d->rubberBand = new QRubberBand(QRubberBand::Line, this); // For accessibility to identify this special widget. - d->rubberBand->setObjectName(QLatin1String("qt_rubberband")); + d->rubberBand->setObjectName("qt_rubberband"_L1); } const QRect newGeom = d->orient == Qt::Horizontal ? QRect(QPoint(pos + hw / 2 - rBord, r.y()), QSize(2 * rBord, r.height())) diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp index ac5d3c142a..74e036f65d 100644 --- a/src/widgets/widgets/qtabbar.cpp +++ b/src/widgets/widgets/qtabbar.cpp @@ -1550,7 +1550,7 @@ static QString computeElidedText(Qt::TextElideMode mode, const QString &text) if (text.length() <= 3) return text; - static const QLatin1String Ellipses("..."); + static const auto Ellipses = "..."_L1; QString ret; switch (mode) { case Qt::ElideRight: diff --git a/src/widgets/widgets/qtabwidget.cpp b/src/widgets/widgets/qtabwidget.cpp index 14059ae70f..1a63319c2b 100644 --- a/src/widgets/widgets/qtabwidget.cpp +++ b/src/widgets/widgets/qtabwidget.cpp @@ -55,6 +55,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + /*! \class QTabWidget \brief The QTabWidget class provides a stack of tabbed widgets. @@ -226,14 +228,14 @@ void QTabWidgetPrivate::init() Q_Q(QTabWidget); stack = new QStackedWidget(q); - stack->setObjectName(QLatin1String("qt_tabwidget_stackedwidget")); + stack->setObjectName("qt_tabwidget_stackedwidget"_L1); stack->setLineWidth(0); // hack so that QMacStyle::layoutSpacing() can detect tab widget pages stack->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred, QSizePolicy::TabWidget)); QObject::connect(stack, SIGNAL(widgetRemoved(int)), q, SLOT(_q_removeTab(int))); QTabBar *tabBar = new QTabBar(q); - tabBar->setObjectName(QLatin1String("qt_tabwidget_tabbar")); + tabBar->setObjectName("qt_tabwidget_tabbar"_L1); tabBar->setDrawBase(false); q->setTabBar(tabBar); diff --git a/src/widgets/widgets/qtextbrowser.cpp b/src/widgets/widgets/qtextbrowser.cpp index b070598f81..c48f4cfa39 100644 --- a/src/widgets/widgets/qtextbrowser.cpp +++ b/src/widgets/widgets/qtextbrowser.cpp @@ -58,6 +58,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + static inline bool shouldEnableInputMethod(QTextBrowser *texbrowser) { #if defined (Q_OS_ANDROID) @@ -169,14 +171,14 @@ Q_DECLARE_TYPEINFO(QTextBrowserPrivate::HistoryEntry, Q_RELOCATABLE_TYPE); QString QTextBrowserPrivate::findFile(const QUrl &name) const { QString fileName; - if (name.scheme() == QLatin1String("qrc")) { - fileName = QLatin1String(":/") + name.path(); + if (name.scheme() == "qrc"_L1) { + fileName = ":/"_L1 + name.path(); } else if (name.scheme().isEmpty()) { fileName = name.path(); } else { #if defined(Q_OS_ANDROID) - if (name.scheme() == QLatin1String("assets")) - fileName = QLatin1String("assets:") + name.path(); + if (name.scheme() == "assets"_L1) + fileName = "assets:"_L1 + name.path(); else #endif fileName = name.toLocalFile(); @@ -207,7 +209,7 @@ QUrl QTextBrowserPrivate::resolveUrl(const QUrl &url) const // For the second case QUrl can merge "#someanchor" with "foo.html" // correctly to "foo.html#someanchor" if (!(currentURL.isRelative() - || (currentURL.scheme() == QLatin1String("file") + || (currentURL.scheme() == "file"_L1 && !QFileInfo(currentURL.toLocalFile()).isAbsolute())) || (url.hasFragment() && url.path().isEmpty())) { return currentURL.resolved(url); @@ -245,11 +247,11 @@ void QTextBrowserPrivate::_q_activateAnchor(const QString &href) #ifndef QT_NO_DESKTOPSERVICES bool isFileScheme = - url.scheme() == QLatin1String("file") + url.scheme() == "file"_L1 #if defined(Q_OS_ANDROID) - || url.scheme() == QLatin1String("assets") + || url.scheme() == "assets"_L1 #endif - || url.scheme() == QLatin1String("qrc"); + || url.scheme() == "qrc"_L1; if ((openExternalLinks && !isFileScheme && !url.isRelative()) || (url.isRelative() && !currentURL.isRelative() && !isFileScheme)) { QDesktopServices::openUrl(url); @@ -304,9 +306,9 @@ void QTextBrowserPrivate::setSource(const QUrl &url, QTextDocument::ResourceType QString fileName = url.fileName(); if (type == QTextDocument::UnknownResource) { #if QT_CONFIG(textmarkdownreader) - if (fileName.endsWith(QLatin1String(".md")) || - fileName.endsWith(QLatin1String(".mkd")) || - fileName.endsWith(QLatin1String(".markdown"))) + if (fileName.endsWith(".md"_L1) || + fileName.endsWith(".mkd"_L1) || + fileName.endsWith(".markdown"_L1)) type = QTextDocument::MarkdownResource; else #endif @@ -337,7 +339,7 @@ void QTextBrowserPrivate::setSource(const QUrl &url, QTextDocument::ResourceType if (q->isVisible()) { const QStringView firstTag = QStringView{txt}.left(txt.indexOf(u'>') + 1); - if (firstTag.startsWith(QLatin1String("<qt")) && firstTag.contains(QLatin1String("type")) && firstTag.contains(QLatin1String("detail"))) { + if (firstTag.startsWith("<qt"_L1) && firstTag.contains("type"_L1) && firstTag.contains("detail"_L1)) { #ifndef QT_NO_CURSOR QGuiApplication::restoreOverrideCursor(); #endif diff --git a/src/widgets/widgets/qtoolbarextension.cpp b/src/widgets/widgets/qtoolbarextension.cpp index 76bc5a4773..a17d375d15 100644 --- a/src/widgets/widgets/qtoolbarextension.cpp +++ b/src/widgets/widgets/qtoolbarextension.cpp @@ -45,11 +45,13 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + QToolBarExtension::QToolBarExtension(QWidget *parent) : QToolButton(parent) , m_orientation(Qt::Horizontal) { - setObjectName(QLatin1String("qt_toolbar_ext_button")); + setObjectName("qt_toolbar_ext_button"_L1); setAutoRaise(true); setOrientation(m_orientation); setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); diff --git a/src/widgets/widgets/qtoolbox.cpp b/src/widgets/widgets/qtoolbox.cpp index 787554551d..5afda0a871 100644 --- a/src/widgets/widgets/qtoolbox.cpp +++ b/src/widgets/widgets/qtoolbox.cpp @@ -56,6 +56,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + class QToolBoxButton : public QAbstractButton { Q_OBJECT @@ -351,7 +353,7 @@ int QToolBox::insertItem(int index, QWidget *widget, const QIcon &icon, const QS auto &c = *newPage; c.widget = widget; c.button = new QToolBoxButton(this); - c.button->setObjectName(QLatin1String("qt_toolbox_toolboxbutton")); + c.button->setObjectName("qt_toolbox_toolboxbutton"_L1); connect(c.button, SIGNAL(clicked()), this, SLOT(_q_buttonClicked())); c.sv = new QScrollArea(this); diff --git a/src/widgets/widgets/qtoolbutton.cpp b/src/widgets/widgets/qtoolbutton.cpp index 9f47b876c0..bb4b4acc7f 100644 --- a/src/widgets/widgets/qtoolbutton.cpp +++ b/src/widgets/widgets/qtoolbutton.cpp @@ -67,6 +67,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + class QToolButtonPrivate : public QAbstractButtonPrivate { Q_DECLARE_PUBLIC(QToolButton) @@ -939,7 +941,7 @@ void QToolButton::setDefaultAction(QAction *action) // If iconText() is generated from text(), we need to escape any '&'s so they // don't turn into shortcuts if (QActionPrivate::get(action)->iconText.isEmpty()) - buttonText.replace(QLatin1String("&"), QLatin1String("&&")); + buttonText.replace("&"_L1, "&&"_L1); setText(buttonText); setIcon(action->icon()); #if QT_CONFIG(tooltip) diff --git a/src/widgets/widgets/qwidgetresizehandler.cpp b/src/widgets/widgets/qwidgetresizehandler.cpp index 0cf9457a57..c2933d292e 100644 --- a/src/widgets/widgets/qwidgetresizehandler.cpp +++ b/src/widgets/widgets/qwidgetresizehandler.cpp @@ -52,6 +52,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + #define RANGE 4 static bool resizeHorizontalDirectionFixed = false; @@ -219,7 +221,7 @@ void QWidgetResizeHandler::mouseMoveEvent(QMouseEvent *e) QPoint pp = globalPos - moveOffset; // Workaround for window managers which refuse to move a tool window partially offscreen. - if (QGuiApplication::platformName() == QLatin1String("xcb")) { + if (QGuiApplication::platformName() == "xcb"_L1) { const QRect desktop = QWidgetPrivate::availableScreenGeometry(widget); pp.rx() = qMax(pp.x(), desktop.left()); pp.ry() = qMax(pp.y(), desktop.top()); diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp index bc7da638c9..3d41f2a9fb 100644 --- a/src/widgets/widgets/qwidgettextcontrol.cpp +++ b/src/widgets/widgets/qwidgettextcontrol.cpp @@ -110,6 +110,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + // could go into QTextCursor... static QTextLine currentTextLine(const QTextCursor &cursor) { @@ -2709,8 +2711,8 @@ bool QWidgetTextControl::canInsertFromMimeData(const QMimeData *source) const if (d->acceptRichText) return (source->hasText() && !source->text().isEmpty()) || source->hasHtml() - || source->hasFormat(QLatin1String("application/x-qrichtext")) - || source->hasFormat(QLatin1String("application/x-qt-richtext")); + || source->hasFormat("application/x-qrichtext"_L1) + || source->hasFormat("application/x-qt-richtext"_L1); else return source->hasText() && !source->text().isEmpty(); } @@ -2724,10 +2726,10 @@ void QWidgetTextControl::insertFromMimeData(const QMimeData *source) bool hasData = false; QTextDocumentFragment fragment; #ifndef QT_NO_TEXTHTMLPARSER - if (source->hasFormat(QLatin1String("application/x-qrichtext")) && d->acceptRichText) { + if (source->hasFormat("application/x-qrichtext"_L1) && d->acceptRichText) { // x-qrichtext is always UTF-8 (taken from Qt3 since we don't use it anymore). - const QString richtext = QLatin1String("<meta name=\"qrichtext\" content=\"1\" />") - + QString::fromUtf8(source->data(QLatin1String("application/x-qrichtext"))); + const QString richtext = "<meta name=\"qrichtext\" content=\"1\" />"_L1 + + QString::fromUtf8(source->data("application/x-qrichtext"_L1)); fragment = QTextDocumentFragment::fromHtml(richtext, d->doc); hasData = true; } else if (source->hasHtml() && d->acceptRichText) { @@ -3479,7 +3481,7 @@ void QTextEditMimeData::setup() const { QTextEditMimeData *that = const_cast<QTextEditMimeData *>(this); #ifndef QT_NO_TEXTHTMLPARSER - that->setData(QLatin1String("text/html"), fragment.toHtml().toUtf8()); + that->setData("text/html"_L1, fragment.toHtml().toUtf8()); #endif #ifndef QT_NO_TEXTODFWRITER { @@ -3487,7 +3489,7 @@ void QTextEditMimeData::setup() const QTextDocumentWriter writer(&buffer, "ODF"); writer.write(fragment); buffer.close(); - that->setData(QLatin1String("application/vnd.oasis.opendocument.text"), buffer.data()); + that->setData("application/vnd.oasis.opendocument.text"_L1, buffer.data()); } #endif that->setText(fragment.toRawText()); |