Use std::map as CPDF_Dictionary's underlying store.

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>
 #include <set>
 
 #include "core/include/fxcrt/fx_coordinates.h"
 #include "core/include/fxcrt/fx_system.h"
 
 class CPDF_Array;
 class CPDF_Boolean;
 class CPDF_CryptoHandler;
 class CPDF_Dictionary;
 class CPDF_Document;
@@ skipping 311 matching lines @@
 };
 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:
+  typedef std::map<CFX_ByteString, CPDF_Object*>::iterator iterator;

[Tom Sepez, 2016/01/05 19:41:55]

nit: using

[Oliver Chang, 2016/01/07 16:04:25]

Done.

+  typedef std::map<CFX_ByteString, CPDF_Object*>::const_iterator const_iterator;
+
   CPDF_Dictionary() : CPDF_Object(PDFOBJ_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_ByteStringC GetConstString(const CFX_ByteStringC& key) const;
 
@@ skipping 22 matching lines @@
   CPDF_Array* GetArray(const CFX_ByteStringC& key) const;
 
   CFX_FloatRect GetRect(const CFX_ByteStringC& key) const;
 
   CFX_Matrix GetMatrix(const CFX_ByteStringC& key) const;
 
   FX_FLOAT GetFloat(const CFX_ByteStringC& key) const { return GetNumber(key); }
 
   FX_BOOL KeyExist(const CFX_ByteStringC& key) const;
 
-  FX_POSITION GetStartPos() const;
-
-  CPDF_Object* GetNextElement(FX_POSITION& pos, CFX_ByteString& key) const;
-
   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);
 
   void SetAtInteger(const CFX_ByteStringC& key, int i);
 
   void SetAtNumber(const CFX_ByteStringC& key, FX_FLOAT f);
 
@@ skipping 16 matching lines @@
   void SetAtMatrix(const CFX_ByteStringC& key, const CFX_Matrix& matrix);
 
   void SetAtBoolean(const CFX_ByteStringC& key, FX_BOOL bValue);
 
   void RemoveAt(const CFX_ByteStringC& key);
 
   void ReplaceKey(const CFX_ByteStringC& oldkey, const CFX_ByteStringC& newkey);
 
   FX_BOOL Identical(CPDF_Dictionary* pDict) const;
 
-  int GetCount() const { return m_Map.GetCount(); }
+  size_t GetCount() const { return m_Map.size(); }
 
-  void AddValue(const CFX_ByteStringC& key, CPDF_Object* pObj);
+  iterator begin() { return m_Map.begin(); }
+
+  iterator end() { return m_Map.end(); }
+
+  const_iterator begin() const { return m_Map.begin(); }
+
+  const_iterator end() const { return m_Map.end(); }
 
  protected:
   ~CPDF_Dictionary();
 
-  CFX_CMapByteStringToPtr m_Map;
+  std::map<CFX_ByteString, CPDF_Object*> m_Map;
 
   friend class CPDF_Object;
 };
 inline CPDF_Dictionary* ToDictionary(CPDF_Object* obj) {
   return obj ? obj->AsDictionary() : nullptr;
 }
 inline const CPDF_Dictionary* ToDictionary(const CPDF_Object* obj) {
   return obj ? obj->AsDictionary() : nullptr;
 }
 
@@ skipping 157 matching lines @@
 
  protected:
   CFX_MapPtrToPtr m_IndirectObjs;
 
   CPDF_Parser* m_pParser;
 
   FX_DWORD m_LastObjNum;
 };
 
 #endif  // CORE_INCLUDE_FPDFAPI_FPDF_OBJECTS_H_