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_code128.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'fxbarcode/cbc_code128.cpp') diff --git a/fxbarcode/cbc_code128.cpp b/fxbarcode/cbc_code128.cpp index d802b28a17..7ba623542d 100644 --- a/fxbarcode/cbc_code128.cpp +++ b/fxbarcode/cbc_code128.cpp @@ -35,7 +35,7 @@ bool CBC_Code128::SetTextLocation(BC_TEXT_LOC location) { return GetOnedCode128Writer()->SetTextLocation(location); } -bool CBC_Code128::Encode(const CFX_WideStringC& contents) { +bool CBC_Code128::Encode(const WideStringView& contents) { if (contents.IsEmpty()) return false; @@ -43,25 +43,25 @@ bool CBC_Code128::Encode(const CFX_WideStringC& contents) { int32_t outWidth = 0; int32_t outHeight = 0; auto* pWriter = GetOnedCode128Writer(); - CFX_WideString content(contents); + WideString content(contents); if (contents.GetLength() % 2 && pWriter->GetType() == BC_CODE128_C) content += '0'; - CFX_WideString encodeContents = pWriter->FilterContents(content.AsStringC()); + WideString encodeContents = pWriter->FilterContents(content.AsStringView()); m_renderContents = encodeContents; - CFX_ByteString byteString = encodeContents.UTF8Encode(); + ByteString byteString = encodeContents.UTF8Encode(); std::unique_ptr data( pWriter->Encode(byteString, format, outWidth, outHeight)); if (!data) return false; - return pWriter->RenderResult(encodeContents.AsStringC(), data.get(), + return pWriter->RenderResult(encodeContents.AsStringView(), data.get(), outWidth); } bool CBC_Code128::RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matrix) { return GetOnedCode128Writer()->RenderDeviceResult( - device, matrix, m_renderContents.AsStringC()); + device, matrix, m_renderContents.AsStringView()); } BC_TYPE CBC_Code128::GetType() { -- cgit v1.2.3