commit 6020e45b406e7a130024de87101b4493543f9deb
author tsepez <tsepez@chromium.org> Mon May 02 13:47:17 2016 -0700
committer Commit bot <commit-bot@chromium.org> Mon May 02 13:47:17 2016 -0700
tree e533401947212d7615a2504922caaaa7f450703a
parent fbe14b97f00b866e69e0970881550f6d6d9465cd

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

diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h b/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h
index bbdec5b..be0a76c 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h
+++ b/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h
@@ -16,6 +16,7 @@
 class CBC_QRCoderBitVector;
 class CBC_CommonByteArray;
 class CBC_CommonByteMatrix;
+class Make_Pair;
 
 class CBC_QRCoderEncoder {
  private:
@@ -120,14 +121,18 @@
                                   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<Make_Pair*>* result,
+                          int32_t versionNum,
+                          int32_t& e);
+  static void SplitString(const CFX_ByteString& content,
+                          CFX_ArrayTemplate<Make_Pair*>* result);
+  static void AppendDataModeLenghInfo(
+      const CFX_ArrayTemplate<Make_Pair*>& splitResult,
+      CBC_QRCoderBitVector& headerAndDataBits,
+      CBC_QRCoderMode* tempMode,
+      CBC_QRCoder* qrCode,
+      CFX_ByteString& encoding,
+      int32_t& e);
 };
 
 #endif  // XFA_FXBARCODE_QRCODE_BC_QRCODERENCODER_H_