From ceaa7d6341e666f6fe0d071ea34cad9877961a0e Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Wed, 13 Apr 2022 11:42:38 +0200 Subject: Plugins: use _L1 for for creating Latin-1 string literals As a drive-by, fix qsizetype -> int narrowing conversion warnings for the touched lines. Task-number: QTBUG-98434 Change-Id: I7fadd3cf27ad099028d70f05956303e3af62c0f5 Reviewed-by: Marc Mutz --- src/plugins/platforms/cocoa/main.mm | 4 +++- src/plugins/platforms/cocoa/qcocoaaccessibility.mm | 4 +++- src/plugins/platforms/cocoa/qcocoacursor.mm | 8 +++++--- src/plugins/platforms/cocoa/qcocoadrag.mm | 4 +++- src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm | 6 ++++-- src/plugins/platforms/cocoa/qcocoaintegration.mm | 4 +++- src/plugins/platforms/cocoa/qcocoamenuitem.mm | 6 ++++-- src/plugins/platforms/cocoa/qcocoamimetypes.mm | 16 +++++++++------- src/plugins/platforms/cocoa/qmacclipboard.mm | 14 ++++++++------ src/plugins/platforms/cocoa/qmultitouch_mac.mm | 4 +++- src/plugins/platforms/cocoa/qnsview_mouse.mm | 6 ++++-- 11 files changed, 49 insertions(+), 27 deletions(-) (limited to 'src/plugins/platforms/cocoa') diff --git a/src/plugins/platforms/cocoa/main.mm b/src/plugins/platforms/cocoa/main.mm index 89ecdf46f9..45ebd10127 100644 --- a/src/plugins/platforms/cocoa/main.mm +++ b/src/plugins/platforms/cocoa/main.mm @@ -46,6 +46,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + class QCocoaIntegrationPlugin : public QPlatformIntegrationPlugin { Q_OBJECT @@ -57,7 +59,7 @@ public: QPlatformIntegration * QCocoaIntegrationPlugin::create(const QString& system, const QStringList& paramList) { QMacAutoReleasePool pool; - if (system.compare(QLatin1String("cocoa"), Qt::CaseInsensitive) == 0) + if (system.compare("cocoa"_L1, Qt::CaseInsensitive) == 0) return new QCocoaIntegration(paramList); return nullptr; diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibility.mm b/src/plugins/platforms/cocoa/qcocoaaccessibility.mm index 1ec4c5a114..b7651c98f2 100644 --- a/src/plugins/platforms/cocoa/qcocoaaccessibility.mm +++ b/src/plugins/platforms/cocoa/qcocoaaccessibility.mm @@ -47,6 +47,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + #ifndef QT_NO_ACCESSIBILITY QCocoaAccessibility::QCocoaAccessibility() @@ -253,7 +255,7 @@ bool shouldBeIgnored(QAccessibleInterface *interface) // VoiceOver focusing on tool tips can be confusing. The contents of the // tool tip is available through the description attribute anyway, so // we disable accessibility for tool tips. - if (className == QLatin1String("QTipLabel")) + if (className == "QTipLabel"_L1) return true; } diff --git a/src/plugins/platforms/cocoa/qcocoacursor.mm b/src/plugins/platforms/cocoa/qcocoacursor.mm index 77d7fe2003..58b1fae6e3 100644 --- a/src/plugins/platforms/cocoa/qcocoacursor.mm +++ b/src/plugins/platforms/cocoa/qcocoacursor.mm @@ -58,6 +58,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + QCocoaCursor::QCocoaCursor() { } @@ -284,15 +286,15 @@ NSCursor *QCocoaCursor::createCursorData(QCursor *cursor) return createCursorFromPixmap(pixmap); break; } case Qt::WaitCursor: { - QPixmap pixmap = QPixmap(QLatin1String(":/qt-project.org/mac/cursors/images/spincursor.png")); + QPixmap pixmap = QPixmap(":/qt-project.org/mac/cursors/images/spincursor.png"_L1); return createCursorFromPixmap(pixmap, hotspot); break; } case Qt::SizeAllCursor: { - QPixmap pixmap = QPixmap(QLatin1String(":/qt-project.org/mac/cursors/images/sizeallcursor.png")); + QPixmap pixmap = QPixmap(":/qt-project.org/mac/cursors/images/sizeallcursor.png"_L1); return createCursorFromPixmap(pixmap, QPoint(8, 8)); break; } case Qt::BusyCursor: { - QPixmap pixmap = QPixmap(QLatin1String(":/qt-project.org/mac/cursors/images/waitcursor.png")); + QPixmap pixmap = QPixmap(":/qt-project.org/mac/cursors/images/waitcursor.png"_L1); return createCursorFromPixmap(pixmap, hotspot); break; } #define QT_USE_APPROXIMATE_CURSORS diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm index fa073e5e29..47688dd231 100644 --- a/src/plugins/platforms/cocoa/qcocoadrag.mm +++ b/src/plugins/platforms/cocoa/qcocoadrag.mm @@ -49,6 +49,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + static const int dragImageMaxChars = 26; QCocoaDrag::QCocoaDrag() : @@ -131,7 +133,7 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o) m_executed_drop_action = Qt::IgnoreAction; QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QMacInternalPasteboardMime::MIME_DND); - m_drag->mimeData()->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray("dummy")); + m_drag->mimeData()->setData("application/x-qt-mime-type-name"_L1, QByteArray("dummy")); dragBoard.setMimeData(m_drag->mimeData(), QMacPasteboard::LazyRequest); if (maybeDragMultipleItems()) diff --git a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm index 8801b5fb8e..b71155a430 100644 --- a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm +++ b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm @@ -63,9 +63,11 @@ QT_USE_NAMESPACE +using namespace Qt::StringLiterals; + static NSString *strippedText(QString s) { - s.remove(QLatin1String("...")); + s.remove("..."_L1); return QPlatformTheme::removeMnemonics(s).trimmed().toNSString(); } @@ -443,7 +445,7 @@ typedef QSharedPointer SharedPointerFileDialogOptions; QStringList fileTypes; for (const QString &filter : *m_selectedNameFilter) { - if (!filter.startsWith(QLatin1String("*."))) + if (!filter.startsWith("*."_L1)) continue; if (filter.contains(u'?')) diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm index ffd762b012..7e2b14dc7a 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.mm +++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm @@ -80,6 +80,8 @@ static void initResources() QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + Q_LOGGING_CATEGORY(lcQpa, "qt.qpa", QtWarningMsg); static void logVersionInformation() @@ -114,7 +116,7 @@ static QCocoaIntegration::Options parseOptions(const QStringList ¶mList) QCocoaIntegration::Options options; for (const QString ¶m : paramList) { #ifndef QT_NO_FREETYPE - if (param == QLatin1String("fontengine=freetype")) + if (param == "fontengine=freetype"_L1) options |= QCocoaIntegration::UseFreeTypeFontEngine; else #endif diff --git a/src/plugins/platforms/cocoa/qcocoamenuitem.mm b/src/plugins/platforms/cocoa/qcocoamenuitem.mm index 4b4a0b9316..777c6d1bec 100644 --- a/src/plugins/platforms/cocoa/qcocoamenuitem.mm +++ b/src/plugins/platforms/cocoa/qcocoamenuitem.mm @@ -58,6 +58,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + static const char *application_menu_strings[] = { QT_TRANSLATE_NOOP("MAC_APPLICATION_MENU","About %1"), @@ -220,7 +222,7 @@ static QPlatformMenuItem::MenuRole detectMenuRole(const QString &caption) const QString aboutString = QCoreApplication::translate("QCocoaMenuItem", "About"); if (captionNoAmpersand.startsWith(aboutString, Qt::CaseInsensitive) || captionNoAmpersand.endsWith(aboutString, Qt::CaseInsensitive)) { - static const QRegularExpression qtRegExp(QLatin1String("qt$"), QRegularExpression::CaseInsensitiveOption); + static const QRegularExpression qtRegExp("qt$"_L1, QRegularExpression::CaseInsensitiveOption); if (captionNoAmpersand.contains(qtRegExp)) return QPlatformMenuItem::AboutQtRole; return QPlatformMenuItem::AboutRole; @@ -345,7 +347,7 @@ NSMenuItem *QCocoaMenuItem::sync() // Show multiple key sequences as part of the menu text. if (accel.count() > 1) - text += QLatin1String(" (") + accel.toString(QKeySequence::NativeText) + QLatin1String(")"); + text += " ("_L1 + accel.toString(QKeySequence::NativeText) + ")"_L1; #endif m_native.title = QPlatformTheme::removeMnemonics(text).toNSString(); diff --git a/src/plugins/platforms/cocoa/qcocoamimetypes.mm b/src/plugins/platforms/cocoa/qcocoamimetypes.mm index 82ff8fe002..6229084fdd 100644 --- a/src/plugins/platforms/cocoa/qcocoamimetypes.mm +++ b/src/plugins/platforms/cocoa/qcocoamimetypes.mm @@ -46,6 +46,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + class QMacPasteboardMimeTraditionalMacPlainText : public QMacInternalPasteboardMime { public: QMacPasteboardMimeTraditionalMacPlainText() : QMacInternalPasteboardMime(MIME_ALL) { } @@ -60,20 +62,20 @@ public: QString QMacPasteboardMimeTraditionalMacPlainText::convertorName() { - return QLatin1String("PlainText (traditional-mac-plain-text)"); + return "PlainText (traditional-mac-plain-text)"_L1; } QString QMacPasteboardMimeTraditionalMacPlainText::flavorFor(const QString &mime) { - if (mime == QLatin1String("text/plain")) - return QLatin1String("com.apple.traditional-mac-plain-text"); + if (mime == "text/plain"_L1) + return "com.apple.traditional-mac-plain-text"_L1; return QString(); } QString QMacPasteboardMimeTraditionalMacPlainText::mimeFor(QString flav) { - if (flav == QLatin1String("com.apple.traditional-mac-plain-text")) - return QLatin1String("text/plain"); + if (flav == "com.apple.traditional-mac-plain-text"_L1) + return "text/plain"_L1; return QString(); } @@ -88,7 +90,7 @@ QVariant QMacPasteboardMimeTraditionalMacPlainText::convertToMime(const QString qWarning("QMacPasteboardMimeTraditionalMacPlainText: Cannot handle multiple member data"); const QByteArray &firstData = data.first(); QVariant ret; - if (flavor == QLatin1String("com.apple.traditional-mac-plain-text")) { + if (flavor == "com.apple.traditional-mac-plain-text"_L1) { return QString(QCFString(CFStringCreateWithBytes(kCFAllocatorDefault, reinterpret_cast(firstData.constData()), firstData.size(), CFStringGetSystemEncoding(), false))); @@ -102,7 +104,7 @@ QList QMacPasteboardMimeTraditionalMacPlainText::convertFromMime(con { QList ret; QString string = data.toString(); - if (flavor == QLatin1String("com.apple.traditional-mac-plain-text")) + if (flavor == "com.apple.traditional-mac-plain-text"_L1) ret.append(string.toLatin1()); return ret; } diff --git a/src/plugins/platforms/cocoa/qmacclipboard.mm b/src/plugins/platforms/cocoa/qmacclipboard.mm index 23c8749b5d..97f11be9d3 100644 --- a/src/plugins/platforms/cocoa/qmacclipboard.mm +++ b/src/plugins/platforms/cocoa/qmacclipboard.mm @@ -55,6 +55,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + /***************************************************************************** QMacPasteboard code *****************************************************************************/ @@ -180,7 +182,7 @@ OSStatus QMacPasteboard::promiseKeeper(PasteboardRef paste, PasteboardItemID id, } } - if (!promise.itemId && flavorAsQString == QLatin1String("com.trolltech.qt.MimeTypeName")) { + if (!promise.itemId && flavorAsQString == "com.trolltech.qt.MimeTypeName"_L1) { // we have promised this data, but won't be able to convert, so return null data. // This helps in making the application/x-qt-mime-type-name hidden from normal use. QByteArray ba; @@ -328,7 +330,7 @@ QMacPasteboard::setMimeData(QMimeData *mime_src, DataRequestType dataRequestType // QMimeData sub classes reimplementing the formats() might not expose the // temporary "application/x-qt-mime-type-name" mimetype. So check the existence // of this mime type while doing drag and drop. - QString dummyMimeType(QLatin1String("application/x-qt-mime-type-name")); + QString dummyMimeType("application/x-qt-mime-type-name"_L1); if (!formats.contains(dummyMimeType)) { QByteArray dummyType = mime_src->data(dummyMimeType); if (!dummyType.isEmpty()) { @@ -342,7 +344,7 @@ QMacPasteboard::setMimeData(QMimeData *mime_src, DataRequestType dataRequestType // Hack: The Rtf handler converts incoming Rtf to Html. We do // not want to convert outgoing Html to Rtf but instead keep // posting it as Html. Skip the Rtf handler here. - if (c->convertorName() == QLatin1String("Rtf")) + if (c->convertorName() == "Rtf"_L1) continue; QString flavor(c->flavorFor(mimeType)); if (!flavor.isEmpty()) { @@ -463,9 +465,9 @@ QMacPasteboard::retrieveData(const QString &format, QMetaType) const // Converting via PasteboardCopyItemFlavorData below will for some UITs result // in newlines mapping to '\r' instead of '\n'. To work around this we shortcut // the conversion via NSPasteboard's NSStringPboardType if possible. - if (c_flavor == QLatin1String("com.apple.traditional-mac-plain-text") - || c_flavor == QLatin1String("public.utf8-plain-text") - || c_flavor == QLatin1String("public.utf16-plain-text")) { + if (c_flavor == "com.apple.traditional-mac-plain-text"_L1 + || c_flavor == "public.utf8-plain-text"_L1 + || c_flavor == "public.utf16-plain-text"_L1) { QString str = qt_mac_get_pasteboardString(paste); if (!str.isEmpty()) return str; diff --git a/src/plugins/platforms/cocoa/qmultitouch_mac.mm b/src/plugins/platforms/cocoa/qmultitouch_mac.mm index 5521b7525c..6bb16fb8a5 100644 --- a/src/plugins/platforms/cocoa/qmultitouch_mac.mm +++ b/src/plugins/platforms/cocoa/qmultitouch_mac.mm @@ -46,6 +46,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + QHash QCocoaTouch::_currentTouches; QHash QCocoaTouch::_touchDevices; QPointF QCocoaTouch::_screenReferencePos; @@ -221,7 +223,7 @@ QPointingDevice *QCocoaTouch::getTouchDevice(QInputDevice::DeviceType type, quin { QPointingDevice *ret = _touchDevices.value(id); if (!ret) { - ret = new QPointingDevice(type == QInputDevice::DeviceType::TouchScreen ? QLatin1String("touchscreen") : QLatin1String("trackpad"), + ret = new QPointingDevice(type == QInputDevice::DeviceType::TouchScreen ? "touchscreen"_L1 : "trackpad"_L1, id, type, QPointingDevice::PointerType::Finger, QInputDevice::Capability::Position | QInputDevice::Capability::NormalizedPosition | diff --git a/src/plugins/platforms/cocoa/qnsview_mouse.mm b/src/plugins/platforms/cocoa/qnsview_mouse.mm index d977867890..c0063f81a9 100644 --- a/src/plugins/platforms/cocoa/qnsview_mouse.mm +++ b/src/plugins/platforms/cocoa/qnsview_mouse.mm @@ -39,6 +39,8 @@ // This file is included from qnsview.mm, and only used to organize the code +using namespace Qt::StringLiterals; + static const QPointingDevice *pointingDeviceFor(qint64 deviceID) { // macOS will in many cases not report a deviceID (0 value). @@ -60,7 +62,7 @@ static const QPointingDevice *pointingDeviceFor(qint64 deviceID) return primaryDevice; } else { // Register a new device. Name and capabilities may need updating later. - const auto *device = new QPointingDevice(QLatin1String("mouse"), deviceID, + const auto *device = new QPointingDevice("mouse"_L1, deviceID, QInputDevice::DeviceType::Mouse, QPointingDevice::PointerType::Generic, QInputDevice::Capability::Scroll | QInputDevice::Capability::Position, 1, 3, QString(), QPointingDeviceUniqueId(), QCocoaIntegration::instance()); @@ -770,7 +772,7 @@ static const QPointingDevice *pointingDeviceFor(qint64 deviceID) if (theEvent.hasPreciseScrollingDeltas) { auto *devicePriv = QPointingDevicePrivate::get(const_cast(device)); if (!devicePriv->capabilities.testFlag(QInputDevice::Capability::PixelScroll)) { - devicePriv->name = QLatin1String("trackpad or magic mouse"); + devicePriv->name = "trackpad or magic mouse"_L1; devicePriv->deviceType = QInputDevice::DeviceType::TouchPad; devicePriv->capabilities |= QInputDevice::Capability::PixelScroll; qCDebug(lcInputDevices) << "mouse scrolling: updated capabilities" << device; -- cgit v1.2.3