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 /examples | |
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 'examples')
-rw-r--r-- | examples/winextras/iconextractor/main.cpp | 8 | ||||
-rw-r--r-- | examples/winextras/musicplayer/main.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/examples/winextras/iconextractor/main.cpp b/examples/winextras/iconextractor/main.cpp index 97b869a..3fafada 100644 --- a/examples/winextras/iconextractor/main.cpp +++ b/examples/winextras/iconextractor/main.cpp @@ -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; } |