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 /xfa/src/fxbarcode | |
| 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 'xfa/src/fxbarcode')
| -rw-r--r-- | xfa/src/fxbarcode/BC_UtilCodingConvert.cpp | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp b/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp index 8b01512ef1..280d3a73b6 100644 --- a/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp +++ b/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp @@ -6,25 +6,31 @@ #include "barcode.h" #include "BC_UtilCodingConvert.h" + CBC_UtilCodingConvert::CBC_UtilCodingConvert() {} + CBC_UtilCodingConvert::~CBC_UtilCodingConvert() {} + void CBC_UtilCodingConvert::UnicodeToLocale(const CFX_WideString& src, CFX_ByteString& dst) { - dst.ConvertFrom(src); + dst = CFX_ByteString::FromUnicode(src); } + void CBC_UtilCodingConvert::LocaleToUtf8(const CFX_ByteString& src, CFX_ByteString& dst) { - CFX_WideString unicode = CFX_WideString::FromLocal(src, src.GetLength()); + CFX_WideString unicode = CFX_WideString::FromLocal(src); dst = unicode.UTF8Encode(); } + void CBC_UtilCodingConvert::LocaleToUtf8(const CFX_ByteString& src, CFX_ByteArray& dst) { - CFX_WideString unicode = CFX_WideString::FromLocal(src, src.GetLength()); + CFX_WideString unicode = CFX_WideString::FromLocal(src); CFX_ByteString utf8 = unicode.UTF8Encode(); for (int32_t i = 0; i < utf8.GetLength(); i++) { dst.Add(utf8[i]); } } + void CBC_UtilCodingConvert::Utf8ToLocale(const CFX_ByteArray& src, CFX_ByteString& dst) { CFX_ByteString utf8; @@ -32,14 +38,16 @@ void CBC_UtilCodingConvert::Utf8ToLocale(const CFX_ByteArray& src, utf8 += src[i]; } CFX_WideString unicode = CFX_WideString::FromUTF8(utf8, utf8.GetLength()); - dst.ConvertFrom(unicode); + dst = CFX_ByteString::FromUnicode(unicode); } + void CBC_UtilCodingConvert::Utf8ToLocale(const uint8_t* src, int32_t count, CFX_ByteString& dst) { CFX_WideString unicode = CFX_WideString::FromUTF8((const char*)src, count); - dst.ConvertFrom(unicode); + dst = CFX_ByteString::FromUnicode(unicode); } + void CBC_UtilCodingConvert::UnicodeToUTF8(const CFX_WideString& src, CFX_ByteString& dst) { dst = src.UTF8Encode(); |