From 9f4c7a8aaaee80988cfa8451a36feaeaaf6b89b8 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 15 Mar 2023 21:29:14 +0100 Subject: [PATCH] Use `PLATFORM_WINDOWS` (and not `PLATFORM_MINGW`) in conversion functions Whether MinGW (or MSVC) is used shouldn't make a difference here. The code using these functions generally sticks to UTF-8 on Windows. --- misc/conversion.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/misc/conversion.h b/misc/conversion.h index 0648cb1..527fca4 100644 --- a/misc/conversion.h +++ b/misc/conversion.h @@ -12,7 +12,7 @@ namespace QtUtilities { inline QByteArray toNativeFileName(const QString &fileName) { -#if !defined(PLATFORM_MINGW) || !defined(CPP_UTILITIES_USE_NATIVE_FILE_BUFFER) +#if !defined(PLATFORM_WINDOWS) || !defined(CPP_UTILITIES_USE_NATIVE_FILE_BUFFER) return fileName.toLocal8Bit(); #else return fileName.toUtf8(); @@ -21,7 +21,7 @@ inline QByteArray toNativeFileName(const QString &fileName) inline QString fromNativeFileName(const char *nativeFileName, int size = -1) { -#if !defined(PLATFORM_MINGW) || !defined(CPP_UTILITIES_USE_NATIVE_FILE_BUFFER) +#if !defined(PLATFORM_WINDOWS) || !defined(CPP_UTILITIES_USE_NATIVE_FILE_BUFFER) return QString::fromLocal8Bit(nativeFileName, size); #else return QString::fromUtf8(nativeFileName, size); @@ -30,7 +30,7 @@ inline QString fromNativeFileName(const char *nativeFileName, int size = -1) inline QString fromNativeFileName(const std::string &nativeFileName) { -#if !defined(PLATFORM_MINGW) || !defined(CPP_UTILITIES_USE_NATIVE_FILE_BUFFER) +#if !defined(PLATFORM_WINDOWS) || !defined(CPP_UTILITIES_USE_NATIVE_FILE_BUFFER) return QString::fromLocal8Bit(nativeFileName.data(), static_cast(nativeFileName.size())); #else return QString::fromUtf8(nativeFileName.data(), static_cast(nativeFileName.size()));