diff options
author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-04-11 14:04:17 +0200 |
---|---|---|
committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-04-13 18:34:15 +0200 |
commit | a5b9600356cb8941a2d9685975b2454837b5e6ed (patch) | |
tree | efecf045643824fe74d088d4b8bb8302b014bf96 /src/gui/platform | |
parent | 2e29f55f76e49c1fbffd2af51ec19d59b87f0e72 (diff) | |
download | qtbase-a5b9600356cb8941a2d9685975b2454837b5e6ed.tar.gz |
QtGui: stop using QLatin1Char constructor for creating char literals
Required for porting away from QLatin1Char/QLatin1String in scope of
QTBUG-98434.
Change-Id: I308d86cefcbfd126929b68f9a853d420840c965f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'src/gui/platform')
-rw-r--r-- | src/gui/platform/darwin/qmacmime.mm | 4 | ||||
-rw-r--r-- | src/gui/platform/unix/dbusmenu/qdbusmenutypes.cpp | 4 | ||||
-rw-r--r-- | src/gui/platform/unix/qgenericunixservices.cpp | 2 | ||||
-rw-r--r-- | src/gui/platform/unix/qgenericunixthemes.cpp | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/platform/darwin/qmacmime.mm b/src/gui/platform/darwin/qmacmime.mm index 58cd8dbc63..f8c152e1c4 100644 --- a/src/gui/platform/darwin/qmacmime.mm +++ b/src/gui/platform/darwin/qmacmime.mm @@ -212,7 +212,7 @@ QString QMacPasteboardMimeAny::flavorFor(const QString &mime) if (mime == QLatin1String("application/x-qt-mime-type-name")) return QString(); QString ret = QLatin1String("com.trolltech.anymime.") + mime; - return ret.replace(QLatin1Char('/'), QLatin1String("--")); + return ret.replace(u'/', QLatin1String("--")); } QString QMacPasteboardMimeAny::mimeFor(QString flav) @@ -389,7 +389,7 @@ QString QMacPasteboardMimeUnicodeText::flavorFor(const QString &mime) int i = mime.indexOf(QLatin1String("charset=")); if (i >= 0) { QString cs(mime.mid(i+8).toLower()); - i = cs.indexOf(QLatin1Char(';')); + i = cs.indexOf(u';'); if (i>=0) cs = cs.left(i); if (cs == QLatin1String("system")) diff --git a/src/gui/platform/unix/dbusmenu/qdbusmenutypes.cpp b/src/gui/platform/unix/dbusmenu/qdbusmenutypes.cpp index 9f3f4e9309..c356797102 100644 --- a/src/gui/platform/unix/dbusmenu/qdbusmenutypes.cpp +++ b/src/gui/platform/unix/dbusmenu/qdbusmenutypes.cpp @@ -237,11 +237,11 @@ QString QDBusMenuItem::convertMnemonic(const QString &label) { // convert only the first occurrence of ampersand which is not at the end // dbusmenu uses underscore instead of ampersand - int idx = label.indexOf(QLatin1Char('&')); + int idx = label.indexOf(u'&'); if (idx < 0 || idx == label.length() - 1) return label; QString ret(label); - ret[idx] = QLatin1Char('_'); + ret[idx] = u'_'; return ret; } diff --git a/src/gui/platform/unix/qgenericunixservices.cpp b/src/gui/platform/unix/qgenericunixservices.cpp index 0fcc7ab44c..b1ff06e040 100644 --- a/src/gui/platform/unix/qgenericunixservices.cpp +++ b/src/gui/platform/unix/qgenericunixservices.cpp @@ -162,7 +162,7 @@ static inline bool detectWebBrowser(const QByteArray &desktop, static inline bool launch(const QString &launcher, const QUrl &url) { - const QString command = launcher + QLatin1Char(' ') + QLatin1String(url.toEncoded()); + const QString command = launcher + u' ' + QLatin1String(url.toEncoded()); if (debug) qDebug("Launching %s", qPrintable(command)); #if !QT_CONFIG(process) diff --git a/src/gui/platform/unix/qgenericunixthemes.cpp b/src/gui/platform/unix/qgenericunixthemes.cpp index 6554440d49..2465c8733d 100644 --- a/src/gui/platform/unix/qgenericunixthemes.cpp +++ b/src/gui/platform/unix/qgenericunixthemes.cpp @@ -523,7 +523,7 @@ QFont *QKdeThemePrivate::kdeFont(const QVariant &fontValue) const QStringList list = fontValue.toStringList(); if (!list.isEmpty()) { fontFamily = list.first(); - fontDescription = list.join(QLatin1Char(',')); + fontDescription = list.join(u','); } } else { fontDescription = fontFamily = fontValue.toString(); @@ -643,7 +643,7 @@ QPlatformTheme *QKdeTheme::createKdeTheme() const QString kdeDirsVar = QFile::decodeName(qgetenv("KDEDIRS")); if (!kdeDirsVar.isEmpty()) - kdeDirs += kdeDirsVar.split(QLatin1Char(':'), Qt::SkipEmptyParts); + kdeDirs += kdeDirsVar.split(u':', Qt::SkipEmptyParts); const QString kdeVersionHomePath = QDir::homePath() + QLatin1String("/.kde") + QLatin1String(kdeVersionBA); if (QFileInfo(kdeVersionHomePath).isDir()) |