From de8018557568465305cf3c9eb6e85f9a7608c26e Mon Sep 17 00:00:00 2001 From: Mate Barany Date: Mon, 19 Sep 2022 14:50:36 +0200 Subject: [PATCH] QtWidgets: Fix mismatches between string types and literals To address some findings from the review of QTBUG-98434, fix type mismatches between strings and string literals in QtWidgets. Task-number: QTBUG-103100 Change-Id: Ie4543d49ddfba382183c5d43df067694f5da53c7 Reviewed-by: Marc Mutz --- src/widgets/dialogs/qfiledialog.cpp | 4 ++-- src/widgets/dialogs/qwizard.cpp | 6 +++--- src/widgets/styles/qstylesheetstyle.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index be08271f9a..8b7a83047a 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -1319,9 +1319,9 @@ QStringList qt_make_filter_list(const QString &filter) if (filter.isEmpty()) return QStringList(); - QString sep(";;"_L1); + auto sep = ";;"_L1; if (!filter.contains(sep) && filter.contains(u'\n')) - sep = u'\n'; + sep = "\n"_L1; return filter.split(sep); } diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index 5b95b62772..6de0530c51 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -1331,11 +1331,11 @@ static QString object_name_for_button(QWizard::WizardButton which) { switch (which) { case QWizard::CommitButton: - return "qt_wizard_commit"_L1; + return u"qt_wizard_commit"_s; case QWizard::FinishButton: - return "qt_wizard_finish"_L1; + return u"qt_wizard_finish"_s; case QWizard::CancelButton: - return "qt_wizard_cancel"_L1; + return u"qt_wizard_cancel"_s; case QWizard::BackButton: case QWizard::NextButton: case QWizard::HelpButton: diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index 6abef62835..69d9e26cf8 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -2163,7 +2163,7 @@ bool QStyleSheetStyle::hasStyleRule(const QObject *obj, int part) const return result; } - QString pseudoElement = QLatin1StringView(knownPseudoElements[part].name); + auto pseudoElement = QLatin1StringView(knownPseudoElements[part].name); for (int i = 0; i < rules.count(); i++) { const Selector& selector = rules.at(i).selectors.at(0); if (pseudoElement.compare(selector.pseudoElement(), Qt::CaseInsensitive) == 0) {