diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-29 14:43:39 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-12-02 21:00:18 +0100 |
| commit | c23dcca0a0d768f87c1fa164380f1028ce1ee43d (patch) | |
| tree | 57acbba62b2fe366a30abf110910a139f08162b4 /tests | |
| parent | 98fea3ae261313b88cb3f67c7f9d3368e635cd51 (diff) | |
Use UTF-16 literals where possible
This should minimize diffs to Qt 6.
Change-Id: I4ba077ebec3b1d76f822b74328ab55235d1ee11a
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qpixmap/tst_qpixmap.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/qwinjumplist/tst_qwinjumplist.cpp | 4 | ||||
| -rw-r--r-- | tests/manual/jumplist/main.cpp | 2 | ||||
| -rw-r--r-- | tests/manual/thumbnail/main.cpp | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp index 2791cd2..e16889d 100644 --- a/tests/auto/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/qpixmap/tst_qpixmap.cpp @@ -192,8 +192,8 @@ static bool compareImages(const QImage &actual, const QImage &expected, static inline QString pngFileName(const QString &image, int width, int height) { - return image + QLatin1Char('_') + QString::number(width) - + QLatin1Char('x') + QString::number(height) + QStringLiteral(".png"); + return image + u'_' + QString::number(width) + + u'x' + QString::number(height) + QStringLiteral(".png"); } void tst_QPixmap::toHICON_data() diff --git a/tests/auto/qwinjumplist/tst_qwinjumplist.cpp b/tests/auto/qwinjumplist/tst_qwinjumplist.cpp index 52b1ee5..4676524 100644 --- a/tests/auto/qwinjumplist/tst_qwinjumplist.cpp +++ b/tests/auto/qwinjumplist/tst_qwinjumplist.cpp @@ -49,8 +49,8 @@ private slots: static inline QByteArray msgFileNameMismatch(const QString &f1, const QString &f2) { - const QString result = QLatin1Char('"') + f1 + QStringLiteral("\" != \"") - + f2 + QLatin1Char('"'); + const QString result = u'"' + f1 + QStringLiteral("\" != \"") + + f2 + u'"'; return result.toLocal8Bit(); } diff --git a/tests/manual/jumplist/main.cpp b/tests/manual/jumplist/main.cpp index 5447187..464b915 100644 --- a/tests/manual/jumplist/main.cpp +++ b/tests/manual/jumplist/main.cpp @@ -44,7 +44,7 @@ static bool associateFileType() { const QString applicationBinary = QCoreApplication::applicationFilePath(); QString exeFileName = applicationBinary; - const int lastSlashPos = exeFileName.lastIndexOf(QLatin1Char('/')); + const int lastSlashPos = exeFileName.lastIndexOf(u'/'); exeFileName.remove(0, lastSlashPos + 1); QSettings regApplications("HKEY_CURRENT_USER\\Software\\Classes\\Applications\\" + exeFileName, QSettings::NativeFormat); regApplications.setValue("FriendlyAppName", QGuiApplication::applicationDisplayName()); diff --git a/tests/manual/thumbnail/main.cpp b/tests/manual/thumbnail/main.cpp index 009662f..8266a0a 100644 --- a/tests/manual/thumbnail/main.cpp +++ b/tests/manual/thumbnail/main.cpp @@ -134,7 +134,7 @@ void MainWindow::updateIconicThumbnailPixmap() if (!m_enableIconicPixmapAction->isChecked()) return; const QString number = QString::number(n++); - logText(QLatin1String(__FUNCTION__) + QLatin1Char(' ') + number); + logText(QLatin1String(__FUNCTION__) + u' ' + number); const QPixmap pixmap = drawColoredPixmap(QSize(200, 50), Qt::yellow, QStringLiteral("ITP ") + number); m_thumbnailToolBar->setIconicThumbnailPixmap(pixmap); @@ -146,7 +146,7 @@ void MainWindow::updateIconicLivePreviewPixmap() if (!m_enableIconicLivePreviewAction->isChecked()) return; const QString number = QString::number(n++); - logText(QLatin1String(__FUNCTION__) + QLatin1Char(' ') + number); + logText(QLatin1String(__FUNCTION__) + u' ' + number); const QPixmap pixmap = drawColoredPixmap(QSize(200, 50), Qt::red, QStringLiteral("ILP ") + number); m_thumbnailToolBar->setIconicLivePreviewPixmap(pixmap); |