diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-09-29 13:12:56 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-09-29 13:12:56 -0700 |
| commit | 1727aee85f22d9403e6cd8a0f786b9b7c0a2740a (patch) | |
| tree | f443fc8ec5e24a054169d1c566e6d1ad55236c77 | |
| parent | 39c62fd528854eb4606b8f1917a777532b04db03 (diff) | |
| download | pdfium-1727aee85f22d9403e6cd8a0f786b9b7c0a2740a.tar.xz | |
Move core/fpdfdoc/include to core/fpdfdoc
BUG=pdfium:611
Review-Url: https://codereview.chromium.org/2374383003
117 files changed, 301 insertions, 301 deletions
@@ -239,33 +239,55 @@ static_library("fpdfdoc") { "core/fpdfdoc/clines.cpp", "core/fpdfdoc/clines.h", "core/fpdfdoc/cpdf_aaction.cpp", + "core/fpdfdoc/cpdf_aaction.h", "core/fpdfdoc/cpdf_action.cpp", + "core/fpdfdoc/cpdf_action.h", "core/fpdfdoc/cpdf_actionfields.cpp", + "core/fpdfdoc/cpdf_actionfields.h", "core/fpdfdoc/cpdf_annot.cpp", + "core/fpdfdoc/cpdf_annot.h", "core/fpdfdoc/cpdf_annotlist.cpp", + "core/fpdfdoc/cpdf_annotlist.h", "core/fpdfdoc/cpdf_apsettings.cpp", "core/fpdfdoc/cpdf_apsettings.h", "core/fpdfdoc/cpdf_bookmark.cpp", + "core/fpdfdoc/cpdf_bookmark.h", "core/fpdfdoc/cpdf_bookmarktree.cpp", + "core/fpdfdoc/cpdf_bookmarktree.h", "core/fpdfdoc/cpdf_defaultappearance.cpp", + "core/fpdfdoc/cpdf_defaultappearance.h", "core/fpdfdoc/cpdf_dest.cpp", + "core/fpdfdoc/cpdf_dest.h", "core/fpdfdoc/cpdf_docjsactions.cpp", + "core/fpdfdoc/cpdf_docjsactions.h", "core/fpdfdoc/cpdf_filespec.cpp", + "core/fpdfdoc/cpdf_filespec.h", "core/fpdfdoc/cpdf_formcontrol.cpp", + "core/fpdfdoc/cpdf_formcontrol.h", "core/fpdfdoc/cpdf_formfield.cpp", + "core/fpdfdoc/cpdf_formfield.h", "core/fpdfdoc/cpdf_iconfit.cpp", + "core/fpdfdoc/cpdf_iconfit.h", "core/fpdfdoc/cpdf_interform.cpp", + "core/fpdfdoc/cpdf_interform.h", "core/fpdfdoc/cpdf_link.cpp", + "core/fpdfdoc/cpdf_link.h", "core/fpdfdoc/cpdf_linklist.cpp", + "core/fpdfdoc/cpdf_linklist.h", "core/fpdfdoc/cpdf_metadata.cpp", + "core/fpdfdoc/cpdf_metadata.h", "core/fpdfdoc/cpdf_nametree.cpp", + "core/fpdfdoc/cpdf_nametree.h", "core/fpdfdoc/cpdf_numbertree.cpp", "core/fpdfdoc/cpdf_numbertree.h", "core/fpdfdoc/cpdf_occontext.cpp", + "core/fpdfdoc/cpdf_occontext.h", "core/fpdfdoc/cpdf_pagelabel.cpp", "core/fpdfdoc/cpdf_pagelabel.h", "core/fpdfdoc/cpdf_variabletext.cpp", + "core/fpdfdoc/cpdf_variabletext.h", "core/fpdfdoc/cpdf_viewerpreferences.cpp", + "core/fpdfdoc/cpdf_viewerpreferences.h", "core/fpdfdoc/cpvt_arraytemplate.h", "core/fpdfdoc/cpvt_color.cpp", "core/fpdfdoc/cpvt_color.h", @@ -275,48 +297,26 @@ static_library("fpdfdoc") { "core/fpdfdoc/cpvt_fontmap.h", "core/fpdfdoc/cpvt_generateap.cpp", "core/fpdfdoc/cpvt_generateap.h", + "core/fpdfdoc/cpvt_line.h", "core/fpdfdoc/cpvt_lineinfo.h", + "core/fpdfdoc/cpvt_secprops.h", + "core/fpdfdoc/cpvt_section.h", "core/fpdfdoc/cpvt_sectioninfo.cpp", "core/fpdfdoc/cpvt_sectioninfo.h", + "core/fpdfdoc/cpvt_word.h", "core/fpdfdoc/cpvt_wordinfo.cpp", "core/fpdfdoc/cpvt_wordinfo.h", + "core/fpdfdoc/cpvt_wordplace.h", + "core/fpdfdoc/cpvt_wordprops.h", + "core/fpdfdoc/cpvt_wordrange.h", "core/fpdfdoc/csection.cpp", "core/fpdfdoc/csection.h", "core/fpdfdoc/ctypeset.cpp", "core/fpdfdoc/ctypeset.h", "core/fpdfdoc/doc_tagged.cpp", - "core/fpdfdoc/include/cpdf_aaction.h", - "core/fpdfdoc/include/cpdf_action.h", - "core/fpdfdoc/include/cpdf_actionfields.h", - "core/fpdfdoc/include/cpdf_annot.h", - "core/fpdfdoc/include/cpdf_annotlist.h", - "core/fpdfdoc/include/cpdf_bookmark.h", - "core/fpdfdoc/include/cpdf_bookmarktree.h", - "core/fpdfdoc/include/cpdf_defaultappearance.h", - "core/fpdfdoc/include/cpdf_dest.h", - "core/fpdfdoc/include/cpdf_docjsactions.h", - "core/fpdfdoc/include/cpdf_filespec.h", - "core/fpdfdoc/include/cpdf_formcontrol.h", - "core/fpdfdoc/include/cpdf_formfield.h", - "core/fpdfdoc/include/cpdf_iconfit.h", - "core/fpdfdoc/include/cpdf_interform.h", - "core/fpdfdoc/include/cpdf_link.h", - "core/fpdfdoc/include/cpdf_linklist.h", - "core/fpdfdoc/include/cpdf_metadata.h", - "core/fpdfdoc/include/cpdf_nametree.h", - "core/fpdfdoc/include/cpdf_occontext.h", - "core/fpdfdoc/include/cpdf_variabletext.h", - "core/fpdfdoc/include/cpdf_viewerpreferences.h", - "core/fpdfdoc/include/cpvt_line.h", - "core/fpdfdoc/include/cpvt_secprops.h", - "core/fpdfdoc/include/cpvt_section.h", - "core/fpdfdoc/include/cpvt_word.h", - "core/fpdfdoc/include/cpvt_wordplace.h", - "core/fpdfdoc/include/cpvt_wordprops.h", - "core/fpdfdoc/include/cpvt_wordrange.h", - "core/fpdfdoc/include/fpdf_tagged.h", - "core/fpdfdoc/include/ipdf_formnotify.h", - "core/fpdfdoc/include/ipvt_fontmap.h", + "core/fpdfdoc/fpdf_tagged.h", + "core/fpdfdoc/ipdf_formnotify.h", + "core/fpdfdoc/ipvt_fontmap.h", "core/fpdfdoc/tagged_int.h", ] configs += [ ":pdfium_core_config" ] diff --git a/core/fpdfapi/cpdf_pagerendercontext.cpp b/core/fpdfapi/cpdf_pagerendercontext.cpp index 6a1918176c..e9a6f54aa2 100644 --- a/core/fpdfapi/cpdf_pagerendercontext.cpp +++ b/core/fpdfapi/cpdf_pagerendercontext.cpp @@ -9,8 +9,8 @@ #include "core/fpdfapi/fpdf_render/cpdf_progressiverenderer.h" #include "core/fpdfapi/fpdf_render/cpdf_rendercontext.h" #include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h" -#include "core/fpdfdoc/include/cpdf_annotlist.h" -#include "core/fpdfdoc/include/cpdf_occontext.h" +#include "core/fpdfdoc/cpdf_annotlist.h" +#include "core/fpdfdoc/cpdf_occontext.h" #include "core/fxge/include/cfx_renderdevice.h" CPDF_PageRenderContext::CPDF_PageRenderContext() {} diff --git a/core/fpdfapi/fpdf_parser/cpdf_document.h b/core/fpdfapi/fpdf_parser/cpdf_document.h index cac9dfbfdf..46b4d7881b 100644 --- a/core/fpdfapi/fpdf_parser/cpdf_document.h +++ b/core/fpdfapi/fpdf_parser/cpdf_document.h @@ -12,7 +12,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.h" #include "core/fpdfapi/fpdf_parser/cpdf_object.h" -#include "core/fpdfdoc/include/cpdf_linklist.h" +#include "core/fpdfdoc/cpdf_linklist.h" #include "core/fxcrt/include/cfx_string_pool_template.h" #include "core/fxcrt/include/cfx_weak_ptr.h" #include "core/fxcrt/include/fx_basic.h" diff --git a/core/fpdfapi/fpdf_render/fpdf_render.cpp b/core/fpdfapi/fpdf_render/fpdf_render.cpp index 19bfc1c3d0..d610670fd5 100644 --- a/core/fpdfapi/fpdf_render/fpdf_render.cpp +++ b/core/fpdfapi/fpdf_render/fpdf_render.cpp @@ -29,7 +29,7 @@ #include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h" #include "core/fpdfapi/fpdf_render/cpdf_textrenderer.h" #include "core/fpdfapi/fpdf_render/cpdf_type3cache.h" -#include "core/fpdfdoc/include/cpdf_occontext.h" +#include "core/fpdfdoc/cpdf_occontext.h" #include "core/fxge/include/cfx_fxgedevice.h" #include "core/fxge/include/cfx_graphstatedata.h" #include "core/fxge/include/cfx_pathdata.h" diff --git a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp index cfb392d649..62b92c605b 100644 --- a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp +++ b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp @@ -23,7 +23,7 @@ #include "core/fpdfapi/fpdf_render/cpdf_pagerendercache.h" #include "core/fpdfapi/fpdf_render/cpdf_rendercontext.h" #include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h" -#include "core/fpdfdoc/include/cpdf_occontext.h" +#include "core/fpdfdoc/cpdf_occontext.h" #include "core/fxcodec/include/fx_codec.h" #include "core/fxcrt/include/fx_safe_types.h" #include "core/fxge/include/cfx_fxgedevice.h" diff --git a/core/fpdfdoc/cline.h b/core/fpdfdoc/cline.h index a0cdbfd4af..6f95beb546 100644 --- a/core/fpdfdoc/cline.h +++ b/core/fpdfdoc/cline.h @@ -8,7 +8,7 @@ #define CORE_FPDFDOC_CLINE_H_ #include "core/fpdfdoc/cpvt_lineinfo.h" -#include "core/fpdfdoc/include/cpvt_wordplace.h" +#include "core/fpdfdoc/cpvt_wordplace.h" class CLine final { public: diff --git a/core/fpdfdoc/cpdf_aaction.cpp b/core/fpdfdoc/cpdf_aaction.cpp index 588c4c38df..da654b107d 100644 --- a/core/fpdfdoc/cpdf_aaction.cpp +++ b/core/fpdfdoc/cpdf_aaction.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fpdfdoc/include/cpdf_aaction.h" +#include "core/fpdfdoc/cpdf_aaction.h" namespace { diff --git a/core/fpdfdoc/include/cpdf_aaction.h b/core/fpdfdoc/cpdf_aaction.h index b3a55da23e..cef39f0407 100644 --- a/core/fpdfdoc/include/cpdf_aaction.h +++ b/core/fpdfdoc/cpdf_aaction.h @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_CPDF_AACTION_H_ -#define CORE_FPDFDOC_INCLUDE_CPDF_AACTION_H_ +#ifndef CORE_FPDFDOC_CPDF_AACTION_H_ +#define CORE_FPDFDOC_CPDF_AACTION_H_ -#include "core/fpdfdoc/include/cpdf_action.h" +#include "core/fpdfdoc/cpdf_action.h" class CPDF_Dictionary; @@ -48,4 +48,4 @@ class CPDF_AAction { CPDF_Dictionary* const m_pDict; }; -#endif // CORE_FPDFDOC_INCLUDE_CPDF_AACTION_H_ +#endif // CORE_FPDFDOC_CPDF_AACTION_H_ diff --git a/core/fpdfdoc/cpdf_action.cpp b/core/fpdfdoc/cpdf_action.cpp index b6466217ca..d23925745e 100644 --- a/core/fpdfdoc/cpdf_action.cpp +++ b/core/fpdfdoc/cpdf_action.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fpdfdoc/include/cpdf_action.h" +#include "core/fpdfdoc/cpdf_action.h" #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" -#include "core/fpdfdoc/include/cpdf_filespec.h" -#include "core/fpdfdoc/include/cpdf_nametree.h" +#include "core/fpdfdoc/cpdf_filespec.h" +#include "core/fpdfdoc/cpdf_nametree.h" namespace { diff --git a/core/fpdfdoc/include/cpdf_action.h b/core/fpdfdoc/cpdf_action.h index 209f1f9f09..7bef84d2e4 100644 --- a/core/fpdfdoc/include/cpdf_action.h +++ b/core/fpdfdoc/cpdf_action.h @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_CPDF_ACTION_H_ -#define CORE_FPDFDOC_INCLUDE_CPDF_ACTION_H_ +#ifndef CORE_FPDFDOC_CPDF_ACTION_H_ +#define CORE_FPDFDOC_CPDF_ACTION_H_ #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" -#include "core/fpdfdoc/include/cpdf_dest.h" +#include "core/fpdfdoc/cpdf_dest.h" #include "core/fxcrt/include/fx_string.h" class CPDF_Document; @@ -56,4 +56,4 @@ class CPDF_Action { CPDF_Dictionary* const m_pDict; }; -#endif // CORE_FPDFDOC_INCLUDE_CPDF_ACTION_H_ +#endif // CORE_FPDFDOC_CPDF_ACTION_H_ diff --git a/core/fpdfdoc/cpdf_actionfields.cpp b/core/fpdfdoc/cpdf_actionfields.cpp index f9ac76e575..d87da28016 100644 --- a/core/fpdfdoc/cpdf_actionfields.cpp +++ b/core/fpdfdoc/cpdf_actionfields.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fpdfdoc/include/cpdf_actionfields.h" +#include "core/fpdfdoc/cpdf_actionfields.h" #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" -#include "core/fpdfdoc/include/cpdf_action.h" +#include "core/fpdfdoc/cpdf_action.h" size_t CPDF_ActionFields::GetFieldsCount() const { if (!m_pAction) diff --git a/core/fpdfdoc/include/cpdf_actionfields.h b/core/fpdfdoc/cpdf_actionfields.h index 0f38e1d469..9e0664cadb 100644 --- a/core/fpdfdoc/include/cpdf_actionfields.h +++ b/core/fpdfdoc/cpdf_actionfields.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_CPDF_ACTIONFIELDS_H_ -#define CORE_FPDFDOC_INCLUDE_CPDF_ACTIONFIELDS_H_ +#ifndef CORE_FPDFDOC_CPDF_ACTIONFIELDS_H_ +#define CORE_FPDFDOC_CPDF_ACTIONFIELDS_H_ #include <stddef.h> @@ -26,4 +26,4 @@ class CPDF_ActionFields { const CPDF_Action* const m_pAction; }; -#endif // CORE_FPDFDOC_INCLUDE_CPDF_ACTIONFIELDS_H_ +#endif // CORE_FPDFDOC_CPDF_ACTIONFIELDS_H_ diff --git a/core/fpdfdoc/cpdf_annot.cpp b/core/fpdfdoc/cpdf_annot.cpp index 7a85ad1f27..17b2d56bef 100644 --- a/core/fpdfdoc/cpdf_annot.cpp +++ b/core/fpdfdoc/cpdf_annot.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fpdfdoc/include/cpdf_annot.h" +#include "core/fpdfdoc/cpdf_annot.h" #include "core/fpdfapi/fpdf_page/cpdf_form.h" #include "core/fpdfapi/fpdf_page/cpdf_page.h" diff --git a/core/fpdfdoc/include/cpdf_annot.h b/core/fpdfdoc/cpdf_annot.h index e88375a903..f3166256d6 100644 --- a/core/fpdfdoc/include/cpdf_annot.h +++ b/core/fpdfdoc/cpdf_annot.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_CPDF_ANNOT_H_ -#define CORE_FPDFDOC_INCLUDE_CPDF_ANNOT_H_ +#ifndef CORE_FPDFDOC_CPDF_ANNOT_H_ +#define CORE_FPDFDOC_CPDF_ANNOT_H_ #include <map> #include <memory> @@ -128,4 +128,4 @@ class CPDF_Annot { CPDF_Stream* FPDFDOC_GetAnnotAP(CPDF_Dictionary* pAnnotDict, CPDF_Annot::AppearanceMode mode); -#endif // CORE_FPDFDOC_INCLUDE_CPDF_ANNOT_H_ +#endif // CORE_FPDFDOC_CPDF_ANNOT_H_ diff --git a/core/fpdfdoc/cpdf_annotlist.cpp b/core/fpdfdoc/cpdf_annotlist.cpp index a76c341935..d19f9b4b70 100644 --- a/core/fpdfdoc/cpdf_annotlist.cpp +++ b/core/fpdfdoc/cpdf_annotlist.cpp @@ -4,16 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fpdfdoc/include/cpdf_annotlist.h" +#include "core/fpdfdoc/cpdf_annotlist.h" #include "core/fpdfapi/fpdf_page/cpdf_page.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "core/fpdfapi/fpdf_parser/cpdf_reference.h" #include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h" +#include "core/fpdfdoc/cpdf_annot.h" +#include "core/fpdfdoc/cpdf_interform.h" +#include "core/fpdfdoc/cpdf_occontext.h" #include "core/fpdfdoc/cpvt_generateap.h" -#include "core/fpdfdoc/include/cpdf_annot.h" -#include "core/fpdfdoc/include/cpdf_interform.h" -#include "core/fpdfdoc/include/cpdf_occontext.h" #include "core/fxge/include/cfx_renderdevice.h" namespace { diff --git a/core/fpdfdoc/include/cpdf_annotlist.h b/core/fpdfdoc/cpdf_annotlist.h index f76ec64cd9..afe85f33af 100644 --- a/core/fpdfdoc/include/cpdf_annotlist.h +++ b/core/fpdfdoc/cpdf_annotlist.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_CPDF_ANNOTLIST_H_ -#define CORE_FPDFDOC_INCLUDE_CPDF_ANNOTLIST_H_ +#ifndef CORE_FPDFDOC_CPDF_ANNOTLIST_H_ +#define CORE_FPDFDOC_CPDF_ANNOTLIST_H_ #include <memory> #include <vector> @@ -61,4 +61,4 @@ class CPDF_AnnotList { std::vector<std::unique_ptr<CPDF_Annot>> m_AnnotList; }; -#endif // CORE_FPDFDOC_INCLUDE_CPDF_ANNOTLIST_H_ +#endif // CORE_FPDFDOC_CPDF_ANNOTLIST_H_ diff --git a/core/fpdfdoc/cpdf_apsettings.cpp b/core/fpdfdoc/cpdf_apsettings.cpp index 33d9b0648d..1c20792cf6 100644 --- a/core/fpdfdoc/cpdf_apsettings.cpp +++ b/core/fpdfdoc/cpdf_apsettings.cpp @@ -8,7 +8,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" -#include "core/fpdfdoc/include/cpdf_formcontrol.h" +#include "core/fpdfdoc/cpdf_formcontrol.h" CPDF_ApSettings::CPDF_ApSettings(CPDF_Dictionary* pDict) : m_pDict(pDict) {} diff --git a/core/fpdfdoc/cpdf_apsettings.h b/core/fpdfdoc/cpdf_apsettings.h index 860807efd2..4354ac071f 100644 --- a/core/fpdfdoc/cpdf_apsettings.h +++ b/core/fpdfdoc/cpdf_apsettings.h @@ -7,7 +7,7 @@ #ifndef CORE_FPDFDOC_CPDF_APSETTINGS_H_ #define CORE_FPDFDOC_CPDF_APSETTINGS_H_ -#include "core/fpdfdoc/include/cpdf_iconfit.h" +#include "core/fpdfdoc/cpdf_iconfit.h" #include "core/fxcrt/include/fx_string.h" #include "core/fxcrt/include/fx_system.h" #include "core/fxge/include/fx_dib.h" diff --git a/core/fpdfdoc/cpdf_bookmark.cpp b/core/fpdfdoc/cpdf_bookmark.cpp index b82cee8753..fb74567938 100644 --- a/core/fpdfdoc/cpdf_bookmark.cpp +++ b/core/fpdfdoc/cpdf_bookmark.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fpdfdoc/include/cpdf_bookmark.h" +#include "core/fpdfdoc/cpdf_bookmark.h" #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_string.h" -#include "core/fpdfdoc/include/cpdf_nametree.h" +#include "core/fpdfdoc/cpdf_nametree.h" #include "core/fxge/include/fx_dib.h" uint32_t CPDF_Bookmark::GetColorRef() const { diff --git a/core/fpdfdoc/include/cpdf_bookmark.h b/core/fpdfdoc/cpdf_bookmark.h index ba0b059572..b19ebbbd8c 100644 --- a/core/fpdfdoc/include/cpdf_bookmark.h +++ b/core/fpdfdoc/cpdf_bookmark.h @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_CPDF_BOOKMARK_H_ -#define CORE_FPDFDOC_INCLUDE_CPDF_BOOKMARK_H_ +#ifndef CORE_FPDFDOC_CPDF_BOOKMARK_H_ +#define CORE_FPDFDOC_CPDF_BOOKMARK_H_ -#include "core/fpdfdoc/include/cpdf_action.h" -#include "core/fpdfdoc/include/cpdf_dest.h" +#include "core/fpdfdoc/cpdf_action.h" +#include "core/fpdfdoc/cpdf_dest.h" #include "core/fxcrt/include/fx_string.h" class CPDF_Dictionary; @@ -30,4 +30,4 @@ class CPDF_Bookmark { CPDF_Dictionary* m_pDict; }; -#endif // CORE_FPDFDOC_INCLUDE_CPDF_BOOKMARK_H_ +#endif // CORE_FPDFDOC_CPDF_BOOKMARK_H_ diff --git a/core/fpdfdoc/cpdf_bookmarktree.cpp b/core/fpdfdoc/cpdf_bookmarktree.cpp index 7ff4b09ad6..7ede3fefff 100644 --- a/core/fpdfdoc/cpdf_bookmarktree.cpp +++ b/core/fpdfdoc/cpdf_bookmarktree.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fpdfdoc/include/cpdf_bookmarktree.h" +#include "core/fpdfdoc/cpdf_bookmarktree.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" diff --git a/core/fpdfdoc/include/cpdf_bookmarktree.h b/core/fpdfdoc/cpdf_bookmarktree.h index f496053383..7207357b1e 100644 --- a/core/fpdfdoc/include/cpdf_bookmarktree.h +++ b/core/fpdfdoc/cpdf_bookmarktree.h @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_CPDF_BOOKMARKTREE_H_ -#define CORE_FPDFDOC_INCLUDE_CPDF_BOOKMARKTREE_H_ +#ifndef CORE_FPDFDOC_CPDF_BOOKMARKTREE_H_ +#define CORE_FPDFDOC_CPDF_BOOKMARKTREE_H_ -#include "core/fpdfdoc/include/cpdf_bookmark.h" +#include "core/fpdfdoc/cpdf_bookmark.h" class CPDF_Document; @@ -23,4 +23,4 @@ class CPDF_BookmarkTree { CPDF_Document* const m_pDocument; }; -#endif // CORE_FPDFDOC_INCLUDE_CPDF_BOOKMARKTREE_H_ +#endif // CORE_FPDFDOC_CPDF_BOOKMARKTREE_H_ diff --git a/core/fpdfdoc/cpdf_defaultappearance.cpp b/core/fpdfdoc/cpdf_defaultappearance.cpp index 40491786d7..39f2d23745 100644 --- a/core/fpdfdoc/cpdf_defaultappearance.cpp +++ b/core/fpdfdoc/cpdf_defaultappearance.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fpdfdoc/include/cpdf_defaultappearance.h" +#include "core/fpdfdoc/cpdf_defaultappearance.h" #include "core/fpdfapi/fpdf_parser/cpdf_simple_parser.h" #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h" -#include "core/fpdfdoc/include/cpdf_formcontrol.h" +#include "core/fpdfdoc/cpdf_formcontrol.h" FX_BOOL CPDF_DefaultAppearance::HasFont() { if (m_csDA.IsEmpty()) diff --git a/core/fpdfdoc/include/cpdf_defaultappearance.h b/core/fpdfdoc/cpdf_defaultappearance.h index c0fd3de709..c09a5aacf4 100644 --- a/core/fpdfdoc/include/cpdf_defaultappearance.h +++ b/core/fpdfdoc/cpdf_defaultappearance.h @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_CPDF_DEFAULTAPPEARANCE_H_ -#define CORE_FPDFDOC_INCLUDE_CPDF_DEFAULTAPPEARANCE_H_ +#ifndef CORE_FPDFDOC_CPDF_DEFAULTAPPEARANCE_H_ +#define CORE_FPDFDOC_CPDF_DEFAULTAPPEARANCE_H_ -#include "core/fpdfdoc/include/cpdf_defaultappearance.h" +#include "core/fpdfdoc/cpdf_defaultappearance.h" #include "core/fxcrt/include/fx_coordinates.h" #include "core/fxcrt/include/fx_string.h" #include "core/fxcrt/include/fx_system.h" @@ -49,4 +49,4 @@ class CPDF_DefaultAppearance { CFX_ByteString m_csDA; }; -#endif // CORE_FPDFDOC_INCLUDE_CPDF_DEFAULTAPPEARANCE_H_ +#endif // CORE_FPDFDOC_CPDF_DEFAULTAPPEARANCE_H_ diff --git a/core/fpdfdoc/cpdf_dest.cpp b/core/fpdfdoc/cpdf_dest.cpp index 6a843c684f..da4b9a6f69 100644 --- a/core/fpdfdoc/cpdf_dest.cpp +++ b/core/fpdfdoc/cpdf_dest.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fpdfdoc/include/cpdf_dest.h" +#include "core/fpdfdoc/cpdf_dest.h" #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" diff --git a/core/fpdfdoc/include/cpdf_dest.h b/core/fpdfdoc/cpdf_dest.h index 82d8a2b5cf..7a966e26fe 100644 --- a/core/fpdfdoc/include/cpdf_dest.h +++ b/core/fpdfdoc/cpdf_dest.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_CPDF_DEST_H_ -#define CORE_FPDFDOC_INCLUDE_CPDF_DEST_H_ +#ifndef CORE_FPDFDOC_CPDF_DEST_H_ +#define CORE_FPDFDOC_CPDF_DEST_H_ #include "core/fxcrt/include/fx_string.h" #include "core/fxcrt/include/fx_system.h" @@ -29,4 +29,4 @@ class CPDF_Dest { CPDF_Object* m_pObj; }; -#endif // CORE_FPDFDOC_INCLUDE_CPDF_DEST_H_ +#endif // CORE_FPDFDOC_CPDF_DEST_H_ diff --git a/core/fpdfdoc/cpdf_docjsactions.cpp b/core/fpdfdoc/cpdf_docjsactions.cpp index 897cdac610..a7fcdfd071 100644 --- a/core/fpdfdoc/cpdf_docjsactions.cpp +++ b/core/fpdfdoc/cpdf_docjsactions.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fpdfdoc/include/cpdf_docjsactions.h" +#include "core/fpdfdoc/cpdf_docjsactions.h" -#include "core/fpdfdoc/include/cpdf_nametree.h" +#include "core/fpdfdoc/cpdf_nametree.h" CPDF_DocJSActions::CPDF_DocJSActions(CPDF_Document* pDoc) : m_pDocument(pDoc) {} diff --git a/core/fpdfdoc/include/cpdf_docjsactions.h b/core/fpdfdoc/cpdf_docjsactions.h index 137b6afd53..34b8b7ed9e 100644 --- a/core/fpdfdoc/include/cpdf_docjsactions.h +++ b/core/fpdfdoc/cpdf_docjsactions.h @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_CPDF_DOCJSACTIONS_H_ -#define CORE_FPDFDOC_INCLUDE_CPDF_DOCJSACTIONS_H_ +#ifndef CORE_FPDFDOC_CPDF_DOCJSACTIONS_H_ +#define CORE_FPDFDOC_CPDF_DOCJSACTIONS_H_ -#include "core/fpdfdoc/include/cpdf_action.h" +#include "core/fpdfdoc/cpdf_action.h" #include "core/fxcrt/include/fx_string.h" class CPDF_Document; @@ -26,4 +26,4 @@ class CPDF_DocJSActions { CPDF_Document* const m_pDocument; }; -#endif // CORE_FPDFDOC_INCLUDE_CPDF_DOCJSACTIONS_H_ +#endif // CORE_FPDFDOC_CPDF_DOCJSACTIONS_H_ diff --git a/core/fpdfdoc/cpdf_filespec.cpp b/core/fpdfdoc/cpdf_filespec.cpp index 6c30cdba81..51b8b356a5 100644 --- a/core/fpdfdoc/cpdf_filespec.cpp +++ b/core/fpdfdoc/cpdf_filespec.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fpdfdoc/include/cpdf_filespec.h" +#include "core/fpdfdoc/cpdf_filespec.h" #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/cpdf_object.h" diff --git a/core/fpdfdoc/include/cpdf_filespec.h b/core/fpdfdoc/cpdf_filespec.h index 66f35fc202..c960a839f4 100644 --- a/core/fpdfdoc/include/cpdf_filespec.h +++ b/core/fpdfdoc/cpdf_filespec.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_CPDF_FILESPEC_H_ -#define CORE_FPDFDOC_INCLUDE_CPDF_FILESPEC_H_ +#ifndef CORE_FPDFDOC_CPDF_FILESPEC_H_ +#define CORE_FPDFDOC_CPDF_FILESPEC_H_ #include "core/fxcrt/include/cfx_string_pool_template.h" #include "core/fxcrt/include/cfx_weak_ptr.h" @@ -34,4 +34,4 @@ class CPDF_FileSpec { CPDF_Object* m_pObj; }; -#endif // CORE_FPDFDOC_INCLUDE_CPDF_FILESPEC_H_ +#endif // CORE_FPDFDOC_CPDF_FILESPEC_H_ diff --git a/core/fpdfdoc/cpdf_filespec_unittest.cpp b/core/fpdfdoc/cpdf_filespec_unittest.cpp index b1b20e172b..c0f08dc480 100644 --- a/core/fpdfdoc/cpdf_filespec_unittest.cpp +++ b/core/fpdfdoc/cpdf_filespec_unittest.cpp @@ -8,7 +8,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/cpdf_name.h" #include "core/fpdfapi/fpdf_parser/cpdf_string.h" -#include "core/fpdfdoc/include/cpdf_filespec.h" +#include "core/fpdfdoc/cpdf_filespec.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/test_support.h" diff --git a/core/fpdfdoc/cpdf_formcontrol.cpp b/core/fpdfdoc/cpdf_formcontrol.cpp index 24cb04478d..82a416f942 100644 --- a/core/fpdfdoc/cpdf_formcontrol.cpp +++ b/core/fpdfdoc/cpdf_formcontrol.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fpdfdoc/include/cpdf_formcontrol.h" +#include "core/fpdfdoc/cpdf_formcontrol.h" #include <algorithm> @@ -14,7 +14,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_stream.h" #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h" #include "core/fpdfapi/fpdf_render/cpdf_rendercontext.h" -#include "core/fpdfdoc/include/cpdf_interform.h" +#include "core/fpdfdoc/cpdf_interform.h" #include "core/fxge/include/cfx_renderdevice.h" namespace { diff --git a/core/fpdfdoc/include/cpdf_formcontrol.h b/core/fpdfdoc/cpdf_formcontrol.h index c73318f49e..3f6cb537ce 100644 --- a/core/fpdfdoc/include/cpdf_formcontrol.h +++ b/core/fpdfdoc/cpdf_formcontrol.h @@ -4,18 +4,18 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_CPDF_FORMCONTROL_H_ -#define CORE_FPDFDOC_INCLUDE_CPDF_FORMCONTROL_H_ +#ifndef CORE_FPDFDOC_CPDF_FORMCONTROL_H_ +#define CORE_FPDFDOC_CPDF_FORMCONTROL_H_ +#include "core/fpdfdoc/cpdf_aaction.h" +#include "core/fpdfdoc/cpdf_action.h" +#include "core/fpdfdoc/cpdf_annot.h" +#include "core/fpdfdoc/cpdf_annotlist.h" #include "core/fpdfdoc/cpdf_apsettings.h" -#include "core/fpdfdoc/include/cpdf_aaction.h" -#include "core/fpdfdoc/include/cpdf_action.h" -#include "core/fpdfdoc/include/cpdf_annot.h" -#include "core/fpdfdoc/include/cpdf_annotlist.h" -#include "core/fpdfdoc/include/cpdf_defaultappearance.h" -#include "core/fpdfdoc/include/cpdf_formfield.h" -#include "core/fpdfdoc/include/cpdf_iconfit.h" -#include "core/fpdfdoc/include/ipdf_formnotify.h" +#include "core/fpdfdoc/cpdf_defaultappearance.h" +#include "core/fpdfdoc/cpdf_formfield.h" +#include "core/fpdfdoc/cpdf_iconfit.h" +#include "core/fpdfdoc/ipdf_formnotify.h" #include "core/fxcrt/include/fx_coordinates.h" #include "core/fxcrt/include/fx_string.h" #include "core/fxge/include/fx_dib.h" @@ -131,4 +131,4 @@ class CPDF_FormControl { CPDF_InterForm* const m_pForm; }; -#endif // CORE_FPDFDOC_INCLUDE_CPDF_FORMCONTROL_H_ +#endif // CORE_FPDFDOC_CPDF_FORMCONTROL_H_ diff --git a/core/fpdfdoc/cpdf_formfield.cpp b/core/fpdfdoc/cpdf_formfield.cpp index d709a53a61..4b4ba7fb47 100644 --- a/core/fpdfdoc/cpdf_formfield.cpp +++ b/core/fpdfdoc/cpdf_formfield.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fpdfdoc/include/cpdf_formfield.h" +#include "core/fpdfdoc/cpdf_formfield.h" #include <set> @@ -15,9 +15,9 @@ #include "core/fpdfapi/fpdf_parser/cpdf_simple_parser.h" #include "core/fpdfapi/fpdf_parser/cpdf_string.h" #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h" +#include "core/fpdfdoc/cpdf_formcontrol.h" +#include "core/fpdfdoc/cpdf_interform.h" #include "core/fpdfdoc/cpvt_generateap.h" -#include "core/fpdfdoc/include/cpdf_formcontrol.h" -#include "core/fpdfdoc/include/cpdf_interform.h" #include "third_party/base/stl_util.h" namespace { diff --git a/core/fpdfdoc/include/cpdf_formfield.h b/core/fpdfdoc/cpdf_formfield.h index d39c6da4d4..1d83eb060c 100644 --- a/core/fpdfdoc/include/cpdf_formfield.h +++ b/core/fpdfdoc/cpdf_formfield.h @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_CPDF_FORMFIELD_H_ -#define CORE_FPDFDOC_INCLUDE_CPDF_FORMFIELD_H_ +#ifndef CORE_FPDFDOC_CPDF_FORMFIELD_H_ +#define CORE_FPDFDOC_CPDF_FORMFIELD_H_ -#include "core/fpdfdoc/include/cpdf_aaction.h" -#include "core/fpdfdoc/include/cpdf_formfield.h" +#include "core/fpdfdoc/cpdf_aaction.h" +#include "core/fpdfdoc/cpdf_formfield.h" #include "core/fxcrt/include/fx_basic.h" #include "core/fxcrt/include/fx_string.h" #include "core/fxcrt/include/fx_system.h" @@ -165,4 +165,4 @@ class CPDF_FormField { CPDF_Font* m_pFont; }; -#endif // CORE_FPDFDOC_INCLUDE_CPDF_FORMFIELD_H_ +#endif // CORE_FPDFDOC_CPDF_FORMFIELD_H_ diff --git a/core/fpdfdoc/cpdf_formfield_unittest.cpp b/core/fpdfdoc/cpdf_formfield_unittest.cpp index 6042fa9d9a..1fe5ee3838 100644 --- a/core/fpdfdoc/cpdf_formfield_unittest.cpp +++ b/core/fpdfdoc/cpdf_formfield_unittest.cpp @@ -4,7 +4,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.h" -#include "core/fpdfdoc/include/cpdf_formfield.h" +#include "core/fpdfdoc/cpdf_formfield.h" #include "testing/gtest/include/gtest/gtest.h" TEST(cpdf_formfield, FPDF_GetFullName) { diff --git a/core/fpdfdoc/cpdf_iconfit.cpp b/core/fpdfdoc/cpdf_iconfit.cpp index fe4fc9a02b..1b800b6be9 100644 --- a/core/fpdfdoc/cpdf_iconfit.cpp +++ b/core/fpdfdoc/cpdf_iconfit.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fpdfdoc/include/cpdf_iconfit.h" +#include "core/fpdfdoc/cpdf_iconfit.h" #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" diff --git a/core/fpdfdoc/include/cpdf_iconfit.h b/core/fpdfdoc/cpdf_iconfit.h index a13730d8ce..746161475e 100644 --- a/core/fpdfdoc/include/cpdf_iconfit.h +++ b/core/fpdfdoc/cpdf_iconfit.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_CPDF_ICONFIT_H_ -#define CORE_FPDFDOC_INCLUDE_CPDF_ICONFIT_H_ +#ifndef CORE_FPDFDOC_CPDF_ICONFIT_H_ +#define CORE_FPDFDOC_CPDF_ICONFIT_H_ #include "core/fxcrt/include/fx_system.h" @@ -27,4 +27,4 @@ class CPDF_IconFit { const CPDF_Dictionary* const m_pDict; }; -#endif // CORE_FPDFDOC_INCLUDE_CPDF_ICONFIT_H_ +#endif // CORE_FPDFDOC_CPDF_ICONFIT_H_ diff --git a/core/fpdfdoc/cpdf_interform.cpp b/core/fpdfdoc/cpdf_interform.cpp index 7e54db2dae..00fff1acb4 100644 --- a/core/fpdfdoc/cpdf_interform.cpp +++ b/core/fpdfdoc/cpdf_interform.cpp @@ -13,9 +13,9 @@ #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "core/fpdfapi/fpdf_parser/cpdf_string.h" -#include "core/fpdfdoc/include/cpdf_filespec.h" -#include "core/fpdfdoc/include/cpdf_formcontrol.h" -#include "core/fpdfdoc/include/cpdf_interform.h" +#include "core/fpdfdoc/cpdf_filespec.h" +#include "core/fpdfdoc/cpdf_formcontrol.h" +#include "core/fpdfdoc/cpdf_interform.h" #include "core/fxge/include/cfx_substfont.h" #include "core/fxge/include/fx_font.h" #include "third_party/base/stl_util.h" diff --git a/core/fpdfdoc/include/cpdf_interform.h b/core/fpdfdoc/cpdf_interform.h index c5512d4699..4c62a401b7 100644 --- a/core/fpdfdoc/include/cpdf_interform.h +++ b/core/fpdfdoc/cpdf_interform.h @@ -4,15 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_CPDF_INTERFORM_H_ -#define CORE_FPDFDOC_INCLUDE_CPDF_INTERFORM_H_ +#ifndef CORE_FPDFDOC_CPDF_INTERFORM_H_ +#define CORE_FPDFDOC_CPDF_INTERFORM_H_ #include <map> #include <memory> #include <vector> #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h" -#include "core/fpdfdoc/include/cpdf_defaultappearance.h" +#include "core/fpdfdoc/cpdf_defaultappearance.h" #include "core/fxcrt/include/fx_string.h" #include "core/fxcrt/include/fx_system.h" @@ -116,4 +116,4 @@ class CPDF_InterForm { IPDF_FormNotify* m_pFormNotify; }; -#endif // CORE_FPDFDOC_INCLUDE_CPDF_INTERFORM_H_ +#endif // CORE_FPDFDOC_CPDF_INTERFORM_H_ diff --git a/core/fpdfdoc/cpdf_link.cpp b/core/fpdfdoc/cpdf_link.cpp index 6cb53182a2..3c2df15f5a 100644 --- a/core/fpdfdoc/cpdf_link.cpp +++ b/core/fpdfdoc/cpdf_link.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fpdfdoc/include/cpdf_link.h" +#include "core/fpdfdoc/cpdf_link.h" #include "core/fpdfapi/fpdf_parser/cpdf_array.h" -#include "core/fpdfdoc/include/cpdf_nametree.h" +#include "core/fpdfdoc/cpdf_nametree.h" CFX_FloatRect CPDF_Link::GetRect() { return m_pDict->GetRectFor("Rect"); diff --git a/core/fpdfdoc/include/cpdf_link.h b/core/fpdfdoc/cpdf_link.h index a3be3ccc90..ce99573e91 100644 --- a/core/fpdfdoc/include/cpdf_link.h +++ b/core/fpdfdoc/cpdf_link.h @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_CPDF_LINK_H_ -#define CORE_FPDFDOC_INCLUDE_CPDF_LINK_H_ +#ifndef CORE_FPDFDOC_CPDF_LINK_H_ +#define CORE_FPDFDOC_CPDF_LINK_H_ -#include "core/fpdfdoc/include/cpdf_action.h" -#include "core/fpdfdoc/include/cpdf_dest.h" +#include "core/fpdfdoc/cpdf_action.h" +#include "core/fpdfdoc/cpdf_dest.h" #include "core/fxcrt/include/fx_coordinates.h" class CPDF_Dictionary; @@ -28,4 +28,4 @@ class CPDF_Link { CPDF_Dictionary* m_pDict; }; -#endif // CORE_FPDFDOC_INCLUDE_CPDF_LINK_H_ +#endif // CORE_FPDFDOC_CPDF_LINK_H_ diff --git a/core/fpdfdoc/cpdf_linklist.cpp b/core/fpdfdoc/cpdf_linklist.cpp index 326bdda339..d08032d40e 100644 --- a/core/fpdfdoc/cpdf_linklist.cpp +++ b/core/fpdfdoc/cpdf_linklist.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fpdfdoc/include/cpdf_linklist.h" +#include "core/fpdfdoc/cpdf_linklist.h" #include "core/fpdfapi/fpdf_page/cpdf_page.h" #include "core/fpdfapi/fpdf_parser/cpdf_array.h" diff --git a/core/fpdfdoc/include/cpdf_linklist.h b/core/fpdfdoc/cpdf_linklist.h index dd9f5517d4..d5c0432671 100644 --- a/core/fpdfdoc/include/cpdf_linklist.h +++ b/core/fpdfdoc/cpdf_linklist.h @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_CPDF_LINKLIST_H_ -#define CORE_FPDFDOC_INCLUDE_CPDF_LINKLIST_H_ +#ifndef CORE_FPDFDOC_CPDF_LINKLIST_H_ +#define CORE_FPDFDOC_CPDF_LINKLIST_H_ #include <map> #include <vector> -#include "core/fpdfdoc/include/cpdf_link.h" +#include "core/fpdfdoc/cpdf_link.h" #include "core/fxcrt/include/fx_system.h" class CPDF_Page; @@ -33,4 +33,4 @@ class CPDF_LinkList { std::map<uint32_t, std::vector<CPDF_Dictionary*>> m_PageMap; }; -#endif // CORE_FPDFDOC_INCLUDE_CPDF_LINKLIST_H_ +#endif // CORE_FPDFDOC_CPDF_LINKLIST_H_ diff --git a/core/fpdfdoc/cpdf_metadata.cpp b/core/fpdfdoc/cpdf_metadata.cpp index 5fd8e920c8..8186c70c54 100644 --- a/core/fpdfdoc/cpdf_metadata.cpp +++ b/core/fpdfdoc/cpdf_metadata.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fpdfdoc/include/cpdf_metadata.h" +#include "core/fpdfdoc/cpdf_metadata.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream.h" diff --git a/core/fpdfdoc/include/cpdf_metadata.h b/core/fpdfdoc/cpdf_metadata.h index 31497dd33c..dd68dda713 100644 --- a/core/fpdfdoc/include/cpdf_metadata.h +++ b/core/fpdfdoc/cpdf_metadata.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_CPDF_METADATA_H_ -#define CORE_FPDFDOC_INCLUDE_CPDF_METADATA_H_ +#ifndef CORE_FPDFDOC_CPDF_METADATA_H_ +#define CORE_FPDFDOC_CPDF_METADATA_H_ #include <memory> @@ -23,4 +23,4 @@ class CPDF_Metadata { std::unique_ptr<CXML_Element> m_pXmlElement; }; -#endif // CORE_FPDFDOC_INCLUDE_CPDF_METADATA_H_ +#endif // CORE_FPDFDOC_CPDF_METADATA_H_ diff --git a/core/fpdfdoc/cpdf_nametree.cpp b/core/fpdfdoc/cpdf_nametree.cpp index c8f6ebfa7c..37aab075c0 100644 --- a/core/fpdfdoc/cpdf_nametree.cpp +++ b/core/fpdfdoc/cpdf_nametree.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fpdfdoc/include/cpdf_nametree.h" +#include "core/fpdfdoc/cpdf_nametree.h" #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" diff --git a/core/fpdfdoc/include/cpdf_nametree.h b/core/fpdfdoc/cpdf_nametree.h index 39a520ddfa..45308b7de5 100644 --- a/core/fpdfdoc/include/cpdf_nametree.h +++ b/core/fpdfdoc/cpdf_nametree.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_CPDF_NAMETREE_H_ -#define CORE_FPDFDOC_INCLUDE_CPDF_NAMETREE_H_ +#ifndef CORE_FPDFDOC_CPDF_NAMETREE_H_ +#define CORE_FPDFDOC_CPDF_NAMETREE_H_ #include "core/fxcrt/include/fx_string.h" @@ -31,4 +31,4 @@ class CPDF_NameTree { CPDF_Dictionary* m_pRoot; }; -#endif // CORE_FPDFDOC_INCLUDE_CPDF_NAMETREE_H_ +#endif // CORE_FPDFDOC_CPDF_NAMETREE_H_ diff --git a/core/fpdfdoc/cpdf_occontext.cpp b/core/fpdfdoc/cpdf_occontext.cpp index 6cb007514e..d2994ac010 100644 --- a/core/fpdfdoc/cpdf_occontext.cpp +++ b/core/fpdfdoc/cpdf_occontext.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fpdfdoc/include/cpdf_occontext.h" +#include "core/fpdfdoc/cpdf_occontext.h" #include "core/fpdfapi/fpdf_page/cpdf_pageobject.h" #include "core/fpdfapi/fpdf_parser/cpdf_array.h" diff --git a/core/fpdfdoc/include/cpdf_occontext.h b/core/fpdfdoc/cpdf_occontext.h index 38e81705e5..5c850b9400 100644 --- a/core/fpdfdoc/include/cpdf_occontext.h +++ b/core/fpdfdoc/cpdf_occontext.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_CPDF_OCCONTEXT_H_ -#define CORE_FPDFDOC_INCLUDE_CPDF_OCCONTEXT_H_ +#ifndef CORE_FPDFDOC_CPDF_OCCONTEXT_H_ +#define CORE_FPDFDOC_CPDF_OCCONTEXT_H_ #include <unordered_map> @@ -39,4 +39,4 @@ class CPDF_OCContext { std::unordered_map<const CPDF_Dictionary*, bool> m_OCGStates; }; -#endif // CORE_FPDFDOC_INCLUDE_CPDF_OCCONTEXT_H_ +#endif // CORE_FPDFDOC_CPDF_OCCONTEXT_H_ diff --git a/core/fpdfdoc/cpdf_variabletext.cpp b/core/fpdfdoc/cpdf_variabletext.cpp index d8f8f5a9aa..4ac6c6b1f9 100644 --- a/core/fpdfdoc/cpdf_variabletext.cpp +++ b/core/fpdfdoc/cpdf_variabletext.cpp @@ -4,15 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fpdfdoc/include/cpdf_variabletext.h" +#include "core/fpdfdoc/cpdf_variabletext.h" #include "core/fpdfapi/fpdf_font/cpdf_font.h" #include "core/fpdfdoc/cline.h" +#include "core/fpdfdoc/cpvt_section.h" +#include "core/fpdfdoc/cpvt_word.h" #include "core/fpdfdoc/cpvt_wordinfo.h" #include "core/fpdfdoc/csection.h" -#include "core/fpdfdoc/include/cpvt_section.h" -#include "core/fpdfdoc/include/cpvt_word.h" -#include "core/fpdfdoc/include/ipvt_fontmap.h" +#include "core/fpdfdoc/ipvt_fontmap.h" namespace { diff --git a/core/fpdfdoc/include/cpdf_variabletext.h b/core/fpdfdoc/cpdf_variabletext.h index 31cf75ff0b..cc13b33f30 100644 --- a/core/fpdfdoc/include/cpdf_variabletext.h +++ b/core/fpdfdoc/cpdf_variabletext.h @@ -4,17 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_CPDF_VARIABLETEXT_H_ -#define CORE_FPDFDOC_INCLUDE_CPDF_VARIABLETEXT_H_ +#ifndef CORE_FPDFDOC_CPDF_VARIABLETEXT_H_ +#define CORE_FPDFDOC_CPDF_VARIABLETEXT_H_ #include <memory> #include "core/fpdfdoc/cpvt_arraytemplate.h" #include "core/fpdfdoc/cpvt_floatrect.h" +#include "core/fpdfdoc/cpvt_line.h" #include "core/fpdfdoc/cpvt_lineinfo.h" -#include "core/fpdfdoc/include/cpvt_line.h" -#include "core/fpdfdoc/include/cpvt_wordplace.h" -#include "core/fpdfdoc/include/cpvt_wordrange.h" +#include "core/fpdfdoc/cpvt_wordplace.h" +#include "core/fpdfdoc/cpvt_wordrange.h" #include "core/fxcrt/include/fx_coordinates.h" #include "core/fxcrt/include/fx_string.h" #include "core/fxcrt/include/fx_system.h" @@ -242,4 +242,4 @@ class CPDF_VariableText { CPVT_FloatRect m_rcContent; }; -#endif // CORE_FPDFDOC_INCLUDE_CPDF_VARIABLETEXT_H_ +#endif // CORE_FPDFDOC_CPDF_VARIABLETEXT_H_ diff --git a/core/fpdfdoc/cpdf_viewerpreferences.cpp b/core/fpdfdoc/cpdf_viewerpreferences.cpp index 5ebe2bb11e..98e22b3d44 100644 --- a/core/fpdfdoc/cpdf_viewerpreferences.cpp +++ b/core/fpdfdoc/cpdf_viewerpreferences.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fpdfdoc/include/cpdf_viewerpreferences.h" +#include "core/fpdfdoc/cpdf_viewerpreferences.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" diff --git a/core/fpdfdoc/include/cpdf_viewerpreferences.h b/core/fpdfdoc/cpdf_viewerpreferences.h index d93c261183..9375e85b25 100644 --- a/core/fpdfdoc/include/cpdf_viewerpreferences.h +++ b/core/fpdfdoc/cpdf_viewerpreferences.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_CPDF_VIEWERPREFERENCES_H_ -#define CORE_FPDFDOC_INCLUDE_CPDF_VIEWERPREFERENCES_H_ +#ifndef CORE_FPDFDOC_CPDF_VIEWERPREFERENCES_H_ +#define CORE_FPDFDOC_CPDF_VIEWERPREFERENCES_H_ #include "core/fxcrt/include/fx_string.h" #include "core/fxcrt/include/fx_system.h" @@ -31,4 +31,4 @@ class CPDF_ViewerPreferences { CPDF_Document* const m_pDoc; }; -#endif // CORE_FPDFDOC_INCLUDE_CPDF_VIEWERPREFERENCES_H_ +#endif // CORE_FPDFDOC_CPDF_VIEWERPREFERENCES_H_ diff --git a/core/fpdfdoc/cpvt_fontmap.cpp b/core/fpdfdoc/cpvt_fontmap.cpp index cb600fb3a4..908f69f761 100644 --- a/core/fpdfdoc/cpvt_fontmap.cpp +++ b/core/fpdfdoc/cpvt_fontmap.cpp @@ -9,7 +9,7 @@ #include "core/fpdfapi/fpdf_font/cpdf_font.h" #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" -#include "core/fpdfdoc/include/cpdf_interform.h" +#include "core/fpdfdoc/cpdf_interform.h" CPVT_FontMap::CPVT_FontMap(CPDF_Document* pDoc, CPDF_Dictionary* pResDict, diff --git a/core/fpdfdoc/cpvt_fontmap.h b/core/fpdfdoc/cpvt_fontmap.h index 5c9b4ab5d0..d5ec87948d 100644 --- a/core/fpdfdoc/cpvt_fontmap.h +++ b/core/fpdfdoc/cpvt_fontmap.h @@ -9,7 +9,7 @@ #include <stdint.h> -#include "core/fpdfdoc/include/ipvt_fontmap.h" +#include "core/fpdfdoc/ipvt_fontmap.h" #include "core/fxcrt/include/fx_string.h" class CPDF_Document; diff --git a/core/fpdfdoc/cpvt_generateap.cpp b/core/fpdfdoc/cpvt_generateap.cpp index 96e11d38ad..c09503614f 100644 --- a/core/fpdfdoc/cpvt_generateap.cpp +++ b/core/fpdfdoc/cpvt_generateap.cpp @@ -14,11 +14,11 @@ #include "core/fpdfapi/fpdf_parser/cpdf_simple_parser.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream.h" #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h" +#include "core/fpdfdoc/cpdf_annot.h" +#include "core/fpdfdoc/cpdf_formfield.h" #include "core/fpdfdoc/cpvt_color.h" #include "core/fpdfdoc/cpvt_fontmap.h" -#include "core/fpdfdoc/include/cpdf_annot.h" -#include "core/fpdfdoc/include/cpdf_formfield.h" -#include "core/fpdfdoc/include/cpvt_word.h" +#include "core/fpdfdoc/cpvt_word.h" namespace { diff --git a/core/fpdfdoc/cpvt_generateap.h b/core/fpdfdoc/cpvt_generateap.h index 3fbc4cc591..603d4458f4 100644 --- a/core/fpdfdoc/cpvt_generateap.h +++ b/core/fpdfdoc/cpvt_generateap.h @@ -7,10 +7,10 @@ #ifndef CORE_FPDFDOC_CPVT_GENERATEAP_H_ #define CORE_FPDFDOC_CPVT_GENERATEAP_H_ +#include "core/fpdfdoc/cpdf_defaultappearance.h" +#include "core/fpdfdoc/cpdf_variabletext.h" #include "core/fpdfdoc/cpvt_color.h" #include "core/fpdfdoc/cpvt_dash.h" -#include "core/fpdfdoc/include/cpdf_defaultappearance.h" -#include "core/fpdfdoc/include/cpdf_variabletext.h" #include "core/fxcrt/include/fx_coordinates.h" #include "core/fxcrt/include/fx_string.h" #include "core/fxcrt/include/fx_system.h" diff --git a/core/fpdfdoc/include/cpvt_line.h b/core/fpdfdoc/cpvt_line.h index d6c74edb4e..70e3b7f40b 100644 --- a/core/fpdfdoc/include/cpvt_line.h +++ b/core/fpdfdoc/cpvt_line.h @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_CPVT_LINE_H_ -#define CORE_FPDFDOC_INCLUDE_CPVT_LINE_H_ +#ifndef CORE_FPDFDOC_CPVT_LINE_H_ +#define CORE_FPDFDOC_CPVT_LINE_H_ -#include "core/fpdfdoc/include/cpvt_wordplace.h" +#include "core/fpdfdoc/cpvt_wordplace.h" #include "core/fxcrt/include/fx_coordinates.h" #include "core/fxcrt/include/fx_system.h" @@ -22,4 +22,4 @@ struct CPVT_Line { FX_FLOAT fLineDescent; }; -#endif // CORE_FPDFDOC_INCLUDE_CPVT_LINE_H_ +#endif // CORE_FPDFDOC_CPVT_LINE_H_ diff --git a/core/fpdfdoc/include/cpvt_secprops.h b/core/fpdfdoc/cpvt_secprops.h index 67878f8625..e5c633f2c4 100644 --- a/core/fpdfdoc/include/cpvt_secprops.h +++ b/core/fpdfdoc/cpvt_secprops.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_CPVT_SECPROPS_H_ -#define CORE_FPDFDOC_INCLUDE_CPVT_SECPROPS_H_ +#ifndef CORE_FPDFDOC_CPVT_SECPROPS_H_ +#define CORE_FPDFDOC_CPVT_SECPROPS_H_ #include "core/fxcrt/include/fx_system.h" @@ -27,4 +27,4 @@ struct CPVT_SecProps { int32_t nAlignment; }; -#endif // CORE_FPDFDOC_INCLUDE_CPVT_SECPROPS_H_ +#endif // CORE_FPDFDOC_CPVT_SECPROPS_H_ diff --git a/core/fpdfdoc/include/cpvt_section.h b/core/fpdfdoc/cpvt_section.h index a9820bd5f9..ae122902d8 100644 --- a/core/fpdfdoc/include/cpvt_section.h +++ b/core/fpdfdoc/cpvt_section.h @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_CPVT_SECTION_H_ -#define CORE_FPDFDOC_INCLUDE_CPVT_SECTION_H_ +#ifndef CORE_FPDFDOC_CPVT_SECTION_H_ +#define CORE_FPDFDOC_CPVT_SECTION_H_ -#include "core/fpdfdoc/include/cpvt_secprops.h" -#include "core/fpdfdoc/include/cpvt_wordplace.h" -#include "core/fpdfdoc/include/cpvt_wordprops.h" +#include "core/fpdfdoc/cpvt_secprops.h" +#include "core/fpdfdoc/cpvt_wordplace.h" +#include "core/fpdfdoc/cpvt_wordprops.h" #include "core/fxcrt/include/fx_coordinates.h" struct CPVT_Section { @@ -19,4 +19,4 @@ struct CPVT_Section { CPVT_WordProps WordProps; }; -#endif // CORE_FPDFDOC_INCLUDE_CPVT_SECTION_H_ +#endif // CORE_FPDFDOC_CPVT_SECTION_H_ diff --git a/core/fpdfdoc/cpvt_sectioninfo.h b/core/fpdfdoc/cpvt_sectioninfo.h index 9d9b99fc27..6422efe868 100644 --- a/core/fpdfdoc/cpvt_sectioninfo.h +++ b/core/fpdfdoc/cpvt_sectioninfo.h @@ -10,8 +10,8 @@ #include <memory> #include "core/fpdfdoc/cpvt_floatrect.h" -#include "core/fpdfdoc/include/cpvt_secprops.h" -#include "core/fpdfdoc/include/cpvt_wordprops.h" +#include "core/fpdfdoc/cpvt_secprops.h" +#include "core/fpdfdoc/cpvt_wordprops.h" struct CPVT_SectionInfo { CPVT_SectionInfo(); diff --git a/core/fpdfdoc/include/cpvt_word.h b/core/fpdfdoc/cpvt_word.h index b2af4ec6fa..1e3b5aa0bd 100644 --- a/core/fpdfdoc/include/cpvt_word.h +++ b/core/fpdfdoc/cpvt_word.h @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_CPVT_WORD_H_ -#define CORE_FPDFDOC_INCLUDE_CPVT_WORD_H_ +#ifndef CORE_FPDFDOC_CPVT_WORD_H_ +#define CORE_FPDFDOC_CPVT_WORD_H_ -#include "core/fpdfdoc/include/cpvt_wordplace.h" -#include "core/fpdfdoc/include/cpvt_wordprops.h" +#include "core/fpdfdoc/cpvt_wordplace.h" +#include "core/fpdfdoc/cpvt_wordprops.h" #include "core/fxcrt/include/fx_system.h" struct CPVT_Word { @@ -35,4 +35,4 @@ inline CPVT_Word::CPVT_Word() nFontIndex(-1), fFontSize(0.0f) {} -#endif // CORE_FPDFDOC_INCLUDE_CPVT_WORD_H_ +#endif // CORE_FPDFDOC_CPVT_WORD_H_ diff --git a/core/fpdfdoc/cpvt_wordinfo.h b/core/fpdfdoc/cpvt_wordinfo.h index c690e2aa7b..3bb452a005 100644 --- a/core/fpdfdoc/cpvt_wordinfo.h +++ b/core/fpdfdoc/cpvt_wordinfo.h @@ -9,7 +9,7 @@ #include <memory> -#include "core/fpdfdoc/include/cpvt_wordprops.h" +#include "core/fpdfdoc/cpvt_wordprops.h" #include "core/fxcrt/include/fx_system.h" struct CPVT_WordInfo { diff --git a/core/fpdfdoc/include/cpvt_wordplace.h b/core/fpdfdoc/cpvt_wordplace.h index ef7907797e..33ba7c9ce1 100644 --- a/core/fpdfdoc/include/cpvt_wordplace.h +++ b/core/fpdfdoc/cpvt_wordplace.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_CPVT_WORDPLACE_H_ -#define CORE_FPDFDOC_INCLUDE_CPVT_WORDPLACE_H_ +#ifndef CORE_FPDFDOC_CPVT_WORDPLACE_H_ +#define CORE_FPDFDOC_CPVT_WORDPLACE_H_ #include "core/fxcrt/include/fx_system.h" @@ -70,4 +70,4 @@ struct CPVT_WordPlace { int32_t nWordIndex; }; -#endif // CORE_FPDFDOC_INCLUDE_CPVT_WORDPLACE_H_ +#endif // CORE_FPDFDOC_CPVT_WORDPLACE_H_ diff --git a/core/fpdfdoc/include/cpvt_wordprops.h b/core/fpdfdoc/cpvt_wordprops.h index 690a5e1950..25d8d76f00 100644 --- a/core/fpdfdoc/include/cpvt_wordprops.h +++ b/core/fpdfdoc/cpvt_wordprops.h @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_CPVT_WORDPROPS_H_ -#define CORE_FPDFDOC_INCLUDE_CPVT_WORDPROPS_H_ +#ifndef CORE_FPDFDOC_CPVT_WORDPROPS_H_ +#define CORE_FPDFDOC_CPVT_WORDPROPS_H_ -#include "core/fpdfdoc/include/cpdf_variabletext.h" +#include "core/fpdfdoc/cpdf_variabletext.h" #include "core/fxcrt/include/fx_system.h" #include "core/fxge/include/fx_dib.h" @@ -55,4 +55,4 @@ struct CPVT_WordProps { int32_t nHorzScale; }; -#endif // CORE_FPDFDOC_INCLUDE_CPVT_WORDPROPS_H_ +#endif // CORE_FPDFDOC_CPVT_WORDPROPS_H_ diff --git a/core/fpdfdoc/include/cpvt_wordrange.h b/core/fpdfdoc/cpvt_wordrange.h index 3c6f05b159..3cd0ecfb99 100644 --- a/core/fpdfdoc/include/cpvt_wordrange.h +++ b/core/fpdfdoc/cpvt_wordrange.h @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_CPVT_WORDRANGE_H_ -#define CORE_FPDFDOC_INCLUDE_CPVT_WORDRANGE_H_ +#ifndef CORE_FPDFDOC_CPVT_WORDRANGE_H_ +#define CORE_FPDFDOC_CPVT_WORDRANGE_H_ -#include "core/fpdfdoc/include/cpvt_wordplace.h" +#include "core/fpdfdoc/cpvt_wordplace.h" #include "core/fxcrt/include/fx_system.h" struct CPVT_WordRange { @@ -56,4 +56,4 @@ struct CPVT_WordRange { CPVT_WordPlace EndPos; }; -#endif // CORE_FPDFDOC_INCLUDE_CPVT_WORDRANGE_H_ +#endif // CORE_FPDFDOC_CPVT_WORDRANGE_H_ diff --git a/core/fpdfdoc/doc_tagged.cpp b/core/fpdfdoc/doc_tagged.cpp index a0ce472270..551732d836 100644 --- a/core/fpdfdoc/doc_tagged.cpp +++ b/core/fpdfdoc/doc_tagged.cpp @@ -12,7 +12,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_reference.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream.h" #include "core/fpdfdoc/cpdf_numbertree.h" -#include "core/fpdfdoc/include/fpdf_tagged.h" +#include "core/fpdfdoc/fpdf_tagged.h" #include "core/fpdfdoc/tagged_int.h" namespace { diff --git a/core/fpdfdoc/include/fpdf_tagged.h b/core/fpdfdoc/fpdf_tagged.h index 43d69e8db9..da05b79674 100644 --- a/core/fpdfdoc/include/fpdf_tagged.h +++ b/core/fpdfdoc/fpdf_tagged.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_FPDF_TAGGED_H_ -#define CORE_FPDFDOC_INCLUDE_FPDF_TAGGED_H_ +#ifndef CORE_FPDFDOC_FPDF_TAGGED_H_ +#define CORE_FPDFDOC_FPDF_TAGGED_H_ #include "core/fxge/include/fx_dib.h" @@ -90,4 +90,4 @@ class IPDF_StructElement { int subindex = -1) = 0; }; -#endif // CORE_FPDFDOC_INCLUDE_FPDF_TAGGED_H_ +#endif // CORE_FPDFDOC_FPDF_TAGGED_H_ diff --git a/core/fpdfdoc/include/ipdf_formnotify.h b/core/fpdfdoc/ipdf_formnotify.h index 49bb84d81e..4937bb1f0e 100644 --- a/core/fpdfdoc/include/ipdf_formnotify.h +++ b/core/fpdfdoc/ipdf_formnotify.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_IPDF_FORMNOTIFY_H_ -#define CORE_FPDFDOC_INCLUDE_IPDF_FORMNOTIFY_H_ +#ifndef CORE_FPDFDOC_IPDF_FORMNOTIFY_H_ +#define CORE_FPDFDOC_IPDF_FORMNOTIFY_H_ #include "core/fxcrt/include/fx_string.h" @@ -29,4 +29,4 @@ class IPDF_FormNotify { virtual void AfterFormImportData(CPDF_InterForm* pForm) = 0; }; -#endif // CORE_FPDFDOC_INCLUDE_IPDF_FORMNOTIFY_H_ +#endif // CORE_FPDFDOC_IPDF_FORMNOTIFY_H_ diff --git a/core/fpdfdoc/include/ipvt_fontmap.h b/core/fpdfdoc/ipvt_fontmap.h index 9835d5ec12..072783b70c 100644 --- a/core/fpdfdoc/include/ipvt_fontmap.h +++ b/core/fpdfdoc/ipvt_fontmap.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_INCLUDE_IPVT_FONTMAP_H_ -#define CORE_FPDFDOC_INCLUDE_IPVT_FONTMAP_H_ +#ifndef CORE_FPDFDOC_IPVT_FONTMAP_H_ +#define CORE_FPDFDOC_IPVT_FONTMAP_H_ #include <stdint.h> @@ -26,4 +26,4 @@ class IPVT_FontMap { virtual int32_t CharSetFromUnicode(uint16_t word, int32_t nOldCharset) = 0; }; -#endif // CORE_FPDFDOC_INCLUDE_IPVT_FONTMAP_H_ +#endif // CORE_FPDFDOC_IPVT_FONTMAP_H_ diff --git a/core/fpdfdoc/tagged_int.h b/core/fpdfdoc/tagged_int.h index 354a93cb76..871a01eeb7 100644 --- a/core/fpdfdoc/tagged_int.h +++ b/core/fpdfdoc/tagged_int.h @@ -11,7 +11,7 @@ #include <memory> #include <vector> -#include "core/fpdfdoc/include/fpdf_tagged.h" +#include "core/fpdfdoc/fpdf_tagged.h" #include "core/fxcrt/include/cfx_retain_ptr.h" #include "third_party/base/stl_util.h" diff --git a/fpdfsdk/DEPS b/fpdfsdk/DEPS index f5e84768ff..30e2079961 100644 --- a/fpdfsdk/DEPS +++ b/fpdfsdk/DEPS @@ -5,7 +5,7 @@ include_rules = [ '+core/fpdfapi/fpdf_page', '+core/fpdfapi/fpdf_parser', '+core/fpdfapi/fpdf_render', - '+core/fpdfdoc/include', + '+core/fpdfdoc', '+core/fxcodec/include', '+core/fxcrt/include', '+core/fxge/include', diff --git a/fpdfsdk/cpdfsdk_annothandlermgr.cpp b/fpdfsdk/cpdfsdk_annothandlermgr.cpp index 75542d360e..9dd5a4e46f 100644 --- a/fpdfsdk/cpdfsdk_annothandlermgr.cpp +++ b/fpdfsdk/cpdfsdk_annothandlermgr.cpp @@ -6,7 +6,7 @@ #include "fpdfsdk/include/cpdfsdk_annothandlermgr.h" -#include "core/fpdfdoc/include/cpdf_annot.h" +#include "core/fpdfdoc/cpdf_annot.h" #include "fpdfsdk/include/cba_annotiterator.h" #include "fpdfsdk/include/cpdfsdk_annot.h" #include "fpdfsdk/include/cpdfsdk_baannot.h" diff --git a/fpdfsdk/cpdfsdk_baannothandler.cpp b/fpdfsdk/cpdfsdk_baannothandler.cpp index ebbf2c11e4..4f5213e42e 100644 --- a/fpdfsdk/cpdfsdk_baannothandler.cpp +++ b/fpdfsdk/cpdfsdk_baannothandler.cpp @@ -11,7 +11,7 @@ #include "core/fpdfapi/fpdf_page/cpdf_page.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" -#include "core/fpdfdoc/include/cpdf_interform.h" +#include "core/fpdfdoc/cpdf_interform.h" #include "fpdfsdk/formfiller/cffl_formfiller.h" #include "fpdfsdk/include/cpdfsdk_annot.h" #include "fpdfsdk/include/cpdfsdk_baannot.h" diff --git a/fpdfsdk/cpdfsdk_document.cpp b/fpdfsdk/cpdfsdk_document.cpp index 09093fe80d..7c4686f4b3 100644 --- a/fpdfsdk/cpdfsdk_document.cpp +++ b/fpdfsdk/cpdfsdk_document.cpp @@ -10,9 +10,9 @@ #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "core/fpdfapi/fpdf_parser/cpdf_object.h" -#include "core/fpdfdoc/include/cpdf_action.h" -#include "core/fpdfdoc/include/cpdf_docjsactions.h" -#include "core/fpdfdoc/include/cpdf_occontext.h" +#include "core/fpdfdoc/cpdf_action.h" +#include "core/fpdfdoc/cpdf_docjsactions.h" +#include "core/fpdfdoc/cpdf_occontext.h" #include "fpdfsdk/include/cpdfsdk_annot.h" #include "fpdfsdk/include/cpdfsdk_annothandlermgr.h" #include "fpdfsdk/include/cpdfsdk_environment.h" diff --git a/fpdfsdk/cpdfsdk_interform.cpp b/fpdfsdk/cpdfsdk_interform.cpp index e41df1df28..9afd30b57b 100644 --- a/fpdfsdk/cpdfsdk_interform.cpp +++ b/fpdfsdk/cpdfsdk_interform.cpp @@ -15,8 +15,8 @@ #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream.h" -#include "core/fpdfdoc/include/cpdf_actionfields.h" -#include "core/fpdfdoc/include/cpdf_interform.h" +#include "core/fpdfdoc/cpdf_actionfields.h" +#include "core/fpdfdoc/cpdf_interform.h" #include "core/fxge/include/cfx_graphstatedata.h" #include "core/fxge/include/cfx_pathdata.h" #include "core/fxge/include/cfx_renderdevice.h" diff --git a/fpdfsdk/cpdfsdk_pageview.cpp b/fpdfsdk/cpdfsdk_pageview.cpp index 0ffc3fc610..cb76a8a571 100644 --- a/fpdfsdk/cpdfsdk_pageview.cpp +++ b/fpdfsdk/cpdfsdk_pageview.cpp @@ -11,8 +11,8 @@ #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h" -#include "core/fpdfdoc/include/cpdf_annotlist.h" -#include "core/fpdfdoc/include/cpdf_interform.h" +#include "core/fpdfdoc/cpdf_annotlist.h" +#include "core/fpdfdoc/cpdf_interform.h" #include "fpdfsdk/include/cpdfsdk_annot.h" #include "fpdfsdk/include/cpdfsdk_annothandlermgr.h" #include "fpdfsdk/include/cpdfsdk_annotiterator.h" diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp index f0583dd8f3..284fe8a762 100644 --- a/fpdfsdk/cpdfsdk_widget.cpp +++ b/fpdfsdk/cpdfsdk_widget.cpp @@ -11,11 +11,11 @@ #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream.h" -#include "core/fpdfdoc/include/cpdf_defaultappearance.h" -#include "core/fpdfdoc/include/cpdf_formcontrol.h" -#include "core/fpdfdoc/include/cpdf_formfield.h" -#include "core/fpdfdoc/include/cpdf_iconfit.h" -#include "core/fpdfdoc/include/cpdf_interform.h" +#include "core/fpdfdoc/cpdf_defaultappearance.h" +#include "core/fpdfdoc/cpdf_formcontrol.h" +#include "core/fpdfdoc/cpdf_formfield.h" +#include "core/fpdfdoc/cpdf_iconfit.h" +#include "core/fpdfdoc/cpdf_interform.h" #include "core/fxge/include/cfx_graphstatedata.h" #include "core/fxge/include/cfx_pathdata.h" #include "core/fxge/include/cfx_renderdevice.h" diff --git a/fpdfsdk/cpdfsdk_widgethandler.cpp b/fpdfsdk/cpdfsdk_widgethandler.cpp index c84372ea52..208877edaf 100644 --- a/fpdfsdk/cpdfsdk_widgethandler.cpp +++ b/fpdfsdk/cpdfsdk_widgethandler.cpp @@ -11,7 +11,7 @@ #include "core/fpdfapi/fpdf_page/cpdf_page.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" -#include "core/fpdfdoc/include/cpdf_interform.h" +#include "core/fpdfdoc/cpdf_interform.h" #include "fpdfsdk/formfiller/cffl_formfiller.h" #include "fpdfsdk/include/cpdfsdk_annot.h" #include "fpdfsdk/include/cpdfsdk_document.h" diff --git a/fpdfsdk/cpdfsdk_xfawidgethandler.cpp b/fpdfsdk/cpdfsdk_xfawidgethandler.cpp index 381699155e..2abe9944f0 100644 --- a/fpdfsdk/cpdfsdk_xfawidgethandler.cpp +++ b/fpdfsdk/cpdfsdk_xfawidgethandler.cpp @@ -6,7 +6,7 @@ #include "fpdfsdk/include/cpdfsdk_xfawidgethandler.h" -#include "core/fpdfdoc/include/cpdf_interform.h" +#include "core/fpdfdoc/cpdf_interform.h" #include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" #include "fpdfsdk/include/cpdfsdk_annot.h" #include "fpdfsdk/include/cpdfsdk_document.h" diff --git a/fpdfsdk/formfiller/cba_fontmap.cpp b/fpdfsdk/formfiller/cba_fontmap.cpp index 9e2a53f496..60e17a3ae8 100644 --- a/fpdfsdk/formfiller/cba_fontmap.cpp +++ b/fpdfsdk/formfiller/cba_fontmap.cpp @@ -12,7 +12,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_simple_parser.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream.h" #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h" -#include "core/fpdfdoc/include/cpdf_formfield.h" +#include "core/fpdfdoc/cpdf_formfield.h" #include "core/fxge/include/cfx_substfont.h" #include "fpdfsdk/include/cpdfsdk_annot.h" diff --git a/fpdfsdk/fpdf_ext.cpp b/fpdfsdk/fpdf_ext.cpp index d261b7150c..f9ae0c0cde 100644 --- a/fpdfsdk/fpdf_ext.cpp +++ b/fpdfsdk/fpdf_ext.cpp @@ -11,9 +11,9 @@ #include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" -#include "core/fpdfdoc/include/cpdf_annot.h" -#include "core/fpdfdoc/include/cpdf_interform.h" -#include "core/fpdfdoc/include/cpdf_metadata.h" +#include "core/fpdfdoc/cpdf_annot.h" +#include "core/fpdfdoc/cpdf_interform.h" +#include "core/fpdfdoc/cpdf_metadata.h" #include "core/fxcrt/include/fx_basic.h" #include "core/fxcrt/include/fx_memory.h" #include "core/fxcrt/include/fx_xml.h" diff --git a/fpdfsdk/fpdf_flatten.cpp b/fpdfsdk/fpdf_flatten.cpp index 1f3305b8c0..69c7a32207 100644 --- a/fpdfsdk/fpdf_flatten.cpp +++ b/fpdfsdk/fpdf_flatten.cpp @@ -15,7 +15,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_number.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h" -#include "core/fpdfdoc/include/cpdf_annot.h" +#include "core/fpdfdoc/cpdf_annot.h" #include "fpdfsdk/include/fsdk_define.h" typedef CFX_ArrayTemplate<CPDF_Dictionary*> CPDF_ObjectArray; diff --git a/fpdfsdk/fpdfdoc.cpp b/fpdfsdk/fpdfdoc.cpp index 55297bb2c0..4e0d05c30b 100644 --- a/fpdfsdk/fpdfdoc.cpp +++ b/fpdfsdk/fpdfdoc.cpp @@ -11,8 +11,8 @@ #include "core/fpdfapi/fpdf_page/cpdf_page.h" #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" -#include "core/fpdfdoc/include/cpdf_bookmark.h" -#include "core/fpdfdoc/include/cpdf_bookmarktree.h" +#include "core/fpdfdoc/cpdf_bookmark.h" +#include "core/fpdfdoc/cpdf_bookmarktree.h" #include "fpdfsdk/include/fsdk_define.h" #include "third_party/base/stl_util.h" diff --git a/fpdfsdk/fpdfeditpage.cpp b/fpdfsdk/fpdfeditpage.cpp index 5a0c6a4905..acbb295a63 100644 --- a/fpdfsdk/fpdfeditpage.cpp +++ b/fpdfsdk/fpdfeditpage.cpp @@ -22,8 +22,8 @@ #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "core/fpdfapi/fpdf_parser/cpdf_number.h" #include "core/fpdfapi/fpdf_parser/cpdf_string.h" -#include "core/fpdfdoc/include/cpdf_annot.h" -#include "core/fpdfdoc/include/cpdf_annotlist.h" +#include "core/fpdfdoc/cpdf_annot.h" +#include "core/fpdfdoc/cpdf_annotlist.h" #include "fpdfsdk/include/fsdk_define.h" #include "public/fpdf_formfill.h" #include "third_party/base/stl_util.h" diff --git a/fpdfsdk/fpdfformfill.cpp b/fpdfsdk/fpdfformfill.cpp index 4abeb81aae..11d4467854 100644 --- a/fpdfsdk/fpdfformfill.cpp +++ b/fpdfsdk/fpdfformfill.cpp @@ -12,10 +12,10 @@ #include "core/fpdfapi/fpdf_page/cpdf_page.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h" -#include "core/fpdfdoc/include/cpdf_formcontrol.h" -#include "core/fpdfdoc/include/cpdf_formfield.h" -#include "core/fpdfdoc/include/cpdf_interform.h" -#include "core/fpdfdoc/include/cpdf_occontext.h" +#include "core/fpdfdoc/cpdf_formcontrol.h" +#include "core/fpdfdoc/cpdf_formfield.h" +#include "core/fpdfdoc/cpdf_interform.h" +#include "core/fpdfdoc/cpdf_occontext.h" #include "core/fxge/include/cfx_fxgedevice.h" #include "fpdfsdk/include/cpdfsdk_document.h" #include "fpdfsdk/include/cpdfsdk_environment.h" diff --git a/fpdfsdk/fpdftext.cpp b/fpdfsdk/fpdftext.cpp index 7662b7d7cb..4a637b7662 100644 --- a/fpdfsdk/fpdftext.cpp +++ b/fpdfsdk/fpdftext.cpp @@ -7,7 +7,7 @@ #include "public/fpdf_text.h" #include "core/fpdfapi/fpdf_page/cpdf_page.h" -#include "core/fpdfdoc/include/cpdf_viewerpreferences.h" +#include "core/fpdfdoc/cpdf_viewerpreferences.h" #include "core/fpdftext/include/cpdf_linkextract.h" #include "core/fpdftext/include/cpdf_textpage.h" #include "core/fpdftext/include/cpdf_textpagefind.h" diff --git a/fpdfsdk/fpdfview.cpp b/fpdfsdk/fpdfview.cpp index 05f73e8517..d6d7f3b8e8 100644 --- a/fpdfsdk/fpdfview.cpp +++ b/fpdfsdk/fpdfview.cpp @@ -17,10 +17,10 @@ #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h" #include "core/fpdfapi/fpdf_render/cpdf_progressiverenderer.h" #include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h" -#include "core/fpdfdoc/include/cpdf_annotlist.h" -#include "core/fpdfdoc/include/cpdf_nametree.h" -#include "core/fpdfdoc/include/cpdf_occontext.h" -#include "core/fpdfdoc/include/cpdf_viewerpreferences.h" +#include "core/fpdfdoc/cpdf_annotlist.h" +#include "core/fpdfdoc/cpdf_nametree.h" +#include "core/fpdfdoc/cpdf_occontext.h" +#include "core/fpdfdoc/cpdf_viewerpreferences.h" #include "core/fxcodec/include/fx_codec.h" #include "core/fxcrt/include/fx_memory.h" #include "core/fxcrt/include/fx_safe_types.h" diff --git a/fpdfsdk/fsdk_actionhandler.cpp b/fpdfsdk/fsdk_actionhandler.cpp index 021d5a066b..d904352915 100644 --- a/fpdfsdk/fsdk_actionhandler.cpp +++ b/fpdfsdk/fsdk_actionhandler.cpp @@ -9,8 +9,8 @@ #include <set> #include "core/fpdfapi/fpdf_parser/cpdf_array.h" -#include "core/fpdfdoc/include/cpdf_formfield.h" -#include "core/fpdfdoc/include/cpdf_interform.h" +#include "core/fpdfdoc/cpdf_formfield.h" +#include "core/fpdfdoc/cpdf_interform.h" #include "fpdfsdk/include/cpdfsdk_document.h" #include "fpdfsdk/include/cpdfsdk_environment.h" #include "fpdfsdk/include/cpdfsdk_interform.h" diff --git a/fpdfsdk/fxedit/DEPS b/fpdfsdk/fxedit/DEPS index 973ea055cf..a8612e1c54 100644 --- a/fpdfsdk/fxedit/DEPS +++ b/fpdfsdk/fxedit/DEPS @@ -1,4 +1,4 @@ include_rules = [ '+core/fpdfapi/fpdf_font', - '+core/fpdfdoc/include', + '+core/fpdfdoc', ] diff --git a/fpdfsdk/fxedit/fxet_ap.cpp b/fpdfsdk/fxedit/fxet_ap.cpp index 7bd7e61f6c..e3fb03432a 100644 --- a/fpdfsdk/fxedit/fxet_ap.cpp +++ b/fpdfsdk/fxedit/fxet_ap.cpp @@ -6,8 +6,8 @@ #include "core/fpdfapi/fpdf_font/cpdf_font.h" #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h" -#include "core/fpdfdoc/include/cpvt_word.h" -#include "core/fpdfdoc/include/ipvt_fontmap.h" +#include "core/fpdfdoc/cpvt_word.h" +#include "core/fpdfdoc/ipvt_fontmap.h" #include "fpdfsdk/fxedit/include/fx_edit.h" #include "fpdfsdk/fxedit/include/fxet_edit.h" diff --git a/fpdfsdk/fxedit/fxet_edit.cpp b/fpdfsdk/fxedit/fxet_edit.cpp index f7597d2369..db299e5bf7 100644 --- a/fpdfsdk/fxedit/fxet_edit.cpp +++ b/fpdfsdk/fxedit/fxet_edit.cpp @@ -18,9 +18,9 @@ #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h" #include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h" #include "core/fpdfapi/fpdf_render/cpdf_textrenderer.h" -#include "core/fpdfdoc/include/cpvt_section.h" -#include "core/fpdfdoc/include/cpvt_word.h" -#include "core/fpdfdoc/include/ipvt_fontmap.h" +#include "core/fpdfdoc/cpvt_section.h" +#include "core/fpdfdoc/cpvt_word.h" +#include "core/fpdfdoc/ipvt_fontmap.h" #include "core/fxge/include/cfx_graphstatedata.h" #include "core/fxge/include/cfx_pathdata.h" #include "core/fxge/include/cfx_renderdevice.h" diff --git a/fpdfsdk/fxedit/fxet_list.cpp b/fpdfsdk/fxedit/fxet_list.cpp index 5fb26b119e..5c51446db4 100644 --- a/fpdfsdk/fxedit/fxet_list.cpp +++ b/fpdfsdk/fxedit/fxet_list.cpp @@ -6,7 +6,7 @@ #include "fpdfsdk/fxedit/include/fxet_list.h" -#include "core/fpdfdoc/include/cpvt_word.h" +#include "core/fpdfdoc/cpvt_word.h" #include "fpdfsdk/fxedit/include/fxet_edit.h" #include "fpdfsdk/pdfwindow/PWL_ListBox.h" diff --git a/fpdfsdk/fxedit/include/DEPS b/fpdfsdk/fxedit/include/DEPS index db9a09c342..0b00511fb2 100644 --- a/fpdfsdk/fxedit/include/DEPS +++ b/fpdfsdk/fxedit/include/DEPS @@ -1,3 +1,3 @@ include_rules = [ - '+core/fpdfdoc/include', + '+core/fpdfdoc', ] diff --git a/fpdfsdk/fxedit/include/fxet_edit.h b/fpdfsdk/fxedit/include/fxet_edit.h index 22db613d57..652dbbf2ce 100644 --- a/fpdfsdk/fxedit/include/fxet_edit.h +++ b/fpdfsdk/fxedit/include/fxet_edit.h @@ -9,8 +9,8 @@ #include <memory> -#include "core/fpdfdoc/include/cpvt_secprops.h" -#include "core/fpdfdoc/include/cpvt_wordprops.h" +#include "core/fpdfdoc/cpvt_secprops.h" +#include "core/fpdfdoc/cpvt_wordprops.h" #include "fpdfsdk/fxedit/include/fx_edit.h" class CFFL_FormFiller; diff --git a/fpdfsdk/include/cba_annotiterator.h b/fpdfsdk/include/cba_annotiterator.h index aa0ad2d72b..7d9078e23d 100644 --- a/fpdfsdk/include/cba_annotiterator.h +++ b/fpdfsdk/include/cba_annotiterator.h @@ -9,7 +9,7 @@ #include <vector> -#include "core/fpdfdoc/include/cpdf_annot.h" +#include "core/fpdfdoc/cpdf_annot.h" #include "core/fxcrt/include/fx_coordinates.h" #include "core/fxcrt/include/fx_string.h" diff --git a/fpdfsdk/include/cpdfsdk_annot.h b/fpdfsdk/include/cpdfsdk_annot.h index e7ae2e15a2..7356ce821b 100644 --- a/fpdfsdk/include/cpdfsdk_annot.h +++ b/fpdfsdk/include/cpdfsdk_annot.h @@ -7,9 +7,9 @@ #ifndef FPDFSDK_INCLUDE_CPDFSDK_ANNOT_H_ #define FPDFSDK_INCLUDE_CPDFSDK_ANNOT_H_ -#include "core/fpdfdoc/include/cpdf_aaction.h" -#include "core/fpdfdoc/include/cpdf_annot.h" -#include "core/fpdfdoc/include/cpdf_defaultappearance.h" +#include "core/fpdfdoc/cpdf_aaction.h" +#include "core/fpdfdoc/cpdf_annot.h" +#include "core/fpdfdoc/cpdf_defaultappearance.h" #include "core/fxcrt/include/cfx_observable.h" #include "core/fxcrt/include/fx_basic.h" #include "fpdfsdk/cfx_systemhandler.h" diff --git a/fpdfsdk/include/cpdfsdk_annothandlermgr.h b/fpdfsdk/include/cpdfsdk_annothandlermgr.h index d66914aafb..da54c7e54b 100644 --- a/fpdfsdk/include/cpdfsdk_annothandlermgr.h +++ b/fpdfsdk/include/cpdfsdk_annothandlermgr.h @@ -10,7 +10,7 @@ #include <map> #include <memory> -#include "core/fpdfdoc/include/cpdf_annot.h" +#include "core/fpdfdoc/cpdf_annot.h" #include "core/fxcrt/include/fx_basic.h" #include "core/fxcrt/include/fx_coordinates.h" #include "fpdfsdk/include/cpdfsdk_annot.h" diff --git a/fpdfsdk/include/cpdfsdk_baannot.h b/fpdfsdk/include/cpdfsdk_baannot.h index 4575bfe087..9cc1680bee 100644 --- a/fpdfsdk/include/cpdfsdk_baannot.h +++ b/fpdfsdk/include/cpdfsdk_baannot.h @@ -7,10 +7,10 @@ #ifndef FPDFSDK_INCLUDE_CPDFSDK_BAANNOT_H_ #define FPDFSDK_INCLUDE_CPDFSDK_BAANNOT_H_ -#include "core/fpdfdoc/include/cpdf_aaction.h" -#include "core/fpdfdoc/include/cpdf_action.h" -#include "core/fpdfdoc/include/cpdf_annot.h" -#include "core/fpdfdoc/include/cpdf_defaultappearance.h" +#include "core/fpdfdoc/cpdf_aaction.h" +#include "core/fpdfdoc/cpdf_action.h" +#include "core/fpdfdoc/cpdf_annot.h" +#include "core/fpdfdoc/cpdf_defaultappearance.h" #include "core/fxcrt/include/fx_coordinates.h" #include "core/fxcrt/include/fx_string.h" #include "fpdfsdk/cfx_systemhandler.h" diff --git a/fpdfsdk/include/cpdfsdk_environment.h b/fpdfsdk/include/cpdfsdk_environment.h index 4cf39f2145..35b48507ad 100644 --- a/fpdfsdk/include/cpdfsdk_environment.h +++ b/fpdfsdk/include/cpdfsdk_environment.h @@ -11,7 +11,7 @@ #include "core/fpdfapi/fpdf_page/cpdf_page.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" -#include "core/fpdfdoc/include/cpdf_occontext.h" +#include "core/fpdfdoc/cpdf_occontext.h" #include "core/fxcrt/include/cfx_observable.h" #include "fpdfsdk/cfx_systemhandler.h" #include "fpdfsdk/include/fsdk_define.h" diff --git a/fpdfsdk/include/cpdfsdk_interform.h b/fpdfsdk/include/cpdfsdk_interform.h index b4b5db3fca..b186ceb8cc 100644 --- a/fpdfsdk/include/cpdfsdk_interform.h +++ b/fpdfsdk/include/cpdfsdk_interform.h @@ -10,8 +10,8 @@ #include <map> #include <vector> -#include "core/fpdfdoc/include/cpdf_action.h" -#include "core/fpdfdoc/include/ipdf_formnotify.h" +#include "core/fpdfdoc/cpdf_action.h" +#include "core/fpdfdoc/ipdf_formnotify.h" #include "core/fxcrt/include/fx_basic.h" #include "core/fxge/include/fx_dib.h" diff --git a/fpdfsdk/include/cpdfsdk_widget.h b/fpdfsdk/include/cpdfsdk_widget.h index 09f9d94693..01710917ff 100644 --- a/fpdfsdk/include/cpdfsdk_widget.h +++ b/fpdfsdk/include/cpdfsdk_widget.h @@ -9,9 +9,9 @@ #include <set> -#include "core/fpdfdoc/include/cpdf_aaction.h" -#include "core/fpdfdoc/include/cpdf_action.h" -#include "core/fpdfdoc/include/cpdf_annot.h" +#include "core/fpdfdoc/cpdf_aaction.h" +#include "core/fpdfdoc/cpdf_action.h" +#include "core/fpdfdoc/cpdf_annot.h" #include "core/fxcrt/include/fx_coordinates.h" #include "core/fxcrt/include/fx_string.h" #include "fpdfsdk/include/cpdfsdk_baannot.h" diff --git a/fpdfsdk/include/fsdk_actionhandler.h b/fpdfsdk/include/fsdk_actionhandler.h index 5262439d81..fc6758898f 100644 --- a/fpdfsdk/include/fsdk_actionhandler.h +++ b/fpdfsdk/include/fsdk_actionhandler.h @@ -10,8 +10,8 @@ #include <memory> #include <set> -#include "core/fpdfdoc/include/cpdf_aaction.h" -#include "core/fpdfdoc/include/cpdf_action.h" +#include "core/fpdfdoc/cpdf_aaction.h" +#include "core/fpdfdoc/cpdf_action.h" #include "core/fxcrt/include/fx_string.h" #include "fpdfsdk/include/pdfsdk_fieldaction.h" diff --git a/fpdfsdk/javascript/Document.cpp b/fpdfsdk/javascript/Document.cpp index 1f6fb7d15e..594a92e099 100644 --- a/fpdfsdk/javascript/Document.cpp +++ b/fpdfsdk/javascript/Document.cpp @@ -14,8 +14,8 @@ #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h" -#include "core/fpdfdoc/include/cpdf_interform.h" -#include "core/fpdfdoc/include/cpdf_nametree.h" +#include "core/fpdfdoc/cpdf_interform.h" +#include "core/fpdfdoc/cpdf_nametree.h" #include "fpdfsdk/include/cpdfsdk_annotiterator.h" #include "fpdfsdk/include/cpdfsdk_document.h" #include "fpdfsdk/include/cpdfsdk_environment.h" diff --git a/fpdfsdk/javascript/Field.cpp b/fpdfsdk/javascript/Field.cpp index 7a0494f41e..0e65b16619 100644 --- a/fpdfsdk/javascript/Field.cpp +++ b/fpdfsdk/javascript/Field.cpp @@ -14,7 +14,7 @@ #include "core/fpdfapi/fpdf_font/cpdf_font.h" #include "core/fpdfapi/fpdf_page/cpdf_page.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" -#include "core/fpdfdoc/include/cpdf_interform.h" +#include "core/fpdfdoc/cpdf_interform.h" #include "fpdfsdk/include/cpdfsdk_document.h" #include "fpdfsdk/include/cpdfsdk_environment.h" #include "fpdfsdk/include/cpdfsdk_interform.h" diff --git a/fpdfsdk/javascript/PublicMethods.cpp b/fpdfsdk/javascript/PublicMethods.cpp index 65af6a1fa5..c7f7b85f45 100644 --- a/fpdfsdk/javascript/PublicMethods.cpp +++ b/fpdfsdk/javascript/PublicMethods.cpp @@ -9,7 +9,7 @@ #include <algorithm> #include <vector> -#include "core/fpdfdoc/include/cpdf_interform.h" +#include "core/fpdfdoc/cpdf_interform.h" #include "core/fxcrt/include/fx_ext.h" #include "fpdfsdk/include/cpdfsdk_document.h" #include "fpdfsdk/include/cpdfsdk_environment.h" diff --git a/fpdfsdk/pdfwindow/DEPS b/fpdfsdk/pdfwindow/DEPS index 973ea055cf..a8612e1c54 100644 --- a/fpdfsdk/pdfwindow/DEPS +++ b/fpdfsdk/pdfwindow/DEPS @@ -1,4 +1,4 @@ include_rules = [ '+core/fpdfapi/fpdf_font', - '+core/fpdfdoc/include', + '+core/fpdfdoc', ] diff --git a/fpdfsdk/pdfwindow/PWL_Edit.cpp b/fpdfsdk/pdfwindow/PWL_Edit.cpp index fc7d04cdef..b87d3390ea 100644 --- a/fpdfsdk/pdfwindow/PWL_Edit.cpp +++ b/fpdfsdk/pdfwindow/PWL_Edit.cpp @@ -9,7 +9,7 @@ #include <vector> #include "core/fpdfapi/fpdf_font/cpdf_font.h" -#include "core/fpdfdoc/include/cpvt_word.h" +#include "core/fpdfdoc/cpvt_word.h" #include "core/fxcrt/include/fx_safe_types.h" #include "core/fxcrt/include/fx_xml.h" #include "core/fxge/include/cfx_graphstatedata.h" diff --git a/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp b/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp index 2ec88cb15e..c99af4d155 100644 --- a/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp +++ b/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp @@ -6,8 +6,8 @@ #include "fpdfsdk/pdfwindow/PWL_EditCtrl.h" -#include "core/fpdfdoc/include/cpvt_section.h" -#include "core/fpdfdoc/include/cpvt_word.h" +#include "core/fpdfdoc/cpvt_section.h" +#include "core/fpdfdoc/cpvt_word.h" #include "core/fxge/include/fx_font.h" #include "fpdfsdk/fxedit/include/fxet_edit.h" #include "fpdfsdk/pdfwindow/PWL_Caret.h" diff --git a/fpdfsdk/pdfwindow/PWL_FontMap.cpp b/fpdfsdk/pdfwindow/PWL_FontMap.cpp index 6b719606a7..57feb27dcd 100644 --- a/fpdfsdk/pdfwindow/PWL_FontMap.cpp +++ b/fpdfsdk/pdfwindow/PWL_FontMap.cpp @@ -11,7 +11,7 @@ #include "core/fpdfapi/fpdf_font/cpdf_fontencoding.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "core/fpdfapi/fpdf_parser/cpdf_parser.h" -#include "core/fpdfdoc/include/ipvt_fontmap.h" +#include "core/fpdfdoc/ipvt_fontmap.h" #include "fpdfsdk/pdfwindow/PWL_Wnd.h" namespace { diff --git a/fpdfsdk/pdfwindow/PWL_FontMap.h b/fpdfsdk/pdfwindow/PWL_FontMap.h index bb3925d5c2..3dcd33919f 100644 --- a/fpdfsdk/pdfwindow/PWL_FontMap.h +++ b/fpdfsdk/pdfwindow/PWL_FontMap.h @@ -9,7 +9,7 @@ #include <memory> -#include "core/fpdfdoc/include/ipvt_fontmap.h" +#include "core/fpdfdoc/ipvt_fontmap.h" #include "core/fxge/include/fx_font.h" #include "fpdfsdk/fxedit/include/fx_edit.h" #include "public/fpdf_sysfontinfo.h" diff --git a/fpdfsdk/pdfwindow/PWL_Utils.cpp b/fpdfsdk/pdfwindow/PWL_Utils.cpp index 7c7e05af00..4b19fd5927 100644 --- a/fpdfsdk/pdfwindow/PWL_Utils.cpp +++ b/fpdfsdk/pdfwindow/PWL_Utils.cpp @@ -8,7 +8,7 @@ #include <algorithm> -#include "core/fpdfdoc/include/cpvt_word.h" +#include "core/fpdfdoc/cpvt_word.h" #include "core/fxge/include/cfx_graphstatedata.h" #include "core/fxge/include/cfx_pathdata.h" #include "core/fxge/include/cfx_renderdevice.h" diff --git a/fpdfsdk/pdfwindow/PWL_Utils.h b/fpdfsdk/pdfwindow/PWL_Utils.h index d7c65d2a8a..bdcba968a6 100644 --- a/fpdfsdk/pdfwindow/PWL_Utils.h +++ b/fpdfsdk/pdfwindow/PWL_Utils.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_PDFWINDOW_PWL_UTILS_H_ #define FPDFSDK_PDFWINDOW_PWL_UTILS_H_ -#include "core/fpdfdoc/include/cpvt_wordrange.h" +#include "core/fpdfdoc/cpvt_wordrange.h" #include "fpdfsdk/pdfwindow/PWL_Wnd.h" class CFX_Edit; diff --git a/fpdfsdk/pdfwindow/PWL_Wnd.h b/fpdfsdk/pdfwindow/PWL_Wnd.h index ca2b4c77da..37209ed8f8 100644 --- a/fpdfsdk/pdfwindow/PWL_Wnd.h +++ b/fpdfsdk/pdfwindow/PWL_Wnd.h @@ -10,7 +10,7 @@ #include <memory> #include <vector> -#include "core/fpdfdoc/include/cpdf_formcontrol.h" +#include "core/fpdfdoc/cpdf_formcontrol.h" #include "core/fxcrt/include/fx_basic.h" #include "fpdfsdk/cfx_systemhandler.h" diff --git a/xfa/fxfa/app/DEPS b/xfa/fxfa/app/DEPS index 5943f04098..abdf53d98f 100644 --- a/xfa/fxfa/app/DEPS +++ b/xfa/fxfa/app/DEPS @@ -3,7 +3,7 @@ include_rules = [ '+core/fpdfapi/fpdf_font', '+core/fpdfapi/fpdf_page', '+core/fpdfapi/fpdf_parser', - '+core/fpdfdoc/include', + '+core/fpdfdoc', '+core/fxcodec/include', '+core/fxcodec/codec/include', ] diff --git a/xfa/fxfa/app/xfa_ffdoc.cpp b/xfa/fxfa/app/xfa_ffdoc.cpp index a36e5e022e..f9b92c6f6d 100644 --- a/xfa/fxfa/app/xfa_ffdoc.cpp +++ b/xfa/fxfa/app/xfa_ffdoc.cpp @@ -11,7 +11,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h" -#include "core/fpdfdoc/include/cpdf_nametree.h" +#include "core/fpdfdoc/cpdf_nametree.h" #include "core/fxcrt/include/fx_ext.h" #include "core/fxcrt/include/fx_memory.h" #include "xfa/fde/xml/fde_xml_imp.h" |