feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

cdbext: fix c++17 deprecation warning

Browse Source 
Change-Id: I2d06f602b4b229d1dec1dc1924e473f6b7aa4f68
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2021-09-22 09:33:35 +02:00
parent 7b6f1000c6
commit 6b1421af8d
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/qtcreatorcdbext/stringutils.cpp
View File

@@ -36,6 +36,8 @@
#include <codecvt> #include <codecvt>
#include <iomanip> #include <iomanip>
#include <Windows.h>
static const char whiteSpace[] = " \t\r\n"; static const char whiteSpace[] = " \t\r\n";
void trimFront(std::string &s) void trimFront(std::string &s)
@@ -152,7 +154,10 @@ std::string wStringToString(const std::wstring &w)
std::wstring utf8ToUtf16(const std::string &s) std::wstring utf8ToUtf16(const std::string &s)
{ {
return std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>>().from_bytes(s.data()); const int size = MultiByteToWideChar(CP_UTF8, 0, s.data(), int(s.size()), NULL, 0);
std::wstring result(size, 0);
MultiByteToWideChar(CP_UTF8, 0, s.data(), int(s.size()), result.data(), size);
return result;
} }
// Convert an ASCII hex digit to its value 'A'->10 // Convert an ASCII hex digit to its value 'A'->10