diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-07-27 11:55:29 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-07-27 11:55:29 -0700 |
| commit | ff46aaf499edcf153ee2f57c7016587aa96dcfa0 (patch) | |
| tree | 0a0d92713af476897899b126d180cc6294433d10 /fpdfsdk/include/fsdk_baseannot.h | |
| parent | aafeff816e22c1333c17d8a0eb4fe8927c28142d (diff) | |
| download | pdfium-ff46aaf499edcf153ee2f57c7016587aa96dcfa0.tar.xz | |
FX Bool considered harmful, part 3
Try to reland this patch after fixing underlying issues that
caused it to be reverted.
fx_system.h is the only manual edit.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1258093002 .
Diffstat (limited to 'fpdfsdk/include/fsdk_baseannot.h')
| -rw-r--r-- | fpdfsdk/include/fsdk_baseannot.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/fpdfsdk/include/fsdk_baseannot.h b/fpdfsdk/include/fsdk_baseannot.h index dcd295de9f..b9f1fcd4b1 100644 --- a/fpdfsdk/include/fsdk_baseannot.h +++ b/fpdfsdk/include/fsdk_baseannot.h @@ -38,12 +38,12 @@ public: CPDFSDK_DateTime& operator = (const CPDFSDK_DateTime& datetime); CPDFSDK_DateTime& operator = (const FX_SYSTEMTIME& st); - FX_BOOL operator == (CPDFSDK_DateTime& datetime); - FX_BOOL operator != (CPDFSDK_DateTime& datetime); - FX_BOOL operator > (CPDFSDK_DateTime& datetime); - FX_BOOL operator >= (CPDFSDK_DateTime& datetime); - FX_BOOL operator < (CPDFSDK_DateTime& datetime); - FX_BOOL operator <= (CPDFSDK_DateTime& datetime); + bool operator == (CPDFSDK_DateTime& datetime); + bool operator != (CPDFSDK_DateTime& datetime); + bool operator > (CPDFSDK_DateTime& datetime); + bool operator >= (CPDFSDK_DateTime& datetime); + bool operator < (CPDFSDK_DateTime& datetime); + bool operator <= (CPDFSDK_DateTime& datetime); operator time_t(); CPDFSDK_DateTime& FromPDFDateTimeString(const CFX_ByteString& dtStr); @@ -92,8 +92,8 @@ public: void SetTabOrder(int iTabOrder); // Selection - FX_BOOL IsSelected(); - void SetSelected(FX_BOOL bSelected); + bool IsSelected(); + void SetSelected(bool bSelected); CFX_ByteString GetType() const; virtual CFX_ByteString GetSubType() const; @@ -146,9 +146,9 @@ public: void SetColor(FX_COLORREF color); void RemoveColor(); - FX_BOOL GetColor(FX_COLORREF& color) const; + bool GetColor(FX_COLORREF& color) const; - FX_BOOL IsVisible() const; + bool IsVisible() const; //action CPDF_Action GetAction() const; @@ -162,8 +162,8 @@ public: virtual CPDF_Action GetAAction(CPDF_AAction::AActionType eAAT); public: - FX_BOOL IsAppearanceValid(); - FX_BOOL IsAppearanceValid(CPDF_Annot::AppearanceMode mode); + bool IsAppearanceValid(); + bool IsAppearanceValid(CPDF_Annot::AppearanceMode mode); void DrawAppearance(CFX_RenderDevice* pDevice, const CPDF_Matrix* pUser2Device, CPDF_Annot::AppearanceMode mode, const CPDF_RenderOptions* pOptions); void DrawBorder(CFX_RenderDevice* pDevice, const CPDF_Matrix* pUser2Device, @@ -181,11 +181,11 @@ public: private: - FX_BOOL CreateFormFiller(); + bool CreateFormFiller(); protected: CPDF_Annot* m_pAnnot; CPDFSDK_PageView* m_pPageView; - FX_BOOL m_bSelected; + bool m_bSelected; int m_nTabOrder; }; |