diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-15 17:55:05 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-15 18:33:09 +0200 |
| commit | d8edf07ed9e7a3e2f2ab43ffd2935b93326f2caa (patch) | |
| tree | fcc91844900827238324f8ad93f1dbf64306b13b /shell/inc | |
| parent | 42782fddff98eeab5c8249918e9ba000f08c22e8 (diff) | |
Bin use of UTF-16 expat variant in the Windows shell extension
Thus we can drop that variant completely.
Change-Id: I11a8e40436921219bd6dd4afad4c7907ccb6b84c
Diffstat (limited to 'shell/inc')
| -rw-r--r-- | shell/inc/internal/i_xml_parser_event_handler.hxx | 2 | ||||
| -rw-r--r-- | shell/inc/internal/utilities.hxx | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/shell/inc/internal/i_xml_parser_event_handler.hxx b/shell/inc/internal/i_xml_parser_event_handler.hxx index 2f2d7d81aa2a..356c92130277 100644 --- a/shell/inc/internal/i_xml_parser_event_handler.hxx +++ b/shell/inc/internal/i_xml_parser_event_handler.hxx @@ -23,7 +23,7 @@ #include <string> #include <map> -#if defined(XML_UNICODE) || defined(XML_UNICODE_WCHAR_T) +#ifdef _WIN32 typedef std::wstring string_t; typedef wchar_t char_t; #else diff --git a/shell/inc/internal/utilities.hxx b/shell/inc/internal/utilities.hxx index 157859a8e7f7..8921671fb4e7 100644 --- a/shell/inc/internal/utilities.hxx +++ b/shell/inc/internal/utilities.hxx @@ -73,6 +73,12 @@ std::wstring StringToWString(const std::string& String); std::string WStringToString(const std::wstring& String); //--------------------------------- +/** Convert a string to a wstring + using CP_UTF8 +*/ +std::wstring UTF8ToWString(const std::string& String); + +//--------------------------------- /** Retrieve a string from the resources of this module */ |