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/oned/BC_OnedEAN13Writer.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'fxbarcode/oned/BC_OnedEAN13Writer.cpp') diff --git a/fxbarcode/oned/BC_OnedEAN13Writer.cpp b/fxbarcode/oned/BC_OnedEAN13Writer.cpp index 2d9759b9eb..6de7c2cb20 100644 --- a/fxbarcode/oned/BC_OnedEAN13Writer.cpp +++ b/fxbarcode/oned/BC_OnedEAN13Writer.cpp @@ -56,14 +56,12 @@ CBC_OnedEAN13Writer::CBC_OnedEAN13Writer() { } CBC_OnedEAN13Writer::~CBC_OnedEAN13Writer() {} -bool CBC_OnedEAN13Writer::CheckContentValidity( - const CFX_WideStringC& contents) { +bool CBC_OnedEAN13Writer::CheckContentValidity(const WideStringView& contents) { return std::all_of(contents.begin(), contents.end(), std::iswdigit); } -CFX_WideString CBC_OnedEAN13Writer::FilterContents( - const CFX_WideStringC& contents) { - CFX_WideString filtercontents; +WideString CBC_OnedEAN13Writer::FilterContents(const WideStringView& contents) { + WideString filtercontents; wchar_t ch; for (FX_STRSIZE i = 0; i < contents.GetLength(); i++) { ch = contents[i]; @@ -78,11 +76,11 @@ CFX_WideString CBC_OnedEAN13Writer::FilterContents( return filtercontents; } -int32_t CBC_OnedEAN13Writer::CalcChecksum(const CFX_ByteString& contents) { +int32_t CBC_OnedEAN13Writer::CalcChecksum(const ByteString& contents) { return EANCalcChecksum(contents); } -uint8_t* CBC_OnedEAN13Writer::EncodeWithHint(const CFX_ByteString& contents, +uint8_t* CBC_OnedEAN13Writer::EncodeWithHint(const ByteString& contents, BCFORMAT format, int32_t& outWidth, int32_t& outHeight, @@ -93,7 +91,7 @@ uint8_t* CBC_OnedEAN13Writer::EncodeWithHint(const CFX_ByteString& contents, hints); } -uint8_t* CBC_OnedEAN13Writer::EncodeImpl(const CFX_ByteString& contents, +uint8_t* CBC_OnedEAN13Writer::EncodeImpl(const ByteString& contents, int32_t& outLength) { if (contents.GetLength() != 13) return nullptr; @@ -136,7 +134,7 @@ uint8_t* CBC_OnedEAN13Writer::EncodeImpl(const CFX_ByteString& contents, return result.release(); } -bool CBC_OnedEAN13Writer::ShowChars(const CFX_WideStringC& contents, +bool CBC_OnedEAN13Writer::ShowChars(const WideStringView& contents, CFX_RenderDevice* device, const CFX_Matrix* matrix, int32_t barWidth, @@ -146,12 +144,12 @@ bool CBC_OnedEAN13Writer::ShowChars(const CFX_WideStringC& contents, int32_t leftPadding = 7 * multiple; int32_t leftPosition = 3 * multiple + leftPadding; - CFX_ByteString str = FX_UTF8Encode(contents); + ByteString str = FX_UTF8Encode(contents); int32_t iLen = str.GetLength(); std::vector charpos(iLen); int32_t iFontSize = (int32_t)fabs(m_fFontSize); int32_t iTextHeight = iFontSize + 1; - CFX_ByteString tempStr = str.Mid(1, 6); + ByteString tempStr = str.Mid(1, 6); int32_t strWidth = multiple * 42; CFX_Matrix matr(m_outputHScale, 0.0, 0.0, 1.0, 0.0, 0.0); -- cgit v1.2.3