From 31c7b73b71bd7352f96a82716b5e81d7fa24f37f Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 19 Feb 2016 10:53:24 -0800 Subject: Remove CFX_{Byte,Wide}String::ConvertFrom(). Use/add CFX_{Byte,Wide}String::FromFoo() instead. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1711893003 . --- core/include/fxcrt/fx_string.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'core/include/fxcrt/fx_string.h') diff --git a/core/include/fxcrt/fx_string.h b/core/include/fxcrt/fx_string.h index 36eba8d1c1..c625bfa925 100644 --- a/core/include/fxcrt/fx_string.h +++ b/core/include/fxcrt/fx_string.h @@ -289,8 +289,6 @@ class CFX_ByteString { CFX_WideString UTF8Decode() const; - void ConvertFrom(const CFX_WideString& str, CFX_CharMap* pCharMap = NULL); - FX_DWORD GetID(FX_STRSIZE start_pos = 0) const; #define FXFORMAT_SIGNED 1 @@ -561,7 +559,10 @@ class CFX_WideString { ~CFX_WideString(); - static CFX_WideString FromLocal(const char* str, FX_STRSIZE len = -1); + static CFX_WideString FromLocal(const CFX_ByteString& str); + + static CFX_WideString FromCodePage(const CFX_ByteString& str, + FX_WORD codepage); static CFX_WideString FromUTF8(const char* str, FX_STRSIZE len); @@ -685,8 +686,6 @@ class CFX_WideString { CFX_ByteString UTF16LE_Encode() const; - void ConvertFrom(const CFX_ByteString& str, CFX_CharMap* pCharMap = NULL); - protected: class StringData { public: -- cgit v1.2.3