diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-08-31 13:19:18 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-08-31 17:29:26 +0000 |
| commit | bcd1e70175b6bbbcb9d9466c579e0538f34297c6 (patch) | |
| tree | 9748923cde5a3e52054488fbad5f9dbb855aecc0 /core/fxcrt/xml | |
| parent | bc0ca1ec9b157ab8773c9043725c7422f7c1a57c (diff) | |
| download | pdfium-bcd1e70175b6bbbcb9d9466c579e0538f34297c6.tar.xz | |
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 <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fxcrt/xml')
| -rw-r--r-- | core/fxcrt/xml/cfx_saxcontext.h | 1 | ||||
| -rw-r--r-- | core/fxcrt/xml/cfx_saxreader.cpp | 1 | ||||
| -rw-r--r-- | core/fxcrt/xml/cfx_saxreader.h | 4 | ||||
| -rw-r--r-- | core/fxcrt/xml/cfx_xmlparser.cpp | 1 | ||||
| -rw-r--r-- | core/fxcrt/xml/cxml_element.h | 1 | ||||
| -rw-r--r-- | core/fxcrt/xml/cxml_object.h | 2 |
6 files changed, 4 insertions, 6 deletions
diff --git a/core/fxcrt/xml/cfx_saxcontext.h b/core/fxcrt/xml/cfx_saxcontext.h index fcc889f7a3..f66c76c9cc 100644 --- a/core/fxcrt/xml/cfx_saxcontext.h +++ b/core/fxcrt/xml/cfx_saxcontext.h @@ -9,7 +9,6 @@ #include <sstream> -#include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_string.h" #include "core/fxcrt/xml/cfx_saxreader.h" diff --git a/core/fxcrt/xml/cfx_saxreader.cpp b/core/fxcrt/xml/cfx_saxreader.cpp index 42bf510c19..641dc08688 100644 --- a/core/fxcrt/xml/cfx_saxreader.cpp +++ b/core/fxcrt/xml/cfx_saxreader.cpp @@ -9,6 +9,7 @@ #include <algorithm> #include <utility> +#include "core/fxcrt/fx_stream.h" #include "core/fxcrt/xml/cfx_saxreaderhandler.h" #include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" diff --git a/core/fxcrt/xml/cfx_saxreader.h b/core/fxcrt/xml/cfx_saxreader.h index 9f1f324062..3db1c7c80c 100644 --- a/core/fxcrt/xml/cfx_saxreader.h +++ b/core/fxcrt/xml/cfx_saxreader.h @@ -11,10 +11,12 @@ #include <stack> #include <vector> -#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/cfx_retain_ptr.h" +#include "core/fxcrt/fx_string.h" class CFX_SAXCommentContext; class CFX_SAXContext; +class IFX_SeekableReadStream; enum class CFX_SaxMode; class CFX_SAXItem { diff --git a/core/fxcrt/xml/cfx_xmlparser.cpp b/core/fxcrt/xml/cfx_xmlparser.cpp index 884f6fc477..ce45481512 100644 --- a/core/fxcrt/xml/cfx_xmlparser.cpp +++ b/core/fxcrt/xml/cfx_xmlparser.cpp @@ -6,7 +6,6 @@ #include "core/fxcrt/xml/cfx_xmlparser.h" -#include "core/fxcrt/fx_basic.h" #include "core/fxcrt/xml/cfx_xmlchardata.h" #include "core/fxcrt/xml/cfx_xmlelement.h" #include "core/fxcrt/xml/cfx_xmlinstruction.h" diff --git a/core/fxcrt/xml/cxml_element.h b/core/fxcrt/xml/cxml_element.h index d708032adb..a4b4b14129 100644 --- a/core/fxcrt/xml/cxml_element.h +++ b/core/fxcrt/xml/cxml_element.h @@ -10,7 +10,6 @@ #include <memory> #include <vector> -#include "core/fxcrt/fx_basic.h" #include "core/fxcrt/xml/cxml_attrmap.h" #include "core/fxcrt/xml/cxml_object.h" diff --git a/core/fxcrt/xml/cxml_object.h b/core/fxcrt/xml/cxml_object.h index e7f23aa988..d009359932 100644 --- a/core/fxcrt/xml/cxml_object.h +++ b/core/fxcrt/xml/cxml_object.h @@ -7,8 +7,6 @@ #ifndef CORE_FXCRT_XML_CXML_OBJECT_H_ #define CORE_FXCRT_XML_CXML_OBJECT_H_ -#include "core/fxcrt/fx_basic.h" - class CXML_Content; class CXML_Element; |