From 880962cb81b7a34e4b90a2ecb1992f1afb13d529 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 23 Feb 2016 09:09:24 -0500 Subject: Sort includes in xfa/. This CL sorts all the includes in the xfa/ directory. There are a lot of IWYU errors that have been fixed to make things compile again. BUG=pdfium:65 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1722803002 . --- xfa/src/fee/include/fx_wordbreak.h | 3 +++ xfa/src/fee/include/ifde_txtedtbuf.h | 2 ++ xfa/src/fee/include/ifde_txtedtengine.h | 4 ++++ xfa/src/fee/include/ifde_txtedtpage.h | 5 ++++- xfa/src/fee/src/fee/fde_txtedtblock.cpp | 2 +- xfa/src/fee/src/fee/fde_txtedtbuf.cpp | 2 +- xfa/src/fee/src/fee/fde_txtedtbuf.h | 4 +++- xfa/src/fee/src/fee/fde_txtedtengine.cpp | 6 +++--- xfa/src/fee/src/fee/fde_txtedtpage.cpp | 8 ++++---- xfa/src/fee/src/fee/fde_txtedtparag.cpp | 8 ++++---- xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp | 4 +++- xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h | 8 ++++++++ xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp | 2 +- 13 files changed, 41 insertions(+), 17 deletions(-) (limited to 'xfa/src/fee') diff --git a/xfa/src/fee/include/fx_wordbreak.h b/xfa/src/fee/include/fx_wordbreak.h index 0146df26b0..f545f487cd 100644 --- a/xfa/src/fee/include/fx_wordbreak.h +++ b/xfa/src/fee/include/fx_wordbreak.h @@ -7,6 +7,9 @@ #ifndef XFA_SRC_FEE_INCLUDE_FX_WORDBREAK_H_ #define XFA_SRC_FEE_INCLUDE_FX_WORDBREAK_H_ +#include "core/include/fxcrt/fx_string.h" +#include "core/include/fxcrt/fx_system.h" + class IFX_CharIter; class IFX_WordBreak { diff --git a/xfa/src/fee/include/ifde_txtedtbuf.h b/xfa/src/fee/include/ifde_txtedtbuf.h index f4a9c119b9..f7c9550fe8 100644 --- a/xfa/src/fee/include/ifde_txtedtbuf.h +++ b/xfa/src/fee/include/ifde_txtedtbuf.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTBUF_H_ #define XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTBUF_H_ +#include "core/include/fxcrt/fx_basic.h" + #define FDE_DEFCHUNKLENGTH (1024) class IFDE_TxtEdtBuf { diff --git a/xfa/src/fee/include/ifde_txtedtengine.h b/xfa/src/fee/include/ifde_txtedtengine.h index 8af71d6de0..290d110ad6 100644 --- a/xfa/src/fee/include/ifde_txtedtengine.h +++ b/xfa/src/fee/include/ifde_txtedtengine.h @@ -7,11 +7,15 @@ #ifndef XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTENGINE_H_ #define XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTENGINE_H_ +#include "core/include/fxge/fx_dib.h" +#include "xfa/src/fgas/include/fx_fnt.h" + class IFDE_TxtEdtBuf; class IFDE_TxtEdtPage; class IFDE_TxtEdtEngine; class IFDE_TxtEdtEventSink; class IFDE_TxtEdtParag; + #define FDE_TXTEDT_FIND_FLAGS_Prev (0L << 0) #define FDE_TXTEDT_FIND_FLAGS_Next (1L << 0) #define FDE_TXTEDT_FIND_FLAGS_WholeWord (1L << 1) diff --git a/xfa/src/fee/include/ifde_txtedtpage.h b/xfa/src/fee/include/ifde_txtedtpage.h index 63b488f17f..c16e94febf 100644 --- a/xfa/src/fee/include/ifde_txtedtpage.h +++ b/xfa/src/fee/include/ifde_txtedtpage.h @@ -7,8 +7,11 @@ #ifndef XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTPAGE_H_ #define XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTPAGE_H_ +#include "core/include/fxge/fx_ge.h" +#include "xfa/src/fdp/include/fde_psr.h" +#include "xfa/src/fgas/include/fx_tbk.h" + class IFDE_TxtEdtEngine; -class IFDE_TxtEdtPage; class IFDE_TxtEdtPage : public IFDE_CanvasSet, public IFX_TxtAccess { public: static IFDE_TxtEdtPage* Create(IFDE_TxtEdtEngine* pEngine, int32_t nIndex); diff --git a/xfa/src/fee/src/fee/fde_txtedtblock.cpp b/xfa/src/fee/src/fee/fde_txtedtblock.cpp index 6a3a8abb89..99b23753cc 100644 --- a/xfa/src/fee/src/fee/fde_txtedtblock.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtblock.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" #include "xfa/src/fee/src/fee/fde_txtedtblock.h" +#include "xfa/src/foxitlib.h" #ifdef FDE_USEFORMATBLOCK #define FDE_TXTEDT_FORMATBLOCK_BGN 0xFFF9 #define FDE_TXTEDT_FORMATBLOCK_END 0xFFFB diff --git a/xfa/src/fee/src/fee/fde_txtedtbuf.cpp b/xfa/src/fee/src/fee/fde_txtedtbuf.cpp index bd8eaea155..7b71f47bdc 100644 --- a/xfa/src/fee/src/fee/fde_txtedtbuf.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtbuf.cpp @@ -6,10 +6,10 @@ #include -#include "xfa/src/foxitlib.h" #include "xfa/src/fee/include/ifde_txtedtbuf.h" #include "xfa/src/fee/include/ifde_txtedtengine.h" #include "xfa/src/fee/src/fee/fde_txtedtbuf.h" +#include "xfa/src/foxitlib.h" #define FDE_DEFCHUNKCOUNT 2 #define FDE_TXTEDT_FORMATBLOCK_BGN 0xFFF9 #define FDE_TXTEDT_FORMATBLOCK_END 0xFFFB diff --git a/xfa/src/fee/src/fee/fde_txtedtbuf.h b/xfa/src/fee/src/fee/fde_txtedtbuf.h index fd551aa9cc..be4e942d9b 100644 --- a/xfa/src/fee/src/fee/fde_txtedtbuf.h +++ b/xfa/src/fee/src/fee/fde_txtedtbuf.h @@ -7,9 +7,11 @@ #ifndef XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTBUF_H_ #define XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTBUF_H_ +#include "xfa/src/fgas/include/fx_mem.h" + class IFX_CharIter; -class CFDE_TxtEdtBufIter; class CFDE_TxtEdtBuf; + class CFDE_TxtEdtBufIter : public IFX_CharIter { public: #ifdef FDE_USEFORMATBLOCK diff --git a/xfa/src/fee/src/fee/fde_txtedtengine.cpp b/xfa/src/fee/src/fee/fde_txtedtengine.cpp index 7610302ca2..dd2a9f9a34 100644 --- a/xfa/src/fee/src/fee/fde_txtedtengine.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtengine.cpp @@ -6,13 +6,13 @@ #include -#include "xfa/src/foxitlib.h" -#include "xfa/src/fee/include/ifde_txtedtengine.h" #include "xfa/src/fee/include/ifde_txtedtbuf.h" +#include "xfa/src/fee/include/ifde_txtedtengine.h" #include "xfa/src/fee/include/ifde_txtedtpage.h" +#include "xfa/src/fee/src/fee/fde_txtedtbuf.h" #include "xfa/src/fee/src/fee/fde_txtedtengine.h" #include "xfa/src/fee/src/fee/fde_txtedtparag.h" -#include "xfa/src/fee/src/fee/fde_txtedtbuf.h" +#include "xfa/src/foxitlib.h" #ifdef FDE_USEFORMATBLOCK #include "xfa/src/fee/src/fee/fde_txtedtblock.h" #endif diff --git a/xfa/src/fee/src/fee/fde_txtedtpage.cpp b/xfa/src/fee/src/fee/fde_txtedtpage.cpp index 879c400328..78fb1b7e37 100644 --- a/xfa/src/fee/src/fee/fde_txtedtpage.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtpage.cpp @@ -6,15 +6,15 @@ #include -#include "xfa/src/foxitlib.h" +#include "xfa/src/fee/include/fx_wordbreak.h" #include "xfa/src/fee/include/ifde_txtedtbuf.h" #include "xfa/src/fee/include/ifde_txtedtengine.h" #include "xfa/src/fee/include/ifde_txtedtpage.h" -#include "xfa/src/fee/include/fx_wordbreak.h" -#include "xfa/src/fee/src/fee/fde_txtedtpage.h" +#include "xfa/src/fee/src/fee/fde_txtedtbuf.h" #include "xfa/src/fee/src/fee/fde_txtedtengine.h" +#include "xfa/src/fee/src/fee/fde_txtedtpage.h" #include "xfa/src/fee/src/fee/fde_txtedtparag.h" -#include "xfa/src/fee/src/fee/fde_txtedtbuf.h" +#include "xfa/src/foxitlib.h" #define FDE_TXTEDT_TOLERANCE 0.1f IFDE_TxtEdtPage* IFDE_TxtEdtPage::Create(IFDE_TxtEdtEngine* pEngine, int32_t nIndex) { diff --git a/xfa/src/fee/src/fee/fde_txtedtparag.cpp b/xfa/src/fee/src/fee/fde_txtedtparag.cpp index 3e7e1ef0c0..af102969b7 100644 --- a/xfa/src/fee/src/fee/fde_txtedtparag.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtparag.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" +#include "xfa/src/fee/include/fx_wordbreak.h" #include "xfa/src/fee/include/ifde_txtedtbuf.h" #include "xfa/src/fee/include/ifde_txtedtengine.h" -#include "xfa/src/fee/include/fx_wordbreak.h" -#include "xfa/src/fee/src/fee/fde_txtedtparag.h" -#include "xfa/src/fee/src/fee/fde_txtedtengine.h" #include "xfa/src/fee/src/fee/fde_txtedtbuf.h" +#include "xfa/src/fee/src/fee/fde_txtedtengine.h" +#include "xfa/src/fee/src/fee/fde_txtedtparag.h" +#include "xfa/src/foxitlib.h" CFDE_TxtEdtParag::CFDE_TxtEdtParag(CFDE_TxtEdtEngine* pEngine) : m_nCharStart(0), m_nCharCount(0), diff --git a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp b/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp index b1f3a4cb62..421e1a4610 100644 --- a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp +++ b/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp @@ -4,9 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" #include "xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h" +#include "xfa/src/foxitlib.h" + #define FX_IsOdd(a) ((a)&1) + FX_WordBreakProp FX_GetWordBreakProperty(FX_WCHAR wcCodePoint) { FX_DWORD dwProperty = (FX_DWORD)gs_FX_WordBreak_CodePointProperties[wcCodePoint >> 1]; diff --git a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h b/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h index 6fe76bdfdd..616690bcea 100644 --- a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h +++ b/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h @@ -7,6 +7,14 @@ #ifndef XFA_SRC_FEE_SRC_FX_WORDBREAK_FX_WORDBREAK_IMPL_H_ #define XFA_SRC_FEE_SRC_FX_WORDBREAK_FX_WORDBREAK_IMPL_H_ +#include + +#include "core/include/fxcrt/fx_string.h" +#include "core/include/fxcrt/fx_system.h" +#include "xfa/src/fee/include/fx_wordbreak.h" +#include "xfa/src/fee/include/ifde_txtedtengine.h" +#include "xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h" + extern const FX_WORD gs_FX_WordBreak_Table[16]; extern const uint8_t gs_FX_WordBreak_CodePointProperties[(0xFFFF - 1) / 2 + 1]; enum FX_WordBreakProp { diff --git a/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp b/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp index 114b843e4c..c1342b8981 100644 --- a/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp +++ b/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" #include "xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h" +#include "xfa/src/foxitlib.h" extern const FX_WORD gs_FX_WordBreak_Table[16] = { 0xFFFF, 0xFFF9, 0xFFFB, 0xFFFB, 0xFFFB, 0xFFFB, 0xEFBB, 0xE77B, 0xFFFB, 0xFFFB, 0xFFFB, 0xE77B, 0xE73B, 0xFFFB, 0xFFFB, 0xFFFB, -- cgit v1.2.3