Martchus
/
qtutilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Martchus 2023-03-15 21:29:14 +01:00
parent 647ad121a5
commit 9f4c7a8aaa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
misc/conversion.h
View File

@ -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<int>(nativeFileName.size()));
#else
return QString::fromUtf8(nativeFileName.data(), static_cast<int>(nativeFileName.size()));