diff options
Diffstat (limited to 'xfa/fwl')
52 files changed, 111 insertions, 14 deletions
diff --git a/xfa/fwl/core/cfwl_listbox.cpp b/xfa/fwl/core/cfwl_listbox.cpp index 0f931d9905..faedf5bef7 100644 --- a/xfa/fwl/core/cfwl_listbox.cpp +++ b/xfa/fwl/core/cfwl_listbox.cpp @@ -7,6 +7,7 @@ #include "xfa/fwl/core/cfwl_listbox.h" #include <memory> +#include <utility> #include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" diff --git a/xfa/fwl/core/cfwl_msgkey.cpp b/xfa/fwl/core/cfwl_msgkey.cpp index 0163da9e8d..7d839f7203 100644 --- a/xfa/fwl/core/cfwl_msgkey.cpp +++ b/xfa/fwl/core/cfwl_msgkey.cpp @@ -6,6 +6,8 @@ #include "xfa/fwl/core/cfwl_msgkey.h" +#include <memory> + #include "third_party/base/ptr_util.h" CFWL_MsgKey::CFWL_MsgKey() {} diff --git a/xfa/fwl/core/cfwl_msgkey.h b/xfa/fwl/core/cfwl_msgkey.h index 492e53fdfb..c7cd74315c 100644 --- a/xfa/fwl/core/cfwl_msgkey.h +++ b/xfa/fwl/core/cfwl_msgkey.h @@ -7,6 +7,8 @@ #ifndef XFA_FWL_CORE_CFWL_MSGKEY_H_ #define XFA_FWL_CORE_CFWL_MSGKEY_H_ +#include <memory> + #include "xfa/fwl/core/cfwl_message.h" enum class FWL_KeyCommand { KeyDown, KeyUp, Char }; diff --git a/xfa/fwl/core/cfwl_msgkillfocus.cpp b/xfa/fwl/core/cfwl_msgkillfocus.cpp index c2407edfef..0c8ac47029 100644 --- a/xfa/fwl/core/cfwl_msgkillfocus.cpp +++ b/xfa/fwl/core/cfwl_msgkillfocus.cpp @@ -6,6 +6,8 @@ #include "xfa/fwl/core/cfwl_msgkillfocus.h" +#include <memory> + #include "third_party/base/ptr_util.h" CFWL_MsgKillFocus::CFWL_MsgKillFocus() {} diff --git a/xfa/fwl/core/cfwl_msgkillfocus.h b/xfa/fwl/core/cfwl_msgkillfocus.h index d2a1f20db4..71c52d90c7 100644 --- a/xfa/fwl/core/cfwl_msgkillfocus.h +++ b/xfa/fwl/core/cfwl_msgkillfocus.h @@ -7,6 +7,8 @@ #ifndef XFA_FWL_CORE_CFWL_MSGKILLFOCUS_H_ #define XFA_FWL_CORE_CFWL_MSGKILLFOCUS_H_ +#include <memory> + #include "xfa/fwl/core/cfwl_message.h" class CFWL_MsgKillFocus : public CFWL_Message { diff --git a/xfa/fwl/core/cfwl_msgmouse.cpp b/xfa/fwl/core/cfwl_msgmouse.cpp index ff28cdc9c8..de2540d8fc 100644 --- a/xfa/fwl/core/cfwl_msgmouse.cpp +++ b/xfa/fwl/core/cfwl_msgmouse.cpp @@ -6,6 +6,8 @@ #include "xfa/fwl/core/cfwl_msgmouse.h" +#include <memory> + #include "third_party/base/ptr_util.h" CFWL_MsgMouse::CFWL_MsgMouse() {} diff --git a/xfa/fwl/core/cfwl_msgmouse.h b/xfa/fwl/core/cfwl_msgmouse.h index c617ac1d42..5a4054c024 100644 --- a/xfa/fwl/core/cfwl_msgmouse.h +++ b/xfa/fwl/core/cfwl_msgmouse.h @@ -7,6 +7,8 @@ #ifndef XFA_FWL_CORE_CFWL_MSGMOUSE_H_ #define XFA_FWL_CORE_CFWL_MSGMOUSE_H_ +#include <memory> + #include "xfa/fwl/core/cfwl_message.h" enum class FWL_MouseCommand { diff --git a/xfa/fwl/core/cfwl_msgmousewheel.cpp b/xfa/fwl/core/cfwl_msgmousewheel.cpp index b5cbd14da0..739c43174c 100644 --- a/xfa/fwl/core/cfwl_msgmousewheel.cpp +++ b/xfa/fwl/core/cfwl_msgmousewheel.cpp @@ -6,6 +6,8 @@ #include "xfa/fwl/core/cfwl_msgmousewheel.h" +#include <memory> + #include "third_party/base/ptr_util.h" CFWL_MsgMouseWheel::CFWL_MsgMouseWheel() {} diff --git a/xfa/fwl/core/cfwl_msgmousewheel.h b/xfa/fwl/core/cfwl_msgmousewheel.h index c913eae42c..076870135b 100644 --- a/xfa/fwl/core/cfwl_msgmousewheel.h +++ b/xfa/fwl/core/cfwl_msgmousewheel.h @@ -7,6 +7,8 @@ #ifndef XFA_FWL_CORE_CFWL_MSGMOUSEWHEEL_H_ #define XFA_FWL_CORE_CFWL_MSGMOUSEWHEEL_H_ +#include <memory> + #include "xfa/fwl/core/cfwl_message.h" class CFWL_MsgMouseWheel : public CFWL_Message { diff --git a/xfa/fwl/core/cfwl_msgsetfocus.cpp b/xfa/fwl/core/cfwl_msgsetfocus.cpp index 7fe3501a6a..0463da1c6c 100644 --- a/xfa/fwl/core/cfwl_msgsetfocus.cpp +++ b/xfa/fwl/core/cfwl_msgsetfocus.cpp @@ -6,6 +6,8 @@ #include "xfa/fwl/core/cfwl_msgsetfocus.h" +#include <memory> + #include "third_party/base/ptr_util.h" CFWL_MsgSetFocus::CFWL_MsgSetFocus() {} diff --git a/xfa/fwl/core/cfwl_msgsetfocus.h b/xfa/fwl/core/cfwl_msgsetfocus.h index ffcf5b3539..47eab2a12a 100644 --- a/xfa/fwl/core/cfwl_msgsetfocus.h +++ b/xfa/fwl/core/cfwl_msgsetfocus.h @@ -7,6 +7,8 @@ #ifndef XFA_FWL_CORE_CFWL_MSGSETFOCUS_H_ #define XFA_FWL_CORE_CFWL_MSGSETFOCUS_H_ +#include <memory> + #include "xfa/fwl/core/cfwl_message.h" class CFWL_MsgSetFocus : public CFWL_Message { diff --git a/xfa/fwl/core/cfwl_widget.cpp b/xfa/fwl/core/cfwl_widget.cpp index 7cd2ca3913..39d86fa8ba 100644 --- a/xfa/fwl/core/cfwl_widget.cpp +++ b/xfa/fwl/core/cfwl_widget.cpp @@ -10,7 +10,6 @@ #include "xfa/fwl/core/cfwl_themetext.h" #include "xfa/fwl/core/cfwl_widgetmgr.h" #include "xfa/fwl/core/fwl_noteimp.h" -#include "xfa/fwl/core/fwl_noteimp.h" #include "xfa/fwl/core/ifwl_app.h" #include "xfa/fwl/core/ifwl_themeprovider.h" diff --git a/xfa/fwl/core/cfwl_widgetmgr.cpp b/xfa/fwl/core/cfwl_widgetmgr.cpp index 9172d7918a..6623e8f9fb 100644 --- a/xfa/fwl/core/cfwl_widgetmgr.cpp +++ b/xfa/fwl/core/cfwl_widgetmgr.cpp @@ -6,6 +6,8 @@ #include "xfa/fwl/core/cfwl_widgetmgr.h" +#include <utility> + #include "xfa/fwl/core/fwl_noteimp.h" #include "xfa/fwl/core/ifwl_app.h" #include "xfa/fwl/core/ifwl_form.h" diff --git a/xfa/fwl/core/cfwl_widgetproperties.h b/xfa/fwl/core/cfwl_widgetproperties.h index cadba3f8c7..83e54f1672 100644 --- a/xfa/fwl/core/cfwl_widgetproperties.h +++ b/xfa/fwl/core/cfwl_widgetproperties.h @@ -18,7 +18,7 @@ class IFWL_Widget; class CFWL_WidgetProperties { public: CFWL_WidgetProperties(); - CFWL_WidgetProperties(IFWL_Widget::DataProvider* dataProvider); + explicit CFWL_WidgetProperties(IFWL_Widget::DataProvider* dataProvider); ~CFWL_WidgetProperties(); CFX_RectF m_rtWidget; diff --git a/xfa/fwl/core/fwl_noteimp.cpp b/xfa/fwl/core/fwl_noteimp.cpp index 857fdfbac6..8b9a7236fe 100644 --- a/xfa/fwl/core/fwl_noteimp.cpp +++ b/xfa/fwl/core/fwl_noteimp.cpp @@ -6,6 +6,8 @@ #include "xfa/fwl/core/fwl_noteimp.h" +#include <utility> + #include "core/fxcrt/fx_ext.h" #include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" diff --git a/xfa/fwl/core/fwl_noteimp.h b/xfa/fwl/core/fwl_noteimp.h index ec7855dec6..5a530ed9af 100644 --- a/xfa/fwl/core/fwl_noteimp.h +++ b/xfa/fwl/core/fwl_noteimp.h @@ -95,7 +95,7 @@ class CFWL_NoteDriver { class CFWL_EventTarget { public: - CFWL_EventTarget(IFWL_Widget* pListener); + explicit CFWL_EventTarget(IFWL_Widget* pListener); ~CFWL_EventTarget(); int32_t SetEventSource(IFWL_Widget* pSource, diff --git a/xfa/fwl/core/ifwl_barcode.cpp b/xfa/fwl/core/ifwl_barcode.cpp index d055a4bcd1..e4084aa9c6 100644 --- a/xfa/fwl/core/ifwl_barcode.cpp +++ b/xfa/fwl/core/ifwl_barcode.cpp @@ -6,6 +6,8 @@ #include "xfa/fwl/core/ifwl_barcode.h" +#include <utility> + #include "third_party/base/ptr_util.h" #include "xfa/fgas/font/fgas_gefont.h" #include "xfa/fwl/core/cfwl_themepart.h" diff --git a/xfa/fwl/core/ifwl_caret.cpp b/xfa/fwl/core/ifwl_caret.cpp index cba6c44aa3..b7607e3597 100644 --- a/xfa/fwl/core/ifwl_caret.cpp +++ b/xfa/fwl/core/ifwl_caret.cpp @@ -6,11 +6,12 @@ #include "xfa/fwl/core/ifwl_caret.h" +#include <utility> + #include "third_party/base/ptr_util.h" #include "xfa/fwl/core/cfwl_themebackground.h" #include "xfa/fwl/core/cfwl_widgetproperties.h" #include "xfa/fwl/core/fwl_noteimp.h" -#include "xfa/fwl/core/ifwl_caret.h" #include "xfa/fwl/core/ifwl_themeprovider.h" #include "xfa/fwl/core/ifwl_timerinfo.h" diff --git a/xfa/fwl/core/ifwl_checkbox.cpp b/xfa/fwl/core/ifwl_checkbox.cpp index 1f053dbe20..0d18e2cec5 100644 --- a/xfa/fwl/core/ifwl_checkbox.cpp +++ b/xfa/fwl/core/ifwl_checkbox.cpp @@ -7,6 +7,8 @@ #include "xfa/fwl/core/ifwl_checkbox.h" #include <algorithm> +#include <memory> +#include <utility> #include "third_party/base/ptr_util.h" #include "xfa/fde/tto/fde_textout.h" @@ -18,7 +20,6 @@ #include "xfa/fwl/core/cfwl_widgetmgr.h" #include "xfa/fwl/core/fwl_noteimp.h" #include "xfa/fwl/core/ifwl_app.h" -#include "xfa/fwl/core/ifwl_checkbox.h" #include "xfa/fwl/core/ifwl_themeprovider.h" namespace { diff --git a/xfa/fwl/core/ifwl_checkbox.h b/xfa/fwl/core/ifwl_checkbox.h index b947e954ae..30d9b637a0 100644 --- a/xfa/fwl/core/ifwl_checkbox.h +++ b/xfa/fwl/core/ifwl_checkbox.h @@ -7,6 +7,8 @@ #ifndef XFA_FWL_CORE_IFWL_CHECKBOX_H_ #define XFA_FWL_CORE_IFWL_CHECKBOX_H_ +#include <memory> + #include "xfa/fwl/core/cfwl_event.h" #include "xfa/fwl/core/cfwl_widgetproperties.h" #include "xfa/fwl/core/ifwl_widget.h" diff --git a/xfa/fwl/core/ifwl_combobox.cpp b/xfa/fwl/core/ifwl_combobox.cpp index 12e009f91a..b85f4e4959 100644 --- a/xfa/fwl/core/ifwl_combobox.cpp +++ b/xfa/fwl/core/ifwl_combobox.cpp @@ -6,6 +6,10 @@ #include "xfa/fwl/core/ifwl_combobox.h" +#include <algorithm> +#include <memory> +#include <utility> + #include "third_party/base/ptr_util.h" #include "xfa/fde/cfde_txtedtengine.h" #include "xfa/fde/tto/fde_textout.h" @@ -24,7 +28,6 @@ #include "xfa/fwl/core/cfwl_widgetmgr.h" #include "xfa/fwl/core/fwl_noteimp.h" #include "xfa/fwl/core/ifwl_app.h" -#include "xfa/fwl/core/ifwl_combobox.h" #include "xfa/fwl/core/ifwl_formproxy.h" #include "xfa/fwl/core/ifwl_listbox.h" #include "xfa/fwl/core/ifwl_themeprovider.h" diff --git a/xfa/fwl/core/ifwl_combobox.h b/xfa/fwl/core/ifwl_combobox.h index 7cf17e2881..db5b0678ae 100644 --- a/xfa/fwl/core/ifwl_combobox.h +++ b/xfa/fwl/core/ifwl_combobox.h @@ -7,6 +7,8 @@ #ifndef XFA_FWL_CORE_IFWL_COMBOBOX_H_ #define XFA_FWL_CORE_IFWL_COMBOBOX_H_ +#include <memory> + #include "xfa/fwl/core/ifwl_comboboxproxy.h" #include "xfa/fwl/core/ifwl_comboedit.h" #include "xfa/fwl/core/ifwl_combolist.h" diff --git a/xfa/fwl/core/ifwl_comboboxproxy.cpp b/xfa/fwl/core/ifwl_comboboxproxy.cpp index 03bfca2727..f454f4c9eb 100644 --- a/xfa/fwl/core/ifwl_comboboxproxy.cpp +++ b/xfa/fwl/core/ifwl_comboboxproxy.cpp @@ -6,6 +6,9 @@ #include "xfa/fwl/core/ifwl_comboboxproxy.h" +#include <memory> +#include <utility> + #include "xfa/fwl/core/cfwl_msgkillfocus.h" #include "xfa/fwl/core/cfwl_msgmouse.h" #include "xfa/fwl/core/fwl_noteimp.h" diff --git a/xfa/fwl/core/ifwl_comboboxproxy.h b/xfa/fwl/core/ifwl_comboboxproxy.h index 7ff56232f8..3425005e81 100644 --- a/xfa/fwl/core/ifwl_comboboxproxy.h +++ b/xfa/fwl/core/ifwl_comboboxproxy.h @@ -7,6 +7,8 @@ #ifndef XFA_FWL_CORE_IFWL_COMBOBOXPROXY_H_ #define XFA_FWL_CORE_IFWL_COMBOBOXPROXY_H_ +#include <memory> + #include "xfa/fwl/core/ifwl_formproxy.h" class IFWL_ComboBox; diff --git a/xfa/fwl/core/ifwl_comboedit.cpp b/xfa/fwl/core/ifwl_comboedit.cpp index 965ba009f2..07fe5150ad 100644 --- a/xfa/fwl/core/ifwl_comboedit.cpp +++ b/xfa/fwl/core/ifwl_comboedit.cpp @@ -6,6 +6,9 @@ #include "xfa/fwl/core/ifwl_comboedit.h" +#include <memory> +#include <utility> + #include "xfa/fde/cfde_txtedtengine.h" #include "xfa/fwl/core/cfwl_msgmouse.h" #include "xfa/fwl/core/ifwl_combobox.h" diff --git a/xfa/fwl/core/ifwl_comboedit.h b/xfa/fwl/core/ifwl_comboedit.h index c7d2e1072e..21b9cf90c7 100644 --- a/xfa/fwl/core/ifwl_comboedit.h +++ b/xfa/fwl/core/ifwl_comboedit.h @@ -7,6 +7,8 @@ #ifndef XFA_FWL_CORE_IFWL_COMBOEDIT_H_ #define XFA_FWL_CORE_IFWL_COMBOEDIT_H_ +#include <memory> + #include "xfa/fwl/core/cfwl_widgetproperties.h" #include "xfa/fwl/core/ifwl_edit.h" #include "xfa/fwl/core/ifwl_widget.h" diff --git a/xfa/fwl/core/ifwl_combolist.cpp b/xfa/fwl/core/ifwl_combolist.cpp index deaab7860b..e3ddcd08d9 100644 --- a/xfa/fwl/core/ifwl_combolist.cpp +++ b/xfa/fwl/core/ifwl_combolist.cpp @@ -6,6 +6,9 @@ #include "xfa/fwl/core/ifwl_combolist.h" +#include <memory> +#include <utility> + #include "third_party/base/ptr_util.h" #include "xfa/fwl/core/cfwl_msgkey.h" #include "xfa/fwl/core/cfwl_msgkillfocus.h" diff --git a/xfa/fwl/core/ifwl_combolist.h b/xfa/fwl/core/ifwl_combolist.h index ff479cbefe..360bc20059 100644 --- a/xfa/fwl/core/ifwl_combolist.h +++ b/xfa/fwl/core/ifwl_combolist.h @@ -7,6 +7,8 @@ #ifndef XFA_FWL_CORE_IFWL_COMBOLIST_H_ #define XFA_FWL_CORE_IFWL_COMBOLIST_H_ +#include <memory> + #include "xfa/fwl/core/cfwl_widgetproperties.h" #include "xfa/fwl/core/ifwl_listbox.h" #include "xfa/fwl/core/ifwl_widget.h" diff --git a/xfa/fwl/core/ifwl_datetimeedit.cpp b/xfa/fwl/core/ifwl_datetimeedit.cpp index 636209754c..a996dc138e 100644 --- a/xfa/fwl/core/ifwl_datetimeedit.cpp +++ b/xfa/fwl/core/ifwl_datetimeedit.cpp @@ -6,6 +6,9 @@ #include "xfa/fwl/core/ifwl_datetimeedit.h" +#include <memory> +#include <utility> + #include "third_party/base/ptr_util.h" #include "xfa/fwl/core/cfwl_msgmouse.h" #include "xfa/fwl/core/cfwl_widgetmgr.h" diff --git a/xfa/fwl/core/ifwl_datetimeedit.h b/xfa/fwl/core/ifwl_datetimeedit.h index 71745500b0..a814796c5a 100644 --- a/xfa/fwl/core/ifwl_datetimeedit.h +++ b/xfa/fwl/core/ifwl_datetimeedit.h @@ -7,6 +7,8 @@ #ifndef XFA_FWL_CORE_IFWL_DATETIMEEDIT_H_ #define XFA_FWL_CORE_IFWL_DATETIMEEDIT_H_ +#include <memory> + #include "xfa/fwl/core/cfwl_widgetproperties.h" #include "xfa/fwl/core/fwl_error.h" #include "xfa/fwl/core/ifwl_edit.h" diff --git a/xfa/fwl/core/ifwl_datetimepicker.cpp b/xfa/fwl/core/ifwl_datetimepicker.cpp index 8d5d6cf442..dca32c3b42 100644 --- a/xfa/fwl/core/ifwl_datetimepicker.cpp +++ b/xfa/fwl/core/ifwl_datetimepicker.cpp @@ -6,6 +6,9 @@ #include "xfa/fwl/core/ifwl_datetimepicker.h" +#include <memory> +#include <utility> + #include "third_party/base/ptr_util.h" #include "xfa/fwl/core/cfwl_evteditchanged.h" #include "xfa/fwl/core/cfwl_evtselectchanged.h" diff --git a/xfa/fwl/core/ifwl_datetimepicker.h b/xfa/fwl/core/ifwl_datetimepicker.h index c8d70f5575..9d7b83a6c8 100644 --- a/xfa/fwl/core/ifwl_datetimepicker.h +++ b/xfa/fwl/core/ifwl_datetimepicker.h @@ -7,6 +7,8 @@ #ifndef XFA_FWL_CORE_IFWL_DATETIMEPICKER_H_ #define XFA_FWL_CORE_IFWL_DATETIMEPICKER_H_ +#include <memory> + #include "xfa/fwl/core/cfwl_event.h" #include "xfa/fwl/core/cfwl_widgetproperties.h" #include "xfa/fwl/core/ifwl_datetimeedit.h" diff --git a/xfa/fwl/core/ifwl_edit.cpp b/xfa/fwl/core/ifwl_edit.cpp index c3b0be0240..d129e70a8c 100644 --- a/xfa/fwl/core/ifwl_edit.cpp +++ b/xfa/fwl/core/ifwl_edit.cpp @@ -8,6 +8,7 @@ #include <algorithm> #include <memory> +#include <utility> #include <vector> #include "third_party/base/ptr_util.h" diff --git a/xfa/fwl/core/ifwl_edit.h b/xfa/fwl/core/ifwl_edit.h index a46245e122..04288a51e4 100644 --- a/xfa/fwl/core/ifwl_edit.h +++ b/xfa/fwl/core/ifwl_edit.h @@ -8,6 +8,7 @@ #define XFA_FWL_CORE_IFWL_EDIT_H_ #include <deque> +#include <memory> #include <vector> #include "xfa/fde/cfde_txtedtengine.h" diff --git a/xfa/fwl/core/ifwl_form.cpp b/xfa/fwl/core/ifwl_form.cpp index 57e2507257..f89261d422 100644 --- a/xfa/fwl/core/ifwl_form.cpp +++ b/xfa/fwl/core/ifwl_form.cpp @@ -6,6 +6,8 @@ #include "xfa/fwl/core/ifwl_form.h" +#include <utility> + #include "third_party/base/ptr_util.h" #include "xfa/fde/tto/fde_textout.h" #include "xfa/fwl/core/cfwl_evtclose.h" diff --git a/xfa/fwl/core/ifwl_formproxy.cpp b/xfa/fwl/core/ifwl_formproxy.cpp index 1bdc002b18..0e85d986ed 100644 --- a/xfa/fwl/core/ifwl_formproxy.cpp +++ b/xfa/fwl/core/ifwl_formproxy.cpp @@ -6,6 +6,9 @@ #include "xfa/fwl/core/ifwl_formproxy.h" +#include <memory> +#include <utility> + #include "third_party/base/ptr_util.h" #include "xfa/fwl/core/fwl_noteimp.h" diff --git a/xfa/fwl/core/ifwl_formproxy.h b/xfa/fwl/core/ifwl_formproxy.h index b86d609a72..bd2fe893bd 100644 --- a/xfa/fwl/core/ifwl_formproxy.h +++ b/xfa/fwl/core/ifwl_formproxy.h @@ -7,6 +7,8 @@ #ifndef XFA_FWL_CORE_IFWL_FORMPROXY_H_ #define XFA_FWL_CORE_IFWL_FORMPROXY_H_ +#include <memory> + #include "xfa/fwl/core/ifwl_form.h" class CFWL_WidgetProperties; diff --git a/xfa/fwl/core/ifwl_listbox.cpp b/xfa/fwl/core/ifwl_listbox.cpp index 785f5a3f80..a1646e2c92 100644 --- a/xfa/fwl/core/ifwl_listbox.cpp +++ b/xfa/fwl/core/ifwl_listbox.cpp @@ -6,6 +6,10 @@ #include "xfa/fwl/core/ifwl_listbox.h" +#include <algorithm> +#include <memory> +#include <utility> + #include "third_party/base/ptr_util.h" #include "xfa/fde/tto/fde_textout.h" #include "xfa/fwl/core/cfwl_msgkey.h" @@ -15,7 +19,6 @@ #include "xfa/fwl/core/cfwl_themepart.h" #include "xfa/fwl/core/cfwl_themetext.h" #include "xfa/fwl/core/ifwl_app.h" -#include "xfa/fwl/core/ifwl_listbox.h" #include "xfa/fwl/core/ifwl_themeprovider.h" namespace { diff --git a/xfa/fwl/core/ifwl_monthcalendar.cpp b/xfa/fwl/core/ifwl_monthcalendar.cpp index ab9cbc411e..3d7dbf549f 100644 --- a/xfa/fwl/core/ifwl_monthcalendar.cpp +++ b/xfa/fwl/core/ifwl_monthcalendar.cpp @@ -7,6 +7,8 @@ #include "xfa/fwl/core/ifwl_monthcalendar.h" #include <algorithm> +#include <memory> +#include <utility> #include "third_party/base/ptr_util.h" #include "xfa/fde/tto/fde_textout.h" @@ -16,7 +18,6 @@ #include "xfa/fwl/core/fwl_noteimp.h" #include "xfa/fwl/core/ifwl_datetimepicker.h" #include "xfa/fwl/core/ifwl_formproxy.h" -#include "xfa/fwl/core/ifwl_monthcalendar.h" #include "xfa/fwl/core/ifwl_themeprovider.h" #define MONTHCAL_HSEP_HEIGHT 1 diff --git a/xfa/fwl/core/ifwl_monthcalendar.h b/xfa/fwl/core/ifwl_monthcalendar.h index 7a8b3125a6..f2c072e978 100644 --- a/xfa/fwl/core/ifwl_monthcalendar.h +++ b/xfa/fwl/core/ifwl_monthcalendar.h @@ -7,6 +7,8 @@ #ifndef XFA_FWL_CORE_IFWL_MONTHCALENDAR_H_ #define XFA_FWL_CORE_IFWL_MONTHCALENDAR_H_ +#include <memory> + #include "xfa/fgas/localization/fgas_datetime.h" #include "xfa/fwl/core/cfwl_event.h" #include "xfa/fwl/core/cfwl_widgetproperties.h" diff --git a/xfa/fwl/core/ifwl_picturebox.cpp b/xfa/fwl/core/ifwl_picturebox.cpp index 38685f73b1..f1bec5134a 100644 --- a/xfa/fwl/core/ifwl_picturebox.cpp +++ b/xfa/fwl/core/ifwl_picturebox.cpp @@ -6,6 +6,9 @@ #include "xfa/fwl/core/ifwl_picturebox.h" +#include <memory> +#include <utility> + #include "third_party/base/ptr_util.h" #include "xfa/fwl/core/cfwl_picturebox.h" #include "xfa/fwl/core/fwl_noteimp.h" diff --git a/xfa/fwl/core/ifwl_picturebox.h b/xfa/fwl/core/ifwl_picturebox.h index 5036cf9eef..d303992a56 100644 --- a/xfa/fwl/core/ifwl_picturebox.h +++ b/xfa/fwl/core/ifwl_picturebox.h @@ -7,6 +7,8 @@ #ifndef XFA_FWL_CORE_IFWL_PICTUREBOX_H_ #define XFA_FWL_CORE_IFWL_PICTUREBOX_H_ +#include <memory> + #include "xfa/fwl/core/cfwl_widgetproperties.h" #include "xfa/fwl/core/ifwl_widget.h" diff --git a/xfa/fwl/core/ifwl_pushbutton.cpp b/xfa/fwl/core/ifwl_pushbutton.cpp index 23f141b1dc..b1894931d5 100644 --- a/xfa/fwl/core/ifwl_pushbutton.cpp +++ b/xfa/fwl/core/ifwl_pushbutton.cpp @@ -6,6 +6,9 @@ #include "xfa/fwl/core/ifwl_pushbutton.h" +#include <memory> +#include <utility> + #include "third_party/base/ptr_util.h" #include "xfa/fde/tto/fde_textout.h" #include "xfa/fwl/core/cfwl_evtclick.h" @@ -15,7 +18,6 @@ #include "xfa/fwl/core/cfwl_themebackground.h" #include "xfa/fwl/core/cfwl_themetext.h" #include "xfa/fwl/core/fwl_noteimp.h" -#include "xfa/fwl/core/ifwl_pushbutton.h" #include "xfa/fwl/core/ifwl_themeprovider.h" IFWL_PushButton::IFWL_PushButton( diff --git a/xfa/fwl/core/ifwl_pushbutton.h b/xfa/fwl/core/ifwl_pushbutton.h index 8651aa019d..a3fa8da1a8 100644 --- a/xfa/fwl/core/ifwl_pushbutton.h +++ b/xfa/fwl/core/ifwl_pushbutton.h @@ -7,6 +7,8 @@ #ifndef XFA_FWL_CORE_IFWL_PUSHBUTTON_H_ #define XFA_FWL_CORE_IFWL_PUSHBUTTON_H_ +#include <memory> + #include "xfa/fwl/core/cfwl_widgetproperties.h" #include "xfa/fwl/core/ifwl_widget.h" diff --git a/xfa/fwl/core/ifwl_scrollbar.cpp b/xfa/fwl/core/ifwl_scrollbar.cpp index 54b3f217da..9d5f7a685e 100644 --- a/xfa/fwl/core/ifwl_scrollbar.cpp +++ b/xfa/fwl/core/ifwl_scrollbar.cpp @@ -6,13 +6,16 @@ #include "xfa/fwl/core/ifwl_scrollbar.h" +#include <algorithm> +#include <memory> +#include <utility> + #include "third_party/base/ptr_util.h" #include "xfa/fwl/core/cfwl_msgmouse.h" #include "xfa/fwl/core/cfwl_msgmousewheel.h" #include "xfa/fwl/core/cfwl_themebackground.h" #include "xfa/fwl/core/cfwl_themepart.h" #include "xfa/fwl/core/fwl_noteimp.h" -#include "xfa/fwl/core/ifwl_scrollbar.h" #include "xfa/fwl/core/ifwl_themeprovider.h" #include "xfa/fwl/core/ifwl_timerinfo.h" diff --git a/xfa/fwl/core/ifwl_scrollbar.h b/xfa/fwl/core/ifwl_scrollbar.h index ac19a30fed..148abf982b 100644 --- a/xfa/fwl/core/ifwl_scrollbar.h +++ b/xfa/fwl/core/ifwl_scrollbar.h @@ -7,6 +7,8 @@ #ifndef XFA_FWL_CORE_IFWL_SCROLLBAR_H_ #define XFA_FWL_CORE_IFWL_SCROLLBAR_H_ +#include <memory> + #include "core/fxcrt/fx_system.h" #include "xfa/fwl/core/cfwl_evtscroll.h" #include "xfa/fwl/core/cfwl_widgetproperties.h" diff --git a/xfa/fwl/core/ifwl_spinbutton.cpp b/xfa/fwl/core/ifwl_spinbutton.cpp index a12c7bbeae..fa063d6da5 100644 --- a/xfa/fwl/core/ifwl_spinbutton.cpp +++ b/xfa/fwl/core/ifwl_spinbutton.cpp @@ -6,6 +6,9 @@ #include "xfa/fwl/core/ifwl_spinbutton.h" +#include <memory> +#include <utility> + #include "third_party/base/ptr_util.h" #include "xfa/fwl/core/cfwl_evtclick.h" #include "xfa/fwl/core/cfwl_msgkey.h" @@ -13,8 +16,6 @@ #include "xfa/fwl/core/cfwl_themebackground.h" #include "xfa/fwl/core/cfwl_widgetproperties.h" #include "xfa/fwl/core/fwl_noteimp.h" -#include "xfa/fwl/core/ifwl_spinbutton.h" -#include "xfa/fwl/core/ifwl_themeprovider.h" #include "xfa/fwl/core/ifwl_themeprovider.h" #include "xfa/fwl/core/ifwl_timerinfo.h" diff --git a/xfa/fwl/core/ifwl_spinbutton.h b/xfa/fwl/core/ifwl_spinbutton.h index e2fda86da0..bc4f3ab1a8 100644 --- a/xfa/fwl/core/ifwl_spinbutton.h +++ b/xfa/fwl/core/ifwl_spinbutton.h @@ -7,6 +7,8 @@ #ifndef XFA_FWL_CORE_IFWL_SPINBUTTON_H_ #define XFA_FWL_CORE_IFWL_SPINBUTTON_H_ +#include <memory> + #include "xfa/fwl/core/cfwl_event.h" #include "xfa/fwl/core/ifwl_timer.h" #include "xfa/fwl/core/ifwl_widget.h" diff --git a/xfa/fwl/core/ifwl_tooltip.cpp b/xfa/fwl/core/ifwl_tooltip.cpp index 82b0fd723b..a9a07c636a 100644 --- a/xfa/fwl/core/ifwl_tooltip.cpp +++ b/xfa/fwl/core/ifwl_tooltip.cpp @@ -6,6 +6,9 @@ #include "xfa/fwl/core/ifwl_tooltip.h" +#include <memory> +#include <utility> + #include "third_party/base/ptr_util.h" #include "xfa/fde/tto/fde_textout.h" #include "xfa/fwl/core/cfwl_themebackground.h" @@ -14,7 +17,6 @@ #include "xfa/fwl/core/fwl_noteimp.h" #include "xfa/fwl/core/ifwl_themeprovider.h" #include "xfa/fwl/core/ifwl_timerinfo.h" -#include "xfa/fwl/core/ifwl_tooltip.h" #include "xfa/fwl/theme/cfwl_widgettp.h" IFWL_ToolTip::IFWL_ToolTip(const IFWL_App* app, diff --git a/xfa/fwl/core/ifwl_tooltip.h b/xfa/fwl/core/ifwl_tooltip.h index cb3eab1740..71a913010a 100644 --- a/xfa/fwl/core/ifwl_tooltip.h +++ b/xfa/fwl/core/ifwl_tooltip.h @@ -7,6 +7,8 @@ #ifndef XFA_FWL_CORE_IFWL_TOOLTIP_H_ #define XFA_FWL_CORE_IFWL_TOOLTIP_H_ +#include <memory> + #include "xfa/fwl/core/ifwl_form.h" #include "xfa/fwl/core/ifwl_timer.h" diff --git a/xfa/fwl/core/ifwl_widget.cpp b/xfa/fwl/core/ifwl_widget.cpp index 01f9a4d5d4..e9ee2a8715 100644 --- a/xfa/fwl/core/ifwl_widget.cpp +++ b/xfa/fwl/core/ifwl_widget.cpp @@ -7,6 +7,7 @@ #include "xfa/fwl/core/ifwl_widget.h" #include <algorithm> +#include <utility> #include "xfa/fde/tto/fde_textout.h" #include "xfa/fwl/core/cfwl_evtkey.h" @@ -29,7 +30,6 @@ #include "xfa/fwl/core/ifwl_combobox.h" #include "xfa/fwl/core/ifwl_form.h" #include "xfa/fwl/core/ifwl_themeprovider.h" -#include "xfa/fwl/core/ifwl_widget.h" #include "xfa/fxfa/xfa_ffapp.h" #define FWL_STYLEEXT_MNU_Vert (1L << 0) diff --git a/xfa/fwl/theme/cfwl_widgettp.cpp b/xfa/fwl/theme/cfwl_widgettp.cpp index 80a7b8fe4a..9eb598bc8c 100644 --- a/xfa/fwl/theme/cfwl_widgettp.cpp +++ b/xfa/fwl/theme/cfwl_widgettp.cpp @@ -7,6 +7,7 @@ #include "xfa/fwl/theme/cfwl_widgettp.h" #include <algorithm> +#include <utility> #include "xfa/fde/tto/fde_textout.h" #include "xfa/fgas/font/fgas_gefont.h" |