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/cbc_codabar.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'fxbarcode/cbc_codabar.cpp') diff --git a/fxbarcode/cbc_codabar.cpp b/fxbarcode/cbc_codabar.cpp index a8729b64c6..0795ff295d 100644 --- a/fxbarcode/cbc_codabar.cpp +++ b/fxbarcode/cbc_codabar.cpp @@ -47,16 +47,15 @@ bool CBC_Codabar::SetWideNarrowRatio(int8_t ratio) { return GetOnedCodaBarWriter()->SetWideNarrowRatio(ratio); } -bool CBC_Codabar::Encode(const CFX_WideStringC& contents) { +bool CBC_Codabar::Encode(const WideStringView& contents) { if (contents.IsEmpty()) return false; BCFORMAT format = BCFORMAT_CODABAR; int32_t outWidth = 0; int32_t outHeight = 0; - CFX_WideString filtercontents = - GetOnedCodaBarWriter()->FilterContents(contents); - CFX_ByteString byteString = filtercontents.UTF8Encode(); + WideString filtercontents = GetOnedCodaBarWriter()->FilterContents(contents); + ByteString byteString = filtercontents.UTF8Encode(); m_renderContents = filtercontents; auto* pWriter = GetOnedCodaBarWriter(); std::unique_ptr data( @@ -64,16 +63,16 @@ bool CBC_Codabar::Encode(const CFX_WideStringC& contents) { if (!data) return false; - return pWriter->RenderResult(filtercontents.AsStringC(), data.get(), + return pWriter->RenderResult(filtercontents.AsStringView(), data.get(), outWidth); } bool CBC_Codabar::RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matrix) { auto* pWriter = GetOnedCodaBarWriter(); - CFX_WideString renderCon = - pWriter->encodedContents(m_renderContents.AsStringC()); - return pWriter->RenderDeviceResult(device, matrix, renderCon.AsStringC()); + WideString renderCon = + pWriter->encodedContents(m_renderContents.AsStringView()); + return pWriter->RenderDeviceResult(device, matrix, renderCon.AsStringView()); } BC_TYPE CBC_Codabar::GetType() { -- cgit v1.2.3