Merge to XFA: Member function name refactoring

core/include/fpdfapi/fpdf_objects.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 CORE_INCLUDE_FPDFAPI_FPDF_OBJECTS_H_
 #define CORE_INCLUDE_FPDFAPI_FPDF_OBJECTS_H_
 
 #include <map>
@@ skipping 238 matching lines @@
   FX_DWORD GetCount() const { return m_Objects.GetSize(); }
 
   CPDF_Object* GetElement(FX_DWORD index) const;
 
   CPDF_Object* GetElementValue(FX_DWORD index) const;
 
   CFX_Matrix GetMatrix();
 
   CFX_FloatRect GetRect();
 
-  CFX_ByteString GetString(FX_DWORD index) const;
+  CFX_ByteString GetStringAt(FX_DWORD index) const;
 
-  CFX_ByteStringC GetConstString(FX_DWORD index) const;
+  CFX_ByteStringC GetConstStringAt(FX_DWORD index) const;
 
-  int GetInteger(FX_DWORD index) const;
+  int GetIntegerAt(FX_DWORD index) const;
 
-  FX_FLOAT GetNumber(FX_DWORD index) const;
+  FX_FLOAT GetNumberAt(FX_DWORD index) const;
 
-  CPDF_Dictionary* GetDict(FX_DWORD index) const;
+  CPDF_Dictionary* GetDictAt(FX_DWORD index) const;
 
-  CPDF_Stream* GetStream(FX_DWORD index) const;
+  CPDF_Stream* GetStreamAt(FX_DWORD index) const;
 
-  CPDF_Array* GetArray(FX_DWORD index) const;
+  CPDF_Array* GetArrayAt(FX_DWORD index) const;
 
-  FX_FLOAT GetFloat(FX_DWORD index) const { return GetNumber(index); }
+  FX_FLOAT GetFloatAt(FX_DWORD index) const { return GetNumberAt(index); }
 
   void SetAt(FX_DWORD index,
              CPDF_Object* pObj,
              CPDF_IndirectObjectHolder* pObjs = NULL);
 
   void InsertAt(FX_DWORD index,
                 CPDF_Object* pObj,
                 CPDF_IndirectObjectHolder* pObjs = NULL);
 
   void RemoveAt(FX_DWORD index, int nCount = 1);
 
   void Add(CPDF_Object* pObj, CPDF_IndirectObjectHolder* pObjs = NULL);
 
   void AddNumber(FX_FLOAT f);
 
   void AddInteger(int i);
 
   void AddString(const CFX_ByteString& str);
 
   void AddName(const CFX_ByteString& str);
 
   void AddReference(CPDF_IndirectObjectHolder* pDoc, FX_DWORD objnum);
 
   void AddReference(CPDF_IndirectObjectHolder* pDoc, CPDF_Object* obj) {
     AddReference(pDoc, obj->GetObjNum());
   }
 
