diff options
| author | Mate Barany <mate.barany@qt.io> | 2022-09-19 14:50:36 +0200 |
|---|---|---|
| committer | Mate Barany <mate.barany@qt.io> | 2022-09-23 13:53:26 +0200 |
| commit | de8018557568465305cf3c9eb6e85f9a7608c26e (patch) | |
| tree | 7d4f825914439b2171e9556eea3459eda87d5036 /src/widgets/dialogs | |
| parent | b1b61636b374c544ab6d09a876af73cb8beb6b4a (diff) | |
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 <marc.mutz@qt.io>
Diffstat (limited to 'src/widgets/dialogs')
| -rw-r--r-- | src/widgets/dialogs/qfiledialog.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/dialogs/qwizard.cpp | 6 |
2 files changed, 5 insertions, 5 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: |