diff options
Diffstat (limited to 'core/fxcrt/include')
| -rw-r--r-- | core/fxcrt/include/fx_basic.h | 4 | ||||
| -rw-r--r-- | core/fxcrt/include/fx_string.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/fxcrt/include/fx_basic.h b/core/fxcrt/include/fx_basic.h index 744b2dd10f..1cb5174351 100644 --- a/core/fxcrt/include/fx_basic.h +++ b/core/fxcrt/include/fx_basic.h @@ -186,10 +186,10 @@ class CFX_FileBufferArchive { class CFX_CharMap { public: static CFX_ByteString GetByteString(uint16_t codepage, - const CFX_WideString& wstr); + const CFX_WideStringC& wstr); static CFX_WideString GetWideString(uint16_t codepage, - const CFX_ByteString& bstr); + const CFX_ByteStringC& bstr); CFX_CharMap() = delete; }; diff --git a/core/fxcrt/include/fx_string.h b/core/fxcrt/include/fx_string.h index 382e141dc2..8a0b3ff3db 100644 --- a/core/fxcrt/include/fx_string.h +++ b/core/fxcrt/include/fx_string.h @@ -497,8 +497,8 @@ class CFX_WideString { ~CFX_WideString(); - static CFX_WideString FromLocal(const CFX_ByteString& str); - static CFX_WideString FromCodePage(const CFX_ByteString& str, + static CFX_WideString FromLocal(const CFX_ByteStringC& str); + static CFX_WideString FromCodePage(const CFX_ByteStringC& str, uint16_t codepage); static CFX_WideString FromUTF8(const CFX_ByteStringC& str); |