-  FX_FLOAT GetNumber16(FX_DWORD index) const { return GetNumber(index); }
+  FX_FLOAT GetNumber16(FX_DWORD index) const { return GetNumberAt(index); }
 
   void AddNumber16(FX_FLOAT value) { AddNumber(value); }
 
   FX_BOOL Identical(CPDF_Array* pOther) const;
 
  protected:
   ~CPDF_Array();
 
   CFX_ArrayTemplate<CPDF_Object*> m_Objects;
   friend class CPDF_Object;
 };
 inline CPDF_Array* ToArray(CPDF_Object* obj) {
   return obj ? obj->AsArray() : nullptr;
 }
 inline const CPDF_Array* ToArray(const CPDF_Object* obj) {
   return obj ? obj->AsArray() : nullptr;
 }
 
 class CPDF_Dictionary : public CPDF_Object {
  public:
   using iterator = std::map<CFX_ByteString, CPDF_Object*>::iterator;
   using const_iterator = std::map<CFX_ByteString, CPDF_Object*>::const_iterator;
 
   CPDF_Dictionary() : CPDF_Object(DICTIONARY) {}
 
   CPDF_Object* GetElement(const CFX_ByteStringC& key) const;
 
   CPDF_Object* GetElementValue(const CFX_ByteStringC& key) const;
 
-  CFX_ByteString GetString(const CFX_ByteStringC& key) const;
+  CFX_ByteString GetStringBy(const CFX_ByteStringC& key) const;
 
-  CFX_ByteStringC GetConstString(const CFX_ByteStringC& key) const;
+  CFX_ByteStringC GetConstStringBy(const CFX_ByteStringC& key) const;
 
-  CFX_ByteString GetString(const CFX_ByteStringC& key,
-                           const CFX_ByteStringC& default_str) const;
+  CFX_ByteString GetStringBy(const CFX_ByteStringC& key,
+                             const CFX_ByteStringC& default_str) const;
 
-  CFX_ByteStringC GetConstString(const CFX_ByteStringC& key,
-                                 const CFX_ByteStringC& default_str) const;
+  CFX_ByteStringC GetConstStringBy(const CFX_ByteStringC& key,
+                                   const CFX_ByteStringC& default_str) const;
 
-  CFX_WideString GetUnicodeText(const CFX_ByteStringC& key,
-                                CFX_CharMap* pCharMap = NULL) const;
+  CFX_WideString GetUnicodeTextBy(const CFX_ByteStringC& key,
+                                  CFX_CharMap* pCharMap = NULL) const;
 
-  int GetInteger(const CFX_ByteStringC& key) const;
+  int GetIntegerBy(const CFX_ByteStringC& key) const;
 
-  int GetInteger(const CFX_ByteStringC& key, int default_int) const;
+  int GetIntegerBy(const CFX_ByteStringC& key, int default_int) const;
 
-  FX_BOOL GetBoolean(const CFX_ByteStringC& key,
-                     FX_BOOL bDefault = FALSE) const;
+  FX_BOOL GetBooleanBy(const CFX_ByteStringC& key,
+                       FX_BOOL bDefault = FALSE) const;
 
-  FX_FLOAT GetNumber(const CFX_ByteStringC& key) const;
+  FX_FLOAT GetNumberBy(const CFX_ByteStringC& key) const;
 
-  CPDF_Dictionary* GetDict(const CFX_ByteStringC& key) const;
+  CPDF_Dictionary* GetDictBy(const CFX_ByteStringC& key) const;
 
-  CPDF_Stream* GetStream(const CFX_ByteStringC& key) const;
+  CPDF_Stream* GetStreamBy(const CFX_ByteStringC& key) const;
 
-  CPDF_Array* GetArray(const CFX_ByteStringC& key) const;
+  CPDF_Array* GetArrayBy(const CFX_ByteStringC& key) const;
 
-  CFX_FloatRect GetRect(const CFX_ByteStringC& key) const;
+  CFX_FloatRect GetRectBy(const CFX_ByteStringC& key) const;
 
-  CFX_Matrix GetMatrix(const CFX_ByteStringC& key) const;
+  CFX_Matrix GetMatrixBy(const CFX_ByteStringC& key) const;
 
-  FX_FLOAT GetFloat(const CFX_ByteStringC& key) const { return GetNumber(key); }
+  FX_FLOAT GetFloatBy(const CFX_ByteStringC& key) const {
+    return GetNumberBy(key);
+  }
 
   FX_BOOL KeyExist(const CFX_ByteStringC& key) const;
 
   // Set* functions invalidate iterators for the element with the key |key|.
   void SetAt(const CFX_ByteStringC& key, CPDF_Object* pObj);
 
   void SetAtName(const CFX_ByteStringC& key, const CFX_ByteString& name);
 
   void SetAtString(const CFX_ByteStringC& key, const CFX_ByteString& string);
 
@@ skipping 203 matching lines @@
   iterator end() { return m_IndirectObjs.end(); }
   const_iterator end() const { return m_IndirectObjs.end(); }
 
  protected:
   CPDF_Parser* m_pParser;
   FX_DWORD m_LastObjNum;
   std::map<FX_DWORD, CPDF_Object*> m_IndirectObjs;
 };
 
 #endif  // CORE_INCLUDE_FPDFAPI_FPDF_OBJECTS_H_