diff options
Diffstat (limited to 'xfa')
103 files changed, 202 insertions, 54 deletions
diff --git a/xfa/fde/cfde_txtedtbuf.cpp b/xfa/fde/cfde_txtedtbuf.cpp index 6d36eb3da2..b01081e3c9 100644 --- a/xfa/fde/cfde_txtedtbuf.cpp +++ b/xfa/fde/cfde_txtedtbuf.cpp @@ -6,6 +6,8 @@ #include "xfa/fde/cfde_txtedtbuf.h" +#include <algorithm> + #include "xfa/fgas/crt/fgas_memory.h" namespace { diff --git a/xfa/fde/cfde_txtedtbufiter.h b/xfa/fde/cfde_txtedtbufiter.h index 4322708a2a..c536aafc82 100644 --- a/xfa/fde/cfde_txtedtbufiter.h +++ b/xfa/fde/cfde_txtedtbufiter.h @@ -14,7 +14,7 @@ class CFDE_TxtEdtBuf; class CFDE_TxtEdtBufIter : public IFX_CharIter { public: - CFDE_TxtEdtBufIter(CFDE_TxtEdtBuf* pBuf, FX_WCHAR wcAlias = 0); + explicit CFDE_TxtEdtBufIter(CFDE_TxtEdtBuf* pBuf, FX_WCHAR wcAlias = 0); ~CFDE_TxtEdtBufIter() override; bool Next(bool bPrev = false) override; diff --git a/xfa/fde/cfde_txtedtengine.cpp b/xfa/fde/cfde_txtedtengine.cpp index e0e788144a..ad20b04feb 100644 --- a/xfa/fde/cfde_txtedtengine.cpp +++ b/xfa/fde/cfde_txtedtengine.cpp @@ -6,6 +6,8 @@ #include "xfa/fde/cfde_txtedtengine.h" +#include <algorithm> + #include "xfa/fde/cfde_txtedtbuf.h" #include "xfa/fde/cfde_txtedtbufiter.h" #include "xfa/fde/cfde_txtedtdorecord_deleterange.h" diff --git a/xfa/fde/cfde_txtedtparag.cpp b/xfa/fde/cfde_txtedtparag.cpp index 6e6a664ff2..244add4e0a 100644 --- a/xfa/fde/cfde_txtedtparag.cpp +++ b/xfa/fde/cfde_txtedtparag.cpp @@ -6,6 +6,8 @@ #include "xfa/fde/cfde_txtedtparag.h" +#include <memory> + #include "xfa/fde/cfde_txtedtbuf.h" #include "xfa/fde/cfde_txtedtbufiter.h" #include "xfa/fde/cfde_txtedtengine.h" diff --git a/xfa/fde/cfx_wordbreak.cpp b/xfa/fde/cfx_wordbreak.cpp index 04fc32f550..48b45a4e82 100644 --- a/xfa/fde/cfx_wordbreak.cpp +++ b/xfa/fde/cfx_wordbreak.cpp @@ -6,6 +6,8 @@ #include "xfa/fde/cfx_wordbreak.h" +#include <utility> + #include "xfa/fde/cfx_chariter.h" namespace { diff --git a/xfa/fde/css/cfde_cssrulecollection.cpp b/xfa/fde/css/cfde_cssrulecollection.cpp index 28a482b834..2f91c13628 100644 --- a/xfa/fde/css/cfde_cssrulecollection.cpp +++ b/xfa/fde/css/cfde_cssrulecollection.cpp @@ -11,7 +11,6 @@ #include "xfa/fde/css/fde_csscache.h" #include "xfa/fde/css/fde_cssdeclaration.h" -#include "xfa/fde/css/fde_cssstyleselector.h" #include "xfa/fde/css/fde_cssstylesheet.h" #include "xfa/fde/css/fde_csssyntax.h" #include "xfa/fxfa/app/xfa_textlayout.h" diff --git a/xfa/fde/css/fde_cssstyleselector.h b/xfa/fde/css/fde_cssstyleselector.h index 8ef3885823..0096b7a34a 100644 --- a/xfa/fde/css/fde_cssstyleselector.h +++ b/xfa/fde/css/fde_cssstyleselector.h @@ -353,7 +353,7 @@ class CFDE_CSSComputedStyle : public IFDE_CSSComputedStyle, public IFDE_CSSParagraphStyle, public CFX_Target { public: - CFDE_CSSComputedStyle(IFX_MemoryAllocator* pAlloc); + explicit CFDE_CSSComputedStyle(IFX_MemoryAllocator* pAlloc); ~CFDE_CSSComputedStyle() override; // IFX_Retainable diff --git a/xfa/fde/css/fde_cssstylesheet.h b/xfa/fde/css/fde_cssstylesheet.h index 0fe63477d3..7d3ec98844 100644 --- a/xfa/fde/css/fde_cssstylesheet.h +++ b/xfa/fde/css/fde_cssstylesheet.h @@ -96,7 +96,7 @@ class CFDE_CSSFontFaceRule : public IFDE_CSSFontFaceRule, public CFX_Target { class CFDE_CSSStyleSheet : public IFDE_CSSStyleSheet, public CFX_Target { public: - CFDE_CSSStyleSheet(uint32_t dwMediaList); + explicit CFDE_CSSStyleSheet(uint32_t dwMediaList); ~CFDE_CSSStyleSheet() override; // IFX_Retainable: diff --git a/xfa/fde/fde_gedevice.cpp b/xfa/fde/fde_gedevice.cpp index 4adfd54af4..254193659d 100644 --- a/xfa/fde/fde_gedevice.cpp +++ b/xfa/fde/fde_gedevice.cpp @@ -7,6 +7,7 @@ #include "xfa/fde/fde_gedevice.h" #include <algorithm> +#include <memory> #include "core/fxge/cfx_gemodule.h" #include "core/fxge/cfx_graphstatedata.h" diff --git a/xfa/fde/xml/fde_xml_imp_unittest.cpp b/xfa/fde/xml/fde_xml_imp_unittest.cpp index f0d0bca2ca..e5bcb0acb2 100644 --- a/xfa/fde/xml/fde_xml_imp_unittest.cpp +++ b/xfa/fde/xml/fde_xml_imp_unittest.cpp @@ -4,6 +4,8 @@ #include "xfa/fde/xml/fde_xml_imp.h" +#include <memory> + #include "testing/gtest/include/gtest/gtest.h" #include "xfa/fgas/crt/fgas_stream.h" diff --git a/xfa/fgas/crt/fgas_memory.cpp b/xfa/fgas/crt/fgas_memory.cpp index 0cccdc75b0..9625f95203 100644 --- a/xfa/fgas/crt/fgas_memory.cpp +++ b/xfa/fgas/crt/fgas_memory.cpp @@ -25,7 +25,7 @@ struct FX_STATICSTORECHUNK { class CFX_StaticStore : public IFX_MemoryAllocator, public CFX_Target { public: - CFX_StaticStore(size_t iDefChunkSize); + explicit CFX_StaticStore(size_t iDefChunkSize); ~CFX_StaticStore() override; void* Alloc(size_t size) override; diff --git a/xfa/fgas/crt/fgas_utils.h b/xfa/fgas/crt/fgas_utils.h index 5565733c26..c7bc45f73d 100644 --- a/xfa/fgas/crt/fgas_utils.h +++ b/xfa/fgas/crt/fgas_utils.h @@ -33,7 +33,7 @@ class CFX_BaseArray : public CFX_Target { template <class baseType> class CFX_BaseArrayTemplate : public CFX_BaseArray { public: - CFX_BaseArrayTemplate(int32_t iGrowSize) + explicit CFX_BaseArrayTemplate(int32_t iGrowSize) : CFX_BaseArray(iGrowSize, sizeof(baseType)) {} CFX_BaseArrayTemplate(int32_t iGrowSize, int32_t iBlockSize) : CFX_BaseArray(iGrowSize, iBlockSize) {} @@ -123,7 +123,7 @@ class CFX_BaseMassArray : public CFX_Target { template <class baseType> class CFX_MassArrayTemplate : public CFX_BaseMassArray { public: - CFX_MassArrayTemplate(int32_t iChunkSize) + explicit CFX_MassArrayTemplate(int32_t iChunkSize) : CFX_BaseMassArray(iChunkSize, sizeof(baseType)) {} CFX_MassArrayTemplate(int32_t iChunkSize, int32_t iBlockSize) : CFX_BaseMassArray(iChunkSize, iBlockSize) {} @@ -171,7 +171,7 @@ class CFX_MassArrayTemplate : public CFX_BaseMassArray { template <class baseType> class CFX_ObjectMassArrayTemplate : public CFX_BaseMassArray { public: - CFX_ObjectMassArrayTemplate(int32_t iChunkSize) + explicit CFX_ObjectMassArrayTemplate(int32_t iChunkSize) : CFX_BaseMassArray(iChunkSize, sizeof(baseType)) {} ~CFX_ObjectMassArrayTemplate() { RemoveAll(false); } @@ -265,7 +265,7 @@ class CFX_BaseDiscreteArray : public CFX_Target { template <class baseType> class CFX_DiscreteArrayTemplate : public CFX_BaseDiscreteArray { public: - CFX_DiscreteArrayTemplate(int32_t iChunkSize) + explicit CFX_DiscreteArrayTemplate(int32_t iChunkSize) : CFX_BaseDiscreteArray(iChunkSize, sizeof(baseType)) {} baseType& GetAt(int32_t index, const baseType& defValue) const { @@ -298,7 +298,7 @@ class CFX_BaseStack : public CFX_Target { template <class baseType> class CFX_StackTemplate : public CFX_BaseStack { public: - CFX_StackTemplate(int32_t iChunkSize) + explicit CFX_StackTemplate(int32_t iChunkSize) : CFX_BaseStack(iChunkSize, sizeof(baseType)) {} int32_t Push(const baseType& element) { @@ -320,7 +320,7 @@ class CFX_StackTemplate : public CFX_BaseStack { template <class baseType> class CFX_ObjectStackTemplate : public CFX_BaseStack { public: - CFX_ObjectStackTemplate(int32_t iChunkSize) + explicit CFX_ObjectStackTemplate(int32_t iChunkSize) : CFX_BaseStack(iChunkSize, sizeof(baseType)) {} ~CFX_ObjectStackTemplate() { RemoveAll(false); } diff --git a/xfa/fgas/font/cfgas_fontmgr.cpp b/xfa/fgas/font/cfgas_fontmgr.cpp index e42d2a5179..1830850ce6 100644 --- a/xfa/fgas/font/cfgas_fontmgr.cpp +++ b/xfa/fgas/font/cfgas_fontmgr.cpp @@ -6,6 +6,9 @@ #include "xfa/fgas/font/cfgas_fontmgr.h" +#include <memory> +#include <utility> + #include "core/fxcrt/fx_stream.h" #include "core/fxge/cfx_fontmapper.h" #include "core/fxge/cfx_fontmgr.h" diff --git a/xfa/fgas/font/cfgas_fontmgr.h b/xfa/fgas/font/cfgas_fontmgr.h index f571365b88..7b68525188 100644 --- a/xfa/fgas/font/cfgas_fontmgr.h +++ b/xfa/fgas/font/cfgas_fontmgr.h @@ -7,6 +7,7 @@ #ifndef XFA_FGAS_FONT_CFGAS_FONTMGR_H_ #define XFA_FGAS_FONT_CFGAS_FONTMGR_H_ +#include <memory> #include <vector> #include "core/fxcrt/fx_ext.h" diff --git a/xfa/fgas/font/fgas_gefont.h b/xfa/fgas/font/fgas_gefont.h index 7baafefc7e..afe628fc66 100644 --- a/xfa/fgas/font/fgas_gefont.h +++ b/xfa/fgas/font/fgas_gefont.h @@ -8,6 +8,7 @@ #define XFA_FGAS_FONT_FGAS_GEFONT_H_ #include <map> +#include <memory> #include "core/fxcrt/fx_memory.h" #include "xfa/fgas/crt/fgas_utils.h" diff --git a/xfa/fgas/layout/fgas_textbreak.h b/xfa/fgas/layout/fgas_textbreak.h index 4e9238f7bf..7bae6cd46e 100644 --- a/xfa/fgas/layout/fgas_textbreak.h +++ b/xfa/fgas/layout/fgas_textbreak.h @@ -160,7 +160,7 @@ typedef CFX_BaseArrayTemplate<CFX_TxtPiece> CFX_TxtPieceArray; class CFX_TxtLine { public: - CFX_TxtLine(int32_t iBlockSize); + explicit CFX_TxtLine(int32_t iBlockSize); ~CFX_TxtLine(); int32_t CountChars() const { return m_pLineChars->GetSize(); } @@ -199,7 +199,7 @@ class CFX_TxtLine { class CFX_TxtBreak { public: - CFX_TxtBreak(uint32_t dwPolicies); + explicit CFX_TxtBreak(uint32_t dwPolicies); ~CFX_TxtBreak(); void SetLineWidth(FX_FLOAT fLineWidth); diff --git a/xfa/fgas/localization/fgas_datetime.h b/xfa/fgas/localization/fgas_datetime.h index 3383d45669..d3ea9fa4a6 100644 --- a/xfa/fgas/localization/fgas_datetime.h +++ b/xfa/fgas/localization/fgas_datetime.h @@ -30,7 +30,7 @@ uint8_t FX_DaysInMonth(int32_t iYear, uint8_t iMonth); class CFX_Unitime { public: CFX_Unitime() { m_iUnitime = 0; } - CFX_Unitime(FX_UNITIME iUnitime) { m_iUnitime = iUnitime; } + explicit CFX_Unitime(FX_UNITIME iUnitime) { m_iUnitime = iUnitime; } CFX_Unitime(const CFX_Unitime& unitime) { m_iUnitime = unitime.m_iUnitime; } operator FX_UNITIME*() { return &m_iUnitime; } operator FX_UNITIME const*() const { return &m_iUnitime; } @@ -212,7 +212,7 @@ struct FX_DATETIME { class CFX_DateTime { public: CFX_DateTime() {} - CFX_DateTime(const FX_DATETIME& dt) { m_DateTime = dt; } + explicit CFX_DateTime(const FX_DATETIME& dt) { m_DateTime = dt; } CFX_DateTime(const CFX_DateTime& dt) { m_DateTime = dt.m_DateTime; } virtual ~CFX_DateTime() {} operator FX_DATETIME*() { return &m_DateTime; } diff --git a/xfa/fgas/localization/fgas_locale.cpp b/xfa/fgas/localization/fgas_locale.cpp index 68fd94e29f..aea7bacc11 100644 --- a/xfa/fgas/localization/fgas_locale.cpp +++ b/xfa/fgas/localization/fgas_locale.cpp @@ -4,6 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "xfa/fgas/localization/fgas_locale.h" + #include <algorithm> #include "core/fxcrt/fx_ext.h" @@ -92,9 +94,9 @@ class CFX_LCNumeric { CFX_LCNumeric(int64_t integral, uint32_t fractional = 0, int32_t exponent = 0); - CFX_LCNumeric(FX_FLOAT dbRetValue); - CFX_LCNumeric(double dbvalue); - CFX_LCNumeric(CFX_WideString& wsNumeric); + explicit CFX_LCNumeric(FX_FLOAT dbRetValue); + explicit CFX_LCNumeric(double dbvalue); + explicit CFX_LCNumeric(CFX_WideString& wsNumeric); FX_FLOAT GetFloat() const; double GetDouble() const; diff --git a/xfa/fgas/localization/fgas_locale.h b/xfa/fgas/localization/fgas_locale.h index a3272b455f..f15766d2dd 100644 --- a/xfa/fgas/localization/fgas_locale.h +++ b/xfa/fgas/localization/fgas_locale.h @@ -7,6 +7,8 @@ #ifndef XFA_FGAS_LOCALIZATION_FGAS_LOCALE_H_ #define XFA_FGAS_LOCALIZATION_FGAS_LOCALE_H_ +#include <memory> + #include "core/fxcrt/fx_xml.h" #include "xfa/fgas/localization/fgas_datetime.h" @@ -97,13 +99,13 @@ bool FX_TimeFromCanonical(const CFX_WideStringC& wsTime, class CFX_Decimal { public: CFX_Decimal(); - CFX_Decimal(uint32_t val); - CFX_Decimal(uint64_t val); - CFX_Decimal(int32_t val); - CFX_Decimal(int64_t val); - CFX_Decimal(FX_FLOAT val, uint8_t scale = 3); - CFX_Decimal(const CFX_WideStringC& str); - CFX_Decimal(const CFX_ByteStringC& str); + explicit CFX_Decimal(uint32_t val); + explicit CFX_Decimal(uint64_t val); + explicit CFX_Decimal(int32_t val); + explicit CFX_Decimal(int64_t val); + explicit CFX_Decimal(FX_FLOAT val, uint8_t scale = 3); + explicit CFX_Decimal(const CFX_WideStringC& str); + explicit CFX_Decimal(const CFX_ByteStringC& str); operator CFX_WideString() const; operator double() const; bool operator==(const CFX_Decimal& val) const; 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" diff --git a/xfa/fxbarcode/BC_Library.cpp b/xfa/fxbarcode/BC_Library.cpp index b0b4186735..075bc2247d 100644 --- a/xfa/fxbarcode/BC_Library.cpp +++ b/xfa/fxbarcode/BC_Library.cpp @@ -4,6 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "xfa/fxbarcode/BC_Library.h" + #include <stdint.h> #include "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" diff --git a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.h b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.h index 34e94fb0fd..b71cfb4c06 100644 --- a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.h +++ b/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.h @@ -14,7 +14,7 @@ class CBC_ReedSolomonGF256Poly; class CBC_ReedSolomonEncoder { public: - CBC_ReedSolomonEncoder(CBC_ReedSolomonGF256* field); + explicit CBC_ReedSolomonEncoder(CBC_ReedSolomonGF256* field); virtual ~CBC_ReedSolomonEncoder(); void Encode(CFX_Int32Array* toEncode, int32_t ecBytes, int32_t& e); diff --git a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeRow.h b/xfa/fxbarcode/pdf417/BC_PDF417BarcodeRow.h index 802a49cb5e..90e76ac50a 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeRow.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417BarcodeRow.h @@ -11,7 +11,7 @@ class CBC_BarcodeRow { public: - CBC_BarcodeRow(int32_t width); + explicit CBC_BarcodeRow(int32_t width); virtual ~CBC_BarcodeRow(); void set(int32_t x, uint8_t value); diff --git a/xfa/fxfa/app/xfa_ffapp.cpp b/xfa/fxfa/app/xfa_ffapp.cpp index d65a611eb9..3f013487f2 100644 --- a/xfa/fxfa/app/xfa_ffapp.cpp +++ b/xfa/fxfa/app/xfa_ffapp.cpp @@ -7,7 +7,9 @@ #include "xfa/fxfa/xfa_ffapp.h" #include <algorithm> +#include <memory> #include <utility> +#include <vector> #include "xfa/fgas/font/cfgas_fontmgr.h" #include "xfa/fwl/core/cfwl_widgetmgr.h" diff --git a/xfa/fxfa/app/xfa_ffapp_unittest.cpp b/xfa/fxfa/app/xfa_ffapp_unittest.cpp index 7e1b9d7237..10c0545fbb 100644 --- a/xfa/fxfa/app/xfa_ffapp_unittest.cpp +++ b/xfa/fxfa/app/xfa_ffapp_unittest.cpp @@ -5,6 +5,7 @@ #include "xfa/fxfa/xfa_ffapp.h" #include <memory> +#include <vector> #include "core/fpdfapi/parser/cpdf_dictionary.h" #include "core/fpdfapi/parser/cpdf_stream.h" diff --git a/xfa/fxfa/app/xfa_ffdoc.cpp b/xfa/fxfa/app/xfa_ffdoc.cpp index 5439b1fe47..3d1ead5069 100644 --- a/xfa/fxfa/app/xfa_ffdoc.cpp +++ b/xfa/fxfa/app/xfa_ffdoc.cpp @@ -7,6 +7,8 @@ #include "xfa/fxfa/xfa_ffdoc.h" #include <algorithm> +#include <memory> +#include <vector> #include "core/fpdfapi/parser/cpdf_array.h" #include "core/fpdfapi/parser/cpdf_document.h" diff --git a/xfa/fxfa/app/xfa_ffnotify.h b/xfa/fxfa/app/xfa_ffnotify.h index d9530a895e..1bfaffec89 100644 --- a/xfa/fxfa/app/xfa_ffnotify.h +++ b/xfa/fxfa/app/xfa_ffnotify.h @@ -14,7 +14,7 @@ class CXFA_FFWidgetHandler; class CXFA_FFNotify { public: - CXFA_FFNotify(CXFA_FFDoc* pDoc); + explicit CXFA_FFNotify(CXFA_FFDoc* pDoc); ~CXFA_FFNotify(); void OnPageEvent(CXFA_ContainerLayoutItem* pSender, uint32_t dwEvent); diff --git a/xfa/fxfa/app/xfa_ffwidget.cpp b/xfa/fxfa/app/xfa_ffwidget.cpp index 07ba16cd80..afc2a05f6e 100644 --- a/xfa/fxfa/app/xfa_ffwidget.cpp +++ b/xfa/fxfa/app/xfa_ffwidget.cpp @@ -8,6 +8,7 @@ #include <algorithm> #include <memory> +#include <vector> #include "core/fpdfapi/page/cpdf_pageobjectholder.h" #include "core/fxcodec/codec/ccodec_progressivedecoder.h" diff --git a/xfa/fxfa/app/xfa_fwltheme.h b/xfa/fxfa/app/xfa_fwltheme.h index 41ddc74c34..630653236f 100644 --- a/xfa/fxfa/app/xfa_fwltheme.h +++ b/xfa/fxfa/app/xfa_fwltheme.h @@ -26,7 +26,7 @@ class CXFA_FWLTheme final : public IFWL_ThemeProvider { public: - CXFA_FWLTheme(CXFA_FFApp* pApp); + explicit CXFA_FWLTheme(CXFA_FFApp* pApp); ~CXFA_FWLTheme() override; // IFWL_ThemeProvider: diff --git a/xfa/fxfa/fm2js/xfa_expression.cpp b/xfa/fxfa/fm2js/xfa_expression.cpp index 4271ae04e2..6895f25438 100644 --- a/xfa/fxfa/fm2js/xfa_expression.cpp +++ b/xfa/fxfa/fm2js/xfa_expression.cpp @@ -6,6 +6,8 @@ #include "xfa/fxfa/fm2js/xfa_expression.h" +#include <utility> + #include "core/fxcrt/fx_basic.h" namespace { diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp index 5c267717a3..4394455c74 100644 --- a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp +++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp @@ -8,6 +8,10 @@ #include <time.h> +#include <algorithm> +#include <memory> +#include <vector> + #include "core/fxcrt/fx_ext.h" #include "fxjs/cfxjse_arguments.h" #include "fxjs/cfxjse_class.h" diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.h b/xfa/fxfa/fm2js/xfa_fm2jscontext.h index 0f56c6964c..f6be186c15 100644 --- a/xfa/fxfa/fm2js/xfa_fm2jscontext.h +++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.h @@ -7,6 +7,8 @@ #ifndef XFA_FXFA_FM2JS_XFA_FM2JSCONTEXT_H_ #define XFA_FXFA_FM2JS_XFA_FM2JSCONTEXT_H_ +#include <memory> + #include "fxjs/cfxjse_arguments.h" #include "fxjs/cfxjse_context.h" #include "xfa/fxfa/parser/xfa_resolvenode_rs.h" diff --git a/xfa/fxfa/fm2js/xfa_fmparse.cpp b/xfa/fxfa/fm2js/xfa_fmparse.cpp index 530ca85325..a383b2e04a 100644 --- a/xfa/fxfa/fm2js/xfa_fmparse.cpp +++ b/xfa/fxfa/fm2js/xfa_fmparse.cpp @@ -7,6 +7,7 @@ #include "xfa/fxfa/fm2js/xfa_fmparse.h" #include <memory> +#include <utility> CXFA_FMParse::CXFA_FMParse() : m_pToken(nullptr), m_pErrorInfo(0) {} diff --git a/xfa/fxfa/fxfa_widget.h b/xfa/fxfa/fxfa_widget.h index 6e68e841e9..5cdec2dc5c 100644 --- a/xfa/fxfa/fxfa_widget.h +++ b/xfa/fxfa/fxfa_widget.h @@ -7,6 +7,8 @@ #ifndef XFA_FXFA_FXFA_WIDGET_H_ #define XFA_FXFA_FXFA_WIDGET_H_ +#include <memory> + #include "core/fxcrt/fx_coordinates.h" #include "core/fxge/fx_dib.h" #include "xfa/fxfa/parser/cxfa_box.h" diff --git a/xfa/fxfa/parser/cscript_hostpseudomodel.cpp b/xfa/fxfa/parser/cscript_hostpseudomodel.cpp index 6140ad37d8..7493570bc2 100644 --- a/xfa/fxfa/parser/cscript_hostpseudomodel.cpp +++ b/xfa/fxfa/parser/cscript_hostpseudomodel.cpp @@ -6,6 +6,8 @@ #include "xfa/fxfa/parser/cscript_hostpseudomodel.h" +#include <memory> + #include "fxjs/cfxjse_arguments.h" #include "xfa/fxfa/app/xfa_ffnotify.h" #include "xfa/fxfa/parser/cxfa_document.h" diff --git a/xfa/fxfa/parser/cxfa_containerlayoutitem.h b/xfa/fxfa/parser/cxfa_containerlayoutitem.h index 87fa360fe2..3c8a8afa22 100644 --- a/xfa/fxfa/parser/cxfa_containerlayoutitem.h +++ b/xfa/fxfa/parser/cxfa_containerlayoutitem.h @@ -11,7 +11,7 @@ class CXFA_ContainerLayoutItem : public CXFA_LayoutItem { public: - CXFA_ContainerLayoutItem(CXFA_Node* pNode); + explicit CXFA_ContainerLayoutItem(CXFA_Node* pNode); CXFA_LayoutProcessor* GetLayout() const; int32_t GetPageIndex() const; diff --git a/xfa/fxfa/parser/cxfa_contentlayoutitem.h b/xfa/fxfa/parser/cxfa_contentlayoutitem.h index f826f52e5b..9ac1dceb42 100644 --- a/xfa/fxfa/parser/cxfa_contentlayoutitem.h +++ b/xfa/fxfa/parser/cxfa_contentlayoutitem.h @@ -11,7 +11,7 @@ class CXFA_ContentLayoutItem : public CXFA_LayoutItem { public: - CXFA_ContentLayoutItem(CXFA_Node* pNode); + explicit CXFA_ContentLayoutItem(CXFA_Node* pNode); ~CXFA_ContentLayoutItem() override; CXFA_ContentLayoutItem* m_pPrev; diff --git a/xfa/fxfa/parser/cxfa_layoutpagemgr.h b/xfa/fxfa/parser/cxfa_layoutpagemgr.h index dcd798ea1a..3f0410f74c 100644 --- a/xfa/fxfa/parser/cxfa_layoutpagemgr.h +++ b/xfa/fxfa/parser/cxfa_layoutpagemgr.h @@ -14,7 +14,7 @@ class CXFA_LayoutItem; class CXFA_LayoutPageMgr { public: - CXFA_LayoutPageMgr(CXFA_LayoutProcessor* pLayoutProcessor); + explicit CXFA_LayoutPageMgr(CXFA_LayoutProcessor* pLayoutProcessor); ~CXFA_LayoutPageMgr(); bool InitLayoutPage(CXFA_Node* pFormNode); diff --git a/xfa/fxfa/parser/cxfa_layoutprocessor.h b/xfa/fxfa/parser/cxfa_layoutprocessor.h index d735b385bd..cf1b1e83b4 100644 --- a/xfa/fxfa/parser/cxfa_layoutprocessor.h +++ b/xfa/fxfa/parser/cxfa_layoutprocessor.h @@ -20,7 +20,7 @@ class IFX_Pause; class CXFA_LayoutProcessor { public: - CXFA_LayoutProcessor(CXFA_Document* pDocument); + explicit CXFA_LayoutProcessor(CXFA_Document* pDocument); ~CXFA_LayoutProcessor(); CXFA_Document* GetDocument() const; diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp index 1d0f4333f5..18ea41419a 100644 --- a/xfa/fxfa/parser/cxfa_node.cpp +++ b/xfa/fxfa/parser/cxfa_node.cpp @@ -8,6 +8,7 @@ #include <map> #include <memory> +#include <utility> #include "core/fxcrt/fx_ext.h" #include "fxjs/cfxjse_value.h" diff --git a/xfa/fxfa/parser/cxfa_nodelist.cpp b/xfa/fxfa/parser/cxfa_nodelist.cpp index 9eb04c994f..cb09833d24 100644 --- a/xfa/fxfa/parser/cxfa_nodelist.cpp +++ b/xfa/fxfa/parser/cxfa_nodelist.cpp @@ -6,6 +6,8 @@ #include "xfa/fxfa/parser/xfa_object.h" +#include <memory> + #include "core/fxcrt/fx_ext.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/cxfa_scriptcontext.h" diff --git a/xfa/fxfa/parser/cxfa_resolveprocessor.h b/xfa/fxfa/parser/cxfa_resolveprocessor.h index 630a54ea3c..2590021cdb 100644 --- a/xfa/fxfa/parser/cxfa_resolveprocessor.h +++ b/xfa/fxfa/parser/cxfa_resolveprocessor.h @@ -17,7 +17,7 @@ class CXFA_ScriptContext; class CXFA_ResolveNodesData { public: - CXFA_ResolveNodesData(CXFA_ScriptContext* pSC = nullptr); + explicit CXFA_ResolveNodesData(CXFA_ScriptContext* pSC = nullptr); ~CXFA_ResolveNodesData(); CXFA_ScriptContext* m_pSC; diff --git a/xfa/fxfa/parser/cxfa_scriptcontext.cpp b/xfa/fxfa/parser/cxfa_scriptcontext.cpp index 80395149a3..8cad0e08c4 100644 --- a/xfa/fxfa/parser/cxfa_scriptcontext.cpp +++ b/xfa/fxfa/parser/cxfa_scriptcontext.cpp @@ -6,6 +6,8 @@ #include "xfa/fxfa/parser/cxfa_scriptcontext.h" +#include <utility> + #include "core/fxcrt/fx_ext.h" #include "fxjs/cfxjse_arguments.h" #include "fxjs/cfxjse_class.h" diff --git a/xfa/fxfa/parser/cxfa_widetextread.cpp b/xfa/fxfa/parser/cxfa_widetextread.cpp index 35d4dc1270..be2de7c9e4 100644 --- a/xfa/fxfa/parser/cxfa_widetextread.cpp +++ b/xfa/fxfa/parser/cxfa_widetextread.cpp @@ -6,6 +6,8 @@ #include "xfa/fxfa/parser/cxfa_widetextread.h" +#include <algorithm> + #include "core/fxcrt/fx_ext.h" #include "xfa/fgas/crt/fgas_codepage.h" diff --git a/xfa/fxfa/parser/cxfa_widetextread.h b/xfa/fxfa/parser/cxfa_widetextread.h index e0f0eac358..3a39061079 100644 --- a/xfa/fxfa/parser/cxfa_widetextread.h +++ b/xfa/fxfa/parser/cxfa_widetextread.h @@ -11,7 +11,7 @@ class CXFA_WideTextRead : public IFX_Stream { public: - CXFA_WideTextRead(const CFX_WideString& wsBuffer); + explicit CXFA_WideTextRead(const CFX_WideString& wsBuffer); // IFX_Stream void Release() override; diff --git a/xfa/fxfa/parser/cxfa_xml_parser.h b/xfa/fxfa/parser/cxfa_xml_parser.h index 1fdf06b5a8..59def4be67 100644 --- a/xfa/fxfa/parser/cxfa_xml_parser.h +++ b/xfa/fxfa/parser/cxfa_xml_parser.h @@ -7,6 +7,8 @@ #ifndef XFA_FXFA_PARSER_CXFA_XML_PARSER_H_ #define XFA_FXFA_PARSER_CXFA_XML_PARSER_H_ +#include <memory> + #include "xfa/fde/xml/fde_xml_imp.h" class IFX_Stream; diff --git a/xfa/fxfa/parser/xfa_locale.h b/xfa/fxfa/parser/xfa_locale.h index 6d03843419..5326f513c1 100644 --- a/xfa/fxfa/parser/xfa_locale.h +++ b/xfa/fxfa/parser/xfa_locale.h @@ -56,7 +56,7 @@ class CXFA_XMLLocale : public IFX_Locale { class CXFA_NodeLocale : public IFX_Locale { public: - CXFA_NodeLocale(CXFA_Node* pLocale); + explicit CXFA_NodeLocale(CXFA_Node* pLocale); ~CXFA_NodeLocale() override; // IFX_Locale diff --git a/xfa/fxfa/parser/xfa_resolvenode_rs.h b/xfa/fxfa/parser/xfa_resolvenode_rs.h index 2e7e297aea..7ad218efe8 100644 --- a/xfa/fxfa/parser/xfa_resolvenode_rs.h +++ b/xfa/fxfa/parser/xfa_resolvenode_rs.h @@ -7,6 +7,8 @@ #ifndef XFA_FXFA_PARSER_XFA_RESOLVENODE_RS_H_ #define XFA_FXFA_PARSER_XFA_RESOLVENODE_RS_H_ +#include <memory> + #include "fxjs/cfxjse_value.h" #include "xfa/fxfa/fxfa.h" #include "xfa/fxfa/parser/cxfa_valuearray.h" diff --git a/xfa/fxfa/parser/xfa_utils.h b/xfa/fxfa/parser/xfa_utils.h index 9a84fd6f67..7981704973 100644 --- a/xfa/fxfa/parser/xfa_utils.h +++ b/xfa/fxfa/parser/xfa_utils.h @@ -26,7 +26,7 @@ bool XFA_FDEExtension_ResolveNamespaceQualifier( template <class NodeType, class TraverseStrategy> class CXFA_NodeIteratorTemplate { public: - CXFA_NodeIteratorTemplate(NodeType* pRootNode = nullptr) + explicit CXFA_NodeIteratorTemplate(NodeType* pRootNode = nullptr) : m_pRoot(pRootNode), m_NodeStack(100) { if (pRootNode) { m_NodeStack.Push(pRootNode); diff --git a/xfa/fxfa/xfa_checksum.h b/xfa/fxfa/xfa_checksum.h index 8f739151f4..aaa587fed0 100644 --- a/xfa/fxfa/xfa_checksum.h +++ b/xfa/fxfa/xfa_checksum.h @@ -24,7 +24,7 @@ class CXFA_SAXContext { class CXFA_SAXReaderHandler { public: - CXFA_SAXReaderHandler(CXFA_ChecksumContext* pContext); + explicit CXFA_SAXReaderHandler(CXFA_ChecksumContext* pContext); ~CXFA_SAXReaderHandler(); CXFA_SAXContext* OnTagEnter(const CFX_ByteStringC& bsTagName, diff --git a/xfa/fxfa/xfa_ffdocview.h b/xfa/fxfa/xfa_ffdocview.h index 31e4df955f..2350978d52 100644 --- a/xfa/fxfa/xfa_ffdocview.h +++ b/xfa/fxfa/xfa_ffdocview.h @@ -37,7 +37,7 @@ enum XFA_DOCVIEW_LAYOUTSTATUS { }; class CXFA_FFDocView { public: - CXFA_FFDocView(CXFA_FFDoc* pDoc); + explicit CXFA_FFDocView(CXFA_FFDoc* pDoc); ~CXFA_FFDocView(); CXFA_FFDoc* GetDoc() { return m_pDoc; } diff --git a/xfa/fxfa/xfa_ffwidgethandler.h b/xfa/fxfa/xfa_ffwidgethandler.h index ccb2f3d630..7335f9d1b6 100644 --- a/xfa/fxfa/xfa_ffwidgethandler.h +++ b/xfa/fxfa/xfa_ffwidgethandler.h @@ -18,7 +18,7 @@ enum class FWL_WidgetHit; class CXFA_FFWidgetHandler { public: - CXFA_FFWidgetHandler(CXFA_FFDocView* pDocView); + explicit CXFA_FFWidgetHandler(CXFA_FFDocView* pDocView); ~CXFA_FFWidgetHandler(); CXFA_FFWidget* CreateWidget(CXFA_FFWidget* hParent, |