Merge to XFA: War on #defines, part 1.

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 12 matching lines @@
 class CPDF_Null;
 class CPDF_Number;
 class CPDF_Parser;
 class CPDF_Reference;
 class CPDF_Stream;
 class CPDF_StreamAcc;
 class CPDF_StreamFilter;
 class CPDF_String;
 class IFX_FileRead;
 
-#define PDFOBJ_INVALID 0
-#define PDFOBJ_BOOLEAN 1
-#define PDFOBJ_NUMBER 2
-#define PDFOBJ_STRING 3
-#define PDFOBJ_NAME 4
-#define PDFOBJ_ARRAY 5
-#define PDFOBJ_DICTIONARY 6
-#define PDFOBJ_STREAM 7
-#define PDFOBJ_NULL 8
-#define PDFOBJ_REFERENCE 9
-
 class CPDF_Object {
  public:
-  int GetType() const { return m_Type; }
+  enum Type {
+    BOOLEAN = 1,
+    NUMBER,
+    STRING,
+    NAME,
+    ARRAY,
+    DICTIONARY,
+    STREAM,
+    NULLOBJ,
+    REFERENCE
+  };
+
+  Type GetType() const { return m_Type; }
   FX_DWORD GetObjNum() const { return m_ObjNum; }
   FX_DWORD GetGenNum() const { return m_GenNum; }
 
   FX_BOOL IsIdentical(CPDF_Object* pObj) const;
   CPDF_Object* Clone(FX_BOOL bDirect = FALSE) const;
   CPDF_Object* CloneRef(CPDF_IndirectObjectHolder* pObjs) const;
 
   CPDF_Object* GetDirect() const;
   FX_BOOL IsModified() const { return FALSE; }
 
   void Release();
 
   CFX_ByteString GetString() const;
   CFX_ByteStringC GetConstString() const;
   CFX_WideString GetUnicodeText(CFX_CharMap* pCharMap = NULL) const;
   FX_FLOAT GetNumber() const;
   FX_FLOAT GetNumber16() const;
   int GetInteger() const;
   CPDF_Dictionary* GetDict() const;
   CPDF_Array* GetArray() const;
 
   void SetString(const CFX_ByteString& str);
   void SetUnicodeText(const FX_WCHAR* pUnicodes, int len = -1);
 
-  bool IsArray() const { return m_Type == PDFOBJ_ARRAY; }
-  bool IsBoolean() const { return m_Type == PDFOBJ_BOOLEAN; }
-  bool IsDictionary() const { return m_Type == PDFOBJ_DICTIONARY; }
-  bool IsName() const { return m_Type == PDFOBJ_NAME; }
-  bool IsNumber() const { return m_Type == PDFOBJ_NUMBER; }
-  bool IsReference() const { return m_Type == PDFOBJ_REFERENCE; }
-  bool IsStream() const { return m_Type == PDFOBJ_STREAM; }
-  bool IsString() const { return m_Type == PDFOBJ_STRING; }
+  bool IsArray() const { return m_Type == ARRAY; }
+  bool IsBoolean() const { return m_Type == BOOLEAN; }
+  bool IsDictionary() const { return m_Type == DICTIONARY; }
+  bool IsName() const { return m_Type == NAME; }
+  bool IsNumber() const { return m_Type == NUMBER; }
+  bool IsReference() const { return m_Type == REFERENCE; }
+  bool IsStream() const { return m_Type == STREAM; }
+  bool IsString() const { return m_Type == STRING; }
 
   CPDF_Array* AsArray();
   const CPDF_Array* AsArray() const;
   CPDF_Boolean* AsBoolean();
   const CPDF_Boolean* AsBoolean() const;
   CPDF_Dictionary* AsDictionary();
   const CPDF_Dictionary* AsDictionary() const;
   CPDF_Name* AsName();
   const CPDF_Name* AsName() const;
   CPDF_Number* AsNumber();
   const CPDF_Number* AsNumber() const;
   CPDF_Reference* AsReference();
   const CPDF_Reference* AsReference() const;
   CPDF_Stream* AsStream();
   const CPDF_Stream* AsStream() const;
   CPDF_String* AsString();
   const CPDF_String* AsString() const;
 
  protected:
-  explicit CPDF_Object(FX_DWORD type)
-      : m_Type(type), m_ObjNum(0), m_GenNum(0) {}
+  explicit CPDF_Object(Type type) : m_Type(type), m_ObjNum(0), m_GenNum(0) {}
   ~CPDF_Object() {}
   void Destroy();
 
   const CPDF_Object* GetBasicObject() const;
 
-  FX_DWORD m_Type;
+  const Type m_Type;
   FX_DWORD m_ObjNum;
   FX_DWORD m_GenNum;
 
   friend class CPDF_IndirectObjectHolder;
   friend class CPDF_Parser;
   friend class CPDF_SyntaxParser;
 
  private:
-  CPDF_Object(const CPDF_Object& src) {}
   CPDF_Object* CloneInternal(FX_BOOL bDirect,
                              std::set<FX_DWORD>* visited) const;
 };
 class CPDF_Boolean : public CPDF_Object {
  public:
-  CPDF_Boolean() : CPDF_Object(PDFOBJ_BOOLEAN), m_bValue(false) {}
+  CPDF_Boolean() : CPDF_Object(BOOLEAN), m_bValue(false) {}
   explicit CPDF_Boolean(FX_BOOL value)
-      : CPDF_Object(PDFOBJ_BOOLEAN), m_bValue(value) {}
+      : CPDF_Object(BOOLEAN), m_bValue(value) {}
 
   FX_BOOL Identical(CPDF_Boolean* pOther) const {
     return m_bValue == pOther->m_bValue;
   }
 
   CFX_ByteString GetString() const { return m_bValue ? "true" : "false"; }
   FX_BOOL GetValue() const { return m_bValue; }
 
  protected:
   FX_BOOL m_bValue;
   friend class CPDF_Object;
 };
 inline CPDF_Boolean* ToBoolean(CPDF_Object* obj) {
   return obj ? obj->AsBoolean() : nullptr;
 }
 inline const CPDF_Boolean* ToBoolean(const CPDF_Object* obj) {
   return obj ? obj->AsBoolean() : nullptr;
 }
 
 class CPDF_Number : public CPDF_Object {
  public:
-  CPDF_Number() : CPDF_Object(PDFOBJ_NUMBER), m_bInteger(TRUE), m_Integer(0) {}
+  CPDF_Number() : CPDF_Object(NUMBER), m_bInteger(TRUE), m_Integer(0) {}
 
   explicit CPDF_Number(int value);
 
   explicit CPDF_Number(FX_FLOAT value);
 
   explicit CPDF_Number(const CFX_ByteStringC& str);
 
   FX_BOOL Identical(CPDF_Number* pOther) const;
 
   CFX_ByteString GetString() const;
@@ skipping 28 matching lines @@
 };
 inline CPDF_Number* ToNumber(CPDF_Object* obj) {
   return obj ? obj->AsNumber() : nullptr;
 }
 inline const CPDF_Number* ToNumber(const CPDF_Object* obj) {
   return obj ? obj->AsNumber() : nullptr;
 }
 
 class CPDF_String : public CPDF_Object {
  public:
-  CPDF_String() : CPDF_Object(PDFOBJ_STRING), m_bHex(FALSE) {}
+  CPDF_String() : CPDF_Object(STRING), m_bHex(FALSE) {}
 
   CPDF_String(const CFX_ByteString& str, FX_BOOL bHex)
-      : CPDF_Object(PDFOBJ_STRING), m_String(str), m_bHex(bHex) {}
+      : CPDF_Object(STRING), m_String(str), m_bHex(bHex) {}
 
   explicit CPDF_String(const CFX_WideString& str);
 
   CFX_ByteString GetString() const { return m_String; }
 
   FX_BOOL Identical(CPDF_String* pOther) const {
     return m_String == pOther->m_String;
   }
 
   FX_BOOL IsHex() const { return m_bHex; }
 
  protected:
   CFX_ByteString m_String;
 
   FX_BOOL m_bHex;
   friend class CPDF_Object;
 };
 inline CPDF_String* ToString(CPDF_Object* obj) {
   return obj ? obj->AsString() : nullptr;
 }
 inline const CPDF_String* ToString(const CPDF_Object* obj) {
   return obj ? obj->AsString() : nullptr;
 }
 
 class CPDF_Name : public CPDF_Object {
  public:
   explicit CPDF_Name(const CFX_ByteString& str)
-      : CPDF_Object(PDFOBJ_NAME), m_Name(str) {}
+      : CPDF_Object(NAME), m_Name(str) {}
   explicit CPDF_Name(const CFX_ByteStringC& str)
-      : CPDF_Object(PDFOBJ_NAME), m_Name(str) {}
-  explicit CPDF_Name(const FX_CHAR* str)
-      : CPDF_Object(PDFOBJ_NAME), m_Name(str) {}
+      : CPDF_Object(NAME), m_Name(str) {}
+  explicit CPDF_Name(const FX_CHAR* str) : CPDF_Object(NAME), m_Name(str) {}
 
   CFX_ByteString GetString() const { return m_Name; }
 
   FX_BOOL Identical(CPDF_Name* pOther) const {
     return m_Name == pOther->m_Name;
   }
 
  protected:
   CFX_ByteString m_Name;
   friend class CPDF_Object;
 };
 inline CPDF_Name* ToName(CPDF_Object* obj) {
   return obj ? obj->AsName() : nullptr;
 }
 inline const CPDF_Name* ToName(const CPDF_Object* obj) {
   return obj ? obj->AsName() : nullptr;
 }
 
 class CPDF_Array : public CPDF_Object {
  public:
-  CPDF_Array() : CPDF_Object(PDFOBJ_ARRAY) {}
+  CPDF_Array() : CPDF_Object(ARRAY) {}
 
   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();
@@ skipping 57 matching lines @@
 }
 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(PDFOBJ_DICTIONARY) {}
