diff options
| author | David Schulz <david.schulz@qt.io> | 2021-09-22 09:33:35 +0200 |
|---|---|---|
| committer | David Schulz <david.schulz@qt.io> | 2021-09-24 05:12:33 +0000 |
| commit | 6b1421af8df6536ef58cb82c7e27c1282540ef98 (patch) | |
| tree | 6b839c7f2ec747f7999a35a845def6919d567557 /src/libs/qtcreatorcdbext | |
| parent | 7b6f1000c6563e813e4afeb18f3d6ccafc33dd57 (diff) | |
cdbext: fix c++17 deprecation warning
Change-Id: I2d06f602b4b229d1dec1dc1924e473f6b7aa4f68
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/libs/qtcreatorcdbext')
| -rw-r--r-- | src/libs/qtcreatorcdbext/stringutils.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/libs/qtcreatorcdbext/stringutils.cpp b/src/libs/qtcreatorcdbext/stringutils.cpp index 7a8554f91c..5bbd98ed0f 100644 --- a/src/libs/qtcreatorcdbext/stringutils.cpp +++ b/src/libs/qtcreatorcdbext/stringutils.cpp @@ -36,6 +36,8 @@ #include <codecvt> #include <iomanip> +#include <Windows.h> + static const char whiteSpace[] = " \t\r\n"; void trimFront(std::string &s) @@ -152,7 +154,10 @@ std::string wStringToString(const std::wstring &w) 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 |