From d5a0d67c7bfdca0094f38a8b705c9ed0c1192c13 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sat, 12 Dec 2020 12:50:33 +0100 Subject: [PATCH] Use ScopedWCharArray --- src/core/utilities.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp index 794178bb1..72c11aad3 100644 --- a/src/core/utilities.cpp +++ b/src/core/utilities.cpp @@ -215,7 +215,12 @@ quint64 FileSystemCapacity(const QString &path) { return quint64(fs_info.f_blocks) * quint64(fs_info.f_bsize); #elif defined(Q_OS_WIN32) _ULARGE_INTEGER ret; - if (GetDiskFreeSpaceEx(QDir::toNativeSeparators(path).toLocal8Bit().constData(), nullptr,&ret, nullptr) != 0) +# if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + ScopedWCharArray wchar(QDir::toNativeSeparators(path)); + if (GetDiskFreeSpaceEx(wchar.get(), nullptr, &ret, nullptr) != 0) +# else + if (GetDiskFreeSpaceEx(QDir::toNativeSeparators(path).toLocal8Bit().constData(), nullptr, &ret, nullptr) != 0) +# endif return ret.QuadPart; #endif @@ -231,7 +236,12 @@ quint64 FileSystemFreeSpace(const QString &path) { return quint64(fs_info.f_bavail) * quint64(fs_info.f_bsize); #elif defined(Q_OS_WIN32) _ULARGE_INTEGER ret; +# if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + ScopedWCharArray wchar(QDir::toNativeSeparators(path)); + if (GetDiskFreeSpaceEx(wchar.get(), &ret, nullptr, nullptr) != 0) +# else if (GetDiskFreeSpaceEx(QDir::toNativeSeparators(path).toLocal8Bit().constData(), &ret, nullptr, nullptr) != 0) +# endif return ret.QuadPart; #endif