diff options
author | Lei Zhang <thestig@chromium.org> | 2016-02-19 10:53:24 -0800 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2016-02-19 10:53:24 -0800 |
commit | 31c7b73b71bd7352f96a82716b5e81d7fa24f37f (patch) | |
tree | 292a068fb657e97cd0d11dc78a7528915f8a78e0 /core/src/fxcrt/fx_basic_bstring.cpp | |
parent | 490543247e07ce1c92f609bcc2fa484652a86e1f (diff) | |
download | pdfium-31c7b73b71bd7352f96a82716b5e81d7fa24f37f.tar.xz |
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 .
Diffstat (limited to 'core/src/fxcrt/fx_basic_bstring.cpp')
-rw-r--r-- | core/src/fxcrt/fx_basic_bstring.cpp | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/core/src/fxcrt/fx_basic_bstring.cpp b/core/src/fxcrt/fx_basic_bstring.cpp index e0d1146068..85e5041095 100644 --- a/core/src/fxcrt/fx_basic_bstring.cpp +++ b/core/src/fxcrt/fx_basic_bstring.cpp @@ -910,25 +910,20 @@ CFX_WideString CFX_ByteString::UTF8Decode() const { } return decoder.GetResult(); } + +// static CFX_ByteString CFX_ByteString::FromUnicode(const FX_WCHAR* str, FX_STRSIZE len) { - if (len < 0) { - len = FXSYS_wcslen(str); - } - CFX_ByteString bstr; - bstr.ConvertFrom(CFX_WideString(str, len)); - return bstr; + FX_STRSIZE str_len = len >= 0 ? len : FXSYS_wcslen(str); + return FromUnicode(CFX_WideString(str, str_len)); } + +// static CFX_ByteString CFX_ByteString::FromUnicode(const CFX_WideString& str) { - return FromUnicode(str.c_str(), str.GetLength()); -} -void CFX_ByteString::ConvertFrom(const CFX_WideString& str, - CFX_CharMap* pCharMap) { - if (!pCharMap) { - pCharMap = CFX_CharMap::GetDefaultMapper(); - } - *this = (*pCharMap->m_GetByteString)(pCharMap, str); + CFX_CharMap* pCharMap = CFX_CharMap::GetDefaultMapper(); + return (*pCharMap->m_GetByteString)(pCharMap, str); } + int CFX_ByteString::Compare(const CFX_ByteStringC& str) const { if (!m_pData) { return str.IsEmpty() ? 0 : -1; |