From 275e260a6cd4a8e506ba974feb85ebcd926c1739 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Mon, 18 Sep 2017 14:23:18 -0400 Subject: Convert string class names Automated using git grep & sed. Replace StringC classes with StringView classes. Remove the CFX_ prefix and put string classes in fxcrt namespace. Change AsStringC() to AsStringView(). Rename tests from TEST(fxcrt, *String*Foo) to TEST(*String*, Foo). Couple of tests needed to have their names regularlized. BUG=pdfium:894 Change-Id: I7ca038685c8d803795f3ed02545124f7a224c83d Reviewed-on: https://pdfium-review.googlesource.com/14151 Reviewed-by: Tom Sepez Commit-Queue: Ryan Harrison --- fxbarcode/BC_UtilCodingConvert.cpp | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) (limited to 'fxbarcode/BC_UtilCodingConvert.cpp') diff --git a/fxbarcode/BC_UtilCodingConvert.cpp b/fxbarcode/BC_UtilCodingConvert.cpp index f0f497a07b..77c52f2074 100644 --- a/fxbarcode/BC_UtilCodingConvert.cpp +++ b/fxbarcode/BC_UtilCodingConvert.cpp @@ -10,43 +10,42 @@ CBC_UtilCodingConvert::CBC_UtilCodingConvert() {} CBC_UtilCodingConvert::~CBC_UtilCodingConvert() {} -void CBC_UtilCodingConvert::UnicodeToLocale(const CFX_WideString& src, - CFX_ByteString& dst) { - dst = CFX_ByteString::FromUnicode(src); +void CBC_UtilCodingConvert::UnicodeToLocale(const WideString& src, + ByteString& dst) { + dst = ByteString::FromUnicode(src); } -void CBC_UtilCodingConvert::LocaleToUtf8(const CFX_ByteString& src, - CFX_ByteString& dst) { - CFX_WideString unicode = CFX_WideString::FromLocal(src.AsStringC()); +void CBC_UtilCodingConvert::LocaleToUtf8(const ByteString& src, + ByteString& dst) { + WideString unicode = WideString::FromLocal(src.AsStringView()); dst = unicode.UTF8Encode(); } -void CBC_UtilCodingConvert::LocaleToUtf8(const CFX_ByteString& src, +void CBC_UtilCodingConvert::LocaleToUtf8(const ByteString& src, std::vector& dst) { - CFX_WideString unicode = CFX_WideString::FromLocal(src.AsStringC()); - CFX_ByteString utf8 = unicode.UTF8Encode(); + WideString unicode = WideString::FromLocal(src.AsStringView()); + ByteString utf8 = unicode.UTF8Encode(); dst = std::vector(utf8.begin(), utf8.end()); } void CBC_UtilCodingConvert::Utf8ToLocale(const std::vector& src, - CFX_ByteString& dst) { - CFX_ByteString utf8; + ByteString& dst) { + ByteString utf8; for (uint8_t value : src) utf8 += value; - CFX_WideString unicode = CFX_WideString::FromUTF8(utf8.AsStringC()); - dst = CFX_ByteString::FromUnicode(unicode); + WideString unicode = WideString::FromUTF8(utf8.AsStringView()); + dst = ByteString::FromUnicode(unicode); } void CBC_UtilCodingConvert::Utf8ToLocale(const uint8_t* src, int32_t count, - CFX_ByteString& dst) { - CFX_WideString unicode = - CFX_WideString::FromUTF8(CFX_ByteStringC(src, count)); - dst = CFX_ByteString::FromUnicode(unicode); + ByteString& dst) { + WideString unicode = WideString::FromUTF8(ByteStringView(src, count)); + dst = ByteString::FromUnicode(unicode); } -void CBC_UtilCodingConvert::UnicodeToUTF8(const CFX_WideString& src, - CFX_ByteString& dst) { +void CBC_UtilCodingConvert::UnicodeToUTF8(const WideString& src, + ByteString& dst) { dst = src.UTF8Encode(); } -- cgit v1.2.3