From bcd1e70175b6bbbcb9d9466c579e0538f34297c6 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 31 Aug 2017 13:19:18 -0400 Subject: Remove fx_basic.h This CL removes the fx_basic.h header and fixes up includes as needed. Change-Id: I49af32a8327bdbcda40c50a61ffbd75d06609040 Reviewed-on: https://pdfium-review.googlesource.com/12670 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- xfa/fgas/layout/cfx_rtfbreak.h | 1 - xfa/fwl/cfwl_eventtarget.h | 1 - xfa/fwl/cfwl_message.h | 1 - xfa/fxfa/cxfa_linkuserdata.h | 1 - xfa/fxfa/cxfa_loadercontext.h | 1 - xfa/fxfa/cxfa_pieceline.h | 2 -- xfa/fxfa/cxfa_textlayout.h | 1 - xfa/fxfa/cxfa_textpiece.h | 1 - xfa/fxfa/cxfa_texttabstopscontext.cpp | 2 ++ xfa/fxfa/cxfa_texttabstopscontext.h | 2 -- xfa/fxfa/cxfa_textuserdata.h | 1 - xfa/fxfa/fxfa.h | 1 + xfa/fxfa/parser/cxfa_itemlayoutprocessor.h | 1 - 13 files changed, 3 insertions(+), 13 deletions(-) (limited to 'xfa') diff --git a/xfa/fgas/layout/cfx_rtfbreak.h b/xfa/fgas/layout/cfx_rtfbreak.h index bc5ab4a739..5151f4f6db 100644 --- a/xfa/fgas/layout/cfx_rtfbreak.h +++ b/xfa/fgas/layout/cfx_rtfbreak.h @@ -11,7 +11,6 @@ #include #include "core/fxcrt/cfx_retain_ptr.h" -#include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_ucd.h" #include "core/fxge/cfx_renderdevice.h" diff --git a/xfa/fwl/cfwl_eventtarget.h b/xfa/fwl/cfwl_eventtarget.h index 36d301df27..b5a8bdbb9e 100644 --- a/xfa/fwl/cfwl_eventtarget.h +++ b/xfa/fwl/cfwl_eventtarget.h @@ -9,7 +9,6 @@ #include -#include "core/fxcrt/fx_basic.h" #include "xfa/fwl/cfwl_event.h" class CFWL_Event; diff --git a/xfa/fwl/cfwl_message.h b/xfa/fwl/cfwl_message.h index 778e1e2079..99cf01b5b8 100644 --- a/xfa/fwl/cfwl_message.h +++ b/xfa/fwl/cfwl_message.h @@ -9,7 +9,6 @@ #include -#include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" diff --git a/xfa/fxfa/cxfa_linkuserdata.h b/xfa/fxfa/cxfa_linkuserdata.h index a445aadd23..b3ee74a051 100644 --- a/xfa/fxfa/cxfa_linkuserdata.h +++ b/xfa/fxfa/cxfa_linkuserdata.h @@ -8,7 +8,6 @@ #define XFA_FXFA_CXFA_LINKUSERDATA_H_ #include "core/fxcrt/cfx_retain_ptr.h" -#include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" diff --git a/xfa/fxfa/cxfa_loadercontext.h b/xfa/fxfa/cxfa_loadercontext.h index 48077ff538..64ab50696b 100644 --- a/xfa/fxfa/cxfa_loadercontext.h +++ b/xfa/fxfa/cxfa_loadercontext.h @@ -10,7 +10,6 @@ #include #include "core/fxcrt/css/cfx_csscomputedstyle.h" -#include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_system.h" class CFX_XMLNode; diff --git a/xfa/fxfa/cxfa_pieceline.h b/xfa/fxfa/cxfa_pieceline.h index 82af0e5265..dc95e73175 100644 --- a/xfa/fxfa/cxfa_pieceline.h +++ b/xfa/fxfa/cxfa_pieceline.h @@ -10,8 +10,6 @@ #include #include -#include "core/fxcrt/fx_basic.h" - class CXFA_TextPiece; class CXFA_PieceLine { diff --git a/xfa/fxfa/cxfa_textlayout.h b/xfa/fxfa/cxfa_textlayout.h index e4bfa1a0bb..338d3bea50 100644 --- a/xfa/fxfa/cxfa_textlayout.h +++ b/xfa/fxfa/cxfa_textlayout.h @@ -11,7 +11,6 @@ #include #include "core/fxcrt/css/cfx_css.h" -#include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_string.h" #include "xfa/fgas/layout/cfx_rtfbreak.h" diff --git a/xfa/fxfa/cxfa_textpiece.h b/xfa/fxfa/cxfa_textpiece.h index 453257d5ec..a1f100cf0b 100644 --- a/xfa/fxfa/cxfa_textpiece.h +++ b/xfa/fxfa/cxfa_textpiece.h @@ -9,7 +9,6 @@ #include -#include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_string.h" #include "core/fxge/fx_dib.h" diff --git a/xfa/fxfa/cxfa_texttabstopscontext.cpp b/xfa/fxfa/cxfa_texttabstopscontext.cpp index 39476f7c2c..b594f1cc69 100644 --- a/xfa/fxfa/cxfa_texttabstopscontext.cpp +++ b/xfa/fxfa/cxfa_texttabstopscontext.cpp @@ -6,6 +6,8 @@ #include "xfa/fxfa/cxfa_texttabstopscontext.h" +#include + CXFA_TextTabstopsContext::CXFA_TextTabstopsContext() : m_iTabIndex(-1), m_bTabstops(false), m_fTabWidth(0), m_fLeft(0) {} diff --git a/xfa/fxfa/cxfa_texttabstopscontext.h b/xfa/fxfa/cxfa_texttabstopscontext.h index 7124fd88fe..57d0489034 100644 --- a/xfa/fxfa/cxfa_texttabstopscontext.h +++ b/xfa/fxfa/cxfa_texttabstopscontext.h @@ -9,8 +9,6 @@ #include -#include "core/fxcrt/fx_basic.h" - struct XFA_TABSTOPS { uint32_t dwAlign; float fTabstops; diff --git a/xfa/fxfa/cxfa_textuserdata.h b/xfa/fxfa/cxfa_textuserdata.h index f84e768166..442e6318c0 100644 --- a/xfa/fxfa/cxfa_textuserdata.h +++ b/xfa/fxfa/cxfa_textuserdata.h @@ -8,7 +8,6 @@ #define XFA_FXFA_CXFA_TEXTUSERDATA_H_ #include "core/fxcrt/cfx_retain_ptr.h" -#include "core/fxcrt/fx_basic.h" class CFX_CSSComputedStyle; class CXFA_LinkUserData; diff --git a/xfa/fxfa/fxfa.h b/xfa/fxfa/fxfa.h index 3e78ed2f95..dfd4f343d4 100644 --- a/xfa/fxfa/fxfa.h +++ b/xfa/fxfa/fxfa.h @@ -21,6 +21,7 @@ class CXFA_Node; class CXFA_NodeList; class CXFA_WidgetAcc; class IFWL_AdapterTimerMgr; +class IFX_SeekableReadStream; class IXFA_AppProvider; class IXFA_DocEnvironment; class IXFA_WidgetAccIterator; diff --git a/xfa/fxfa/parser/cxfa_itemlayoutprocessor.h b/xfa/fxfa/parser/cxfa_itemlayoutprocessor.h index d5d706e62e..832941c810 100644 --- a/xfa/fxfa/parser/cxfa_itemlayoutprocessor.h +++ b/xfa/fxfa/parser/cxfa_itemlayoutprocessor.h @@ -14,7 +14,6 @@ #include #include -#include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_coordinates.h" #include "xfa/fxfa/fxfa_basic.h" -- cgit v1.2.3