FX Bool considered harmful, part 3

core/include/fpdfapi/fpdf_page.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_PAGE_H_
 #define CORE_INCLUDE_FPDFAPI_FPDF_PAGE_H_
 
 #include "../fxge/fx_dib.h"
@@ skipping 10 matching lines @@
 class CPDF_AllStates;
 class CPDF_ContentParser;
 class CPDF_StreamContentParser;
 #define PDFTRANS_GROUP                  0x0100
 #define PDFTRANS_ISOLATED               0x0200
 #define PDFTRANS_KNOCKOUT               0x0400
 
 class CPDF_PageObjects
 {
 public:
-    CPDF_PageObjects(FX_BOOL bReleaseMembers = TRUE);
+    CPDF_PageObjects(bool bReleaseMembers = true);
     ~CPDF_PageObjects();
 
     void                                ContinueParse(IFX_Pause* pPause);
 
-    FX_BOOL                             IsParsed() const
+    bool                                IsParsed() const
     {
         return m_ParseState == CONTENT_PARSED;
     }
 
     FX_POSITION                 GetFirstObjectPosition() const
     {
         return m_ObjectList.GetHeadPosition();
     }
 
     FX_POSITION                 GetLastObjectPosition() const
@@ skipping 22 matching lines @@
     }
 
     int                                 GetObjectIndex(CPDF_PageObject* pObj) const;
 
     CPDF_PageObject*    GetObjectByIndex(int index) const;
 
     FX_POSITION                 InsertObject(FX_POSITION posInsertAfter, CPDF_PageObject* pNewObject);
 
     void                                Transform(const CFX_AffineMatrix& matrix);
 
-    FX_BOOL                             BackgroundAlphaNeeded() const
+    bool                                BackgroundAlphaNeeded() const
     {
         return m_bBackgroundAlphaNeeded;
     }
 
     CFX_FloatRect               CalcBoundingBox() const;
 
     CPDF_Dictionary*    m_pFormDict;
     CPDF_Stream*                m_pFormStream;
     CPDF_Document*              m_pDocument;
     CPDF_Dictionary*    m_pPageResources;
     CPDF_Dictionary*    m_pResources;
     CFX_FloatRect               m_BBox;
     int                                 m_Transparency;
 
 protected:
     friend class                CPDF_ContentParser;
     friend class                CPDF_StreamContentParser;
     friend class                CPDF_AllStates;
 
     enum ParseState {
         CONTENT_NOT_PARSED,
         CONTENT_PARSING,
         CONTENT_PARSED
     };
 
     void                                LoadTransInfo();
     void                ClearCacheObjects();
 
     CFX_PtrList                 m_ObjectList;
-    FX_BOOL                             m_bBackgroundAlphaNeeded;
-    FX_BOOL                             m_bReleaseMembers;
+    bool                                m_bBackgroundAlphaNeeded;
+    bool                                m_bReleaseMembers;
     CPDF_ContentParser* m_pParser;
     ParseState                  m_ParseState;
 };
 
 class CPDF_Page : public CPDF_PageObjects, public CFX_PrivateData
 {
 public:
 
     CPDF_Page();
 
     ~CPDF_Page();
 
-    void                                Load(CPDF_Document* pDocument, CPDF_Dictionary* pPageDict, FX_BOOL bPageCache = TRUE);
+    void                                Load(CPDF_Document* pDocument, CPDF_Dictionary* pPageDict, bool bPageCache = true);
 
-    void                                StartParse(CPDF_ParseOptions* pOptions = NULL, FX_BOOL bReParse = FALSE);
+    void                                StartParse(CPDF_ParseOptions* pOptions = NULL, bool bReParse = false);
 
-    void                                ParseContent(CPDF_ParseOptions* pOptions = NULL, FX_BOOL bReParse = FALSE);
+    void                                ParseContent(CPDF_ParseOptions* pOptions = NULL, bool bReParse = false);
 
     void                                GetDisplayMatrix(CFX_AffineMatrix& matrix, int xPos, int yPos,
                                          int xSize, int ySize, int iRotate) const;
 
     FX_FLOAT                    GetPageWidth() const
     {
         return m_PageWidth;
     }
 
     FX_FLOAT                    GetPageHeight() const
@@ skipping 32 matching lines @@
     CFX_AffineMatrix    m_PageMatrix;
 
     CPDF_PageRenderCache*       m_pPageRender;
 };
 class CPDF_ParseOptions
 {
 public:
 
     CPDF_ParseOptions();
 
-    FX_BOOL                             m_bTextOnly;
+    bool                                m_bTextOnly;
 
-    FX_BOOL                             m_bMarkedContent;
+    bool                                m_bMarkedContent;
 
-    FX_BOOL                             m_bSeparateForm;
+    bool                                m_bSeparateForm;
 
-    FX_BOOL                             m_bDecodeInlineImage;
+    bool                                m_bDecodeInlineImage;
 };
 class CPDF_Form : public CPDF_PageObjects
 {
 public:
 
     CPDF_Form(CPDF_Document* pDocument, CPDF_Dictionary* pPageResources, CPDF_Stream* pFormStream, CPDF_Dictionary* pParentResources = NULL);
 
     ~CPDF_Form();
 
     void                                StartParse(CPDF_AllStates* pGraphicStates,  CFX_AffineMatrix* pParentMatrix,
                                    CPDF_Type3Char* pType3Char, CPDF_ParseOptions* pOptions, int level = 0);
 
     void                                ParseContent(CPDF_AllStates* pGraphicStates, CFX_AffineMatrix* pParentMatrix,
                                      CPDF_Type3Char* pType3Char, CPDF_ParseOptions* pOptions, int level = 0);
 
     CPDF_Form*                  Clone() const;
 };
 class CPDF_PageContentGenerate
 {
 public:
     CPDF_PageContentGenerate(CPDF_Page* pPage);
     ~CPDF_PageContentGenerate();
-    FX_BOOL InsertPageObject(CPDF_PageObject* pPageObject);
+    bool InsertPageObject(CPDF_PageObject* pPageObject);
     void GenerateContent();
     void TransformContent(CFX_Matrix& matrix);
 protected:
     void            ProcessImage(CFX_ByteTextBuf& buf, CPDF_ImageObject* pImageObj);
     void            ProcessForm(CFX_ByteTextBuf& buf, const uint8_t* data, FX_DWORD size, CFX_Matrix& matrix);
     CFX_ByteString  RealizeResource(CPDF_Object* pResourceObj, const FX_CHAR* szType);
 private:
     CPDF_Page*      m_pPage;
     CPDF_Document*  m_pDocument;
     CFX_PtrArray    m_pageObjects;
 };
 
 #endif  // CORE_INCLUDE_FPDFAPI_FPDF_PAGE_H_