diff options
author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-04-13 11:42:38 +0200 |
---|---|---|
committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-05-04 10:00:35 +0200 |
commit | ceaa7d6341e666f6fe0d071ea34cad9877961a0e (patch) | |
tree | 7280a74e2e0e498720dcd141ac4f759df766a669 /src/plugins/platforms/integrity | |
parent | 5020d1b22a31f5fe45287547037c57fa5aeb06d7 (diff) |
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 <marc.mutz@qt.io>
Diffstat (limited to 'src/plugins/platforms/integrity')
-rw-r--r-- | src/plugins/platforms/integrity/main.cpp | 4 | ||||
-rw-r--r-- | src/plugins/platforms/integrity/qintegrityfbscreen.cpp | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/plugins/platforms/integrity/main.cpp b/src/plugins/platforms/integrity/main.cpp index 6313aa47e5..16e022b470 100644 --- a/src/plugins/platforms/integrity/main.cpp +++ b/src/plugins/platforms/integrity/main.cpp @@ -42,6 +42,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + class QIntegrityFbIntegrationPlugin : public QPlatformIntegrationPlugin { Q_OBJECT @@ -53,7 +55,7 @@ public: QPlatformIntegration* QIntegrityFbIntegrationPlugin::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); - if (!system.compare(QLatin1String("integrityfb"), Qt::CaseInsensitive)) + if (!system.compare("integrityfb"_L1, Qt::CaseInsensitive)) return new QIntegrityFbIntegration(paramList); return 0; diff --git a/src/plugins/platforms/integrity/qintegrityfbscreen.cpp b/src/plugins/platforms/integrity/qintegrityfbscreen.cpp index d64b96ca4c..250cecdc29 100644 --- a/src/plugins/platforms/integrity/qintegrityfbscreen.cpp +++ b/src/plugins/platforms/integrity/qintegrityfbscreen.cpp @@ -51,6 +51,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + static QImage::Format determineFormat(const FBInfo *fbinfo) { QImage::Format format = QImage::Format_Invalid; @@ -109,9 +111,9 @@ QIntegrityFbScreen::~QIntegrityFbScreen() bool QIntegrityFbScreen::initialize() { Error err; - QRegularExpression fbRx(QLatin1String("fb=(.*)")); - QRegularExpression sizeRx(QLatin1String("size=(\\d+)x(\\d+)")); - QRegularExpression offsetRx(QLatin1String("offset=(\\d+)x(\\d+)")); + QRegularExpression fbRx("fb=(.*)"_L1); + QRegularExpression sizeRx("size=(\\d+)x(\\d+)"_L1); + QRegularExpression offsetRx("offset=(\\d+)x(\\d+)"_L1); QString fbDevice; QRect userGeometry; |