From cb798258c433bec7087948fcbfff14d1e7683006 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 17 Sep 2018 18:25:32 +0000 Subject: Fix final/protected conflicts. Classes marked |final| should not have |protected| members. In turn, "private field m_dwEncryptObjNum is not used" warning is produced. Change-Id: I51a96aca5a5f499381a6764d892962f7f2dc0327 Reviewed-on: https://pdfium-review.googlesource.com/42611 Reviewed-by: Lei Zhang Commit-Queue: Tom Sepez --- xfa/fwl/theme/cfwl_carettp.h | 2 +- xfa/fwl/theme/cfwl_checkboxtp.h | 6 ++---- xfa/fwl/theme/cfwl_comboboxtp.h | 2 +- xfa/fwl/theme/cfwl_datetimepickertp.h | 2 +- xfa/fwl/theme/cfwl_listboxtp.h | 2 +- xfa/fwl/theme/cfwl_monthcalendartp.h | 6 ++---- xfa/fwl/theme/cfwl_pushbuttontp.h | 7 ++----- xfa/fwl/theme/cfwl_scrollbartp.h | 6 ++---- xfa/fxfa/cxfa_ffpageview.h | 6 +++--- 9 files changed, 15 insertions(+), 24 deletions(-) (limited to 'xfa') diff --git a/xfa/fwl/theme/cfwl_carettp.h b/xfa/fwl/theme/cfwl_carettp.h index a71afc935f..2fe01bed1a 100644 --- a/xfa/fwl/theme/cfwl_carettp.h +++ b/xfa/fwl/theme/cfwl_carettp.h @@ -17,7 +17,7 @@ class CFWL_CaretTP final : public CFWL_WidgetTP { // CFWL_WidgetTP void DrawBackground(CFWL_ThemeBackground* pParams) override; - protected: + private: void DrawCaretBK(CXFA_Graphics* pGraphics, uint32_t dwStates, const CFX_RectF* pRect, diff --git a/xfa/fwl/theme/cfwl_checkboxtp.h b/xfa/fwl/theme/cfwl_checkboxtp.h index fa06c7ec0e..506f78413a 100644 --- a/xfa/fwl/theme/cfwl_checkboxtp.h +++ b/xfa/fwl/theme/cfwl_checkboxtp.h @@ -23,7 +23,7 @@ class CFWL_CheckBoxTP final : public CFWL_WidgetTP { void DrawText(CFWL_ThemeText* pParams) override; void DrawBackground(CFWL_ThemeBackground* pParams) override; - protected: + private: struct CKBThemeData { FX_ARGB clrSignBorderNormal; FX_ARGB clrSignBorderDisable; @@ -66,12 +66,10 @@ class CFWL_CheckBoxTP final : public CFWL_WidgetTP { CFX_Matrix* pMatrix); void InitCheckPath(float fCheckLen); + void SetThemeData(); std::unique_ptr m_pThemeData; std::unique_ptr m_pCheckPath; - - private: - void SetThemeData(); }; #endif // XFA_FWL_THEME_CFWL_CHECKBOXTP_H_ diff --git a/xfa/fwl/theme/cfwl_comboboxtp.h b/xfa/fwl/theme/cfwl_comboboxtp.h index dd8311c8a1..1456143e43 100644 --- a/xfa/fwl/theme/cfwl_comboboxtp.h +++ b/xfa/fwl/theme/cfwl_comboboxtp.h @@ -17,7 +17,7 @@ class CFWL_ComboBoxTP final : public CFWL_WidgetTP { // CFWL_WidgetTP void DrawBackground(CFWL_ThemeBackground* pParams) override; - protected: + private: void DrawDropDownButton(CFWL_ThemeBackground* pParams, uint32_t dwStates, CFX_Matrix* pMatrix); diff --git a/xfa/fwl/theme/cfwl_datetimepickertp.h b/xfa/fwl/theme/cfwl_datetimepickertp.h index 5a548511cf..e7a7239e8d 100644 --- a/xfa/fwl/theme/cfwl_datetimepickertp.h +++ b/xfa/fwl/theme/cfwl_datetimepickertp.h @@ -17,7 +17,7 @@ class CFWL_DateTimePickerTP final : public CFWL_WidgetTP { // CFWL_WidgetTP void DrawBackground(CFWL_ThemeBackground* pParams) override; - protected: + private: void DrawDropDownButton(CFWL_ThemeBackground* pParams, CFX_Matrix* pMatrix); }; diff --git a/xfa/fwl/theme/cfwl_listboxtp.h b/xfa/fwl/theme/cfwl_listboxtp.h index 95ce01c441..e87ac6f062 100644 --- a/xfa/fwl/theme/cfwl_listboxtp.h +++ b/xfa/fwl/theme/cfwl_listboxtp.h @@ -17,7 +17,7 @@ class CFWL_ListBoxTP final : public CFWL_WidgetTP { // CFWL_WidgetTP void DrawBackground(CFWL_ThemeBackground* pParams) override; - protected: + private: void DrawListBoxItem(CXFA_Graphics* pGraphics, uint32_t dwStates, const CFX_RectF* prtItem, diff --git a/xfa/fwl/theme/cfwl_monthcalendartp.h b/xfa/fwl/theme/cfwl_monthcalendartp.h index 95e2a190b7..4dd08b49c3 100644 --- a/xfa/fwl/theme/cfwl_monthcalendartp.h +++ b/xfa/fwl/theme/cfwl_monthcalendartp.h @@ -22,7 +22,7 @@ class CFWL_MonthCalendarTP final : public CFWL_WidgetTP { void DrawBackground(CFWL_ThemeBackground* pParams) override; void DrawText(CFWL_ThemeText* pParams) override; - protected: + private: struct MCThemeData { FX_ARGB clrCaption; FX_ARGB clrSeperator; @@ -43,12 +43,10 @@ class CFWL_MonthCalendarTP final : public CFWL_WidgetTP { void DrawHSeperator(CFWL_ThemeBackground* pParams, CFX_Matrix* pMatrix); void DrawWeekNumSep(CFWL_ThemeBackground* pParams, CFX_Matrix* pMatrix); FWLTHEME_STATE GetState(uint32_t dwFWLStates); + void SetThemeData(); std::unique_ptr m_pThemeData; WideString wsResource; - - private: - void SetThemeData(); }; #endif // XFA_FWL_THEME_CFWL_MONTHCALENDARTP_H_ diff --git a/xfa/fwl/theme/cfwl_pushbuttontp.h b/xfa/fwl/theme/cfwl_pushbuttontp.h index 2e1782a1b5..6b49ba6479 100644 --- a/xfa/fwl/theme/cfwl_pushbuttontp.h +++ b/xfa/fwl/theme/cfwl_pushbuttontp.h @@ -19,7 +19,7 @@ class CFWL_PushButtonTP final : public CFWL_WidgetTP { // CFWL_WidgetTP void DrawBackground(CFWL_ThemeBackground* pParams) override; - protected: + private: struct PBThemeData { FX_ARGB clrBorder[5]; FX_ARGB clrStart[5]; @@ -34,13 +34,10 @@ class CFWL_PushButtonTP final : public CFWL_WidgetTP { void SetBackgroudColor(uint32_t* pData); void SetCaptionColor(uint32_t* pData); void SetCornerColor(uint32_t* pData); - int32_t GetColorID(uint32_t dwStates) const; + void SetThemeData(); std::unique_ptr m_pThemeData; - - private: - void SetThemeData(); }; #endif // XFA_FWL_THEME_CFWL_PUSHBUTTONTP_H_ diff --git a/xfa/fwl/theme/cfwl_scrollbartp.h b/xfa/fwl/theme/cfwl_scrollbartp.h index 53cbb38d83..2a202e1b1e 100644 --- a/xfa/fwl/theme/cfwl_scrollbartp.h +++ b/xfa/fwl/theme/cfwl_scrollbartp.h @@ -19,7 +19,7 @@ class CFWL_ScrollBarTP final : public CFWL_WidgetTP { // CFWL_WidgetTP void DrawBackground(CFWL_ThemeBackground* pParams) override; - protected: + private: struct SBThemeData { FX_ARGB clrTrackBKStart; FX_ARGB clrTrackBKEnd; @@ -51,11 +51,9 @@ class CFWL_ScrollBarTP final : public CFWL_WidgetTP { bool bVert, FWLTHEME_STATE eState, CFX_Matrix* pMatrix); + void SetThemeData(); std::unique_ptr m_pThemeData; - - private: - void SetThemeData(); }; #endif // XFA_FWL_THEME_CFWL_SCROLLBARTP_H_ diff --git a/xfa/fxfa/cxfa_ffpageview.h b/xfa/fxfa/cxfa_ffpageview.h index a745b0639b..16477fa2d3 100644 --- a/xfa/fxfa/cxfa_ffpageview.h +++ b/xfa/fxfa/cxfa_ffpageview.h @@ -29,7 +29,7 @@ class CXFA_FFPageView final : public CXFA_ContainerLayoutItem { uint32_t dwTraverseWay, uint32_t dwWidgetFilter); - protected: + private: UnownedPtr const m_pDocView; }; @@ -46,7 +46,7 @@ class CXFA_FFPageWidgetIterator final : public IXFA_WidgetIterator { CXFA_FFWidget* GetCurrentWidget() override; bool SetCurrentWidget(CXFA_FFWidget* hWidget) override; - protected: + private: CXFA_FFWidget* GetWidget(CXFA_LayoutItem* pLayoutItem); UnownedPtr m_pPageView; @@ -85,7 +85,7 @@ class CXFA_FFTabOrderPageWidgetIterator final : public IXFA_WidgetIterator { CXFA_FFWidget* GetCurrentWidget() override; bool SetCurrentWidget(CXFA_FFWidget* hWidget) override; - protected: + private: CXFA_FFWidget* GetTraverseWidget(CXFA_FFWidget* pWidget); CXFA_FFWidget* FindWidgetByName(const WideString& wsWidgetName, CXFA_FFWidget* pRefWidget); -- cgit v1.2.3