whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Mate Barany 2022-09-19 14:50:36 +02:00
parent b1b61636b3
commit de80185575
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/widgets/dialogs/qfiledialog.cpp
View File

@ -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);
}

6
src/widgets/dialogs/qwizard.cpp
View File

@ -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:

2
src/widgets/styles/qstylesheetstyle.cpp
View File

@ -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) {