Mercurial > minori
diff src/core/strings.cc @ 411:02a670a8e1c4
*: fix build fails
| author | Paper <paper@tflc.us> |
|---|---|
| date | Sat, 25 Jul 2026 14:22:44 -0400 |
| parents | 4562bc8bfdff |
| children | 192da585a0a8 |
line wrap: on
line diff
--- a/src/core/strings.cc Thu Apr 02 01:09:09 2026 -0400 +++ b/src/core/strings.cc Sat Jul 25 14:22:44 2026 -0400 @@ -141,6 +141,10 @@ return ToUtf8String(session.config.locale.GetLocale().toLower(ToQString(string))); } +#ifdef __GNUC__ +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif std::wstring ToWstring(const std::string &string) { static std::wstring_convert<std::codecvt_utf8<wchar_t>> converter("", L""); @@ -155,13 +159,6 @@ return wstr; } -std::wstring ToWstring(const QString &string) -{ - std::wstring arr(string.size(), L'\0'); - string.toWCharArray(&arr.front()); - return arr; -} - std::string ToUtf8String(const std::wstring &wstring) { static std::wstring_convert<std::codecvt_utf8<wchar_t>> converter("", L""); @@ -179,6 +176,16 @@ static std::wstring_convert<std::codecvt_utf8_utf16<char32_t>, char32_t> converter; return converter.from_bytes(string); } +#ifdef __GNUC__ +# pragma GCC diagnostic pop +#endif + +std::wstring ToWstring(const QString &string) +{ + std::wstring arr(string.size(), L'\0'); + string.toWCharArray(&arr.front()); + return arr; +} std::string ToUtf8String(const QString &string) { @@ -231,9 +238,9 @@ bool ToBool(const std::string &str, bool def) { - std::istringstream s(Strings::ToLower(str)); - s >> std::boolalpha >> def; - return def; + std::string l = Strings::ToLower(str); + + return (l == "true") ? true : (l == "false") ? false : def; } template<typename T>
