From 4c3debb3c91f5842784be30a911b52cdabcab7df Mon Sep 17 00:00:00 2001 From: tsepez Date: Fri, 8 Apr 2016 12:20:38 -0700 Subject: Rename both As{Byte,Wide}StringC() helpers to AsStringC(). The naming is redundant given the base type, and will stand in the way of consolidating Byte and Wide code. BUG= Review URL: https://codereview.chromium.org/1862123003 --- xfa/fwl/basewidget/fwl_barcodeimp.cpp | 2 +- xfa/fwl/basewidget/fwl_editimp.cpp | 6 +++--- xfa/fwl/core/fwl_formimp.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'xfa/fwl') diff --git a/xfa/fwl/basewidget/fwl_barcodeimp.cpp b/xfa/fwl/basewidget/fwl_barcodeimp.cpp index 610233e84e..0ab2e1ed74 100644 --- a/xfa/fwl/basewidget/fwl_barcodeimp.cpp +++ b/xfa/fwl/basewidget/fwl_barcodeimp.cpp @@ -170,7 +170,7 @@ void CFWL_BarcodeImp::GenerateBarcodeImageCache() { m_pBarcodeEngine->SetTruncated(pData->GetTruncated()); } int32_t errorCode = 0; - m_dwStatus = m_pBarcodeEngine->Encode(wsText.AsWideStringC(), TRUE, errorCode) + m_dwStatus = m_pBarcodeEngine->Encode(wsText.AsStringC(), TRUE, errorCode) ? XFA_BCS_EncodeSuccess : 0; } diff --git a/xfa/fwl/basewidget/fwl_editimp.cpp b/xfa/fwl/basewidget/fwl_editimp.cpp index b05bc2ae9d..95cf273ec2 100644 --- a/xfa/fwl/basewidget/fwl_editimp.cpp +++ b/xfa/fwl/basewidget/fwl_editimp.cpp @@ -423,7 +423,7 @@ FX_BOOL CFWL_EditImp::ReplaceSpellCheckWord(CFX_PointF pointf, pBuffer[i] = bsReplace[i]; } wsDest.ReleaseBuffer(nDestLen); - Replace(nWordStart, nWordCount, wsDest.AsWideStringC()); + Replace(nWordStart, nWordCount, wsDest.AsStringC()); return TRUE; } void CFWL_EditImp::DrawSpellCheck(CFX_Graphics* pGraphics, @@ -734,14 +734,14 @@ FX_BOOL CFWL_EditImp::Undo() { return FALSE; } CFX_ByteString bsRecord = m_RecordArr[m_iCurRecord--]; - return Undo(bsRecord.AsByteStringC()); + return Undo(bsRecord.AsStringC()); } FX_BOOL CFWL_EditImp::Redo() { if (!CanRedo()) { return FALSE; } CFX_ByteString bsRecord = m_RecordArr[++m_iCurRecord]; - return Redo(bsRecord.AsByteStringC()); + return Redo(bsRecord.AsStringC()); } FX_BOOL CFWL_EditImp::CanUndo() { return m_iCurRecord >= 0; diff --git a/xfa/fwl/core/fwl_formimp.cpp b/xfa/fwl/core/fwl_formimp.cpp index 5a5cc5e59b..14f3b33c46 100644 --- a/xfa/fwl/core/fwl_formimp.cpp +++ b/xfa/fwl/core/fwl_formimp.cpp @@ -822,7 +822,7 @@ void CFWL_FormImp::UpdateCaption() { return; CFX_WideString text; pData->GetCaption(m_pInterface, text); - pWidgetMgr->SetWidgetCaption_Native(m_pInterface, text.AsWideStringC()); + pWidgetMgr->SetWidgetCaption_Native(m_pInterface, text.AsStringC()); } void CFWL_FormImp::DoWidthLimit(FX_FLOAT& fLeft, FX_FLOAT& fWidth, -- cgit v1.2.3