From 179bebb9a14dfd3ba91e9e068d4d436657a7c780 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Tue, 5 Apr 2016 11:02:18 -0700 Subject: Rename GetCStr and GetPtr to match CFX_ByteString. This CL updates CFX_ByteStringC to use the more common c_str and raw_str instead of GetCStr and GetPtr. Review URL: https://codereview.chromium.org/1857713003 --- xfa/fee/fde_txtedtengine.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'xfa/fee') diff --git a/xfa/fee/fde_txtedtengine.cpp b/xfa/fee/fde_txtedtengine.cpp index 19b5b24311..5cdb55cfaf 100644 --- a/xfa/fee/fde_txtedtengine.cpp +++ b/xfa/fee/fde_txtedtengine.cpp @@ -1624,7 +1624,7 @@ void CFDE_TxtEdtEngine::DeleteSelect() { } IFDE_TxtEdtDoRecord* IFDE_TxtEdtDoRecord::Create( const CFX_ByteStringC& bsDoRecord) { - const FX_CHAR* lpBuf = bsDoRecord.GetCStr(); + const FX_CHAR* lpBuf = bsDoRecord.c_str(); int32_t nType = *((int32_t*)lpBuf); switch (nType) { case FDE_TXTEDT_DORECORD_INS: @@ -1690,8 +1690,9 @@ void CFDE_TxtEdtDoRecord_Insert::Serialize(CFX_ByteString& bsDoRecord) const { } void CFDE_TxtEdtDoRecord_Insert::Deserialize( const CFX_ByteStringC& bsDoRecord) { - CFX_ArchiveLoader ArchiveLoader((const uint8_t*)bsDoRecord.GetCStr(), - bsDoRecord.GetLength()); + CFX_ArchiveLoader ArchiveLoader( + reinterpret_cast(bsDoRecord.c_str()), + bsDoRecord.GetLength()); int32_t nType = 0; ArchiveLoader >> nType; FXSYS_assert(nType == FDE_TXTEDT_DORECORD_INS); @@ -1766,8 +1767,9 @@ void CFDE_TxtEdtDoRecord_DeleteRange::Serialize( } void CFDE_TxtEdtDoRecord_DeleteRange::Deserialize( const CFX_ByteStringC& bsDoRecord) { - CFX_ArchiveLoader ArchiveLoader((const uint8_t*)bsDoRecord.GetCStr(), - bsDoRecord.GetLength()); + CFX_ArchiveLoader ArchiveLoader( + reinterpret_cast(bsDoRecord.c_str()), + bsDoRecord.GetLength()); int32_t nType = 0; ArchiveLoader >> nType; FXSYS_assert(nType == FDE_TXTEDT_DORECORD_DEL); -- cgit v1.2.3