From aa58fb5759b937760464a2e63f19f464cd1cfe52 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 21 Aug 2018 17:31:34 +0000 Subject: Fix some IWYU issues in xfa/fxfa/. Change-Id: Ia002b26d70f5d6e5b66a3341978483636f943db8 Reviewed-on: https://pdfium-review.googlesource.com/40672 Commit-Queue: Ryan Harrison Reviewed-by: Ryan Harrison --- xfa/fxfa/cxfa_textprovider.h | 2 +- xfa/fxfa/parser/cxfa_barcode.h | 2 ++ xfa/fxfa/parser/cxfa_node.h | 2 -- xfa/fxfa/parser/cxfa_thisproxy.h | 3 ++- xfa/fxfa/parser/cxfa_traversestrategy_xfacontainernode.h | 6 +++--- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/xfa/fxfa/cxfa_textprovider.h b/xfa/fxfa/cxfa_textprovider.h index 8c69227010..4f349e47e2 100644 --- a/xfa/fxfa/cxfa_textprovider.h +++ b/xfa/fxfa/cxfa_textprovider.h @@ -9,10 +9,10 @@ #include "core/fxcrt/fx_string.h" #include "xfa/fxfa/cxfa_textlayout.h" -#include "xfa/fxfa/parser/cxfa_node.h" class CXFA_Font; class CXFA_Node; +class CXFA_Para; enum XFA_TEXTPROVIDERTYPE { XFA_TEXTPROVIDERTYPE_Text, diff --git a/xfa/fxfa/parser/cxfa_barcode.h b/xfa/fxfa/parser/cxfa_barcode.h index 0899740424..463e97f236 100644 --- a/xfa/fxfa/parser/cxfa_barcode.h +++ b/xfa/fxfa/parser/cxfa_barcode.h @@ -7,6 +7,8 @@ #ifndef XFA_FXFA_PARSER_CXFA_BARCODE_H_ #define XFA_FXFA_PARSER_CXFA_BARCODE_H_ +#include "fxbarcode/BC_Library.h" +#include "third_party/base/optional.h" #include "xfa/fxfa/parser/cxfa_node.h" class CXFA_Barcode : public CXFA_Node { diff --git a/xfa/fxfa/parser/cxfa_node.h b/xfa/fxfa/parser/cxfa_node.h index 72e2a4eb4a..6b179b354e 100644 --- a/xfa/fxfa/parser/cxfa_node.h +++ b/xfa/fxfa/parser/cxfa_node.h @@ -13,10 +13,8 @@ #include #include "core/fxcrt/fx_string.h" -#include "core/fxcrt/maybe_owned.h" #include "core/fxcrt/xml/cfx_xmlnode.h" #include "core/fxge/fx_dib.h" -#include "fxbarcode/BC_Library.h" #include "third_party/base/optional.h" #include "xfa/fxfa/cxfa_ffwidget.h" #include "xfa/fxfa/parser/cxfa_object.h" diff --git a/xfa/fxfa/parser/cxfa_thisproxy.h b/xfa/fxfa/parser/cxfa_thisproxy.h index 197a97da67..f429a2ce8a 100644 --- a/xfa/fxfa/parser/cxfa_thisproxy.h +++ b/xfa/fxfa/parser/cxfa_thisproxy.h @@ -8,9 +8,10 @@ #define XFA_FXFA_PARSER_CXFA_THISPROXY_H_ #include "core/fxcrt/unowned_ptr.h" -#include "xfa/fxfa/parser/cxfa_node.h" #include "xfa/fxfa/parser/cxfa_object.h" +class CXFA_Node; + class CXFA_ThisProxy : public CXFA_Object { public: CXFA_ThisProxy(CXFA_Node* pThisNode, CXFA_Node* pScriptNode); diff --git a/xfa/fxfa/parser/cxfa_traversestrategy_xfacontainernode.h b/xfa/fxfa/parser/cxfa_traversestrategy_xfacontainernode.h index 3ca632a1d1..d867f9f1c5 100644 --- a/xfa/fxfa/parser/cxfa_traversestrategy_xfacontainernode.h +++ b/xfa/fxfa/parser/cxfa_traversestrategy_xfacontainernode.h @@ -23,8 +23,8 @@ class CXFA_TraverseStrategy_XFAContainerNode { } }; -typedef CXFA_NodeIteratorTemplate - CXFA_ContainerIterator; +using CXFA_ContainerIterator = + CXFA_NodeIteratorTemplate; #endif // XFA_FXFA_PARSER_CXFA_TRAVERSESTRATEGY_XFACONTAINERNODE_H_ -- cgit v1.2.3