From 6020e45b406e7a130024de87101b4493543f9deb Mon Sep 17 00:00:00 2001 From: tsepez Date: Mon, 2 May 2016 13:47:17 -0700 Subject: Replace CFX_PtrArray with typesafe CFX_ArrayTemplate, part 11 Last part. Remove CFX_PtrArray typedef. Review-Url: https://codereview.chromium.org/1941863002 --- xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h') diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h b/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h index bbdec5bf1e..be0a76c337 100644 --- a/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h +++ b/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h @@ -16,6 +16,7 @@ class CBC_QRCoderMode; class CBC_QRCoderBitVector; class CBC_CommonByteArray; class CBC_CommonByteMatrix; +class Make_Pair; class CBC_QRCoderEncoder { private: @@ -120,14 +121,18 @@ class CBC_QRCoderEncoder { CBC_QRCoderMode* modeSecond, int32_t versionNum, int32_t& e); - static void MergeString(CFX_PtrArray& result, int32_t versionNum, int32_t& e); - static void SplitString(const CFX_ByteString& content, CFX_PtrArray& result); - static void AppendDataModeLenghInfo(CFX_PtrArray& splitResult, - CBC_QRCoderBitVector& headerAndDataBits, - CBC_QRCoderMode* tempMode, - CBC_QRCoder* qrCode, - CFX_ByteString& encoding, - int32_t& e); + static void MergeString(CFX_ArrayTemplate* result, + int32_t versionNum, + int32_t& e); + static void SplitString(const CFX_ByteString& content, + CFX_ArrayTemplate* result); + static void AppendDataModeLenghInfo( + const CFX_ArrayTemplate& splitResult, + CBC_QRCoderBitVector& headerAndDataBits, + CBC_QRCoderMode* tempMode, + CBC_QRCoder* qrCode, + CFX_ByteString& encoding, + int32_t& e); }; #endif // XFA_FXBARCODE_QRCODE_BC_QRCODERENCODER_H_ -- cgit v1.2.3