core/src/fpdfdoc/tagged_int.h - Issue 1252613002: FX_BOOL considered harmful.

Unified Diff: core/src/fpdfdoc/tagged_int.h

Issue 1252613002: FX_BOOL considered harmful. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: Manual edits. Created 5 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: core/src/fpdfdoc/tagged_int.h

diff --git a/core/src/fpdfdoc/tagged_int.h b/core/src/fpdfdoc/tagged_int.h

index 9c643a6d6b57b90f2c5064f18fb1c63f83045e89..127961768135db413913f4fb7b26c086f5c72a07 100644

--- a/core/src/fpdfdoc/tagged_int.h

+++ b/core/src/fpdfdoc/tagged_int.h

@@ -26,7 +26,7 @@ public:

void LoadDocTree();

void LoadPageTree(const CPDF_Dictionary* pPageDict);

CPDF_StructElementImpl* AddPageNode(CPDF_Dictionary* pElement, CFX_MapPtrToPtr& map, int nLevel = 0);

- FX_BOOL AddTopLevelNode(CPDF_Dictionary* pDict, CPDF_StructElementImpl* pElement);

+ bool AddTopLevelNode(CPDF_Dictionary* pDict, CPDF_StructElementImpl* pElement);

protected:

const CPDF_Dictionary* m_pTreeRoot;

const CPDF_Dictionary* m_pRoleMap;

@@ -67,16 +67,16 @@ public:

return &m_ObjectArray;

}

- CPDF_Object* GetAttr(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, FX_BOOL bInheritable = FALSE, FX_FLOAT fLevel = 0.0F);

+ CPDF_Object* GetAttr(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, bool bInheritable = false, FX_FLOAT fLevel = 0.0F);

- CFX_ByteString GetName(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, const CFX_ByteStringC& default_value, FX_BOOL bInheritable = FALSE, int subindex = -1);

- FX_ARGB GetColor(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, FX_ARGB default_value, FX_BOOL bInheritable = FALSE, int subindex = -1);

- FX_FLOAT GetNumber(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, FX_FLOAT default_value, FX_BOOL bInheritable = FALSE, int subindex = -1);

- int GetInteger(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, int default_value, FX_BOOL bInheritable = FALSE, int subindex = -1);

+ CFX_ByteString GetName(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, const CFX_ByteStringC& default_value, bool bInheritable = false, int subindex = -1);

+ FX_ARGB GetColor(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, FX_ARGB default_value, bool bInheritable = false, int subindex = -1);

+ FX_FLOAT GetNumber(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, FX_FLOAT default_value, bool bInheritable = false, int subindex = -1);

+ int GetInteger(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, int default_value, bool bInheritable = false, int subindex = -1);

CFX_PtrArray m_ObjectArray;

void LoadKids(CPDF_Dictionary* pDict);

void LoadKid(FX_DWORD PageObjNum, CPDF_Object* pObj, CPDF_StructKid* pKid);

- CPDF_Object* GetAttr(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, FX_BOOL bInheritable, int subindex);

+ CPDF_Object* GetAttr(const CFX_ByteStringC& owner, const CFX_ByteStringC& name, bool bInheritable, int subindex);

CPDF_StructElementImpl* Retain();

void Release();

protected:

« no previous file with comments | « core/src/fpdfdoc/pdf_vt.h ('k') | core/src/fpdftext/fpdf_text.cpp » ('j') | no next file with comments »