From c777f486f84611d2fdd2d03af661b14955f9efb6 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 4 May 2016 17:57:03 -0700 Subject: Convert FWL_ERR into an enum class. This Cl updates FWL_ERR to be an FWL_Error enum class. It removes FX_ERR and replaces it with FWL_Error as well as the values were the same. There were many places where we either returned other values for FWL_ERR results. This Cl is the same as: https://codereview.chromium.org/1943413002/ but I seem to have messed up the base URL in that one. TBR=tsepez@chromium.org Review-Url: https://codereview.chromium.org/1952693003 --- xfa/fwl/core/fwl_noteimp.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'xfa/fwl/core/fwl_noteimp.h') diff --git a/xfa/fwl/core/fwl_noteimp.h b/xfa/fwl/core/fwl_noteimp.h index 723d2e5742..778eae6045 100644 --- a/xfa/fwl/core/fwl_noteimp.h +++ b/xfa/fwl/core/fwl_noteimp.h @@ -44,11 +44,11 @@ class CFWL_NoteLoop { CFWL_NoteLoop(CFWL_WidgetImp* pForm = nullptr); ~CFWL_NoteLoop() {} - FWL_ERR Idle(int32_t count); + FWL_Error Idle(int32_t count); CFWL_WidgetImp* GetForm(); FX_BOOL ContinueModal(); - FWL_ERR EndModalLoop(); - FWL_ERR SetMainForm(CFWL_WidgetImp* pForm); + FWL_Error EndModalLoop(); + FWL_Error SetMainForm(CFWL_WidgetImp* pForm); protected: void GenerateCommondEvent(uint32_t dwCommand); @@ -63,25 +63,25 @@ class CFWL_NoteDriver { ~CFWL_NoteDriver(); FX_BOOL SendEvent(CFWL_Event* pNote); - FWL_ERR RegisterEventTarget(IFWL_Widget* pListener, - IFWL_Widget* pEventSource = nullptr, - uint32_t dwFilter = FWL_EVENT_ALL_MASK); - FWL_ERR UnregisterEventTarget(IFWL_Widget* pListener); + FWL_Error RegisterEventTarget(IFWL_Widget* pListener, + IFWL_Widget* pEventSource = nullptr, + uint32_t dwFilter = FWL_EVENT_ALL_MASK); + FWL_Error UnregisterEventTarget(IFWL_Widget* pListener); void ClearEventTargets(FX_BOOL bRemoveAll); IFWL_App* GetOwnerApp() const; - FWL_ERR PushNoteLoop(CFWL_NoteLoop* pNoteLoop); + FWL_Error PushNoteLoop(CFWL_NoteLoop* pNoteLoop); CFWL_NoteLoop* PopNoteLoop(); IFWL_Widget* GetFocus(); FX_BOOL SetFocus(IFWL_Widget* pFocus, FX_BOOL bNotify = FALSE); void SetGrab(IFWL_Widget* pGrab, FX_BOOL bSet); - FWL_ERR Run(); + FWL_Error Run(); IFWL_Widget* GetHover(); void SetHover(IFWL_Widget* pHover); void NotifyTargetHide(IFWL_Widget* pNoteTarget); void NotifyTargetDestroy(IFWL_Widget* pNoteTarget); - FWL_ERR RegisterForm(CFWL_WidgetImp* pForm); - FWL_ERR UnRegisterForm(CFWL_WidgetImp* pForm); + FWL_Error RegisterForm(CFWL_WidgetImp* pForm); + FWL_Error UnRegisterForm(CFWL_WidgetImp* pForm); FX_BOOL QueueMessage(CFWL_Message* pMessage); FX_BOOL UnqueueMessage(CFWL_NoteLoop* pNoteLoop); CFWL_NoteLoop* GetTopLoop(); @@ -141,8 +141,8 @@ class CFWL_ToolTipContainer { static CFWL_ToolTipContainer* getInstance(); static void DeleteInstance(); - FX_ERR AddToolTipTarget(IFWL_ToolTipTarget* pTarget); - FX_ERR RemoveToolTipTarget(IFWL_ToolTipTarget* pTarget); + FWL_Error AddToolTipTarget(IFWL_ToolTipTarget* pTarget); + FWL_Error RemoveToolTipTarget(IFWL_ToolTipTarget* pTarget); IFWL_ToolTipTarget* GetCurrentToolTipTarget(); FX_BOOL HasToolTip(IFWL_Widget* pWidget); -- cgit v1.2.3