FX Bool considered harmful, part 3

core/include/fpdftext/fpdf_text.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_FPDFTEXT_FPDF_TEXT_H_
 #define CORE_INCLUDE_FPDFTEXT_FPDF_TEXT_H_
 
 #include "../fpdfapi/fpdf_parser.h"
@@ skipping 43 matching lines @@
 #define FPDFTEXT_DOWN                   2
 #define FPDFTEXT_WRITINGMODE_UNKNOW     0
 #define FPDFTEXT_WRITINGMODE_LRTB       1
 #define FPDFTEXT_WRITINGMODE_RLTB       2
 #define FPDFTEXT_WRITINGMODE_TBRL       3
 class CPDFText_ParseOptions
 {
 public:
 
     CPDFText_ParseOptions();
-    FX_BOOL                     m_bGetCharCodeOnly;
-    FX_BOOL                     m_bNormalizeObjs;
-    FX_BOOL                     m_bOutputHyphen;
+    bool                        m_bGetCharCodeOnly;
+    bool                        m_bNormalizeObjs;
+    bool                        m_bOutputHyphen;
 };
 class IPDF_TextPage
 {
 public:
 
     virtual ~IPDF_TextPage() {}
     static IPDF_TextPage*       CreateTextPage(const CPDF_Page* pPage, CPDFText_ParseOptions ParserOptions);
     static IPDF_TextPage*       CreateTextPage(const CPDF_Page* pPage, int flags = 0);
     static IPDF_TextPage*       CreateTextPage(const CPDF_PageObjects* pObjs, int flags = 0);
     static IPDF_TextPage*       CreateReflowTextPage(IPDF_ReflowedPage* pRefPage);
 
-    virtual void                        NormalizeObjects(FX_BOOL bNormalize) = 0;
+    virtual void                        NormalizeObjects(bool bNormalize) = 0;
 
-    virtual FX_BOOL                     ParseTextPage() = 0;
+    virtual bool                        ParseTextPage() = 0;
 
 
-    virtual FX_BOOL                     IsParsered() const = 0;
+    virtual bool                        IsParsered() const = 0;
 public:
 
     virtual int CharIndexFromTextIndex(int TextIndex) const = 0;
 
     virtual int TextIndexFromCharIndex(int CharIndex) const = 0;
 
 
     virtual int                         CountChars() const = 0;
 
     virtual     void                    GetCharInfo(int index, FPDF_CHAR_INFO & info) const = 0;
 
     virtual void                        GetRectArray(int start, int nCount, CFX_RectArray& rectArray) const = 0;
 
 
 
     virtual int                         GetIndexAtPos(CPDF_Point point, FX_FLOAT xTorelance, FX_FLOAT yTorelance) const = 0;
 
     virtual int                         GetIndexAtPos(FX_FLOAT x, FX_FLOAT y, FX_FLOAT xTorelance, FX_FLOAT yTorelance) const = 0;
 
     virtual CFX_WideString      GetTextByRect(const CFX_FloatRect& rect) const = 0;
 
     virtual void                        GetRectsArrayByRect(const CFX_FloatRect& rect, CFX_RectArray& resRectArray) const = 0;
 
 
     virtual int                         CountRects(int start, int nCount) = 0;
 
     virtual     void                    GetRect(int rectIndex, FX_FLOAT& left, FX_FLOAT& top, FX_FLOAT& right, FX_FLOAT &bottom) const = 0;
 
-    virtual FX_BOOL                     GetBaselineRotate(int rectIndex, int& Rotate) = 0;
+    virtual bool                        GetBaselineRotate(int rectIndex, int& Rotate) = 0;
 
-    virtual FX_BOOL                     GetBaselineRotate(const CFX_FloatRect& rect, int& Rotate) = 0;
+    virtual bool                        GetBaselineRotate(const CFX_FloatRect& rect, int& Rotate) = 0;
 
-    virtual     int                             CountBoundedSegments(FX_FLOAT left, FX_FLOAT top, FX_FLOAT right, FX_FLOAT bottom, FX_BOOL bContains = FALSE) = 0;
+    virtual     int                             CountBoundedSegments(FX_FLOAT left, FX_FLOAT top, FX_FLOAT right, FX_FLOAT bottom, bool bContains = false) = 0;
 
     virtual     void                    GetBoundedSegment(int index, int& start, int& count) const = 0;
 
 
     virtual int                         GetWordBreak(int index, int direction) const = 0;
 
     virtual CFX_WideString      GetPageText(int start = 0, int nCount = -1 ) const = 0;
 };
 #define FPDFTEXT_MATCHCASE      0x00000001
 #define FPDFTEXT_MATCHWHOLEWORD 0x00000002
 #define FPDFTEXT_CONSECUTIVE    0x00000004
 class IPDF_TextPageFind
 {
 public:
 
     virtual     ~IPDF_TextPageFind() {}
 
     static      IPDF_TextPageFind*      CreatePageFind(const IPDF_TextPage* pTextPage);
 public:
 
-    virtual     FX_BOOL                         FindFirst(const CFX_WideString& findwhat, int flags, int startPos = 0) = 0;
+    virtual     bool                            FindFirst(const CFX_WideString& findwhat, int flags, int startPos = 0) = 0;
 
-    virtual     FX_BOOL                         FindNext() = 0;
+    virtual     bool                            FindNext() = 0;
 
-    virtual     FX_BOOL                         FindPrev() = 0;
+    virtual     bool                            FindPrev() = 0;
 
     virtual void                                GetRectArray(CFX_RectArray& rects) const = 0;
 
     virtual int                                 GetCurOrder() const = 0;
 
     virtual int                                 GetMatchedCount() const = 0;
 };
 class IPDF_LinkExtract
 {
 public:
 
     virtual     ~IPDF_LinkExtract() {}
 
     static      IPDF_LinkExtract*       CreateLinkExtract();
 
-    virtual FX_BOOL                             ExtractLinks(const IPDF_TextPage* pTextPage) = 0;
+    virtual bool                                ExtractLinks(const IPDF_TextPage* pTextPage) = 0;
 public:
 
     virtual int                                 CountLinks() const = 0;
 
     virtual CFX_WideString              GetURL(int index) const = 0;
 
     virtual     void                            GetBoundedSegment(int index, int& start, int& count) const = 0;
 
     virtual void                                GetRects(int index, CFX_RectArray& rects) const = 0;
 };
 
 #endif  // CORE_INCLUDE_FPDFTEXT_FPDF_TEXT_H_