diff options
author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-04-12 17:33:01 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@qt.io> | 2022-05-02 23:38:46 +0000 |
commit | 7c9c195235378c2619d140bccbb957ba1d7a7dea (patch) | |
tree | f9bb54b9f713aaf0822401d5af80ebdfbf6f5bbd /src/plugins/platforms/cocoa | |
parent | e65e3f3021db90ffd236f9aa4bc3dd43b89a0ec8 (diff) |
Plugins: stop using QLatin1Char constructor for creating char literals
Required for porting away from QLatin1Char/QLatin1String in scope of
QTBUG-98434.
As a drive-by, fix qsizetype -> int narrowing conversion warnings for
the touched lines.
Change-Id: Id76add7e86b6dfb89f758a9efb0644067f0f44de
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa')
5 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm index 9e26f93b9d..131f899a31 100644 --- a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm +++ b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm @@ -192,7 +192,7 @@ static void convertLineOffset(QAccessibleTextInterface *text, int *line, int *of + (id) lineNumberForIndex: (int)index forText:(const QString &)text { auto textBefore = QStringView(text).left(index); - int newlines = textBefore.count(QLatin1Char('\n')); + qsizetype newlines = textBefore.count(u'\n'); return @(newlines); } diff --git a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm index 367164d740..8801b5fb8e 100644 --- a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm +++ b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm @@ -290,7 +290,7 @@ typedef QSharedPointer<QFileDialogOptions> SharedPointerFileDialogOptions; return NO; } if (!(filter & QDir::Hidden) - && (qtFileName.startsWith(QLatin1Char('.')) || [self isHiddenFileAtURL:url])) + && (qtFileName.startsWith(u'.') || [self isHiddenFileAtURL:url])) return NO; return YES; @@ -446,10 +446,10 @@ typedef QSharedPointer<QFileDialogOptions> SharedPointerFileDialogOptions; if (!filter.startsWith(QLatin1String("*."))) continue; - if (filter.contains(QLatin1Char('?'))) + if (filter.contains(u'?')) continue; - if (filter.count(QLatin1Char('*')) != 1) + if (filter.count(u'*') != 1) continue; auto extensions = filter.split('.', Qt::SkipEmptyParts); diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm index e4c6d415c0..4ae97ef6ad 100644 --- a/src/plugins/platforms/cocoa/qcocoahelpers.mm +++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm @@ -225,7 +225,7 @@ QString qt_mac_applicationName() if (appName.isEmpty()) { QString arg0 = QGuiApplicationPrivate::instance()->appName(); if (arg0.contains("/")) { - QStringList parts = arg0.split(QLatin1Char('/')); + QStringList parts = arg0.split(u'/'); appName = parts.at(parts.count() - 1); } else { appName = arg0; diff --git a/src/plugins/platforms/cocoa/qcocoamenubar.mm b/src/plugins/platforms/cocoa/qcocoamenubar.mm index aaea688b39..2dc27759d6 100644 --- a/src/plugins/platforms/cocoa/qcocoamenubar.mm +++ b/src/plugins/platforms/cocoa/qcocoamenubar.mm @@ -195,7 +195,7 @@ void QCocoaMenuBar::syncMenu_helper(QPlatformMenu *menu, bool menubarUpdate) cocoaMenu->syncMenuItem_helper(item, menubarUpdate); const QString captionNoAmpersand = QString::fromNSString(cocoaMenu->nsMenu().title) - .remove(QLatin1Char('&')); + .remove(u'&'); if (captionNoAmpersand == QCoreApplication::translate("QCocoaMenu", "Edit")) { // prevent recursion from QCocoaMenu::insertMenuItem - when the menu is visible // it calls syncMenu again. QCocoaMenu::setVisible just sets the bool, which then diff --git a/src/plugins/platforms/cocoa/qcocoamenuitem.mm b/src/plugins/platforms/cocoa/qcocoamenuitem.mm index 022972518a..4b4a0b9316 100644 --- a/src/plugins/platforms/cocoa/qcocoamenuitem.mm +++ b/src/plugins/platforms/cocoa/qcocoamenuitem.mm @@ -216,7 +216,7 @@ void QCocoaMenuItem::setNativeContents(WId item) static QPlatformMenuItem::MenuRole detectMenuRole(const QString &caption) { QString captionNoAmpersand(caption); - captionNoAmpersand.remove(QLatin1Char('&')); + captionNoAmpersand.remove(u'&'); const QString aboutString = QCoreApplication::translate("QCocoaMenuItem", "About"); if (captionNoAmpersand.startsWith(aboutString, Qt::CaseInsensitive) || captionNoAmpersand.endsWith(aboutString, Qt::CaseInsensitive)) { |