From 44971898e73ce68f0014ff588e5556c20332cdd0 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 18 Nov 2015 17:08:23 -0800 Subject: Kill dead IFWL_*::Initialize() variants dead. Remove default argument in remaining variants. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1453373006 . --- xfa/include/fwl/basewidget/fwl_barcode.h | 3 +-- xfa/include/fwl/basewidget/fwl_caret.h | 3 ++- xfa/include/fwl/basewidget/fwl_checkbox.h | 6 ++---- xfa/include/fwl/basewidget/fwl_combobox.h | 3 +-- xfa/include/fwl/basewidget/fwl_datetimepicker.h | 3 +-- xfa/include/fwl/basewidget/fwl_edit.h | 3 +-- xfa/include/fwl/basewidget/fwl_listbox.h | 3 +-- xfa/include/fwl/basewidget/fwl_monthcalendar.h | 3 +-- xfa/include/fwl/basewidget/fwl_picturebox.h | 3 +-- xfa/include/fwl/basewidget/fwl_pushbutton.h | 3 +-- xfa/include/fwl/basewidget/fwl_scrollbar.h | 4 +--- xfa/include/fwl/basewidget/fwl_spinbutton.h | 3 +-- xfa/include/fwl/basewidget/fwl_tooltipctrl.h | 3 +-- xfa/include/fwl/core/fwl_content.h | 1 - xfa/include/fwl/core/fwl_form.h | 5 +---- xfa/include/fwl/core/fwl_grid.h | 1 - xfa/include/fwl/core/fwl_panel.h | 8 ++------ xfa/include/fwl/core/fwl_widget.h | 4 +--- 18 files changed, 19 insertions(+), 43 deletions(-) (limited to 'xfa/include') diff --git a/xfa/include/fwl/basewidget/fwl_barcode.h b/xfa/include/fwl/basewidget/fwl_barcode.h index f2b0b2a11a..ac54ab8d39 100644 --- a/xfa/include/fwl/basewidget/fwl_barcode.h +++ b/xfa/include/fwl/basewidget/fwl_barcode.h @@ -50,9 +50,8 @@ class IFWL_BarcodeDP : public IFWL_EditDP { class IFWL_Barcode : public IFWL_Edit { public: static IFWL_Barcode* Create(); - FWL_ERR Initialize(IFWL_Widget* pOuter = NULL); FWL_ERR Initialize(const CFWL_WidgetImpProperties& properties, - IFWL_Widget* pOuter = NULL); + IFWL_Widget* pOuter); void SetType(BC_TYPE type); FX_BOOL IsProtectedType(); diff --git a/xfa/include/fwl/basewidget/fwl_caret.h b/xfa/include/fwl/basewidget/fwl_caret.h index 3b8fccbc33..547f1c9ba8 100644 --- a/xfa/include/fwl/basewidget/fwl_caret.h +++ b/xfa/include/fwl/basewidget/fwl_caret.h @@ -17,9 +17,10 @@ class IFWL_Caret; class IFWL_Caret : public IFWL_Widget { public: static IFWL_Caret* Create(); + FWL_ERR Initialize(IFWL_Widget* pOuter = NULL); FWL_ERR Initialize(const CFWL_WidgetImpProperties& properties, - IFWL_Widget* pOuter = NULL); + IFWL_Widget* pOuter); FWL_ERR ShowCaret(FX_BOOL bFlag = TRUE); FWL_ERR GetFrequency(FX_DWORD& elapse); diff --git a/xfa/include/fwl/basewidget/fwl_checkbox.h b/xfa/include/fwl/basewidget/fwl_checkbox.h index 63cc75896a..989430acc1 100644 --- a/xfa/include/fwl/basewidget/fwl_checkbox.h +++ b/xfa/include/fwl/basewidget/fwl_checkbox.h @@ -71,9 +71,8 @@ class IFWL_CheckBoxDP : public IFWL_DataProvider { class IFWL_CheckBox : public IFWL_Widget { public: static IFWL_CheckBox* Create(); - FWL_ERR Initialize(IFWL_Widget* pOuter = NULL); FWL_ERR Initialize(const CFWL_WidgetImpProperties& properties, - IFWL_Widget* pOuter = NULL); + IFWL_Widget* pOuter); int32_t GetCheckState(); FWL_ERR SetCheckState(int32_t iCheck); @@ -83,9 +82,8 @@ class IFWL_CheckBox : public IFWL_Widget { class IFWL_RadioButton : public IFWL_Widget { public: static IFWL_RadioButton* Create(); - FWL_ERR Initialize(IFWL_Widget* pOuter = NULL); FWL_ERR Initialize(const CFWL_WidgetImpProperties& properties, - IFWL_Widget* pOuter = NULL); + IFWL_Widget* pOuter); int32_t GetCheckState(); FWL_ERR SetCheckState(int32_t iCheck); diff --git a/xfa/include/fwl/basewidget/fwl_combobox.h b/xfa/include/fwl/basewidget/fwl_combobox.h index cd7da3d5c8..c3311e5200 100644 --- a/xfa/include/fwl/basewidget/fwl_combobox.h +++ b/xfa/include/fwl/basewidget/fwl_combobox.h @@ -98,9 +98,8 @@ class IFWL_ComboBoxDP : public IFWL_ListBoxDP { class IFWL_ComboBox : public IFWL_Widget { public: static IFWL_ComboBox* Create(); - FWL_ERR Initialize(IFWL_Widget* pOuter = NULL); FWL_ERR Initialize(const CFWL_WidgetImpProperties& properties, - IFWL_Widget* pOuter = NULL); + IFWL_Widget* pOuter); int32_t GetCurSel(); FWL_ERR SetCurSel(int32_t iSel); FWL_ERR SetEditText(const CFX_WideString& wsText); diff --git a/xfa/include/fwl/basewidget/fwl_datetimepicker.h b/xfa/include/fwl/basewidget/fwl_datetimepicker.h index 04ae8d9bba..f311185d1d 100644 --- a/xfa/include/fwl/basewidget/fwl_datetimepicker.h +++ b/xfa/include/fwl/basewidget/fwl_datetimepicker.h @@ -71,9 +71,8 @@ class IFWL_DateTimePickerDP : public IFWL_DataProvider { class IFWL_DateTimePicker : public IFWL_Widget { public: static IFWL_DateTimePicker* Create(); - FWL_ERR Initialize(IFWL_Widget* pOuter = NULL); FWL_ERR Initialize(const CFWL_WidgetImpProperties& properties, - IFWL_Widget* pOuter = NULL); + IFWL_Widget* pOuter); FWL_ERR GetCurSel(int32_t& iYear, int32_t& iMonth, int32_t& iDay); FWL_ERR SetCurSel(int32_t iYear, int32_t iMonth, int32_t iDay); FWL_ERR SetEditText(const CFX_WideString& wsText); diff --git a/xfa/include/fwl/basewidget/fwl_edit.h b/xfa/include/fwl/basewidget/fwl_edit.h index 2be101e840..c804af7ae1 100644 --- a/xfa/include/fwl/basewidget/fwl_edit.h +++ b/xfa/include/fwl/basewidget/fwl_edit.h @@ -113,9 +113,8 @@ typedef struct _FWL_HEDTFIND { void* pData; } * FWL_HEDTFIND; class IFWL_Edit : public IFWL_Widget { public: static IFWL_Edit* Create(); - FWL_ERR Initialize(IFWL_Widget* pOuter = NULL); FWL_ERR Initialize(const CFWL_WidgetImpProperties& properties, - IFWL_Widget* pOuter = NULL); + IFWL_Widget* pOuter); FWL_ERR SetText(const CFX_WideString& wsText); int32_t GetTextLength() const; FWL_ERR GetText(CFX_WideString& wsText, diff --git a/xfa/include/fwl/basewidget/fwl_listbox.h b/xfa/include/fwl/basewidget/fwl_listbox.h index ba59af82dd..569e00ea0c 100644 --- a/xfa/include/fwl/basewidget/fwl_listbox.h +++ b/xfa/include/fwl/basewidget/fwl_listbox.h @@ -110,9 +110,8 @@ class IFWL_ListBoxCompare { class IFWL_ListBox : public IFWL_Widget { public: static IFWL_ListBox* Create(); - FWL_ERR Initialize(IFWL_Widget* pOuter = NULL); FWL_ERR Initialize(const CFWL_WidgetImpProperties& properties, - IFWL_Widget* pOuter = NULL); + IFWL_Widget* pOuter); int32_t CountSelItems(); FWL_HLISTITEM GetSelItem(int32_t nIndexSel); int32_t GetSelIndex(int32_t nIndex); diff --git a/xfa/include/fwl/basewidget/fwl_monthcalendar.h b/xfa/include/fwl/basewidget/fwl_monthcalendar.h index 084b7bb270..23bc0ea712 100644 --- a/xfa/include/fwl/basewidget/fwl_monthcalendar.h +++ b/xfa/include/fwl/basewidget/fwl_monthcalendar.h @@ -116,9 +116,8 @@ class IFWL_MonthCalendar : public IFWL_Widget { public: static IFWL_MonthCalendar* Create(); - FWL_ERR Initialize(IFWL_Widget* pOuter = NULL); FWL_ERR Initialize(const CFWL_WidgetImpProperties& properties, - IFWL_Widget* pOuter = NULL); + IFWL_Widget* pOuter); int32_t CountSelect(); FX_BOOL GetSelect(int32_t& iYear, int32_t& iMonth, diff --git a/xfa/include/fwl/basewidget/fwl_picturebox.h b/xfa/include/fwl/basewidget/fwl_picturebox.h index 76389f65d2..7ca8f526d7 100644 --- a/xfa/include/fwl/basewidget/fwl_picturebox.h +++ b/xfa/include/fwl/basewidget/fwl_picturebox.h @@ -44,9 +44,8 @@ class IFWL_PictureBox : public IFWL_Widget { public: static IFWL_PictureBox* Create(); - FWL_ERR Initialize(IFWL_Widget* pOuter = NULL); FWL_ERR Initialize(const CFWL_WidgetImpProperties& properties, - IFWL_Widget* pOuter = NULL); + IFWL_Widget* pOuter); protected: IFWL_PictureBox(); diff --git a/xfa/include/fwl/basewidget/fwl_pushbutton.h b/xfa/include/fwl/basewidget/fwl_pushbutton.h index 223dc5a311..55a650e23e 100644 --- a/xfa/include/fwl/basewidget/fwl_pushbutton.h +++ b/xfa/include/fwl/basewidget/fwl_pushbutton.h @@ -46,9 +46,8 @@ class IFWL_PushButtonDP : public IFWL_DataProvider { class IFWL_PushButton : public IFWL_Widget { public: static IFWL_PushButton* Create(); - FWL_ERR Initialize(IFWL_Widget* pOuter = NULL); FWL_ERR Initialize(const CFWL_WidgetImpProperties& properties, - IFWL_Widget* pOuter = NULL); + IFWL_Widget* pOuter); protected: IFWL_PushButton(); diff --git a/xfa/include/fwl/basewidget/fwl_scrollbar.h b/xfa/include/fwl/basewidget/fwl_scrollbar.h index f81dfc6907..1dd7dd2d5c 100644 --- a/xfa/include/fwl/basewidget/fwl_scrollbar.h +++ b/xfa/include/fwl/basewidget/fwl_scrollbar.h @@ -48,10 +48,8 @@ class IFWL_ScrollBarDP : public IFWL_DataProvider {}; class IFWL_ScrollBar : public IFWL_Widget { public: static IFWL_ScrollBar* Create(); - - FWL_ERR Initialize(IFWL_Widget* pOuter = NULL); FWL_ERR Initialize(const CFWL_WidgetImpProperties& properties, - IFWL_Widget* pOuter = NULL); + IFWL_Widget* pOuter); FX_BOOL IsVertical(); FWL_ERR GetRange(FX_FLOAT& fMin, FX_FLOAT& fMax); FWL_ERR SetRange(FX_FLOAT fMin, FX_FLOAT fMax); diff --git a/xfa/include/fwl/basewidget/fwl_spinbutton.h b/xfa/include/fwl/basewidget/fwl_spinbutton.h index dad93a34c2..521cfca277 100644 --- a/xfa/include/fwl/basewidget/fwl_spinbutton.h +++ b/xfa/include/fwl/basewidget/fwl_spinbutton.h @@ -31,9 +31,8 @@ class IFWL_SpinButton : public IFWL_Widget { public: static IFWL_SpinButton* Create(); - FWL_ERR Initialize(IFWL_Widget* pOuter = NULL); FWL_ERR Initialize(const CFWL_WidgetImpProperties& properties, - IFWL_Widget* pOuter = NULL); + IFWL_Widget* pOuter); FWL_ERR EnableButton(FX_BOOL bEnable, FX_BOOL bUp = TRUE); FX_BOOL IsButtonEnable(FX_BOOL bUp = TRUE); diff --git a/xfa/include/fwl/basewidget/fwl_tooltipctrl.h b/xfa/include/fwl/basewidget/fwl_tooltipctrl.h index 835f9abf11..2dce69383f 100644 --- a/xfa/include/fwl/basewidget/fwl_tooltipctrl.h +++ b/xfa/include/fwl/basewidget/fwl_tooltipctrl.h @@ -32,9 +32,8 @@ class IFWL_ToolTipDP : public IFWL_DataProvider { class IFWL_ToolTip : public IFWL_Form { public: static IFWL_ToolTip* Create(); - FWL_ERR Initialize(IFWL_Widget* pOuter = NULL); FWL_ERR Initialize(const CFWL_WidgetImpProperties& properties, - IFWL_Widget* pOuter = NULL); + IFWL_Widget* pOuter); FWL_ERR SetAnchor(const CFX_RectF& rtAnchor); FWL_ERR Show(); FWL_ERR Hide(); diff --git a/xfa/include/fwl/core/fwl_content.h b/xfa/include/fwl/core/fwl_content.h index 8669340343..64c4887053 100644 --- a/xfa/include/fwl/core/fwl_content.h +++ b/xfa/include/fwl/core/fwl_content.h @@ -11,7 +11,6 @@ class IFWL_Content; class IFWL_Content : public IFWL_Widget { public: static IFWL_Content* Create(); - FWL_ERR Initialize(); FWL_ERR InsertWidget(IFWL_Widget* pChild, int32_t nIndex = -1); FWL_ERR RemoveWidget(IFWL_Widget* pWidget); FWL_ERR RemoveAllWidgets(); diff --git a/xfa/include/fwl/core/fwl_form.h b/xfa/include/fwl/core/fwl_form.h index b06d5742e9..6d76c614d0 100644 --- a/xfa/include/fwl/core/fwl_form.h +++ b/xfa/include/fwl/core/fwl_form.h @@ -66,12 +66,9 @@ enum FWL_COMMANDID { class IFWL_Form : public IFWL_Panel { public: static IFWL_Form* Create(); - FWL_ERR Initialize(IFWL_Widget* pOuter = NULL); - FWL_ERR Initialize(CFWL_WidgetImpProperties& properties, - IFWL_Widget* pOuter = NULL); FWL_ERR Initialize(CFWL_WidgetImpProperties& properties, CFX_WideString* classname, - IFWL_Widget* pOuter = NULL); + IFWL_Widget* pOuter); FWL_FORMSIZE GetFormSize(); FWL_ERR SetFormSize(FWL_FORMSIZE eFormSize); IFWL_Widget* DoModal(); diff --git a/xfa/include/fwl/core/fwl_grid.h b/xfa/include/fwl/core/fwl_grid.h index 7126024ba7..a41ef4ed53 100644 --- a/xfa/include/fwl/core/fwl_grid.h +++ b/xfa/include/fwl/core/fwl_grid.h @@ -40,7 +40,6 @@ typedef struct _FWL_HGRIDCOLROW { void* pData; } * FWL_HGRIDCOLROW; class IFWL_Grid : public IFWL_Content { public: static IFWL_Grid* Create(); - FWL_ERR Initialize(); FWL_ERR Initialize(CFWL_WidgetImpProperties& properties); FWL_HGRIDCOLROW InsertColRow(FX_BOOL bColumn, int32_t nIndex = -1); diff --git a/xfa/include/fwl/core/fwl_panel.h b/xfa/include/fwl/core/fwl_panel.h index 51d1249d56..bea6675911 100644 --- a/xfa/include/fwl/core/fwl_panel.h +++ b/xfa/include/fwl/core/fwl_panel.h @@ -15,9 +15,7 @@ class IFWL_CustomPanel; class IFWL_Panel : public IFWL_Widget { public: static IFWL_Panel* Create(); - FWL_ERR Initialize(IFWL_Widget* pOuter = NULL); - FWL_ERR Initialize(CFWL_WidgetImpProperties& properties, - IFWL_Widget* pOuter = NULL); + FWL_ERR Initialize(CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter); IFWL_Content* GetContent(); FWL_ERR SetContent(IFWL_Content* pContent); @@ -27,9 +25,7 @@ class IFWL_Panel : public IFWL_Widget { class IFWL_CustomPanel : public IFWL_Widget { public: static IFWL_CustomPanel* Create(); - FWL_ERR Initialize(IFWL_Widget* pOuter = NULL); - FWL_ERR Initialize(CFWL_WidgetImpProperties& properties, - IFWL_Widget* pOuter = NULL); + FWL_ERR Initialize(CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter); IFWL_Content* GetContent(); FWL_ERR SetContent(IFWL_Content* pContent); FWL_ERR SetProxy(IFWL_Proxy* pProxy); diff --git a/xfa/include/fwl/core/fwl_widget.h b/xfa/include/fwl/core/fwl_widget.h index 4a9c794d28..f7ddb5cebd 100644 --- a/xfa/include/fwl/core/fwl_widget.h +++ b/xfa/include/fwl/core/fwl_widget.h @@ -93,10 +93,8 @@ class CFWL_WidgetImpProperties { class IFWL_Custom : public IFWL_Widget { public: static IFWL_Custom* Create(); - - FWL_ERR Initialize(IFWL_Widget* pOuter = NULL); FWL_ERR Initialize(const CFWL_WidgetImpProperties& properties, - IFWL_Widget* pOuter = NULL); + IFWL_Widget* pOuter); FWL_ERR SetProxy(IFWL_Proxy* pProxy); protected: -- cgit v1.2.3