From d19e912dd469e4bdad9f3020e1f6eb98f10f3470 Mon Sep 17 00:00:00 2001 From: tsepez Date: Wed, 2 Nov 2016 15:43:18 -0700 Subject: Remove FX_BOOL from xfa. Review-Url: https://codereview.chromium.org/2467203003 --- xfa/fxfa/app/xfa_fftextedit.h | 106 +++++++++++++++++++++--------------------- 1 file changed, 53 insertions(+), 53 deletions(-) (limited to 'xfa/fxfa/app/xfa_fftextedit.h') diff --git a/xfa/fxfa/app/xfa_fftextedit.h b/xfa/fxfa/app/xfa_fftextedit.h index 048008d700..917d6cf17e 100644 --- a/xfa/fxfa/app/xfa_fftextedit.h +++ b/xfa/fxfa/app/xfa_fftextedit.h @@ -17,31 +17,31 @@ class CXFA_FFTextEdit : public CXFA_FFField { ~CXFA_FFTextEdit() override; // CXFA_FFField - FX_BOOL LoadWidget() override; + bool LoadWidget() override; void UpdateWidgetProperty() override; - FX_BOOL OnLButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) override; - FX_BOOL OnRButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) override; - FX_BOOL OnRButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) override; - FX_BOOL OnSetFocus(CXFA_FFWidget* pOldWidget) override; - FX_BOOL OnKillFocus(CXFA_FFWidget* pNewWidget) override; - FX_BOOL CanUndo() override; - FX_BOOL CanRedo() override; - FX_BOOL Undo() override; - FX_BOOL Redo() override; - FX_BOOL CanCopy() override; - FX_BOOL CanCut() override; - FX_BOOL CanPaste() override; - FX_BOOL CanSelectAll() override; - FX_BOOL Copy(CFX_WideString& wsCopy) override; - FX_BOOL Cut(CFX_WideString& wsCut) override; - FX_BOOL Paste(const CFX_WideString& wsPaste) override; - FX_BOOL SelectAll() override; - FX_BOOL Delete() override; - FX_BOOL DeSelect() override; - FX_BOOL GetSuggestWords(CFX_PointF pointf, - std::vector& sSuggest) override; - FX_BOOL ReplaceSpellCheckWord(CFX_PointF pointf, - const CFX_ByteStringC& bsReplace) override; + bool OnLButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) override; + bool OnRButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) override; + bool OnRButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) override; + bool OnSetFocus(CXFA_FFWidget* pOldWidget) override; + bool OnKillFocus(CXFA_FFWidget* pNewWidget) override; + bool CanUndo() override; + bool CanRedo() override; + bool Undo() override; + bool Redo() override; + bool CanCopy() override; + bool CanCut() override; + bool CanPaste() override; + bool CanSelectAll() override; + bool Copy(CFX_WideString& wsCopy) override; + bool Cut(CFX_WideString& wsCut) override; + bool Paste(const CFX_WideString& wsPaste) override; + bool SelectAll() override; + bool Delete() override; + bool DeSelect() override; + bool GetSuggestWords(CFX_PointF pointf, + std::vector& sSuggest) override; + bool ReplaceSpellCheckWord(CFX_PointF pointf, + const CFX_ByteStringC& bsReplace) override; void OnProcessMessage(CFWL_Message* pMessage) override; void OnProcessEvent(CFWL_Event* pEvent) override; void OnDrawWidget(CFX_Graphics* pGraphics, @@ -51,12 +51,12 @@ class CXFA_FFTextEdit : public CXFA_FFField { const CFX_WideString& wsChanged, const CFX_WideString& wsPrevText); void OnTextFull(IFWL_Widget* pWidget); - FX_BOOL CheckWord(const CFX_ByteStringC& sWord); + bool CheckWord(const CFX_ByteStringC& sWord); protected: - FX_BOOL CommitData() override; - FX_BOOL UpdateFWLData() override; - FX_BOOL IsDataChanged() override; + bool CommitData() override; + bool UpdateFWLData() override; + bool IsDataChanged() override; uint32_t GetAlignment(); void ValidateNumberField(const CFX_WideString& wsText); @@ -70,12 +70,12 @@ class CXFA_FFNumericEdit : public CXFA_FFTextEdit { ~CXFA_FFNumericEdit() override; // CXFA_FFTextEdit - FX_BOOL LoadWidget() override; + bool LoadWidget() override; void UpdateWidgetProperty() override; void OnProcessEvent(CFWL_Event* pEvent) override; public: - FX_BOOL OnValidate(IFWL_Widget* pWidget, CFX_WideString& wsText); + bool OnValidate(IFWL_Widget* pWidget, CFX_WideString& wsText); }; class CXFA_FFPasswordEdit : public CXFA_FFTextEdit { @@ -84,7 +84,7 @@ class CXFA_FFPasswordEdit : public CXFA_FFTextEdit { ~CXFA_FFPasswordEdit() override; // CXFA_FFTextEdit - FX_BOOL LoadWidget() override; + bool LoadWidget() override; void UpdateWidgetProperty() override; protected: @@ -102,26 +102,26 @@ class CXFA_FFDateTimeEdit : public CXFA_FFTextEdit { ~CXFA_FFDateTimeEdit() override; // CXFA_FFTextEdit - FX_BOOL GetBBox(CFX_RectF& rtBox, - uint32_t dwStatus, - FX_BOOL bDrawFocus = FALSE) override; - FX_BOOL LoadWidget() override; + bool GetBBox(CFX_RectF& rtBox, + uint32_t dwStatus, + bool bDrawFocus = false) override; + bool LoadWidget() override; void UpdateWidgetProperty() override; - FX_BOOL CanUndo() override; - FX_BOOL CanRedo() override; - FX_BOOL Undo() override; - FX_BOOL Redo() override; - FX_BOOL CanCopy() override; - FX_BOOL CanCut() override; - FX_BOOL CanPaste() override; - FX_BOOL CanSelectAll() override; - FX_BOOL Copy(CFX_WideString& wsCopy) override; - FX_BOOL Cut(CFX_WideString& wsCut) override; - FX_BOOL Paste(const CFX_WideString& wsPaste) override; - FX_BOOL SelectAll() override; - FX_BOOL Delete() override; - FX_BOOL DeSelect() override; + bool CanUndo() override; + bool CanRedo() override; + bool Undo() override; + bool Redo() override; + bool CanCopy() override; + bool CanCut() override; + bool CanPaste() override; + bool CanSelectAll() override; + bool Copy(CFX_WideString& wsCopy) override; + bool Cut(CFX_WideString& wsCut) override; + bool Paste(const CFX_WideString& wsPaste) override; + bool SelectAll() override; + bool Delete() override; + bool DeSelect() override; void OnProcessEvent(CFWL_Event* pEvent) override; void OnSelectChanged(IFWL_Widget* pWidget, @@ -130,10 +130,10 @@ class CXFA_FFDateTimeEdit : public CXFA_FFTextEdit { int32_t iDay); protected: - FX_BOOL PtInActiveRect(FX_FLOAT fx, FX_FLOAT fy) override; - FX_BOOL CommitData() override; - FX_BOOL UpdateFWLData() override; - FX_BOOL IsDataChanged() override; + bool PtInActiveRect(FX_FLOAT fx, FX_FLOAT fy) override; + bool CommitData() override; + bool UpdateFWLData() override; + bool IsDataChanged() override; uint32_t GetAlignment(); }; -- cgit v1.2.3