From 6fdfe387645217cdd77e8e4230a0d8348d831e31 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 10 Aug 2018 23:43:26 +0000 Subject: Kill some optional parameters that are always supplied. No need to even bring any .cpp files in line with these headers. Change-Id: I934169d77ae09adc11f02e5ea92b1f8b078c9477 Reviewed-on: https://pdfium-review.googlesource.com/39876 Commit-Queue: Tom Sepez Reviewed-by: Lei Zhang --- xfa/fwl/theme/cfwl_carettp.h | 2 +- xfa/fwl/theme/cfwl_listboxtp.h | 4 ++-- xfa/fwl/theme/cfwl_scrollbartp.h | 10 +++++----- xfa/fwl/theme/cfwl_widgettp.h | 14 +++++++------- 4 files changed, 15 insertions(+), 15 deletions(-) (limited to 'xfa/fwl') diff --git a/xfa/fwl/theme/cfwl_carettp.h b/xfa/fwl/theme/cfwl_carettp.h index 8b88feeda3..64bf51b20a 100644 --- a/xfa/fwl/theme/cfwl_carettp.h +++ b/xfa/fwl/theme/cfwl_carettp.h @@ -22,7 +22,7 @@ class CFWL_CaretTP : public CFWL_WidgetTP { uint32_t dwStates, const CFX_RectF* pRect, CXFA_GEColor* crFill, - CFX_Matrix* pMatrix = nullptr); + CFX_Matrix* pMatrix); }; #endif // XFA_FWL_THEME_CFWL_CARETTP_H_ diff --git a/xfa/fwl/theme/cfwl_listboxtp.h b/xfa/fwl/theme/cfwl_listboxtp.h index 5dc45af4fe..cc4691cce0 100644 --- a/xfa/fwl/theme/cfwl_listboxtp.h +++ b/xfa/fwl/theme/cfwl_listboxtp.h @@ -21,8 +21,8 @@ class CFWL_ListBoxTP : public CFWL_WidgetTP { void DrawListBoxItem(CXFA_Graphics* pGraphics, uint32_t dwStates, const CFX_RectF* prtItem, - void* pData = nullptr, - CFX_Matrix* pMatrix = nullptr); + void* pData, + CFX_Matrix* pMatrix); }; #endif // XFA_FWL_THEME_CFWL_LISTBOXTP_H_ diff --git a/xfa/fwl/theme/cfwl_scrollbartp.h b/xfa/fwl/theme/cfwl_scrollbartp.h index bae4e1902c..8398706458 100644 --- a/xfa/fwl/theme/cfwl_scrollbartp.h +++ b/xfa/fwl/theme/cfwl_scrollbartp.h @@ -33,24 +33,24 @@ class CFWL_ScrollBarTP : public CFWL_WidgetTP { const CFX_RectF* pRect, bool bVert, FWLTHEME_STATE eState, - bool bPawButton = true, - CFX_Matrix* pMatrix = nullptr); + bool bPawButton, + CFX_Matrix* pMatrix); void DrawTrack(CXFA_Graphics* pGraphics, const CFX_RectF* pRect, bool bVert, FWLTHEME_STATE eState, bool bLowerTrack, - CFX_Matrix* pMatrix = nullptr); + CFX_Matrix* pMatrix); void DrawMaxMinBtn(CXFA_Graphics* pGraphics, const CFX_RectF* pRect, FWLTHEME_DIRECTION eDict, FWLTHEME_STATE eState, - CFX_Matrix* pMatrix = nullptr); + CFX_Matrix* pMatrix); void DrawPaw(CXFA_Graphics* pGraphics, const CFX_RectF* pRect, bool bVert, FWLTHEME_STATE eState, - CFX_Matrix* pMatrix = nullptr); + CFX_Matrix* pMatrix); std::unique_ptr m_pThemeData; diff --git a/xfa/fwl/theme/cfwl_widgettp.h b/xfa/fwl/theme/cfwl_widgettp.h index f62098d4ef..0facb1ee62 100644 --- a/xfa/fwl/theme/cfwl_widgettp.h +++ b/xfa/fwl/theme/cfwl_widgettp.h @@ -56,31 +56,31 @@ class CFWL_WidgetTP { void DrawBorder(CXFA_Graphics* pGraphics, const CFX_RectF* pRect, - CFX_Matrix* pMatrix = nullptr); + CFX_Matrix* pMatrix); void FillBackground(CXFA_Graphics* pGraphics, const CFX_RectF* pRect, - CFX_Matrix* pMatrix = nullptr); + CFX_Matrix* pMatrix); void FillSolidRect(CXFA_Graphics* pGraphics, FX_ARGB fillColor, const CFX_RectF* pRect, - CFX_Matrix* pMatrix = nullptr); + CFX_Matrix* pMatrix); void DrawFocus(CXFA_Graphics* pGraphics, const CFX_RectF* pRect, - CFX_Matrix* pMatrix = nullptr); + CFX_Matrix* pMatrix); void DrawArrow(CXFA_Graphics* pGraphics, const CFX_RectF* pRect, FWLTHEME_DIRECTION eDict, FX_ARGB argSign, - CFX_Matrix* pMatrix = nullptr); + CFX_Matrix* pMatrix); void DrawBtn(CXFA_Graphics* pGraphics, const CFX_RectF* pRect, FWLTHEME_STATE eState, - CFX_Matrix* pMatrix = nullptr); + CFX_Matrix* pMatrix); void DrawArrowBtn(CXFA_Graphics* pGraphics, const CFX_RectF* pRect, FWLTHEME_DIRECTION eDict, FWLTHEME_STATE eState, - CFX_Matrix* pMatrix = nullptr); + CFX_Matrix* pMatrix); uint32_t m_dwRefCount; std::unique_ptr m_pTextOut; -- cgit v1.2.3