Remove CFX_PtrArray usage in fpdfsdk.

fpdfsdk/src/javascript/Field.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef FPDFSDK_SRC_JAVASCRIPT_FIELD_H_
 #define FPDFSDK_SRC_JAVASCRIPT_FIELD_H_
 
 #include <string>  // For std::wstring.
@@ skipping 71 matching lines @@
   CFX_ByteString string;
   CFX_WideString widestring;
   CPDF_Rect rect;
   CPWL_Color color;
   CFX_DWordArray wordarray;
   CJS_WideStringArray widestringarray;
 };
 
 class Field : public CJS_EmbedObj {
  public:
-  Field(CJS_Object* pJSObject);
+  explicit Field(CJS_Object* pJSObject);
   ~Field() override;
 
   FX_BOOL alignment(IJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError);
   FX_BOOL borderStyle(IJS_Context* cc,
                       CJS_PropValue& vp,
                       CFX_WideString& sError);
   FX_BOOL buttonAlignX(IJS_Context* cc,
                        CJS_PropValue& vp,
                        CFX_WideString& sError);
   FX_BOOL buttonAlignY(IJS_Context* cc,
@@ skipping 182 matching lines @@
                                 CFX_WideString& sError);
   FX_BOOL signatureSign(IJS_Context* cc,
                         const CJS_Parameters& params,
                         CJS_Value& vRet,
                         CFX_WideString& sError);
   FX_BOOL signatureValidate(IJS_Context* cc,
                             const CJS_Parameters& params,
                             CJS_Value& vRet,
                             CFX_WideString& sError);
 
- public:
   static void SetAlignment(CPDFSDK_Document* pDocument,
                            const CFX_WideString& swFieldName,
                            int nControlIndex,
                            const CFX_ByteString& string);
   static void SetBorderStyle(CPDFSDK_Document* pDocument,
                              const CFX_WideString& swFieldName,
                              int nControlIndex,
                              const CFX_ByteString& string);
   static void SetButtonAlignX(CPDFSDK_Document* pDocument,
                               const CFX_WideString& swFieldName,
@@ skipping 119 matching lines @@
                           int number);
   static void SetUserName(CPDFSDK_Document* pDocument,
                           const CFX_WideString& swFieldName,
                           int nControlIndex,
                           const CFX_WideString& string);
   static void SetValue(CPDFSDK_Document* pDocument,
                        const CFX_WideString& swFieldName,
                        int nControlIndex,
                        const CJS_WideStringArray& strArray);
 
- public:
   static void AddField(CPDFSDK_Document* pDocument,
                        int nPageIndex,
                        int nFieldType,
                        const CFX_WideString& sName,
                        const CPDF_Rect& rcCoords);
 
- public:
   static void UpdateFormField(CPDFSDK_Document* pDocument,
                               CPDF_FormField* pFormField,
                               FX_BOOL bChangeMark,
                               FX_BOOL bResetAP,
                               FX_BOOL bRefresh);
   static void UpdateFormControl(CPDFSDK_Document* pDocument,
                                 CPDF_FormControl* pFormControl,
                                 FX_BOOL bChangeMark,
                                 FX_BOOL bResetAP,
                                 FX_BOOL bRefresh);
 
   static CPDFSDK_Widget* GetWidget(CPDFSDK_Document* pDocument,
                                    CPDF_FormControl* pFormControl);
-  static void GetFormFields(CPDFSDK_Document* pDocument,
-                            const CFX_WideString& csFieldName,
-                            CFX_PtrArray& FieldsArray);
+  static std::vector<CPDF_FormField*> GetFormFields(

[Tom Sepez, 2015/11/09 21:25:32]

nit: again, the $64 question is to return these or not.

[Lei Zhang, 2015/11/09 22:45:29]

Answer is RVO yet again.

+      CPDFSDK_Document* pDocument,
+      const CFX_WideString& csFieldName);
 
   static void DoDelay(CPDFSDK_Document* pDocument, CJS_DelayData* pData);
 
- public:
   FX_BOOL AttachField(Document* pDocument, const CFX_WideString& csFieldName);
   void SetDelay(FX_BOOL bDelay);
   void SetIsolate(v8::Isolate* isolate) { m_isolate = isolate; }
 
  protected:
   void ParseFieldName(const std::wstring& strFieldNameParsed,
                       std::wstring& strFieldName,
                       int& iControlNo);
-  void GetFormFields(const CFX_WideString& csFieldName,
-                     CFX_PtrArray& FieldsArray);
+  std::vector<CPDF_FormField*> GetFormFields(
+      const CFX_WideString& csFieldName) const;
   CPDF_FormControl* GetSmartFieldControl(CPDF_FormField* pFormField);
   FX_BOOL ValueIsOccur(CPDF_FormField* pFormField, CFX_WideString csOptLabel);
 
   void AddDelay_Int(enum FIELD_PROP prop, int32_t n);
   void AddDelay_Bool(enum FIELD_PROP prop, bool b);
   void AddDelay_String(enum FIELD_PROP prop, const CFX_ByteString& string);
   void AddDelay_WideString(enum FIELD_PROP prop, const CFX_WideString& string);
   void AddDelay_Rect(enum FIELD_PROP prop, const CPDF_Rect& rect);
   void AddDelay_Color(enum FIELD_PROP prop, const CPWL_Color& color);
   void AddDelay_WordArray(enum FIELD_PROP prop, const CFX_DWordArray& array);
   void AddDelay_WideStringArray(enum FIELD_PROP prop,
                                 const CJS_WideStringArray& array);
 
   void DoDelay();
 
  public:
   Document* m_pJSDoc;
   CPDFSDK_Document* m_pDocument;
   CFX_WideString m_FieldName;
   int m_nFormControlIndex;
   FX_BOOL m_bCanSet;
 
   FX_BOOL m_bDelay;
   v8::Isolate* m_isolate;
 };
 
 class CJS_Field : public CJS_Object {
  public:
-  CJS_Field(v8::Local<v8::Object> pObject) : CJS_Object(pObject) {}
+  explicit CJS_Field(v8::Local<v8::Object> pObject) : CJS_Object(pObject) {}
   ~CJS_Field(void) override {}
 
   void InitInstance(IJS_Runtime* pIRuntime) override;
 
   DECLARE_JS_CLASS();
   JS_STATIC_PROP(alignment, Field);
   JS_STATIC_PROP(borderStyle, Field);
   JS_STATIC_PROP(buttonAlignX, Field);
   JS_STATIC_PROP(buttonAlignY, Field);
   JS_STATIC_PROP(buttonFitBounds, Field);
@@ skipping 67 matching lines @@
   JS_STATIC_METHOD(setLock, Field);
   JS_STATIC_METHOD(signatureGetModifications, Field);
   JS_STATIC_METHOD(signatureGetSeedValue, Field);
   JS_STATIC_METHOD(signatureInfo, Field);
   JS_STATIC_METHOD(signatureSetSeedValue, Field);
   JS_STATIC_METHOD(signatureSign, Field);
   JS_STATIC_METHOD(signatureValidate, Field);
 };
 
 #endif  // FPDFSDK_SRC_JAVASCRIPT_FIELD_H_