Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(682)

Unified Diff: xfa/src/fxbarcode/BC_UtilCodingConvert.cpp

Issue 1711893003: Remove CFX_{Byte,Wide}String::ConvertFrom(). (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: address comments Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « xfa/src/fgas/src/localization/fx_locale.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: xfa/src/fxbarcode/BC_UtilCodingConvert.cpp
diff --git a/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp b/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp
index 8b01512ef1f24599439622c6562415469cf76357..280d3a73b6e9a5da21da68f391ef1a123f6699b4 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();
« no previous file with comments | « xfa/src/fgas/src/localization/fx_locale.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698