diff options
-rw-r--r-- | .qmake.conf | 2 | ||||
-rw-r--r-- | examples/winextras/iconextractor/main.cpp | 10 | ||||
-rw-r--r-- | examples/winextras/musicplayer/main.cpp | 2 | ||||
-rw-r--r-- | examples/winextras/musicplayer/musicplayer.cpp | 2 | ||||
-rw-r--r-- | src/imports/winextras/qquickiconloader_p.h | 4 | ||||
-rw-r--r-- | src/imports/winextras/qquickjumplist_p.h | 3 | ||||
-rw-r--r-- | src/imports/winextras/qquickjumplistcategory_p.h | 3 | ||||
-rw-r--r-- | src/imports/winextras/qquickthumbnailtoolbar_p.h | 3 | ||||
-rw-r--r-- | src/winextras/qwinjumplist.cpp | 14 | ||||
-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 |
13 files changed, 30 insertions, 27 deletions
diff --git a/.qmake.conf b/.qmake.conf index 4e8875e..f0511dd 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.14.1 +MODULE_VERSION = 5.15.0 diff --git a/examples/winextras/iconextractor/main.cpp b/examples/winextras/iconextractor/main.cpp index b72a49a..3fafada 100644 --- a/examples/winextras/iconextractor/main.cpp +++ b/examples/winextras/iconextractor/main.cpp @@ -77,7 +77,7 @@ struct PixmapEntry { QPixmap pixmap; }; -using PixmapEntryList = QList<PixmapEntry>; +using PixmapEntryList = QVector<PixmapEntry>; static std::wostream &operator<<(std::wostream &str, const QString &s) { @@ -91,7 +91,7 @@ static std::wostream &operator<<(std::wostream &str, const QString &s) static QString formatSize(const QSize &size) { - return QString::number(size.width()) + QLatin1Char('x') + QString::number(size.height()); + return QString::number(size.width()) + u'x' + QString::number(size.height()); } // Extract icons contained in executable or DLL using the Win32 API ExtractIconEx() @@ -194,11 +194,11 @@ static PixmapEntryList extractShellIcons(const QString &sourceFile, bool addOver const unsigned modeFlags = baseFlags | modeEntry.flags; QString modePrefix = QLatin1String("_shell_"); if (modeEntry.name[0]) - modePrefix += QLatin1String(modeEntry.name) + QLatin1Char('_'); + modePrefix += QLatin1String(modeEntry.name) + u'_'; for (auto standardSizeEntry : standardSizeEntries) { const unsigned flags = modeFlags | standardSizeEntry.flags; const QString prefix = modePrefix + QLatin1String(standardSizeEntry.name) - + QLatin1Char('_'); + + u'_'; ZeroMemory(&info, sizeof(SHFILEINFO)); const HRESULT hr = SHGetFileInfo(sourceFileC, 0, &info, sizeof(SHFILEINFO), flags); if (FAILED(hr)) { @@ -291,7 +291,7 @@ int main(int argc, char *argv[]) return 1; } const QString &sourceFile = positionalArguments.constFirst(); - imageFileRoot = imageFileRootInfo.absoluteFilePath() + QLatin1Char('/') + QFileInfo(sourceFile).baseName(); + imageFileRoot = imageFileRootInfo.absoluteFilePath() + u'/' + QFileInfo(sourceFile).baseName(); const PixmapEntryList pixmaps = parser.isSet(shellIconOption) ? extractShellIcons(sourceFile, parser.isSet(shellOverlayOption)) diff --git a/examples/winextras/musicplayer/main.cpp b/examples/winextras/musicplayer/main.cpp index 9511152..3dcf1bb 100644 --- a/examples/winextras/musicplayer/main.cpp +++ b/examples/winextras/musicplayer/main.cpp @@ -93,7 +93,7 @@ static bool associateFileTypes() settings.setValue(QStringLiteral("FriendlyAppName"), displayName); settings.beginGroup(QStringLiteral("Command")); settings.setValue(QStringLiteral("."), - QLatin1Char('"') + QDir::toNativeSeparators(filePath) + QStringLiteral("\" \"%1\"")); + u'"' + QDir::toNativeSeparators(filePath) + QStringLiteral("\" \"%1\"")); return true; } diff --git a/examples/winextras/musicplayer/musicplayer.cpp b/examples/winextras/musicplayer/musicplayer.cpp index 2ecff56..4a598d8 100644 --- a/examples/winextras/musicplayer/musicplayer.cpp +++ b/examples/winextras/musicplayer/musicplayer.cpp @@ -154,7 +154,7 @@ void MusicPlayer::showEvent(QShowEvent *event) static bool canHandleDrop(const QDropEvent *event) { - const QList<QUrl> urls = event->mimeData()->urls(); + const auto urls = event->mimeData()->urls(); if (urls.size() != 1) return false; QMimeDatabase mimeDatabase; diff --git a/src/imports/winextras/qquickiconloader_p.h b/src/imports/winextras/qquickiconloader_p.h index bc23581..22aaae6 100644 --- a/src/imports/winextras/qquickiconloader_p.h +++ b/src/imports/winextras/qquickiconloader_p.h @@ -118,7 +118,7 @@ QQuickIconLoader::LoadResult Object *receiver, void (Object::*function)(const QVariant &)) { const QString scheme = url.scheme(); - if (scheme.startsWith(QLatin1String("http"))) { + if (scheme.startsWith(u"http")) { if (QNetworkReply *reply = QQuickIconLoader::loadFromNetwork(url, engine)) { auto *handler = new QQuickIconLoaderNetworkReplyHandler(reply, type); QObject::connect(handler, &QQuickIconLoaderNetworkReplyHandler::finished, receiver, function); @@ -126,7 +126,7 @@ QQuickIconLoader::LoadResult } return LoadError; } - const QVariant resource = scheme == QLatin1String("image") + const QVariant resource = scheme == u"image" ? QQuickIconLoader::loadFromImageProvider(url, engine, type, requestedSize) : QQuickIconLoader::loadFromFile(url, type); // qrc, file if (resource.isValid()) { diff --git a/src/imports/winextras/qquickjumplist_p.h b/src/imports/winextras/qquickjumplist_p.h index c686294..7b475be 100644 --- a/src/imports/winextras/qquickjumplist_p.h +++ b/src/imports/winextras/qquickjumplist_p.h @@ -55,6 +55,7 @@ #include <QObject> #include <QQmlParserStatus> #include <QQmlListProperty> +#include <QVector> QT_BEGIN_NAMESPACE @@ -102,7 +103,7 @@ private: QQuickJumpListCategory *m_recent = nullptr; QQuickJumpListCategory *m_frequent = nullptr; QQuickJumpListCategory *m_tasks = nullptr; - QList<QQuickJumpListCategory *> m_categories; + QVector<QQuickJumpListCategory *> m_categories; }; QT_END_NAMESPACE diff --git a/src/imports/winextras/qquickjumplistcategory_p.h b/src/imports/winextras/qquickjumplistcategory_p.h index 69663f8..19fb65a 100644 --- a/src/imports/winextras/qquickjumplistcategory_p.h +++ b/src/imports/winextras/qquickjumplistcategory_p.h @@ -55,6 +55,7 @@ #include "qquickjumplistitem_p.h" #include <QObject> +#include <QVector> #include <QQmlListProperty> #include <QWinJumpListCategory> #include <QWinJumpListItem> @@ -97,7 +98,7 @@ private: bool m_visible = true; QString m_title; - QList<QQuickJumpListItem *> m_items; + QVector<QQuickJumpListItem *> m_items; }; QT_END_NAMESPACE diff --git a/src/imports/winextras/qquickthumbnailtoolbar_p.h b/src/imports/winextras/qquickthumbnailtoolbar_p.h index 12a9d27..0ea47af 100644 --- a/src/imports/winextras/qquickthumbnailtoolbar_p.h +++ b/src/imports/winextras/qquickthumbnailtoolbar_p.h @@ -55,6 +55,7 @@ #include <QQuickItem> #include <QWinThumbnailToolBar> #include <QUrl> +#include <QVector> QT_BEGIN_NAMESPACE @@ -117,7 +118,7 @@ private: static QQuickThumbnailToolButton *buttonAt(QQmlListProperty<QQuickThumbnailToolButton> *property, int index); QWinThumbnailToolBar m_toolbar; - QList<QQuickThumbnailToolButton *> m_buttons; + QVector<QQuickThumbnailToolButton *> m_buttons; QUrl m_iconicThumbnailSource; QUrl m_iconicLivePreviewSource; }; diff --git a/src/winextras/qwinjumplist.cpp b/src/winextras/qwinjumplist.cpp index 55c99f4..f479096 100644 --- a/src/winextras/qwinjumplist.cpp +++ b/src/winextras/qwinjumplist.cpp @@ -97,17 +97,17 @@ static QString createArguments(const QStringList &arguments) QString tmp = arguments.at(i); // Quotes are escaped and their preceding backslashes are doubled. tmp.replace(QRegularExpression(QLatin1String("(\\\\*)\"")), QLatin1String("\\1\\1\\\"")); - if (tmp.isEmpty() || tmp.contains(QLatin1Char(' ')) || tmp.contains(QLatin1Char('\t'))) { + if (tmp.isEmpty() || tmp.contains(u' ') || tmp.contains(u'\t')) { // The argument must not end with a \ since this would be interpreted // as escaping the quote -- rather put the \ behind the quote: e.g. // rather use "foo"\ than "foo\" int i = tmp.length(); - while (i > 0 && tmp.at(i - 1) == QLatin1Char('\\')) + while (i > 0 && tmp.at(i - 1) == u'\\') --i; - tmp.insert(i, QLatin1Char('"')); - tmp.prepend(QLatin1Char('"')); + tmp.insert(i, u'"'); + tmp.prepend(u'"'); } - args += QLatin1Char(' ') + tmp; + args += u' ' + tmp; } return args; } @@ -120,7 +120,7 @@ void QWinJumpListPrivate::warning(const char *function, HRESULT hresult) QString QWinJumpListPrivate::iconsDirPath() { - QString iconDirPath = QDir::tempPath() + QLatin1Char('/') + QString iconDirPath = QDir::tempPath() + u'/' + QCoreApplication::applicationName() + QLatin1String("/qt-jl-icons/"); QDir().mkpath(iconDirPath); return iconDirPath; @@ -480,7 +480,7 @@ void QWinJumpList::setIdentifier(const QString &identifier) { Q_D(QWinJumpList); QString id = identifier; - id.replace(QLatin1Char(' '), QLatin1Char('_')); + id.replace(u' ', u'_'); if (id.size() > 128) id.truncate(128); if (d->identifier != id) { 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); |