From f3cc72fd2b6910d4d7437f71efce23b501c5b526 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 20 Sep 2018 01:20:45 +0000 Subject: Remove many unneeded STL #includes from headers. Change-Id: I7010cedee8d17d05b2c37a94d767e6f3a9c48f7d Reviewed-on: https://pdfium-review.googlesource.com/42790 Reviewed-by: Tom Sepez Commit-Queue: Lei Zhang --- core/fpdfapi/edit/cpdf_encryptor.h | 1 - core/fpdfapi/font/cpdf_cmapparser.h | 2 -- core/fpdfapi/page/cpdf_imageobject.h | 2 -- core/fpdfapi/parser/cpdf_cross_ref_avail.h | 1 - core/fpdfapi/parser/cpdf_object_avail.h | 1 - core/fpdfapi/parser/cpdf_object_stream.h | 1 - core/fpdfapi/render/cpdf_devicebuffer.h | 2 -- core/fpdfapi/render/cpdf_dibbase.h | 1 - core/fpdfapi/render/cpdf_imagecacheentry.h | 2 -- core/fpdfapi/render/cpdf_imageloader.h | 2 -- core/fpdfdoc/cpdf_metadata.h | 1 - core/fpdfdoc/cpvt_generateap.h | 2 -- core/fpdfdoc/cpvt_wordinfo.h | 2 -- core/fxcodec/bmp/cfx_bmpdecompressor.h | 1 - core/fxcodec/codec/codec_int.h | 5 ----- core/fxcodec/fx_codec.h | 1 - core/fxcrt/css/cfx_cssdata.h | 3 --- core/fxcrt/fx_arabic.h | 2 -- core/fxcrt/fx_bidi.h | 1 - core/fxcrt/xml/cfx_xmlchardata.h | 2 -- core/fxcrt/xml/cfx_xmlelement.h | 2 -- core/fxcrt/xml/cfx_xmlinstruction.h | 1 - core/fxcrt/xml/cfx_xmlnode.h | 2 -- core/fxcrt/xml/cfx_xmltext.h | 2 -- core/fxge/cfx_unicodeencodingex.h | 2 -- core/fxge/dib/cfx_bitmapstorer.h | 3 --- core/fxge/fx_font.h | 2 -- 27 files changed, 49 deletions(-) (limited to 'core') diff --git a/core/fpdfapi/edit/cpdf_encryptor.h b/core/fpdfapi/edit/cpdf_encryptor.h index 5486c4f248..0e1dd571d3 100644 --- a/core/fpdfapi/edit/cpdf_encryptor.h +++ b/core/fpdfapi/edit/cpdf_encryptor.h @@ -9,7 +9,6 @@ #include -#include #include #include "core/fxcrt/fx_memory.h" diff --git a/core/fpdfapi/font/cpdf_cmapparser.h b/core/fpdfapi/font/cpdf_cmapparser.h index fae65cfe00..3cd7b3318e 100644 --- a/core/fpdfapi/font/cpdf_cmapparser.h +++ b/core/fpdfapi/font/cpdf_cmapparser.h @@ -7,7 +7,6 @@ #ifndef CORE_FPDFAPI_FONT_CPDF_CMAPPARSER_H_ #define CORE_FPDFAPI_FONT_CPDF_CMAPPARSER_H_ -#include #include #include @@ -36,7 +35,6 @@ class CPDF_CMapParser { static CIDSet CharsetFromOrdering(const ByteStringView& ordering); private: - UnownedPtr const m_pCMap; int m_Status; int m_CodeSeq; diff --git a/core/fpdfapi/page/cpdf_imageobject.h b/core/fpdfapi/page/cpdf_imageobject.h index 2e01598b8a..41611b826c 100644 --- a/core/fpdfapi/page/cpdf_imageobject.h +++ b/core/fpdfapi/page/cpdf_imageobject.h @@ -7,8 +7,6 @@ #ifndef CORE_FPDFAPI_PAGE_CPDF_IMAGEOBJECT_H_ #define CORE_FPDFAPI_PAGE_CPDF_IMAGEOBJECT_H_ -#include - #include "core/fpdfapi/page/cpdf_pageobject.h" #include "core/fxcrt/fx_coordinates.h" diff --git a/core/fpdfapi/parser/cpdf_cross_ref_avail.h b/core/fpdfapi/parser/cpdf_cross_ref_avail.h index aad58f35e7..fa74bcebb1 100644 --- a/core/fpdfapi/parser/cpdf_cross_ref_avail.h +++ b/core/fpdfapi/parser/cpdf_cross_ref_avail.h @@ -5,7 +5,6 @@ #ifndef CORE_FPDFAPI_PARSER_CPDF_CROSS_REF_AVAIL_H_ #define CORE_FPDFAPI_PARSER_CPDF_CROSS_REF_AVAIL_H_ -#include #include #include diff --git a/core/fpdfapi/parser/cpdf_object_avail.h b/core/fpdfapi/parser/cpdf_object_avail.h index 040cec7252..ea4d449475 100644 --- a/core/fpdfapi/parser/cpdf_object_avail.h +++ b/core/fpdfapi/parser/cpdf_object_avail.h @@ -5,7 +5,6 @@ #ifndef CORE_FPDFAPI_PARSER_CPDF_OBJECT_AVAIL_H_ #define CORE_FPDFAPI_PARSER_CPDF_OBJECT_AVAIL_H_ -#include #include #include diff --git a/core/fpdfapi/parser/cpdf_object_stream.h b/core/fpdfapi/parser/cpdf_object_stream.h index 44aa8f72e5..a5309521a7 100644 --- a/core/fpdfapi/parser/cpdf_object_stream.h +++ b/core/fpdfapi/parser/cpdf_object_stream.h @@ -7,7 +7,6 @@ #include #include -#include #include "core/fpdfapi/parser/cpdf_object.h" #include "core/fxcrt/retain_ptr.h" diff --git a/core/fpdfapi/render/cpdf_devicebuffer.h b/core/fpdfapi/render/cpdf_devicebuffer.h index d265b0c30e..8ccf2b75b7 100644 --- a/core/fpdfapi/render/cpdf_devicebuffer.h +++ b/core/fpdfapi/render/cpdf_devicebuffer.h @@ -7,8 +7,6 @@ #ifndef CORE_FPDFAPI_RENDER_CPDF_DEVICEBUFFER_H_ #define CORE_FPDFAPI_RENDER_CPDF_DEVICEBUFFER_H_ -#include - #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/retain_ptr.h" #include "core/fxcrt/unowned_ptr.h" diff --git a/core/fpdfapi/render/cpdf_dibbase.h b/core/fpdfapi/render/cpdf_dibbase.h index be48c3182d..c74313d23c 100644 --- a/core/fpdfapi/render/cpdf_dibbase.h +++ b/core/fpdfapi/render/cpdf_dibbase.h @@ -7,7 +7,6 @@ #ifndef CORE_FPDFAPI_RENDER_CPDF_DIBBASE_H_ #define CORE_FPDFAPI_RENDER_CPDF_DIBBASE_H_ -#include #include #include diff --git a/core/fpdfapi/render/cpdf_imagecacheentry.h b/core/fpdfapi/render/cpdf_imagecacheentry.h index 8a4f919e8d..1cbe4eed94 100644 --- a/core/fpdfapi/render/cpdf_imagecacheentry.h +++ b/core/fpdfapi/render/cpdf_imagecacheentry.h @@ -7,8 +7,6 @@ #ifndef CORE_FPDFAPI_RENDER_CPDF_IMAGECACHEENTRY_H_ #define CORE_FPDFAPI_RENDER_CPDF_IMAGECACHEENTRY_H_ -#include - #include "core/fpdfapi/render/cpdf_dibbase.h" #include "core/fxcrt/fx_system.h" #include "core/fxcrt/retain_ptr.h" diff --git a/core/fpdfapi/render/cpdf_imageloader.h b/core/fpdfapi/render/cpdf_imageloader.h index 7586d69cc2..672b83b70a 100644 --- a/core/fpdfapi/render/cpdf_imageloader.h +++ b/core/fpdfapi/render/cpdf_imageloader.h @@ -7,8 +7,6 @@ #ifndef CORE_FPDFAPI_RENDER_CPDF_IMAGELOADER_H_ #define CORE_FPDFAPI_RENDER_CPDF_IMAGELOADER_H_ -#include - #include "core/fxcrt/retain_ptr.h" #include "core/fxcrt/unowned_ptr.h" #include "core/fxge/fx_dib.h" diff --git a/core/fpdfdoc/cpdf_metadata.h b/core/fpdfdoc/cpdf_metadata.h index edf1938c4e..683f4f1e52 100644 --- a/core/fpdfdoc/cpdf_metadata.h +++ b/core/fpdfdoc/cpdf_metadata.h @@ -7,7 +7,6 @@ #ifndef CORE_FPDFDOC_CPDF_METADATA_H_ #define CORE_FPDFDOC_CPDF_METADATA_H_ -#include #include #include "core/fxcrt/unowned_ptr.h" diff --git a/core/fpdfdoc/cpvt_generateap.h b/core/fpdfdoc/cpvt_generateap.h index 52c26af020..0e219b77ed 100644 --- a/core/fpdfdoc/cpvt_generateap.h +++ b/core/fpdfdoc/cpvt_generateap.h @@ -7,8 +7,6 @@ #ifndef CORE_FPDFDOC_CPVT_GENERATEAP_H_ #define CORE_FPDFDOC_CPVT_GENERATEAP_H_ -#include - #include "core/fpdfdoc/cpdf_annot.h" #include "core/fpdfdoc/cpdf_defaultappearance.h" #include "core/fpdfdoc/cpdf_variabletext.h" diff --git a/core/fpdfdoc/cpvt_wordinfo.h b/core/fpdfdoc/cpvt_wordinfo.h index 9b2ec8a1e5..401b9a5144 100644 --- a/core/fpdfdoc/cpvt_wordinfo.h +++ b/core/fpdfdoc/cpvt_wordinfo.h @@ -7,8 +7,6 @@ #ifndef CORE_FPDFDOC_CPVT_WORDINFO_H_ #define CORE_FPDFDOC_CPVT_WORDINFO_H_ -#include - #include "core/fxcrt/fx_system.h" struct CPVT_WordInfo { diff --git a/core/fxcodec/bmp/cfx_bmpdecompressor.h b/core/fxcodec/bmp/cfx_bmpdecompressor.h index 331a6347b4..fbe7e1feee 100644 --- a/core/fxcodec/bmp/cfx_bmpdecompressor.h +++ b/core/fxcodec/bmp/cfx_bmpdecompressor.h @@ -11,7 +11,6 @@ #include -#include #include #include "core/fxcodec/codec/cfx_codec_memory.h" diff --git a/core/fxcodec/codec/codec_int.h b/core/fxcodec/codec/codec_int.h index df2e758efe..4fa819bdba 100644 --- a/core/fxcodec/codec/codec_int.h +++ b/core/fxcodec/codec/codec_int.h @@ -9,11 +9,6 @@ #include -#include -#include -#include -#include - #include "core/fxcodec/jbig2/JBig2_Context.h" #include "third_party/libopenjpeg20/openjpeg.h" diff --git a/core/fxcodec/fx_codec.h b/core/fxcodec/fx_codec.h index 0a0c08afc3..8e966761c7 100644 --- a/core/fxcodec/fx_codec.h +++ b/core/fxcodec/fx_codec.h @@ -11,7 +11,6 @@ #include #include #include -#include #include "core/fxcodec/fx_codec_def.h" #include "core/fxcrt/fx_coordinates.h" diff --git a/core/fxcrt/css/cfx_cssdata.h b/core/fxcrt/css/cfx_cssdata.h index e7bf57c26d..a2f774b1af 100644 --- a/core/fxcrt/css/cfx_cssdata.h +++ b/core/fxcrt/css/cfx_cssdata.h @@ -7,9 +7,6 @@ #ifndef CORE_FXCRT_CSS_CFX_CSSDATA_H_ #define CORE_FXCRT_CSS_CFX_CSSDATA_H_ -#include -#include - #include "core/fxcrt/css/cfx_css.h" #include "core/fxcrt/css/cfx_cssnumbervalue.h" #include "core/fxcrt/css/cfx_cssvalue.h" diff --git a/core/fxcrt/fx_arabic.h b/core/fxcrt/fx_arabic.h index 9d23b1557d..6621649be3 100644 --- a/core/fxcrt/fx_arabic.h +++ b/core/fxcrt/fx_arabic.h @@ -7,8 +7,6 @@ #ifndef CORE_FXCRT_FX_ARABIC_H_ #define CORE_FXCRT_FX_ARABIC_H_ -#include - #include "core/fxcrt/cfx_char.h" #include "core/fxcrt/fx_system.h" diff --git a/core/fxcrt/fx_bidi.h b/core/fxcrt/fx_bidi.h index 79a2ddd417..f64fc67e2e 100644 --- a/core/fxcrt/fx_bidi.h +++ b/core/fxcrt/fx_bidi.h @@ -7,7 +7,6 @@ #ifndef CORE_FXCRT_FX_BIDI_H_ #define CORE_FXCRT_FX_BIDI_H_ -#include #include #include "core/fxcrt/fx_string.h" diff --git a/core/fxcrt/xml/cfx_xmlchardata.h b/core/fxcrt/xml/cfx_xmlchardata.h index 71e9407ca2..414300923d 100644 --- a/core/fxcrt/xml/cfx_xmlchardata.h +++ b/core/fxcrt/xml/cfx_xmlchardata.h @@ -7,8 +7,6 @@ #ifndef CORE_FXCRT_XML_CFX_XMLCHARDATA_H_ #define CORE_FXCRT_XML_CFX_XMLCHARDATA_H_ -#include - #include "core/fxcrt/fx_string.h" #include "core/fxcrt/xml/cfx_xmltext.h" diff --git a/core/fxcrt/xml/cfx_xmlelement.h b/core/fxcrt/xml/cfx_xmlelement.h index f54587c4e4..8a8720fa83 100644 --- a/core/fxcrt/xml/cfx_xmlelement.h +++ b/core/fxcrt/xml/cfx_xmlelement.h @@ -8,8 +8,6 @@ #define CORE_FXCRT_XML_CFX_XMLELEMENT_H_ #include -#include -#include #include "core/fxcrt/fx_string.h" #include "core/fxcrt/xml/cfx_xmlnode.h" diff --git a/core/fxcrt/xml/cfx_xmlinstruction.h b/core/fxcrt/xml/cfx_xmlinstruction.h index 18f84c3c3d..c6096a7c46 100644 --- a/core/fxcrt/xml/cfx_xmlinstruction.h +++ b/core/fxcrt/xml/cfx_xmlinstruction.h @@ -7,7 +7,6 @@ #ifndef CORE_FXCRT_XML_CFX_XMLINSTRUCTION_H_ #define CORE_FXCRT_XML_CFX_XMLINSTRUCTION_H_ -#include #include #include "core/fxcrt/fx_string.h" diff --git a/core/fxcrt/xml/cfx_xmlnode.h b/core/fxcrt/xml/cfx_xmlnode.h index 95dc0acce9..78578ae597 100644 --- a/core/fxcrt/xml/cfx_xmlnode.h +++ b/core/fxcrt/xml/cfx_xmlnode.h @@ -7,8 +7,6 @@ #ifndef CORE_FXCRT_XML_CFX_XMLNODE_H_ #define CORE_FXCRT_XML_CFX_XMLNODE_H_ -#include - #include "core/fxcrt/fx_stream.h" #include "core/fxcrt/retain_ptr.h" diff --git a/core/fxcrt/xml/cfx_xmltext.h b/core/fxcrt/xml/cfx_xmltext.h index a8a5f12a53..3e15c5ce9a 100644 --- a/core/fxcrt/xml/cfx_xmltext.h +++ b/core/fxcrt/xml/cfx_xmltext.h @@ -7,8 +7,6 @@ #ifndef CORE_FXCRT_XML_CFX_XMLTEXT_H_ #define CORE_FXCRT_XML_CFX_XMLTEXT_H_ -#include - #include "core/fxcrt/fx_string.h" #include "core/fxcrt/xml/cfx_xmlnode.h" diff --git a/core/fxge/cfx_unicodeencodingex.h b/core/fxge/cfx_unicodeencodingex.h index 9511d2ba7a..9d5ec18fa6 100644 --- a/core/fxge/cfx_unicodeencodingex.h +++ b/core/fxge/cfx_unicodeencodingex.h @@ -7,9 +7,7 @@ #ifndef CORE_FXGE_CFX_UNICODEENCODINGEX_H_ #define CORE_FXGE_CFX_UNICODEENCODINGEX_H_ -#include #include -#include #include "core/fxcrt/fx_system.h" #include "core/fxge/cfx_unicodeencoding.h" diff --git a/core/fxge/dib/cfx_bitmapstorer.h b/core/fxge/dib/cfx_bitmapstorer.h index 3da1f70487..12b0537157 100644 --- a/core/fxge/dib/cfx_bitmapstorer.h +++ b/core/fxge/dib/cfx_bitmapstorer.h @@ -7,9 +7,6 @@ #ifndef CORE_FXGE_DIB_CFX_BITMAPSTORER_H_ #define CORE_FXGE_DIB_CFX_BITMAPSTORER_H_ -#include -#include - #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/retain_ptr.h" #include "core/fxge/dib/cfx_dibitmap.h" diff --git a/core/fxge/fx_font.h b/core/fxge/fx_font.h index 3e0751dbe8..163468d125 100644 --- a/core/fxge/fx_font.h +++ b/core/fxge/fx_font.h @@ -7,8 +7,6 @@ #ifndef CORE_FXGE_FX_FONT_H_ #define CORE_FXGE_FX_FONT_H_ -#include -#include #include #include "core/fxcrt/fx_system.h" -- cgit v1.2.3