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/cfwl_message.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'xfa/fwl/core/cfwl_message.h') diff --git a/xfa/fwl/core/cfwl_message.h b/xfa/fwl/core/cfwl_message.h index 3a30c8fffd..74401c3e34 100644 --- a/xfa/fwl/core/cfwl_message.h +++ b/xfa/fwl/core/cfwl_message.h @@ -61,8 +61,8 @@ class CFWL_Message { virtual ~CFWL_Message() {} virtual CFWL_Message* Clone() { return nullptr; } - virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const { - return FWL_ERR_Succeeded; + virtual FWL_Error GetClassName(CFX_WideString& wsClass) const { + return FWL_Error::Succeeded; } virtual CFWL_MessageType GetClassID() const { return CFWL_MessageType::None; } @@ -87,15 +87,15 @@ class CFWL_Message { uint32_t m_dwRefCount; }; -#define BEGIN_FWL_MESSAGE_DEF(classname, msgType) \ - class classname : public CFWL_Message { \ - public: \ - classname() : CFWL_Message() {} \ - CFWL_Message* Clone() override { return new classname(*this); } \ - FWL_ERR GetClassName(CFX_WideString& wsClass) const override { \ - wsClass = L## #classname; \ - return FWL_ERR_Succeeded; \ - } \ +#define BEGIN_FWL_MESSAGE_DEF(classname, msgType) \ + class classname : public CFWL_Message { \ + public: \ + classname() : CFWL_Message() {} \ + CFWL_Message* Clone() override { return new classname(*this); } \ + FWL_Error GetClassName(CFX_WideString& wsClass) const override { \ + wsClass = L## #classname; \ + return FWL_Error::Succeeded; \ + } \ CFWL_MessageType GetClassID() const override { return msgType; } #define END_FWL_MESSAGE_DEF \ -- cgit v1.2.3