From 3fc8c688374fc8f34f4b02debc5888e2775df91b Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 18 Nov 2015 15:55:21 -0800 Subject: Make IFWL_Target::m_pImpl a private member. Remove pointless subclass dtors since CFWL_TargetImpl has a virtual dtor, and can be deleted by the base class. Kept pointless subclass ctors for the moment to hopefully combine with Initialize someday, though they need not do anything since the base class ctor nulls out m_pImpl. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1460883002 . --- xfa/include/fwl/basewidget/fwl_barcode.h | 1 - xfa/include/fwl/basewidget/fwl_caret.h | 1 - xfa/include/fwl/basewidget/fwl_checkbox.h | 2 -- xfa/include/fwl/basewidget/fwl_combobox.h | 1 - xfa/include/fwl/basewidget/fwl_datetimepicker.h | 1 - xfa/include/fwl/basewidget/fwl_edit.h | 1 - xfa/include/fwl/basewidget/fwl_listbox.h | 1 - xfa/include/fwl/basewidget/fwl_monthcalendar.h | 1 - xfa/include/fwl/basewidget/fwl_picturebox.h | 1 - xfa/include/fwl/basewidget/fwl_pushbutton.h | 1 - xfa/include/fwl/basewidget/fwl_scrollbar.h | 1 - xfa/include/fwl/basewidget/fwl_spinbutton.h | 1 - xfa/include/fwl/basewidget/fwl_tooltipctrl.h | 1 - xfa/include/fwl/core/fwl_content.h | 1 - xfa/include/fwl/core/fwl_form.h | 1 - xfa/include/fwl/core/fwl_grid.h | 1 - xfa/include/fwl/core/fwl_panel.h | 2 -- xfa/include/fwl/core/fwl_target.h | 2 ++ xfa/include/fwl/core/fwl_widget.h | 1 - 19 files changed, 2 insertions(+), 20 deletions(-) (limited to 'xfa/include') diff --git a/xfa/include/fwl/basewidget/fwl_barcode.h b/xfa/include/fwl/basewidget/fwl_barcode.h index 25aa310e5c..f2b0b2a11a 100644 --- a/xfa/include/fwl/basewidget/fwl_barcode.h +++ b/xfa/include/fwl/basewidget/fwl_barcode.h @@ -58,6 +58,5 @@ class IFWL_Barcode : public IFWL_Edit { protected: IFWL_Barcode(); - virtual ~IFWL_Barcode(); }; #endif diff --git a/xfa/include/fwl/basewidget/fwl_caret.h b/xfa/include/fwl/basewidget/fwl_caret.h index a73e8b0661..3b8fccbc33 100644 --- a/xfa/include/fwl/basewidget/fwl_caret.h +++ b/xfa/include/fwl/basewidget/fwl_caret.h @@ -28,6 +28,5 @@ class IFWL_Caret : public IFWL_Widget { protected: IFWL_Caret(); - virtual ~IFWL_Caret(); }; #endif diff --git a/xfa/include/fwl/basewidget/fwl_checkbox.h b/xfa/include/fwl/basewidget/fwl_checkbox.h index 94ee9e7274..63cc75896a 100644 --- a/xfa/include/fwl/basewidget/fwl_checkbox.h +++ b/xfa/include/fwl/basewidget/fwl_checkbox.h @@ -79,7 +79,6 @@ class IFWL_CheckBox : public IFWL_Widget { protected: IFWL_CheckBox(); - virtual ~IFWL_CheckBox(); }; class IFWL_RadioButton : public IFWL_Widget { public: @@ -92,6 +91,5 @@ class IFWL_RadioButton : public IFWL_Widget { protected: IFWL_RadioButton(); - virtual ~IFWL_RadioButton(); }; #endif diff --git a/xfa/include/fwl/basewidget/fwl_combobox.h b/xfa/include/fwl/basewidget/fwl_combobox.h index 9faf224625..cd7da3d5c8 100644 --- a/xfa/include/fwl/basewidget/fwl_combobox.h +++ b/xfa/include/fwl/basewidget/fwl_combobox.h @@ -137,6 +137,5 @@ class IFWL_ComboBox : public IFWL_Widget { protected: IFWL_ComboBox(); - virtual ~IFWL_ComboBox(); }; #endif diff --git a/xfa/include/fwl/basewidget/fwl_datetimepicker.h b/xfa/include/fwl/basewidget/fwl_datetimepicker.h index 754445dcbb..04ae8d9bba 100644 --- a/xfa/include/fwl/basewidget/fwl_datetimepicker.h +++ b/xfa/include/fwl/basewidget/fwl_datetimepicker.h @@ -102,6 +102,5 @@ class IFWL_DateTimePicker : public IFWL_Widget { protected: IFWL_DateTimePicker(); - virtual ~IFWL_DateTimePicker(); }; #endif diff --git a/xfa/include/fwl/basewidget/fwl_edit.h b/xfa/include/fwl/basewidget/fwl_edit.h index 2019d8be4f..2be101e840 100644 --- a/xfa/include/fwl/basewidget/fwl_edit.h +++ b/xfa/include/fwl/basewidget/fwl_edit.h @@ -162,6 +162,5 @@ class IFWL_Edit : public IFWL_Widget { protected: IFWL_Edit(); - virtual ~IFWL_Edit(); }; #endif diff --git a/xfa/include/fwl/basewidget/fwl_listbox.h b/xfa/include/fwl/basewidget/fwl_listbox.h index fcdd8f7a11..ba59af82dd 100644 --- a/xfa/include/fwl/basewidget/fwl_listbox.h +++ b/xfa/include/fwl/basewidget/fwl_listbox.h @@ -123,6 +123,5 @@ class IFWL_ListBox : public IFWL_Widget { protected: IFWL_ListBox(); - virtual ~IFWL_ListBox(); }; #endif diff --git a/xfa/include/fwl/basewidget/fwl_monthcalendar.h b/xfa/include/fwl/basewidget/fwl_monthcalendar.h index a7497f01c2..084b7bb270 100644 --- a/xfa/include/fwl/basewidget/fwl_monthcalendar.h +++ b/xfa/include/fwl/basewidget/fwl_monthcalendar.h @@ -128,6 +128,5 @@ class IFWL_MonthCalendar : public IFWL_Widget { protected: IFWL_MonthCalendar(); - virtual ~IFWL_MonthCalendar(); }; #endif diff --git a/xfa/include/fwl/basewidget/fwl_picturebox.h b/xfa/include/fwl/basewidget/fwl_picturebox.h index caa7fce335..76389f65d2 100644 --- a/xfa/include/fwl/basewidget/fwl_picturebox.h +++ b/xfa/include/fwl/basewidget/fwl_picturebox.h @@ -50,6 +50,5 @@ class IFWL_PictureBox : public IFWL_Widget { protected: IFWL_PictureBox(); - virtual ~IFWL_PictureBox(); }; #endif diff --git a/xfa/include/fwl/basewidget/fwl_pushbutton.h b/xfa/include/fwl/basewidget/fwl_pushbutton.h index ae4ce8820c..223dc5a311 100644 --- a/xfa/include/fwl/basewidget/fwl_pushbutton.h +++ b/xfa/include/fwl/basewidget/fwl_pushbutton.h @@ -52,6 +52,5 @@ class IFWL_PushButton : public IFWL_Widget { protected: IFWL_PushButton(); - virtual ~IFWL_PushButton(); }; #endif diff --git a/xfa/include/fwl/basewidget/fwl_scrollbar.h b/xfa/include/fwl/basewidget/fwl_scrollbar.h index 13d70a1e83..f81dfc6907 100644 --- a/xfa/include/fwl/basewidget/fwl_scrollbar.h +++ b/xfa/include/fwl/basewidget/fwl_scrollbar.h @@ -67,6 +67,5 @@ class IFWL_ScrollBar : public IFWL_Widget { protected: IFWL_ScrollBar(); - virtual ~IFWL_ScrollBar(); }; #endif diff --git a/xfa/include/fwl/basewidget/fwl_spinbutton.h b/xfa/include/fwl/basewidget/fwl_spinbutton.h index 31f06c5e8d..dad93a34c2 100644 --- a/xfa/include/fwl/basewidget/fwl_spinbutton.h +++ b/xfa/include/fwl/basewidget/fwl_spinbutton.h @@ -39,6 +39,5 @@ class IFWL_SpinButton : public IFWL_Widget { protected: IFWL_SpinButton(); - virtual ~IFWL_SpinButton(); }; #endif diff --git a/xfa/include/fwl/basewidget/fwl_tooltipctrl.h b/xfa/include/fwl/basewidget/fwl_tooltipctrl.h index a64d6814a5..835f9abf11 100644 --- a/xfa/include/fwl/basewidget/fwl_tooltipctrl.h +++ b/xfa/include/fwl/basewidget/fwl_tooltipctrl.h @@ -41,6 +41,5 @@ class IFWL_ToolTip : public IFWL_Form { protected: IFWL_ToolTip(); - virtual ~IFWL_ToolTip(); }; #endif diff --git a/xfa/include/fwl/core/fwl_content.h b/xfa/include/fwl/core/fwl_content.h index 41b1af93b5..8669340343 100644 --- a/xfa/include/fwl/core/fwl_content.h +++ b/xfa/include/fwl/core/fwl_content.h @@ -22,6 +22,5 @@ class IFWL_Content : public IFWL_Widget { protected: IFWL_Content(); - virtual ~IFWL_Content(); }; #endif diff --git a/xfa/include/fwl/core/fwl_form.h b/xfa/include/fwl/core/fwl_form.h index 81c06c0591..b06d5742e9 100644 --- a/xfa/include/fwl/core/fwl_form.h +++ b/xfa/include/fwl/core/fwl_form.h @@ -81,6 +81,5 @@ class IFWL_Form : public IFWL_Panel { protected: IFWL_Form(); - virtual ~IFWL_Form(); }; #endif diff --git a/xfa/include/fwl/core/fwl_grid.h b/xfa/include/fwl/core/fwl_grid.h index fc97c9a841..7126024ba7 100644 --- a/xfa/include/fwl/core/fwl_grid.h +++ b/xfa/include/fwl/core/fwl_grid.h @@ -82,6 +82,5 @@ class IFWL_Grid : public IFWL_Content { protected: IFWL_Grid(); - virtual ~IFWL_Grid(); }; #endif diff --git a/xfa/include/fwl/core/fwl_panel.h b/xfa/include/fwl/core/fwl_panel.h index b2aa6f4799..51d1249d56 100644 --- a/xfa/include/fwl/core/fwl_panel.h +++ b/xfa/include/fwl/core/fwl_panel.h @@ -23,7 +23,6 @@ class IFWL_Panel : public IFWL_Widget { protected: IFWL_Panel(); - virtual ~IFWL_Panel(); }; class IFWL_CustomPanel : public IFWL_Widget { public: @@ -37,6 +36,5 @@ class IFWL_CustomPanel : public IFWL_Widget { protected: IFWL_CustomPanel(); - virtual ~IFWL_CustomPanel(); }; #endif diff --git a/xfa/include/fwl/core/fwl_target.h b/xfa/include/fwl/core/fwl_target.h index 363ce30562..bf5cf83f3a 100644 --- a/xfa/include/fwl/core/fwl_target.h +++ b/xfa/include/fwl/core/fwl_target.h @@ -44,6 +44,8 @@ class IFWL_Target { protected: virtual ~IFWL_Target(); + + private: CFWL_TargetImp* m_pImpl; }; diff --git a/xfa/include/fwl/core/fwl_widget.h b/xfa/include/fwl/core/fwl_widget.h index 10808bcac5..4a9c794d28 100644 --- a/xfa/include/fwl/core/fwl_widget.h +++ b/xfa/include/fwl/core/fwl_widget.h @@ -101,7 +101,6 @@ class IFWL_Custom : public IFWL_Widget { protected: IFWL_Custom(); - virtual ~IFWL_Custom(); }; class IFWL_Proxy { public: -- cgit v1.2.3