From 2ca2da505ba75cd830539ffc98dfc482fd4daa41 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Tue, 13 Sep 2016 18:10:34 -0700 Subject: Sort include entries. This CL updates all of the includes to be correctly sorted. A PRESUBMIT warning is added (from chromium) that will warn if the includes are in the wrong order on upload. Review-Url: https://codereview.chromium.org/2337293002 --- xfa/fde/cfde_txtedtengine.cpp | 8 ++++---- xfa/fde/cfde_txtedtpage.cpp | 4 ++-- xfa/fde/cfde_txtedtparag.cpp | 2 +- xfa/fde/xml/fde_xml_imp_unittest.cpp | 2 +- xfa/fgas/font/fgas_stdfontmgr.h | 2 +- xfa/fwl/basewidget/ifwl_barcode.h | 2 +- xfa/fwl/basewidget/ifwl_caret.h | 2 +- xfa/fwl/basewidget/ifwl_checkbox.h | 4 ++-- xfa/fwl/basewidget/ifwl_datetimepicker.h | 4 ++-- xfa/fwl/basewidget/ifwl_listbox.h | 4 ++-- xfa/fwl/basewidget/ifwl_monthcalendar.h | 4 ++-- xfa/fwl/basewidget/ifwl_picturebox.h | 4 ++-- xfa/fwl/basewidget/ifwl_pushbutton.h | 2 +- xfa/fwl/basewidget/ifwl_scrollbar.h | 8 ++++---- xfa/fwl/core/ifwl_form.h | 4 ++-- xfa/fwl/lightwidget/cfwl_widget.h | 2 +- xfa/fwl/theme/cfwl_widgettp.h | 2 +- xfa/fxbarcode/qrcode/BC_QRCodeWriter.cpp | 2 +- xfa/fxfa/app/xfa_ffwidget.cpp | 2 +- xfa/fxfa/app/xfa_textlayout.h | 2 +- 20 files changed, 33 insertions(+), 33 deletions(-) (limited to 'xfa') diff --git a/xfa/fde/cfde_txtedtengine.cpp b/xfa/fde/cfde_txtedtengine.cpp index e7da157178..3852fe7f0f 100644 --- a/xfa/fde/cfde_txtedtengine.cpp +++ b/xfa/fde/cfde_txtedtengine.cpp @@ -8,14 +8,14 @@ #include "xfa/fde/cfde_txtedtbuf.h" #include "xfa/fde/cfde_txtedtbufiter.h" -#include "xfa/fde/ifx_chariter.h" -#include "xfa/fgas/layout/fgas_textbreak.h" -#include "xfa/fwl/basewidget/fwl_editimp.h" #include "xfa/fde/cfde_txtedtdorecord_deleterange.h" #include "xfa/fde/cfde_txtedtdorecord_insert.h" -#include "xfa/fde/cfde_txtedtparag.h" #include "xfa/fde/cfde_txtedtpage.h" +#include "xfa/fde/cfde_txtedtparag.h" +#include "xfa/fde/ifx_chariter.h" #include "xfa/fde/tto/fde_textout.h" +#include "xfa/fgas/layout/fgas_textbreak.h" +#include "xfa/fwl/basewidget/fwl_editimp.h" namespace { diff --git a/xfa/fde/cfde_txtedtpage.cpp b/xfa/fde/cfde_txtedtpage.cpp index 21420998d4..24eab86e0b 100644 --- a/xfa/fde/cfde_txtedtpage.cpp +++ b/xfa/fde/cfde_txtedtpage.cpp @@ -12,10 +12,10 @@ #include "xfa/fde/cfde_txtedtbufiter.h" #include "xfa/fde/cfde_txtedtengine.h" #include "xfa/fde/cfde_txtedtparag.h" -#include "xfa/fde/ifde_txtedtengine.h" -#include "xfa/fde/ifde_txtedtpage.h" #include "xfa/fde/cfde_txtedttextset.h" #include "xfa/fde/cfx_wordbreak.h" +#include "xfa/fde/ifde_txtedtengine.h" +#include "xfa/fde/ifde_txtedtpage.h" namespace { diff --git a/xfa/fde/cfde_txtedtparag.cpp b/xfa/fde/cfde_txtedtparag.cpp index 9ba0fa5431..38f569d334 100644 --- a/xfa/fde/cfde_txtedtparag.cpp +++ b/xfa/fde/cfde_txtedtparag.cpp @@ -10,8 +10,8 @@ #include "xfa/fde/cfde_txtedtbufiter.h" #include "xfa/fde/cfde_txtedtengine.h" #include "xfa/fde/ifde_txtedtengine.h" -#include "xfa/fgas/layout/fgas_textbreak.h" #include "xfa/fde/ifx_chariter.h" +#include "xfa/fgas/layout/fgas_textbreak.h" CFDE_TxtEdtParag::CFDE_TxtEdtParag(CFDE_TxtEdtEngine* pEngine) : m_nCharStart(0), diff --git a/xfa/fde/xml/fde_xml_imp_unittest.cpp b/xfa/fde/xml/fde_xml_imp_unittest.cpp index 03cc426d32..f0d0bca2ca 100644 --- a/xfa/fde/xml/fde_xml_imp_unittest.cpp +++ b/xfa/fde/xml/fde_xml_imp_unittest.cpp @@ -4,8 +4,8 @@ #include "xfa/fde/xml/fde_xml_imp.h" -#include "xfa/fgas/crt/fgas_stream.h" #include "testing/gtest/include/gtest/gtest.h" +#include "xfa/fgas/crt/fgas_stream.h" TEST(CFDE_XMLSyntaxParser, CData) { const FX_WCHAR* input = diff --git a/xfa/fgas/font/fgas_stdfontmgr.h b/xfa/fgas/font/fgas_stdfontmgr.h index 0506876b64..6fed90da50 100644 --- a/xfa/fgas/font/fgas_stdfontmgr.h +++ b/xfa/fgas/font/fgas_stdfontmgr.h @@ -11,8 +11,8 @@ #include "core/fxcrt/include/fx_ext.h" #include "core/fxge/include/cfx_fontmapper.h" -#include "core/fxge/include/ifx_systemfontinfo.h" #include "core/fxge/include/fx_freetype.h" +#include "core/fxge/include/ifx_systemfontinfo.h" #include "third_party/freetype/include/freetype/fttypes.h" #include "xfa/fgas/font/fgas_font.h" diff --git a/xfa/fwl/basewidget/ifwl_barcode.h b/xfa/fwl/basewidget/ifwl_barcode.h index 13652009eb..c2f464f71b 100644 --- a/xfa/fwl/basewidget/ifwl_barcode.h +++ b/xfa/fwl/basewidget/ifwl_barcode.h @@ -7,8 +7,8 @@ #ifndef XFA_FWL_BASEWIDGET_IFWL_BARCODE_H_ #define XFA_FWL_BASEWIDGET_IFWL_BARCODE_H_ -#include "xfa/fxbarcode/include/BC_Library.h" #include "xfa/fwl/basewidget/ifwl_edit.h" +#include "xfa/fxbarcode/include/BC_Library.h" class CFWL_WidgetImpProperties; diff --git a/xfa/fwl/basewidget/ifwl_caret.h b/xfa/fwl/basewidget/ifwl_caret.h index 8648ca0a4b..53166c2aa6 100644 --- a/xfa/fwl/basewidget/ifwl_caret.h +++ b/xfa/fwl/basewidget/ifwl_caret.h @@ -7,8 +7,8 @@ #ifndef XFA_FWL_BASEWIDGET_IFWL_CARET_H_ #define XFA_FWL_BASEWIDGET_IFWL_CARET_H_ -#include "xfa/fwl/core/ifwl_widget.h" #include "xfa/fwl/core/cfwl_widgetimpproperties.h" +#include "xfa/fwl/core/ifwl_widget.h" #define FWL_CLASS_Caret L"FWL_CARET" #define FWL_STATE_CAT_HightLight 1 diff --git a/xfa/fwl/basewidget/ifwl_checkbox.h b/xfa/fwl/basewidget/ifwl_checkbox.h index 2316ada9cd..ff5e3b86f7 100644 --- a/xfa/fwl/basewidget/ifwl_checkbox.h +++ b/xfa/fwl/basewidget/ifwl_checkbox.h @@ -7,10 +7,10 @@ #ifndef XFA_FWL_BASEWIDGET_IFWL_CHECKBOX_H_ #define XFA_FWL_BASEWIDGET_IFWL_CHECKBOX_H_ -#include "xfa/fwl/core/ifwl_widget.h" #include "xfa/fwl/core/cfwl_event.h" -#include "xfa/fwl/core/ifwl_dataprovider.h" #include "xfa/fwl/core/cfwl_widgetimpproperties.h" +#include "xfa/fwl/core/ifwl_dataprovider.h" +#include "xfa/fwl/core/ifwl_widget.h" #define FWL_CLASS_CheckBox L"FWL_CHECKBOX" #define FWL_STYLEEXT_CKB_Left (0L << 0) diff --git a/xfa/fwl/basewidget/ifwl_datetimepicker.h b/xfa/fwl/basewidget/ifwl_datetimepicker.h index f592fc1abe..404ba48f14 100644 --- a/xfa/fwl/basewidget/ifwl_datetimepicker.h +++ b/xfa/fwl/basewidget/ifwl_datetimepicker.h @@ -7,10 +7,10 @@ #ifndef XFA_FWL_BASEWIDGET_IFWL_DATETIMEPICKER_H_ #define XFA_FWL_BASEWIDGET_IFWL_DATETIMEPICKER_H_ -#include "xfa/fwl/core/ifwl_widget.h" -#include "xfa/fwl/core/ifwl_dataprovider.h" #include "xfa/fwl/core/cfwl_event.h" #include "xfa/fwl/core/cfwl_widgetimpproperties.h" +#include "xfa/fwl/core/ifwl_dataprovider.h" +#include "xfa/fwl/core/ifwl_widget.h" #define FWL_CLASS_DateTimePicker L"FWL_DATETIMEPICKER" #define FWL_STYLEEXT_DTP_AllowEdit (1L << 0) diff --git a/xfa/fwl/basewidget/ifwl_listbox.h b/xfa/fwl/basewidget/ifwl_listbox.h index 010a82f705..fde6a88978 100644 --- a/xfa/fwl/basewidget/ifwl_listbox.h +++ b/xfa/fwl/basewidget/ifwl_listbox.h @@ -7,10 +7,10 @@ #ifndef XFA_FWL_BASEWIDGET_IFWL_LISTBOX_H_ #define XFA_FWL_BASEWIDGET_IFWL_LISTBOX_H_ -#include "xfa/fwl/core/ifwl_widget.h" -#include "xfa/fwl/core/ifwl_dataprovider.h" #include "xfa/fwl/core/cfwl_event.h" #include "xfa/fwl/core/cfwl_widgetimpproperties.h" +#include "xfa/fwl/core/ifwl_dataprovider.h" +#include "xfa/fwl/core/ifwl_widget.h" #define FWL_CLASS_ListBox L"FWL_LISTBOX" #define FWL_STYLEEXT_LTB_MultiSelection (1L << 0) diff --git a/xfa/fwl/basewidget/ifwl_monthcalendar.h b/xfa/fwl/basewidget/ifwl_monthcalendar.h index 40ea8cb09f..1ddebe977d 100644 --- a/xfa/fwl/basewidget/ifwl_monthcalendar.h +++ b/xfa/fwl/basewidget/ifwl_monthcalendar.h @@ -7,10 +7,10 @@ #ifndef XFA_FWL_BASEWIDGET_IFWL_MONTHCALENDAR_H_ #define XFA_FWL_BASEWIDGET_IFWL_MONTHCALENDAR_H_ -#include "xfa/fwl/core/ifwl_widget.h" #include "xfa/fwl/core/cfwl_event.h" -#include "xfa/fwl/core/ifwl_dataprovider.h" #include "xfa/fwl/core/cfwl_widgetimpproperties.h" +#include "xfa/fwl/core/ifwl_dataprovider.h" +#include "xfa/fwl/core/ifwl_widget.h" #define FWL_CLASS_MonthCalendar L"FWL_MONTHCALENDAR" #define FWL_STYLEEXT_MCD_MultiSelect (1L << 0) diff --git a/xfa/fwl/basewidget/ifwl_picturebox.h b/xfa/fwl/basewidget/ifwl_picturebox.h index 8ff4981e11..f40454a42d 100644 --- a/xfa/fwl/basewidget/ifwl_picturebox.h +++ b/xfa/fwl/basewidget/ifwl_picturebox.h @@ -7,11 +7,11 @@ #ifndef XFA_FWL_BASEWIDGET_IFWL_PICTUREBOX_H_ #define XFA_FWL_BASEWIDGET_IFWL_PICTUREBOX_H_ +#include "xfa/fwl/core/cfwl_widgetimpproperties.h" +#include "xfa/fwl/core/fwl_error.h" #include "xfa/fwl/core/fwl_widgetimp.h" #include "xfa/fwl/core/ifwl_dataprovider.h" #include "xfa/fwl/core/ifwl_widget.h" -#include "xfa/fwl/core/cfwl_widgetimpproperties.h" -#include "xfa/fwl/core/fwl_error.h" #define FWL_CLASS_PictureBox L"FWL_PICTUREBOX" #define FWL_STYLEEXT_PTB_Left 0L << 0 diff --git a/xfa/fwl/basewidget/ifwl_pushbutton.h b/xfa/fwl/basewidget/ifwl_pushbutton.h index aa8392d9db..bbac4811ac 100644 --- a/xfa/fwl/basewidget/ifwl_pushbutton.h +++ b/xfa/fwl/basewidget/ifwl_pushbutton.h @@ -7,9 +7,9 @@ #ifndef XFA_FWL_BASEWIDGET_IFWL_PUSHBUTTON_H_ #define XFA_FWL_BASEWIDGET_IFWL_PUSHBUTTON_H_ +#include "xfa/fwl/core/cfwl_widgetimpproperties.h" #include "xfa/fwl/core/fwl_widgetimp.h" #include "xfa/fwl/core/ifwl_dataprovider.h" -#include "xfa/fwl/core/cfwl_widgetimpproperties.h" #include "xfa/fwl/core/ifwl_widget.h" #define FWL_CLASS_PushButton L"FWL_PUSHBUTTON" diff --git a/xfa/fwl/basewidget/ifwl_scrollbar.h b/xfa/fwl/basewidget/ifwl_scrollbar.h index bc5c722ca9..033cfe092b 100644 --- a/xfa/fwl/basewidget/ifwl_scrollbar.h +++ b/xfa/fwl/basewidget/ifwl_scrollbar.h @@ -7,12 +7,12 @@ #ifndef XFA_FWL_BASEWIDGET_IFWL_SCROLLBAR_H_ #define XFA_FWL_BASEWIDGET_IFWL_SCROLLBAR_H_ -#include "xfa/fwl/core/fwl_widgetimp.h" -#include "xfa/fwl/core/ifwl_widget.h" -#include "xfa/fwl/core/ifwl_dataprovider.h" -#include "xfa/fwl/core/cfwl_widgetimpproperties.h" #include "core/fxcrt/include/fx_system.h" +#include "xfa/fwl/core/cfwl_widgetimpproperties.h" #include "xfa/fwl/core/fwl_error.h" +#include "xfa/fwl/core/fwl_widgetimp.h" +#include "xfa/fwl/core/ifwl_dataprovider.h" +#include "xfa/fwl/core/ifwl_widget.h" #define FWL_CLASS_ScrollBar L"FWL_SCROLLBAR" #define FWL_STYLEEXT_SCB_Horz (0L << 0) diff --git a/xfa/fwl/core/ifwl_form.h b/xfa/fwl/core/ifwl_form.h index 75bec50d8e..13eb9d31f4 100644 --- a/xfa/fwl/core/ifwl_form.h +++ b/xfa/fwl/core/ifwl_form.h @@ -7,10 +7,10 @@ #ifndef XFA_FWL_CORE_IFWL_FORM_H_ #define XFA_FWL_CORE_IFWL_FORM_H_ -#include "xfa/fwl/core/ifwl_dataprovider.h" -#include "xfa/fwl/core/ifwl_widget.h" #include "core/fxcrt/include/fx_system.h" #include "xfa/fwl/core/cfwl_widgetimpproperties.h" +#include "xfa/fwl/core/ifwl_dataprovider.h" +#include "xfa/fwl/core/ifwl_widget.h" #define FWL_CLASS_Form L"FWL_FORM" #define FWL_CLASS_FormProxy L"FWL_FORMPROXY" diff --git a/xfa/fwl/lightwidget/cfwl_widget.h b/xfa/fwl/lightwidget/cfwl_widget.h index 80e278e161..c230ce200c 100644 --- a/xfa/fwl/lightwidget/cfwl_widget.h +++ b/xfa/fwl/lightwidget/cfwl_widget.h @@ -10,8 +10,8 @@ #include #include "xfa/fwl/core/cfwl_event.h" -#include "xfa/fwl/lightwidget/cfwl_widgetproperties.h" #include "xfa/fwl/core/ifwl_widget.h" +#include "xfa/fwl/lightwidget/cfwl_widgetproperties.h" class CFWL_Event; class CFWL_Message; diff --git a/xfa/fwl/theme/cfwl_widgettp.h b/xfa/fwl/theme/cfwl_widgettp.h index e6d09326c2..091ad7ddae 100644 --- a/xfa/fwl/theme/cfwl_widgettp.h +++ b/xfa/fwl/theme/cfwl_widgettp.h @@ -13,8 +13,8 @@ #include "core/fxcrt/include/fx_coordinates.h" #include "core/fxcrt/include/fx_system.h" #include "xfa/fwl/core/fwl_error.h" -#include "xfa/fxgraphics/include/cfx_graphics.h" #include "xfa/fwl/theme/cfwl_utils.h" +#include "xfa/fxgraphics/include/cfx_graphics.h" enum class CFWL_WidgetCapacity { None = 0, diff --git a/xfa/fxbarcode/qrcode/BC_QRCodeWriter.cpp b/xfa/fxbarcode/qrcode/BC_QRCodeWriter.cpp index b2b87bc9a6..01873f0f04 100644 --- a/xfa/fxbarcode/qrcode/BC_QRCodeWriter.cpp +++ b/xfa/fxbarcode/qrcode/BC_QRCodeWriter.cpp @@ -23,12 +23,12 @@ #include "xfa/fxbarcode/BC_TwoDimWriter.h" #include "xfa/fxbarcode/common/BC_CommonByteMatrix.h" #include "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" +#include "xfa/fxbarcode/qrcode/BC_QRCodeWriter.h" #include "xfa/fxbarcode/qrcode/BC_QRCoder.h" #include "xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h" #include "xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" #include "xfa/fxbarcode/qrcode/BC_QRCoderMode.h" #include "xfa/fxbarcode/qrcode/BC_QRCoderVersion.h" -#include "xfa/fxbarcode/qrcode/BC_QRCodeWriter.h" CBC_QRCodeWriter::CBC_QRCodeWriter() { m_bFixedSize = TRUE; diff --git a/xfa/fxfa/app/xfa_ffwidget.cpp b/xfa/fxfa/app/xfa_ffwidget.cpp index d5ffdee55e..e8de02d7bd 100644 --- a/xfa/fxfa/app/xfa_ffwidget.cpp +++ b/xfa/fxfa/app/xfa_ffwidget.cpp @@ -16,8 +16,8 @@ #include "core/fxge/include/cfx_pathdata.h" #include "core/fxge/include/cfx_renderdevice.h" #include "xfa/fxfa/app/xfa_textlayout.h" -#include "xfa/fxfa/include/fxfa_widget.h" #include "xfa/fxfa/include/cxfa_eventparam.h" +#include "xfa/fxfa/include/fxfa_widget.h" #include "xfa/fxfa/include/xfa_ffapp.h" #include "xfa/fxfa/include/xfa_ffdoc.h" #include "xfa/fxfa/include/xfa_ffdocview.h" diff --git a/xfa/fxfa/app/xfa_textlayout.h b/xfa/fxfa/app/xfa_textlayout.h index 33dc345e30..30265de7e9 100644 --- a/xfa/fxfa/app/xfa_textlayout.h +++ b/xfa/fxfa/app/xfa_textlayout.h @@ -12,8 +12,8 @@ #include "xfa/fde/css/fde_css.h" #include "xfa/fde/fde_gedevice.h" -#include "xfa/fxfa/include/xfa_ffdoc.h" #include "xfa/fgas/layout/fgas_rtfbreak.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" #include "xfa/fxfa/parser/xfa_object.h" #define XFA_LOADERCNTXTFLG_FILTERSPACE 0x001 -- cgit v1.2.3