+  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_ByteStringC GetConstString(const CFX_ByteStringC& key) const;
 
   CFX_ByteString GetString(const CFX_ByteStringC& key,
@@ skipping 182 matching lines @@
 
   CPDF_Dictionary* m_pImageParam;
 
   const CPDF_Stream* m_pStream;
 
   uint8_t* m_pSrcData;
 };
 
 class CPDF_Null : public CPDF_Object {
  public:
-  CPDF_Null() : CPDF_Object(PDFOBJ_NULL) {}
+  CPDF_Null() : CPDF_Object(NULLOBJ) {}
 };
 
 class CPDF_Reference : public CPDF_Object {
  public:
   CPDF_Reference(CPDF_IndirectObjectHolder* pDoc, int objnum)
-      : CPDF_Object(PDFOBJ_REFERENCE), m_pObjList(pDoc), m_RefObjNum(objnum) {}
+      : CPDF_Object(REFERENCE), m_pObjList(pDoc), m_RefObjNum(objnum) {}
 
   CPDF_IndirectObjectHolder* GetObjList() const { return m_pObjList; }
 
   FX_DWORD GetRefObjNum() const { return m_RefObjNum; }
 
   void SetRef(CPDF_IndirectObjectHolder* pDoc, FX_DWORD objnum);
 
   FX_BOOL Identical(CPDF_Reference* pOther) const {
     return m_RefObjNum == pOther->m_RefObjNum;
   }
@@ skipping 32 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_