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_upca.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'fxbarcode/cbc_upca.cpp') diff --git a/fxbarcode/cbc_upca.cpp b/fxbarcode/cbc_upca.cpp index f4c273f764..69cedce580 100644 --- a/fxbarcode/cbc_upca.cpp +++ b/fxbarcode/cbc_upca.cpp @@ -30,15 +30,15 @@ CBC_UPCA::CBC_UPCA() : CBC_OneCode(pdfium::MakeUnique()) {} CBC_UPCA::~CBC_UPCA() {} -CFX_WideString CBC_UPCA::Preprocess(const CFX_WideStringC& contents) { +WideString CBC_UPCA::Preprocess(const WideStringView& contents) { CBC_OnedUPCAWriter* pWriter = GetOnedUPCAWriter(); - CFX_WideString encodeContents = pWriter->FilterContents(contents); + WideString encodeContents = pWriter->FilterContents(contents); int32_t length = encodeContents.GetLength(); if (length <= 11) { for (int32_t i = 0; i < 11 - length; i++) encodeContents = wchar_t('0') + encodeContents; - CFX_ByteString byteString = encodeContents.UTF8Encode(); + ByteString byteString = encodeContents.UTF8Encode(); int32_t checksum = pWriter->CalcChecksum(byteString); byteString += checksum - 0 + '0'; encodeContents = byteString.UTF8Decode(); @@ -49,15 +49,15 @@ CFX_WideString CBC_UPCA::Preprocess(const CFX_WideStringC& contents) { return encodeContents; } -bool CBC_UPCA::Encode(const CFX_WideStringC& contents) { +bool CBC_UPCA::Encode(const WideStringView& contents) { if (contents.IsEmpty()) return false; BCFORMAT format = BCFORMAT_UPC_A; int32_t outWidth = 0; int32_t outHeight = 0; - CFX_WideString encodeContents = Preprocess(contents); - CFX_ByteString byteString = encodeContents.UTF8Encode(); + WideString encodeContents = Preprocess(contents); + ByteString byteString = encodeContents.UTF8Encode(); m_renderContents = encodeContents; CBC_OnedUPCAWriter* pWriter = GetOnedUPCAWriter(); @@ -66,14 +66,14 @@ bool CBC_UPCA::Encode(const CFX_WideStringC& contents) { 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_UPCA::RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matrix) { - return GetOnedUPCAWriter()->RenderDeviceResult(device, matrix, - m_renderContents.AsStringC()); + return GetOnedUPCAWriter()->RenderDeviceResult( + device, matrix, m_renderContents.AsStringView()); } BC_TYPE CBC_UPCA::GetType() { -- cgit v1.2.3