From 1727aee85f22d9403e6cd8a0f786b9b7c0a2740a Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 29 Sep 2016 13:12:56 -0700 Subject: Move core/fpdfdoc/include to core/fpdfdoc BUG=pdfium:611 Review-Url: https://codereview.chromium.org/2374383003 --- fpdfsdk/DEPS | 2 +- fpdfsdk/cpdfsdk_annothandlermgr.cpp | 2 +- fpdfsdk/cpdfsdk_baannothandler.cpp | 2 +- fpdfsdk/cpdfsdk_document.cpp | 6 +++--- fpdfsdk/cpdfsdk_interform.cpp | 4 ++-- fpdfsdk/cpdfsdk_pageview.cpp | 4 ++-- fpdfsdk/cpdfsdk_widget.cpp | 10 +++++----- fpdfsdk/cpdfsdk_widgethandler.cpp | 2 +- fpdfsdk/cpdfsdk_xfawidgethandler.cpp | 2 +- fpdfsdk/formfiller/cba_fontmap.cpp | 2 +- fpdfsdk/fpdf_ext.cpp | 6 +++--- fpdfsdk/fpdf_flatten.cpp | 2 +- fpdfsdk/fpdfdoc.cpp | 4 ++-- fpdfsdk/fpdfeditpage.cpp | 4 ++-- fpdfsdk/fpdfformfill.cpp | 8 ++++---- fpdfsdk/fpdftext.cpp | 2 +- fpdfsdk/fpdfview.cpp | 8 ++++---- fpdfsdk/fsdk_actionhandler.cpp | 4 ++-- fpdfsdk/fxedit/DEPS | 2 +- fpdfsdk/fxedit/fxet_ap.cpp | 4 ++-- fpdfsdk/fxedit/fxet_edit.cpp | 6 +++--- fpdfsdk/fxedit/fxet_list.cpp | 2 +- fpdfsdk/fxedit/include/DEPS | 2 +- fpdfsdk/fxedit/include/fxet_edit.h | 4 ++-- fpdfsdk/include/cba_annotiterator.h | 2 +- fpdfsdk/include/cpdfsdk_annot.h | 6 +++--- fpdfsdk/include/cpdfsdk_annothandlermgr.h | 2 +- fpdfsdk/include/cpdfsdk_baannot.h | 8 ++++---- fpdfsdk/include/cpdfsdk_environment.h | 2 +- fpdfsdk/include/cpdfsdk_interform.h | 4 ++-- fpdfsdk/include/cpdfsdk_widget.h | 6 +++--- fpdfsdk/include/fsdk_actionhandler.h | 4 ++-- fpdfsdk/javascript/Document.cpp | 4 ++-- fpdfsdk/javascript/Field.cpp | 2 +- fpdfsdk/javascript/PublicMethods.cpp | 2 +- fpdfsdk/pdfwindow/DEPS | 2 +- fpdfsdk/pdfwindow/PWL_Edit.cpp | 2 +- fpdfsdk/pdfwindow/PWL_EditCtrl.cpp | 4 ++-- fpdfsdk/pdfwindow/PWL_FontMap.cpp | 2 +- fpdfsdk/pdfwindow/PWL_FontMap.h | 2 +- fpdfsdk/pdfwindow/PWL_Utils.cpp | 2 +- fpdfsdk/pdfwindow/PWL_Utils.h | 2 +- fpdfsdk/pdfwindow/PWL_Wnd.h | 2 +- 43 files changed, 77 insertions(+), 77 deletions(-) (limited to 'fpdfsdk') 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_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 #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 -#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 -#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 #include -#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 #include -#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 -#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 #include -#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 #include -#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 #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 -#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 -#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 #include -#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" -- cgit v1.2.3