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_OnedCodaBarWriter.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'fxbarcode/oned/BC_OnedCodaBarWriter.cpp') diff --git a/fxbarcode/oned/BC_OnedCodaBarWriter.cpp b/fxbarcode/oned/BC_OnedCodaBarWriter.cpp index 03a733a8c2..4c5ad67194 100644 --- a/fxbarcode/oned/BC_OnedCodaBarWriter.cpp +++ b/fxbarcode/oned/BC_OnedCodaBarWriter.cpp @@ -95,15 +95,15 @@ bool CBC_OnedCodaBarWriter::FindChar(wchar_t ch, bool isContent) { } bool CBC_OnedCodaBarWriter::CheckContentValidity( - const CFX_WideStringC& contents) { + const WideStringView& contents) { return std::all_of( contents.begin(), contents.end(), [this](const wchar_t& ch) { return this->FindChar(ch, false); }); } -CFX_WideString CBC_OnedCodaBarWriter::FilterContents( - const CFX_WideStringC& contents) { - CFX_WideString filtercontents; +WideString CBC_OnedCodaBarWriter::FilterContents( + const WideStringView& contents) { + WideString filtercontents; wchar_t ch; for (FX_STRSIZE index = 0; index < contents.GetLength(); index++) { ch = contents[index]; @@ -118,7 +118,7 @@ CFX_WideString CBC_OnedCodaBarWriter::FilterContents( return filtercontents; } -uint8_t* CBC_OnedCodaBarWriter::EncodeWithHint(const CFX_ByteString& contents, +uint8_t* CBC_OnedCodaBarWriter::EncodeWithHint(const ByteString& contents, BCFORMAT format, int32_t& outWidth, int32_t& outHeight, @@ -129,9 +129,9 @@ uint8_t* CBC_OnedCodaBarWriter::EncodeWithHint(const CFX_ByteString& contents, hints); } -uint8_t* CBC_OnedCodaBarWriter::EncodeImpl(const CFX_ByteString& contents, +uint8_t* CBC_OnedCodaBarWriter::EncodeImpl(const ByteString& contents, int32_t& outLength) { - CFX_ByteString data = m_chStart + contents + m_chEnd; + ByteString data = m_chStart + contents + m_chEnd; m_iContentLen = data.GetLength(); uint8_t* result = FX_Alloc2D(uint8_t, m_iWideNarrRatio * 7, data.GetLength()); char ch; @@ -188,16 +188,16 @@ uint8_t* CBC_OnedCodaBarWriter::EncodeImpl(const CFX_ByteString& contents, return result; } -CFX_WideString CBC_OnedCodaBarWriter::encodedContents( - const CFX_WideStringC& contents) { - CFX_WideString strStart(static_cast(m_chStart)); - CFX_WideString strEnd(static_cast(m_chEnd)); +WideString CBC_OnedCodaBarWriter::encodedContents( + const WideStringView& contents) { + WideString strStart(static_cast(m_chStart)); + WideString strEnd(static_cast(m_chEnd)); return strStart + contents + strEnd; } -bool CBC_OnedCodaBarWriter::RenderResult(const CFX_WideStringC& contents, +bool CBC_OnedCodaBarWriter::RenderResult(const WideStringView& contents, uint8_t* code, int32_t codeLength) { - return CBC_OneDimWriter::RenderResult(encodedContents(contents).AsStringC(), - code, codeLength); + return CBC_OneDimWriter::RenderResult( + encodedContents(contents).AsStringView(), code, codeLength); } -- cgit v1.2.3