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/theme/cfwl_checkboxtp.cpp | 4 +-- xfa/fwl/theme/cfwl_checkboxtp.h | 4 +-- xfa/fwl/theme/cfwl_edittp.cpp | 4 +-- xfa/fwl/theme/cfwl_edittp.h | 4 +-- xfa/fwl/theme/cfwl_formtp.cpp | 10 +++--- xfa/fwl/theme/cfwl_formtp.h | 6 ++-- xfa/fwl/theme/cfwl_listboxtp.cpp | 4 +-- xfa/fwl/theme/cfwl_listboxtp.h | 4 +-- xfa/fwl/theme/cfwl_monthcalendartp.cpp | 4 +-- xfa/fwl/theme/cfwl_monthcalendartp.h | 4 +-- xfa/fwl/theme/cfwl_pushbuttontp.cpp | 4 +-- xfa/fwl/theme/cfwl_pushbuttontp.h | 4 +-- xfa/fwl/theme/cfwl_widgettp.cpp | 60 +++++++++++++++++----------------- xfa/fwl/theme/cfwl_widgettp.h | 32 +++++++++--------- 14 files changed, 74 insertions(+), 74 deletions(-) (limited to 'xfa/fwl/theme') diff --git a/xfa/fwl/theme/cfwl_checkboxtp.cpp b/xfa/fwl/theme/cfwl_checkboxtp.cpp index b7d3d724b6..78d829f8b0 100644 --- a/xfa/fwl/theme/cfwl_checkboxtp.cpp +++ b/xfa/fwl/theme/cfwl_checkboxtp.cpp @@ -98,11 +98,11 @@ FX_BOOL CFWL_CheckBoxTP::DrawBackground(CFWL_ThemeBackground* pParams) { } return TRUE; } -FWL_ERR CFWL_CheckBoxTP::Initialize() { +FWL_Error CFWL_CheckBoxTP::Initialize() { InitTTO(); return CFWL_WidgetTP::Initialize(); } -FWL_ERR CFWL_CheckBoxTP::Finalize() { +FWL_Error CFWL_CheckBoxTP::Finalize() { FinalizeTTO(); return CFWL_WidgetTP::Finalize(); } diff --git a/xfa/fwl/theme/cfwl_checkboxtp.h b/xfa/fwl/theme/cfwl_checkboxtp.h index bb2f14dec3..f6a3b82784 100644 --- a/xfa/fwl/theme/cfwl_checkboxtp.h +++ b/xfa/fwl/theme/cfwl_checkboxtp.h @@ -20,8 +20,8 @@ class CFWL_CheckBoxTP : public CFWL_WidgetTP { FX_BOOL bChildren = TRUE); virtual FX_BOOL DrawText(CFWL_ThemeText* pParams); virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams); - virtual FWL_ERR Initialize(); - virtual FWL_ERR Finalize(); + virtual FWL_Error Initialize(); + virtual FWL_Error Finalize(); protected: void DrawBoxBk(IFWL_Widget* pWidget, diff --git a/xfa/fwl/theme/cfwl_edittp.cpp b/xfa/fwl/theme/cfwl_edittp.cpp index e557e6606b..644da90071 100644 --- a/xfa/fwl/theme/cfwl_edittp.cpp +++ b/xfa/fwl/theme/cfwl_edittp.cpp @@ -77,11 +77,11 @@ FX_BOOL CFWL_EditTP::DrawBackground(CFWL_ThemeBackground* pParams) { } return TRUE; } -FWL_ERR CFWL_EditTP::Initialize() { +FWL_Error CFWL_EditTP::Initialize() { InitTTO(); return CFWL_WidgetTP::Initialize(); } -FWL_ERR CFWL_EditTP::Finalize() { +FWL_Error CFWL_EditTP::Finalize() { FinalizeTTO(); return CFWL_WidgetTP::Finalize(); } diff --git a/xfa/fwl/theme/cfwl_edittp.h b/xfa/fwl/theme/cfwl_edittp.h index 73c99dafb7..7077737d8d 100644 --- a/xfa/fwl/theme/cfwl_edittp.h +++ b/xfa/fwl/theme/cfwl_edittp.h @@ -15,8 +15,8 @@ class CFWL_EditTP : public CFWL_WidgetTP { virtual ~CFWL_EditTP(); virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget); virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams); - virtual FWL_ERR Initialize(); - virtual FWL_ERR Finalize(); + virtual FWL_Error Initialize(); + virtual FWL_Error Finalize(); }; #endif // XFA_FWL_THEME_CFWL_EDITTP_H_ diff --git a/xfa/fwl/theme/cfwl_formtp.cpp b/xfa/fwl/theme/cfwl_formtp.cpp index 6fd3453e69..6b876d2b40 100644 --- a/xfa/fwl/theme/cfwl_formtp.cpp +++ b/xfa/fwl/theme/cfwl_formtp.cpp @@ -44,14 +44,14 @@ CFWL_FormTP::~CFWL_FormTP() { delete m_pThemeData; } -FWL_ERR CFWL_FormTP::Initialize() { +FWL_Error CFWL_FormTP::Initialize() { InitTTO(); InitCaption(TRUE); InitCaption(FALSE); return CFWL_WidgetTP::Initialize(); } -FWL_ERR CFWL_FormTP::Finalize() { +FWL_Error CFWL_FormTP::Finalize() { FinalizeTTO(); delete m_pActiveBitmap; m_pActiveBitmap = nullptr; @@ -203,8 +203,8 @@ void* CFWL_FormTP::GetCapacity(CFWL_ThemePart* pThemePart, } return CFWL_WidgetTP::GetCapacity(pThemePart, dwCapacity); } -FWL_ERR CFWL_FormTP::GetPartRect(CFWL_ThemePart* pThemePart, - CFX_RectF& rtPart) { +FWL_Error CFWL_FormTP::GetPartRect(CFWL_ThemePart* pThemePart, + CFX_RectF& rtPart) { switch (pThemePart->m_iPart) { case CFWL_Part::CloseBox: { CalCloseBox(pThemePart->m_pWidget, rtPart); @@ -228,7 +228,7 @@ FWL_ERR CFWL_FormTP::GetPartRect(CFWL_ThemePart* pThemePart, } default: {} } - return FWL_ERR_Succeeded; + return FWL_Error::Succeeded; } void CFWL_FormTP::CalCloseBox(IFWL_Widget* pWidget, CFX_RectF& rect) { uint32_t dwStyles = pWidget->GetStyles(); diff --git a/xfa/fwl/theme/cfwl_formtp.h b/xfa/fwl/theme/cfwl_formtp.h index 6086eca80e..652528e0f9 100644 --- a/xfa/fwl/theme/cfwl_formtp.h +++ b/xfa/fwl/theme/cfwl_formtp.h @@ -15,8 +15,8 @@ class CFWL_FormTP : public CFWL_WidgetTP { CFWL_FormTP(); ~CFWL_FormTP() override; - FWL_ERR Initialize() override; - FWL_ERR Finalize() override; + FWL_Error Initialize() override; + FWL_Error Finalize() override; FX_BOOL IsValidWidget(IFWL_Widget* pWidget) override; uint32_t SetThemeID(IFWL_Widget* pWidget, uint32_t dwThemeID, @@ -25,7 +25,7 @@ class CFWL_FormTP : public CFWL_WidgetTP { FX_BOOL DrawText(CFWL_ThemeText* pParams) override; void* GetCapacity(CFWL_ThemePart* pThemePart, CFWL_WidgetCapacity dwCapacity) override; - FWL_ERR GetPartRect(CFWL_ThemePart* pThemePart, CFX_RectF& rtPart) override; + FWL_Error GetPartRect(CFWL_ThemePart* pThemePart, CFX_RectF& rtPart) override; protected: void CalCloseBox(IFWL_Widget* pWidget, CFX_RectF& rect); diff --git a/xfa/fwl/theme/cfwl_listboxtp.cpp b/xfa/fwl/theme/cfwl_listboxtp.cpp index f1a017ab70..5bab1b09e5 100644 --- a/xfa/fwl/theme/cfwl_listboxtp.cpp +++ b/xfa/fwl/theme/cfwl_listboxtp.cpp @@ -66,11 +66,11 @@ FX_BOOL CFWL_ListBoxTP::DrawBackground(CFWL_ThemeBackground* pParams) { } return TRUE; } -FWL_ERR CFWL_ListBoxTP::Initialize() { +FWL_Error CFWL_ListBoxTP::Initialize() { InitTTO(); return CFWL_WidgetTP::Initialize(); } -FWL_ERR CFWL_ListBoxTP::Finalize() { +FWL_Error CFWL_ListBoxTP::Finalize() { FinalizeTTO(); return CFWL_WidgetTP::Finalize(); } diff --git a/xfa/fwl/theme/cfwl_listboxtp.h b/xfa/fwl/theme/cfwl_listboxtp.h index d4bd7eff94..9ae85c72e7 100644 --- a/xfa/fwl/theme/cfwl_listboxtp.h +++ b/xfa/fwl/theme/cfwl_listboxtp.h @@ -15,8 +15,8 @@ class CFWL_ListBoxTP : public CFWL_WidgetTP { virtual ~CFWL_ListBoxTP(); virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget); virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams); - virtual FWL_ERR Initialize(); - virtual FWL_ERR Finalize(); + virtual FWL_Error Initialize(); + virtual FWL_Error Finalize(); protected: void DrawListBoxItem(CFX_Graphics* pGraphics, diff --git a/xfa/fwl/theme/cfwl_monthcalendartp.cpp b/xfa/fwl/theme/cfwl_monthcalendartp.cpp index 8b10fb993c..fac318f69d 100644 --- a/xfa/fwl/theme/cfwl_monthcalendartp.cpp +++ b/xfa/fwl/theme/cfwl_monthcalendartp.cpp @@ -349,11 +349,11 @@ void* CFWL_MonthCalendarTP::GetCapacity(CFWL_ThemePart* pThemePart, } return CFWL_WidgetTP::GetCapacity(pThemePart, dwCapacity); } -FWL_ERR CFWL_MonthCalendarTP::Initialize() { +FWL_Error CFWL_MonthCalendarTP::Initialize() { InitTTO(); return CFWL_WidgetTP::Initialize(); } -FWL_ERR CFWL_MonthCalendarTP::Finalize() { +FWL_Error CFWL_MonthCalendarTP::Finalize() { FinalizeTTO(); return CFWL_WidgetTP::Finalize(); } diff --git a/xfa/fwl/theme/cfwl_monthcalendartp.h b/xfa/fwl/theme/cfwl_monthcalendartp.h index 08e65ca848..acc4787f0f 100644 --- a/xfa/fwl/theme/cfwl_monthcalendartp.h +++ b/xfa/fwl/theme/cfwl_monthcalendartp.h @@ -22,8 +22,8 @@ class CFWL_MonthCalendarTP : public CFWL_WidgetTP { FX_BOOL DrawText(CFWL_ThemeText* pParams) override; void* GetCapacity(CFWL_ThemePart* pThemePart, CFWL_WidgetCapacity dwCapacity) override; - FWL_ERR Initialize() override; - FWL_ERR Finalize() override; + FWL_Error Initialize() override; + FWL_Error Finalize() override; protected: FX_BOOL DrawTotalBK(CFWL_ThemeBackground* pParams, CFX_Matrix* pMatrix); diff --git a/xfa/fwl/theme/cfwl_pushbuttontp.cpp b/xfa/fwl/theme/cfwl_pushbuttontp.cpp index 780c580369..103bae7aa9 100644 --- a/xfa/fwl/theme/cfwl_pushbuttontp.cpp +++ b/xfa/fwl/theme/cfwl_pushbuttontp.cpp @@ -102,11 +102,11 @@ void* CFWL_PushButtonTP::GetCapacity(CFWL_ThemePart* pThemePart, } return CFWL_WidgetTP::GetCapacity(pThemePart, dwCapacity); } -FWL_ERR CFWL_PushButtonTP::Initialize() { +FWL_Error CFWL_PushButtonTP::Initialize() { InitTTO(); return CFWL_WidgetTP::Initialize(); } -FWL_ERR CFWL_PushButtonTP::Finalize() { +FWL_Error CFWL_PushButtonTP::Finalize() { FinalizeTTO(); return CFWL_WidgetTP::Finalize(); } diff --git a/xfa/fwl/theme/cfwl_pushbuttontp.h b/xfa/fwl/theme/cfwl_pushbuttontp.h index 6329f90207..e51ce55e78 100644 --- a/xfa/fwl/theme/cfwl_pushbuttontp.h +++ b/xfa/fwl/theme/cfwl_pushbuttontp.h @@ -21,8 +21,8 @@ class CFWL_PushButtonTP : public CFWL_WidgetTP { FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams) override; void* GetCapacity(CFWL_ThemePart* pThemePart, CFWL_WidgetCapacity dwCapacity) override; - FWL_ERR Initialize() override; - FWL_ERR Finalize() override; + FWL_Error Initialize() override; + FWL_Error Finalize() override; protected: struct PBThemeData { diff --git a/xfa/fwl/theme/cfwl_widgettp.cpp b/xfa/fwl/theme/cfwl_widgettp.cpp index 6664bbed52..ecf338e103 100644 --- a/xfa/fwl/theme/cfwl_widgettp.cpp +++ b/xfa/fwl/theme/cfwl_widgettp.cpp @@ -66,15 +66,15 @@ uint32_t CFWL_WidgetTP::SetThemeID(IFWL_Widget* pWidget, } return dwOld; } -FWL_ERR CFWL_WidgetTP::GetThemeMatrix(IFWL_Widget* pWidget, - CFX_Matrix& matrix) { +FWL_Error CFWL_WidgetTP::GetThemeMatrix(IFWL_Widget* pWidget, + CFX_Matrix& matrix) { matrix.Set(_ctm.a, _ctm.b, _ctm.c, _ctm.d, _ctm.e, _ctm.f); - return FWL_ERR_Succeeded; + return FWL_Error::Succeeded; } -FWL_ERR CFWL_WidgetTP::SetThemeMatrix(IFWL_Widget* pWidget, - const CFX_Matrix& matrix) { +FWL_Error CFWL_WidgetTP::SetThemeMatrix(IFWL_Widget* pWidget, + const CFX_Matrix& matrix) { _ctm.Set(matrix.a, matrix.b, matrix.c, matrix.d, matrix.e, matrix.f); - return FWL_ERR_Succeeded; + return FWL_Error::Succeeded; } FX_BOOL CFWL_WidgetTP::DrawBackground(CFWL_ThemeBackground* pParams) { return TRUE; @@ -154,9 +154,9 @@ void* CFWL_WidgetTP::GetCapacity(CFWL_ThemePart* pThemePart, FX_BOOL CFWL_WidgetTP::IsCustomizedLayout(IFWL_Widget* pWidget) { return FWL_GetThemeLayout(m_dwThemeID); } -FWL_ERR CFWL_WidgetTP::GetPartRect(CFWL_ThemePart* pThemePart, - CFX_RectF& rect) { - return FWL_ERR_Succeeded; +FWL_Error CFWL_WidgetTP::GetPartRect(CFWL_ThemePart* pThemePart, + CFX_RectF& rect) { + return FWL_Error::Succeeded; } FX_BOOL CFWL_WidgetTP::IsInPart(CFWL_ThemePart* pThemePart, FX_FLOAT fx, @@ -174,51 +174,51 @@ FX_BOOL CFWL_WidgetTP::CalcTextRect(CFWL_ThemeText* pParams, CFX_RectF& rect) { pParams->m_wsText.GetLength(), rect); return TRUE; } -FWL_ERR CFWL_WidgetTP::Initialize() { +FWL_Error CFWL_WidgetTP::Initialize() { m_dwThemeID = 0; _ctm.SetIdentity(); - return FWL_ERR_Succeeded; + return FWL_Error::Succeeded; } -FWL_ERR CFWL_WidgetTP::Finalize() { +FWL_Error CFWL_WidgetTP::Finalize() { if (!m_pTextOut) { FinalizeTTO(); } - return FWL_ERR_Succeeded; + return FWL_Error::Succeeded; } CFWL_WidgetTP::~CFWL_WidgetTP() {} -FWL_ERR CFWL_WidgetTP::SetFont(IFWL_Widget* pWidget, - const FX_WCHAR* strFont, - FX_FLOAT fFontSize, - FX_ARGB rgbFont) { +FWL_Error CFWL_WidgetTP::SetFont(IFWL_Widget* pWidget, + const FX_WCHAR* strFont, + FX_FLOAT fFontSize, + FX_ARGB rgbFont) { if (!m_pTextOut) { - return FWL_ERR_Succeeded; + return FWL_Error::Succeeded; } m_pFDEFont = CFWL_FontManager::GetInstance()->FindFont(strFont, 0, 0); m_pTextOut->SetFont(m_pFDEFont); m_pTextOut->SetFontSize(fFontSize); m_pTextOut->SetTextColor(rgbFont); - return FWL_ERR_Succeeded; + return FWL_Error::Succeeded; } -FWL_ERR CFWL_WidgetTP::SetFont(IFWL_Widget* pWidget, - IFX_Font* pFont, - FX_FLOAT fFontSize, - FX_ARGB rgbFont) { +FWL_Error CFWL_WidgetTP::SetFont(IFWL_Widget* pWidget, + IFX_Font* pFont, + FX_FLOAT fFontSize, + FX_ARGB rgbFont) { if (!m_pTextOut) { - return FWL_ERR_Succeeded; + return FWL_Error::Succeeded; } m_pTextOut->SetFont(pFont); m_pTextOut->SetFontSize(fFontSize); m_pTextOut->SetTextColor(rgbFont); - return FWL_ERR_Succeeded; + return FWL_Error::Succeeded; } IFX_Font* CFWL_WidgetTP::GetFont(IFWL_Widget* pWidget) { return m_pFDEFont; } CFWL_WidgetTP::CFWL_WidgetTP() : m_dwRefCount(1), m_pTextOut(NULL), m_pFDEFont(NULL), m_dwThemeID(0) {} -FX_ERR CFWL_WidgetTP::InitTTO() { +FWL_Error CFWL_WidgetTP::InitTTO() { if (m_pTextOut) { - return FWL_ERR_Succeeded; + return FWL_Error::Succeeded; } m_pFDEFont = CFWL_FontManager::GetInstance()->FindFont(FX_WSTRC(L"Helvetica"), 0, 0); @@ -227,14 +227,14 @@ FX_ERR CFWL_WidgetTP::InitTTO() { m_pTextOut->SetFontSize(FWLTHEME_CAPACITY_FontSize); m_pTextOut->SetTextColor(FWLTHEME_CAPACITY_TextColor); m_pTextOut->SetEllipsisString(L"..."); - return FWL_ERR_Succeeded; + return FWL_Error::Succeeded; } -FX_ERR CFWL_WidgetTP::FinalizeTTO() { +FWL_Error CFWL_WidgetTP::FinalizeTTO() { if (m_pTextOut) { m_pTextOut->Release(); m_pTextOut = NULL; } - return FWL_ERR_Succeeded; + return FWL_Error::Succeeded; } void CFWL_WidgetTP::DrawEdge(CFX_Graphics* pGraphics, diff --git a/xfa/fwl/theme/cfwl_widgettp.h b/xfa/fwl/theme/cfwl_widgettp.h index 8e5c8ba283..633892a8ee 100644 --- a/xfa/fwl/theme/cfwl_widgettp.h +++ b/xfa/fwl/theme/cfwl_widgettp.h @@ -111,36 +111,36 @@ class CFWL_WidgetTP { virtual uint32_t SetThemeID(IFWL_Widget* pWidget, uint32_t dwThemeID, FX_BOOL bChildren = TRUE); - virtual FWL_ERR GetThemeMatrix(IFWL_Widget* pWidget, CFX_Matrix& matrix); - virtual FWL_ERR SetThemeMatrix(IFWL_Widget* pWidget, - const CFX_Matrix& matrix); + virtual FWL_Error GetThemeMatrix(IFWL_Widget* pWidget, CFX_Matrix& matrix); + virtual FWL_Error SetThemeMatrix(IFWL_Widget* pWidget, + const CFX_Matrix& matrix); virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams); virtual FX_BOOL DrawText(CFWL_ThemeText* pParams); virtual void* GetCapacity(CFWL_ThemePart* pThemePart, CFWL_WidgetCapacity dwCapacity); virtual FX_BOOL IsCustomizedLayout(IFWL_Widget* pWidget); - virtual FWL_ERR GetPartRect(CFWL_ThemePart* pThemePart, CFX_RectF& rtPart); + virtual FWL_Error GetPartRect(CFWL_ThemePart* pThemePart, CFX_RectF& rtPart); virtual FX_BOOL IsInPart(CFWL_ThemePart* pThemePart, FX_FLOAT fx, FX_FLOAT fy); virtual FX_BOOL CalcTextRect(CFWL_ThemeText* pParams, CFX_RectF& rect); - virtual FWL_ERR Initialize(); - virtual FWL_ERR Finalize(); + virtual FWL_Error Initialize(); + virtual FWL_Error Finalize(); virtual ~CFWL_WidgetTP(); - FWL_ERR SetFont(IFWL_Widget* pWidget, - const FX_WCHAR* strFont, - FX_FLOAT fFontSize, - FX_ARGB rgbFont); - FWL_ERR SetFont(IFWL_Widget* pWidget, - IFX_Font* pFont, - FX_FLOAT fFontSize, - FX_ARGB rgbFont); + FWL_Error SetFont(IFWL_Widget* pWidget, + const FX_WCHAR* strFont, + FX_FLOAT fFontSize, + FX_ARGB rgbFont); + FWL_Error SetFont(IFWL_Widget* pWidget, + IFX_Font* pFont, + FX_FLOAT fFontSize, + FX_ARGB rgbFont); IFX_Font* GetFont(IFWL_Widget* pWidget); protected: CFWL_WidgetTP(); - FX_ERR InitTTO(); - FX_ERR FinalizeTTO(); + FWL_Error InitTTO(); + FWL_Error FinalizeTTO(); void DrawEdge(CFX_Graphics* pGraphics, uint32_t dwStyles, const CFX_RectF* pRect, -- cgit v1.2.3