diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-04-06 14:33:07 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-06 14:33:08 -0700 |
| commit | 7222ea6936cbcff886037e4d8d4018e13a7f720f (patch) | |
| tree | 2901f6ff4cbd1205a261843f5bc18a31cdc69b69 | |
| parent | 0b5adb6ead171069aa6f8c49c529f1c6d381e155 (diff) | |
| download | pdfium-7222ea6936cbcff886037e4d8d4018e13a7f720f.tar.xz | |
Move remaining xfa/include/fxfa files
This CL moves the remaining files in xfa/include/fxfa to xfa/fxfa/include.
Review URL: https://codereview.chromium.org/1864973005
78 files changed, 250 insertions, 247 deletions
@@ -1463,6 +1463,19 @@ if (pdf_enable_xfa) { "xfa/fxfa/fm2js/xfa_program.h", "xfa/fxfa/fm2js/xfa_simpleexpression.cpp", "xfa/fxfa/fm2js/xfa_simpleexpression.h", + "xfa/fxfa/include/fxfa.h", + "xfa/fxfa/include/fxfa_basic.h", + "xfa/fxfa/include/fxfa_widget.h", + "xfa/fxfa/include/xfa_checksum.h", + "xfa/fxfa/include/xfa_ffapp.h", + "xfa/fxfa/include/xfa_ffdoc.h", + "xfa/fxfa/include/xfa_ffdochandler.h", + "xfa/fxfa/include/xfa_ffdocview.h", + "xfa/fxfa/include/xfa_ffpageview.h", + "xfa/fxfa/include/xfa_ffwidget.h", + "xfa/fxfa/include/xfa_ffwidgethandler.h", + "xfa/fxfa/include/xfa_fontmgr.h", + "xfa/fxfa/include/xfa_rendercontext.h", "xfa/fxfa/parser/cxfa_arc.h", "xfa/fxfa/parser/cxfa_assist.cpp", "xfa/fxfa/parser/cxfa_assist.h", @@ -1585,19 +1598,6 @@ if (pdf_enable_xfa) { "xfa/fxgraphics/cfx_shading.h", "xfa/fxgraphics/include/cfx_graphics.h", "xfa/fxjse/include/fxjse.h", - "xfa/include/fxfa/fxfa.h", - "xfa/include/fxfa/fxfa_basic.h", - "xfa/include/fxfa/fxfa_widget.h", - "xfa/include/fxfa/xfa_checksum.h", - "xfa/include/fxfa/xfa_ffapp.h", - "xfa/include/fxfa/xfa_ffdoc.h", - "xfa/include/fxfa/xfa_ffdochandler.h", - "xfa/include/fxfa/xfa_ffdocview.h", - "xfa/include/fxfa/xfa_ffpageview.h", - "xfa/include/fxfa/xfa_ffwidget.h", - "xfa/include/fxfa/xfa_ffwidgethandler.h", - "xfa/include/fxfa/xfa_fontmgr.h", - "xfa/include/fxfa/xfa_rendercontext.h", ] include_dirs = [ "." ] if (pdf_enable_v8) { diff --git a/fpdfsdk/DEPS b/fpdfsdk/DEPS index 514011d0b3..33b0af6064 100644 --- a/fpdfsdk/DEPS +++ b/fpdfsdk/DEPS @@ -12,6 +12,6 @@ include_rules = [ '+core/fxge/include', '+public', '+v8', - '+xfa/include', + '+xfa/fxfa/include', '+xfa/fxgraphics/include', ] diff --git a/fpdfsdk/fpdfformfill.cpp b/fpdfsdk/fpdfformfill.cpp index bcd8a7472f..aa8bc9a0a0 100644 --- a/fpdfsdk/fpdfformfill.cpp +++ b/fpdfsdk/fpdfformfill.cpp @@ -21,10 +21,10 @@ #include "fpdfsdk/fpdfxfa/include/fpdfxfa_app.h" #include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" #include "fpdfsdk/fpdfxfa/include/fpdfxfa_page.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdocview.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdocview.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" #endif // PDF_ENABLE_XFA namespace { diff --git a/fpdfsdk/fpdfsave.cpp b/fpdfsdk/fpdfsave.cpp index 79b71bc15a..c67db816a9 100644 --- a/fpdfsdk/fpdfsave.cpp +++ b/fpdfsdk/fpdfsave.cpp @@ -23,10 +23,10 @@ #include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" #include "fpdfsdk/fpdfxfa/include/fpdfxfa_util.h" #include "public/fpdf_formfill.h" -#include "xfa/include/fxfa/xfa_checksum.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdocview.h" -#include "xfa/include/fxfa/xfa_ffwidgethandler.h" +#include "xfa/fxfa/include/xfa_checksum.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdocview.h" +#include "xfa/fxfa/include/xfa_ffwidgethandler.h" #endif #if _FX_OS_ == _FX_ANDROID_ diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp index b7a5b15dd9..5a7d24ee88 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp +++ b/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp @@ -11,8 +11,8 @@ #include "fpdfsdk/include/fsdk_mgr.h" #include "public/fpdf_formfill.h" #include "xfa/fxbarcode/include/BC_Library.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_fontmgr.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_fontmgr.h" CPDFXFA_App* CPDFXFA_App::g_pApp = NULL; diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp index 28b17fb6d1..cbf737138e 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp +++ b/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp @@ -16,11 +16,11 @@ #include "fpdfsdk/include/fsdk_mgr.h" #include "fpdfsdk/javascript/ijs_runtime.h" #include "public/fpdf_formfill.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffdocview.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffdocview.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" #define IDS_XFA_Validate_Input \ "At least one required field was empty. Please fill in the required " \ diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp index a62cabc2df..8179db5c11 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp +++ b/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp @@ -12,8 +12,8 @@ #include "fpdfsdk/fpdfxfa/include/fpdfxfa_util.h" #include "fpdfsdk/include/fsdk_define.h" #include "fpdfsdk/include/fsdk_mgr.h" -#include "xfa/include/fxfa/xfa_ffdocview.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffdocview.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" CPDFXFA_Page::CPDFXFA_Page(CPDFXFA_Document* pDoc, int page_index) : m_pPDFPage(NULL), diff --git a/fpdfsdk/fpdfxfa/include/fpdfxfa_app.h b/fpdfsdk/fpdfxfa/include/fpdfxfa_app.h index 2ad798c0e3..e88061fc4b 100644 --- a/fpdfsdk/fpdfxfa/include/fpdfxfa_app.h +++ b/fpdfsdk/fpdfxfa/include/fpdfxfa_app.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_FPDFXFA_INCLUDE_FPDFXFA_APP_H_ #define FPDFSDK_FPDFXFA_INCLUDE_FPDFXFA_APP_H_ -#include "xfa/include/fxfa/fxfa.h" +#include "xfa/fxfa/include/fxfa.h" class CPDFDoc_Environment; class IFXJS_Runtime; diff --git a/fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h b/fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h index 7fbf532923..2d4311f55f 100644 --- a/fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h +++ b/fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h @@ -10,9 +10,9 @@ #include <vector> #include "public/fpdfview.h" -#include "xfa/include/fxfa/fxfa.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffdochandler.h" +#include "xfa/fxfa/include/fxfa.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffdochandler.h" class CPDFXFA_App; class CPDFXFA_Document; diff --git a/fpdfsdk/fsdk_annothandler.cpp b/fpdfsdk/fsdk_annothandler.cpp index 2e421fc40f..24f3d60d47 100644 --- a/fpdfsdk/fsdk_annothandler.cpp +++ b/fpdfsdk/fsdk_annothandler.cpp @@ -19,8 +19,8 @@ #include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" #include "fpdfsdk/fpdfxfa/include/fpdfxfa_page.h" #include "fpdfsdk/fpdfxfa/include/fpdfxfa_util.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" #include "xfa/fxgraphics/include/cfx_graphics.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" #endif // PDF_ENABLE_XFA CPDFSDK_AnnotHandlerMgr::CPDFSDK_AnnotHandlerMgr(CPDFDoc_Environment* pApp) { diff --git a/fpdfsdk/fsdk_baseform.cpp b/fpdfsdk/fsdk_baseform.cpp index cc2fe5272e..859b022754 100644 --- a/fpdfsdk/fsdk_baseform.cpp +++ b/fpdfsdk/fsdk_baseform.cpp @@ -27,7 +27,7 @@ #ifdef PDF_ENABLE_XFA #include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" #include "fpdfsdk/fpdfxfa/include/fpdfxfa_util.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" #endif // PDF_ENABLE_XFA CPDFSDK_Widget::CPDFSDK_Widget(CPDF_Annot* pAnnot, diff --git a/fpdfsdk/fsdk_mgr.cpp b/fpdfsdk/fsdk_mgr.cpp index f905374bee..6c7a8bb4b2 100644 --- a/fpdfsdk/fsdk_mgr.cpp +++ b/fpdfsdk/fsdk_mgr.cpp @@ -23,8 +23,8 @@ #include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h" #include "fpdfsdk/fpdfxfa/include/fpdfxfa_page.h" #include "fpdfsdk/fpdfxfa/include/fpdfxfa_util.h" +#include "xfa/fxfa/include/xfa_rendercontext.h" #include "xfa/fxgraphics/include/cfx_graphics.h" -#include "xfa/include/fxfa/xfa_rendercontext.h" #endif // PDF_ENABLE_XFA #if _FX_OS_ == _FX_ANDROID_ diff --git a/fpdfsdk/include/fsdk_annothandler.h b/fpdfsdk/include/fsdk_annothandler.h index e810a7e504..a9c76e2523 100644 --- a/fpdfsdk/include/fsdk_annothandler.h +++ b/fpdfsdk/include/fsdk_annothandler.h @@ -14,10 +14,10 @@ #include "core/fxcrt/include/fx_coordinates.h" #ifdef PDF_ENABLE_XFA -#include "xfa/include/fxfa/fxfa.h" -#include "xfa/include/fxfa/xfa_ffdocview.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidgethandler.h" +#include "xfa/fxfa/include/fxfa.h" +#include "xfa/fxfa/include/xfa_ffdocview.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidgethandler.h" #define FSDK_XFAWIDGET_TYPENAME "XFAWidget" #endif // PDF_ENABLE_XFA diff --git a/fpdfsdk/include/fsdk_baseform.h b/fpdfsdk/include/fsdk_baseform.h index 084347f53b..fbe9a41c84 100644 --- a/fpdfsdk/include/fsdk_baseform.h +++ b/fpdfsdk/include/fsdk_baseform.h @@ -16,7 +16,7 @@ #include "fpdfsdk/include/fsdk_baseannot.h" #ifdef PDF_ENABLE_XFA -#include "xfa/include/fxfa/xfa_ffwidgethandler.h" +#include "xfa/fxfa/include/xfa_ffwidgethandler.h" #endif // PDF_ENABLE_XFA #if _FX_OS_ == _FX_ANDROID_ @@ -35,19 +35,19 @@ 'FT2_BUILD_LIBRARY', ], "sources":[ - "xfa/include/fxfa/fxfa.h", - "xfa/include/fxfa/fxfa_basic.h", - "xfa/include/fxfa/fxfa_widget.h", - "xfa/include/fxfa/xfa_checksum.h", - "xfa/include/fxfa/xfa_ffapp.h", - "xfa/include/fxfa/xfa_ffdoc.h", - "xfa/include/fxfa/xfa_ffdochandler.h", - "xfa/include/fxfa/xfa_ffdocview.h", - "xfa/include/fxfa/xfa_ffpageview.h", - "xfa/include/fxfa/xfa_ffwidget.h", - "xfa/include/fxfa/xfa_ffwidgethandler.h", - "xfa/include/fxfa/xfa_fontmgr.h", - "xfa/include/fxfa/xfa_rendercontext.h", + "xfa/fxfa/include/fxfa.h", + "xfa/fxfa/include/fxfa_basic.h", + "xfa/fxfa/include/fxfa_widget.h", + "xfa/fxfa/include/xfa_checksum.h", + "xfa/fxfa/include/xfa_ffapp.h", + "xfa/fxfa/include/xfa_ffdoc.h", + "xfa/fxfa/include/xfa_ffdochandler.h", + "xfa/fxfa/include/xfa_ffdocview.h", + "xfa/fxfa/include/xfa_ffpageview.h", + "xfa/fxfa/include/xfa_ffwidget.h", + "xfa/fxfa/include/xfa_ffwidgethandler.h", + "xfa/fxfa/include/xfa_fontmgr.h", + "xfa/fxfa/include/xfa_rendercontext.h", "xfa/fde/css/fde_css.h", "xfa/fde/css/fde_csscache.cpp", "xfa/fde/css/fde_csscache.h", diff --git a/xfa/fwl/basewidget/fwl_editimp.cpp b/xfa/fwl/basewidget/fwl_editimp.cpp index fb25c1e0fc..b05bc2ae9d 100644 --- a/xfa/fwl/basewidget/fwl_editimp.cpp +++ b/xfa/fwl/basewidget/fwl_editimp.cpp @@ -27,9 +27,9 @@ #include "xfa/fwl/core/fwl_widgetimp.h" #include "xfa/fwl/core/fwl_widgetmgrimp.h" #include "xfa/fwl/core/ifwl_themeprovider.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" #include "xfa/fxgraphics/cfx_path.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" // static IFWL_Edit* IFWL_Edit::Create(const CFWL_WidgetImpProperties& properties, diff --git a/xfa/fxfa/app/xfa_checksum.cpp b/xfa/fxfa/app/xfa_checksum.cpp index 318541f05a..39bdb64e47 100644 --- a/xfa/fxfa/app/xfa_checksum.cpp +++ b/xfa/fxfa/app/xfa_checksum.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/include/fxfa/xfa_checksum.h" +#include "xfa/fxfa/include/xfa_checksum.h" #include "core/fdrm/crypto/include/fx_crypt.h" #include "xfa/fgas/crt/fgas_algorithm.h" diff --git a/xfa/fxfa/app/xfa_ffapp.cpp b/xfa/fxfa/app/xfa_ffapp.cpp index f629e408c0..71b8fc44b1 100644 --- a/xfa/fxfa/app/xfa_ffapp.cpp +++ b/xfa/fxfa/app/xfa_ffapp.cpp @@ -4,17 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/include/fxfa/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffapp.h" #include <algorithm> #include "xfa/fwl/core/ifwl_widgetmgrdelegate.h" #include "xfa/fxfa/app/xfa_fwladapter.h" #include "xfa/fxfa/app/xfa_fwltheme.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffdochandler.h" -#include "xfa/include/fxfa/xfa_ffwidgethandler.h" -#include "xfa/include/fxfa/xfa_fontmgr.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffdochandler.h" +#include "xfa/fxfa/include/xfa_ffwidgethandler.h" +#include "xfa/fxfa/include/xfa_fontmgr.h" CXFA_FileRead::CXFA_FileRead(const CFX_ArrayTemplate<CPDF_Stream*>& streams) { int32_t iCount = streams.GetSize(); diff --git a/xfa/fxfa/app/xfa_ffbarcode.cpp b/xfa/fxfa/app/xfa_ffbarcode.cpp index 5f38fafa9f..5987627f7f 100644 --- a/xfa/fxfa/app/xfa_ffbarcode.cpp +++ b/xfa/fxfa/app/xfa_ffbarcode.cpp @@ -13,8 +13,8 @@ #include "xfa/fxfa/app/xfa_fffield.h" #include "xfa/fxfa/app/xfa_fftextedit.h" #include "xfa/fxfa/app/xfa_fwladapter.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" namespace { diff --git a/xfa/fxfa/app/xfa_ffbarcode.h b/xfa/fxfa/app/xfa_ffbarcode.h index 8a32e8df51..ffa7037839 100644 --- a/xfa/fxfa/app/xfa_ffbarcode.h +++ b/xfa/fxfa/app/xfa_ffbarcode.h @@ -9,7 +9,7 @@ #include "xfa/fxbarcode/include/BC_Library.h" #include "xfa/fxfa/app/xfa_fftextedit.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" class CXFA_FFBarcode : public CXFA_FFTextEdit { public: diff --git a/xfa/fxfa/app/xfa_ffcheckbutton.cpp b/xfa/fxfa/app/xfa_ffcheckbutton.cpp index f741f2598e..85f445fedc 100644 --- a/xfa/fxfa/app/xfa_ffcheckbutton.cpp +++ b/xfa/fxfa/app/xfa_ffcheckbutton.cpp @@ -12,11 +12,11 @@ #include "xfa/fwl/lightwidget/cfwl_checkbox.h" #include "xfa/fxfa/app/xfa_ffexclgroup.h" #include "xfa/fxfa/app/xfa_fffield.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffdocview.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffdocview.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" CXFA_FFCheckButton::CXFA_FFCheckButton(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) diff --git a/xfa/fxfa/app/xfa_ffcheckbutton.h b/xfa/fxfa/app/xfa_ffcheckbutton.h index 2e169041d7..a04284250b 100644 --- a/xfa/fxfa/app/xfa_ffcheckbutton.h +++ b/xfa/fxfa/app/xfa_ffcheckbutton.h @@ -8,7 +8,7 @@ #define XFA_FXFA_APP_XFA_FFCHECKBUTTON_H_ #include "xfa/fxfa/app/xfa_fffield.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" class CXFA_FFCheckButton : public CXFA_FFField { public: diff --git a/xfa/fxfa/app/xfa_ffchoicelist.cpp b/xfa/fxfa/app/xfa_ffchoicelist.cpp index 57ef227a93..41564c6b04 100644 --- a/xfa/fxfa/app/xfa_ffchoicelist.cpp +++ b/xfa/fxfa/app/xfa_ffchoicelist.cpp @@ -13,10 +13,10 @@ #include "xfa/fwl/lightwidget/cfwl_listbox.h" #include "xfa/fxfa/app/xfa_fffield.h" #include "xfa/fxfa/app/xfa_fwladapter.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffdocview.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffdocview.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" CXFA_FFListBox::CXFA_FFListBox(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) diff --git a/xfa/fxfa/app/xfa_ffchoicelist.h b/xfa/fxfa/app/xfa_ffchoicelist.h index 580bb8f647..ba48380138 100644 --- a/xfa/fxfa/app/xfa_ffchoicelist.h +++ b/xfa/fxfa/app/xfa_ffchoicelist.h @@ -8,7 +8,7 @@ #define XFA_FXFA_APP_XFA_FFCHOICELIST_H_ #include "xfa/fxfa/app/xfa_fffield.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" class CXFA_FFListBox : public CXFA_FFField { public: diff --git a/xfa/fxfa/app/xfa_ffdoc.cpp b/xfa/fxfa/app/xfa_ffdoc.cpp index 5baebb152a..37bafca77a 100644 --- a/xfa/fxfa/app/xfa_ffdoc.cpp +++ b/xfa/fxfa/app/xfa_ffdoc.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/include/fxfa/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h" @@ -15,16 +15,16 @@ #include "xfa/fgas/crt/fgas_algorithm.h" #include "xfa/fwl/core/ifwl_notedriver.h" #include "xfa/fxfa/app/xfa_ffnotify.h" +#include "xfa/fxfa/include/xfa_checksum.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdocview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_fontmgr.h" #include "xfa/fxfa/parser/xfa_docdata.h" #include "xfa/fxfa/parser/xfa_document_serialize.h" #include "xfa/fxfa/parser/xfa_parser.h" #include "xfa/fxfa/parser/xfa_parser_imp.h" #include "xfa/fxfa/parser/xfa_parser_imp.h" -#include "xfa/include/fxfa/xfa_checksum.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdocview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" -#include "xfa/include/fxfa/xfa_fontmgr.h" CXFA_FFDoc::CXFA_FFDoc(CXFA_FFApp* pApp, IXFA_DocProvider* pDocProvider) : m_pDocProvider(pDocProvider), diff --git a/xfa/fxfa/app/xfa_ffdochandler.cpp b/xfa/fxfa/app/xfa_ffdochandler.cpp index 6aed551fdb..389e5ac6da 100644 --- a/xfa/fxfa/app/xfa_ffdochandler.cpp +++ b/xfa/fxfa/app/xfa_ffdochandler.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/include/fxfa/xfa_ffdochandler.h" +#include "xfa/fxfa/include/xfa_ffdochandler.h" +#include "xfa/fxfa/include/xfa_checksum.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" #include "xfa/fxfa/parser/xfa_script.h" #include "xfa/fxfa/parser/xfa_script_imp.h" -#include "xfa/include/fxfa/xfa_checksum.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" CXFA_FFDocHandler::CXFA_FFDocHandler() {} diff --git a/xfa/fxfa/app/xfa_ffdocview.cpp b/xfa/fxfa/app/xfa_ffdocview.cpp index dbedbad2e3..b9b3b9a4a8 100644 --- a/xfa/fxfa/app/xfa_ffdocview.cpp +++ b/xfa/fxfa/app/xfa_ffdocview.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/include/fxfa/xfa_ffdocview.h" +#include "xfa/fxfa/include/xfa_ffdocview.h" #include "core/fxcrt/include/fx_ext.h" #include "xfa/fxfa/app/xfa_ffbarcode.h" @@ -24,15 +24,15 @@ #include "xfa/fxfa/app/xfa_ffwidgetacc.h" #include "xfa/fxfa/app/xfa_fwladapter.h" #include "xfa/fxfa/app/xfa_textlayout.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffwidgethandler.h" #include "xfa/fxfa/parser/cxfa_binditems.h" #include "xfa/fxfa/parser/xfa_document_layout_imp.h" #include "xfa/fxfa/parser/xfa_script.h" #include "xfa/fxfa/parser/xfa_script_imp.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" -#include "xfa/include/fxfa/xfa_ffwidgethandler.h" extern const XFA_ATTRIBUTEENUM gs_EventActivity[] = { XFA_ATTRIBUTEENUM_Click, XFA_ATTRIBUTEENUM_Change, diff --git a/xfa/fxfa/app/xfa_ffdraw.cpp b/xfa/fxfa/app/xfa_ffdraw.cpp index 68c1d96f4a..d433003f5c 100644 --- a/xfa/fxfa/app/xfa_ffdraw.cpp +++ b/xfa/fxfa/app/xfa_ffdraw.cpp @@ -6,10 +6,10 @@ #include "xfa/fxfa/app/xfa_ffdraw.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" CXFA_FFDraw::CXFA_FFDraw(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFWidget(pPageView, pDataAcc) {} diff --git a/xfa/fxfa/app/xfa_ffdraw.h b/xfa/fxfa/app/xfa_ffdraw.h index 52ceb2cd0c..c3c1c14445 100644 --- a/xfa/fxfa/app/xfa_ffdraw.h +++ b/xfa/fxfa/app/xfa_ffdraw.h @@ -7,8 +7,8 @@ #ifndef XFA_FXFA_APP_XFA_FFDRAW_H_ #define XFA_FXFA_APP_XFA_FFDRAW_H_ -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" class CXFA_FFDraw : public CXFA_FFWidget { public: diff --git a/xfa/fxfa/app/xfa_ffexclgroup.cpp b/xfa/fxfa/app/xfa_ffexclgroup.cpp index 177738d636..f4a1cfb67b 100644 --- a/xfa/fxfa/app/xfa_ffexclgroup.cpp +++ b/xfa/fxfa/app/xfa_ffexclgroup.cpp @@ -6,10 +6,10 @@ #include "xfa/fxfa/app/xfa_ffexclgroup.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" CXFA_FFExclGroup::CXFA_FFExclGroup(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) diff --git a/xfa/fxfa/app/xfa_ffexclgroup.h b/xfa/fxfa/app/xfa_ffexclgroup.h index 5a1fc945b7..6b59f05384 100644 --- a/xfa/fxfa/app/xfa_ffexclgroup.h +++ b/xfa/fxfa/app/xfa_ffexclgroup.h @@ -7,8 +7,8 @@ #ifndef XFA_FXFA_APP_XFA_FFEXCLGROUP_H_ #define XFA_FXFA_APP_XFA_FFEXCLGROUP_H_ -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" class CXFA_FFExclGroup : public CXFA_FFWidget { public: diff --git a/xfa/fxfa/app/xfa_fffield.cpp b/xfa/fxfa/app/xfa_fffield.cpp index 229ed43733..dc1cebbf66 100644 --- a/xfa/fxfa/app/xfa_fffield.cpp +++ b/xfa/fxfa/app/xfa_fffield.cpp @@ -13,13 +13,13 @@ #include "xfa/fwl/lightwidget/cfwl_picturebox.h" #include "xfa/fxfa/app/xfa_fwltheme.h" #include "xfa/fxfa/app/xfa_textlayout.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffdocview.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" #include "xfa/fxgraphics/cfx_color.h" #include "xfa/fxgraphics/cfx_path.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffdocview.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" CXFA_FFField::CXFA_FFField(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFWidget(pPageView, pDataAcc), m_pNormalWidget(NULL) { diff --git a/xfa/fxfa/app/xfa_fffield.h b/xfa/fxfa/app/xfa_fffield.h index 44ee9bb4f2..70ba9fc661 100644 --- a/xfa/fxfa/app/xfa_fffield.h +++ b/xfa/fxfa/app/xfa_fffield.h @@ -10,8 +10,8 @@ #include "xfa/fwl/core/fwl_sdadapterimp.h" #include "xfa/fwl/core/ifwl_widgetdelegate.h" #include "xfa/fwl/lightwidget/cfwl_widget.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" #define XFA_MINUI_HEIGHT 4.32f #define XFA_DEFAULTUI_HEIGHT 2.0f diff --git a/xfa/fxfa/app/xfa_ffimage.cpp b/xfa/fxfa/app/xfa_ffimage.cpp index 5c28682978..7e4b0a9c34 100644 --- a/xfa/fxfa/app/xfa_ffimage.cpp +++ b/xfa/fxfa/app/xfa_ffimage.cpp @@ -7,10 +7,10 @@ #include "xfa/fxfa/app/xfa_ffimage.h" #include "xfa/fxfa/app/xfa_ffdraw.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" CXFA_FFImage::CXFA_FFImage(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFDraw(pPageView, pDataAcc) {} diff --git a/xfa/fxfa/app/xfa_ffimageedit.cpp b/xfa/fxfa/app/xfa_ffimageedit.cpp index d419fbd37d..343293d64c 100644 --- a/xfa/fxfa/app/xfa_ffimageedit.cpp +++ b/xfa/fxfa/app/xfa_ffimageedit.cpp @@ -11,10 +11,10 @@ #include "xfa/fwl/core/ifwl_notedriver.h" #include "xfa/fwl/lightwidget/cfwl_picturebox.h" #include "xfa/fxfa/app/xfa_fffield.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffdocview.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffdocview.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" CXFA_FFImageEdit::CXFA_FFImageEdit(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) diff --git a/xfa/fxfa/app/xfa_ffnotify.cpp b/xfa/fxfa/app/xfa_ffnotify.cpp index 7851819474..ac4cc27f8d 100644 --- a/xfa/fxfa/app/xfa_ffnotify.cpp +++ b/xfa/fxfa/app/xfa_ffnotify.cpp @@ -23,12 +23,12 @@ #include "xfa/fxfa/app/xfa_ffwidgetacc.h" #include "xfa/fxfa/app/xfa_fwladapter.h" #include "xfa/fxfa/app/xfa_textlayout.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffdocview.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" -#include "xfa/include/fxfa/xfa_ffwidgethandler.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffdocview.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffwidgethandler.h" static void XFA_FFDeleteWidgetAcc(void* pData) { delete static_cast<CXFA_WidgetAcc*>(pData); diff --git a/xfa/fxfa/app/xfa_ffpageview.cpp b/xfa/fxfa/app/xfa_ffpageview.cpp index 21eb8554da..54e315f466 100644 --- a/xfa/fxfa/app/xfa_ffpageview.cpp +++ b/xfa/fxfa/app/xfa_ffpageview.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/include/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" #include "xfa/fde/fde_render.h" #include "xfa/fxfa/app/xfa_ffcheckbutton.h" @@ -14,9 +14,9 @@ #include "xfa/fxfa/app/xfa_ffpushbutton.h" #include "xfa/fxfa/app/xfa_fftextedit.h" #include "xfa/fxfa/app/xfa_fwladapter.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffdocview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffdocview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" CXFA_FFPageView::CXFA_FFPageView(CXFA_FFDocView* pDocView, CXFA_Node* pPageArea) : CXFA_ContainerLayoutItem(pPageArea), diff --git a/xfa/fxfa/app/xfa_ffpath.cpp b/xfa/fxfa/app/xfa_ffpath.cpp index 6f30612942..2aad39f99c 100644 --- a/xfa/fxfa/app/xfa_ffpath.cpp +++ b/xfa/fxfa/app/xfa_ffpath.cpp @@ -7,12 +7,12 @@ #include "xfa/fxfa/app/xfa_ffpath.h" #include "xfa/fxfa/app/xfa_ffdraw.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" #include "xfa/fxgraphics/cfx_color.h" #include "xfa/fxgraphics/cfx_path.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" CXFA_FFLine::CXFA_FFLine(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFDraw(pPageView, pDataAcc) {} diff --git a/xfa/fxfa/app/xfa_ffpushbutton.cpp b/xfa/fxfa/app/xfa_ffpushbutton.cpp index 4c54868f55..d070223751 100644 --- a/xfa/fxfa/app/xfa_ffpushbutton.cpp +++ b/xfa/fxfa/app/xfa_ffpushbutton.cpp @@ -12,11 +12,11 @@ #include "xfa/fxfa/app/xfa_fffield.h" #include "xfa/fxfa/app/xfa_ffwidgetacc.h" #include "xfa/fxfa/app/xfa_textlayout.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" #include "xfa/fxgraphics/cfx_color.h" #include "xfa/fxgraphics/cfx_path.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" CXFA_FFPushButton::CXFA_FFPushButton(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) diff --git a/xfa/fxfa/app/xfa_ffsignature.cpp b/xfa/fxfa/app/xfa_ffsignature.cpp index e5dba34985..1cb77a4df1 100644 --- a/xfa/fxfa/app/xfa_ffsignature.cpp +++ b/xfa/fxfa/app/xfa_ffsignature.cpp @@ -7,9 +7,9 @@ #include "xfa/fxfa/app/xfa_ffsignature.h" #include "xfa/fxfa/app/xfa_fffield.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" CXFA_FFSignature::CXFA_FFSignature(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) diff --git a/xfa/fxfa/app/xfa_ffsubform.cpp b/xfa/fxfa/app/xfa_ffsubform.cpp index 0ba4858b72..a2add4f6a4 100644 --- a/xfa/fxfa/app/xfa_ffsubform.cpp +++ b/xfa/fxfa/app/xfa_ffsubform.cpp @@ -6,10 +6,10 @@ #include "xfa/fxfa/app/xfa_ffsubform.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" CXFA_FFSubForm::CXFA_FFSubForm(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) diff --git a/xfa/fxfa/app/xfa_ffsubform.h b/xfa/fxfa/app/xfa_ffsubform.h index 5a705a6a00..fd3da98670 100644 --- a/xfa/fxfa/app/xfa_ffsubform.h +++ b/xfa/fxfa/app/xfa_ffsubform.h @@ -7,8 +7,8 @@ #ifndef XFA_FXFA_APP_XFA_FFSUBFORM_H_ #define XFA_FXFA_APP_XFA_FFSUBFORM_H_ -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" class CXFA_FFSubForm : public CXFA_FFWidget { public: diff --git a/xfa/fxfa/app/xfa_fftext.cpp b/xfa/fxfa/app/xfa_fftext.cpp index d4bce5419f..b529f7e58a 100644 --- a/xfa/fxfa/app/xfa_fftext.cpp +++ b/xfa/fxfa/app/xfa_fftext.cpp @@ -9,11 +9,11 @@ #include "xfa/fwl/core/fwl_widgetdef.h" #include "xfa/fxfa/app/xfa_ffdraw.h" #include "xfa/fxfa/app/xfa_textlayout.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" #include "xfa/fxgraphics/include/cfx_graphics.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" CXFA_FFText::CXFA_FFText(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFDraw(pPageView, pDataAcc) {} diff --git a/xfa/fxfa/app/xfa_fftextedit.cpp b/xfa/fxfa/app/xfa_fftextedit.cpp index de93c031b5..69d445e2ab 100644 --- a/xfa/fxfa/app/xfa_fftextedit.cpp +++ b/xfa/fxfa/app/xfa_fftextedit.cpp @@ -17,12 +17,12 @@ #include "xfa/fxfa/app/xfa_fffield.h" #include "xfa/fxfa/app/xfa_fwladapter.h" #include "xfa/fxfa/app/xfa_textlayout.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffdocview.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" #include "xfa/fxfa/parser/xfa_localevalue.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffdocview.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" CXFA_FFTextEdit::CXFA_FFTextEdit(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) diff --git a/xfa/fxfa/app/xfa_ffwidget.cpp b/xfa/fxfa/app/xfa_ffwidget.cpp index 6f67654e96..c484b9afa8 100644 --- a/xfa/fxfa/app/xfa_ffwidget.cpp +++ b/xfa/fxfa/app/xfa_ffwidget.cpp @@ -4,23 +4,23 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" #include <algorithm> #include "core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h" #include "core/fxcodec/include/fx_codec.h" #include "xfa/fxfa/app/xfa_textlayout.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffdocview.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" #include "xfa/fxfa/parser/cxfa_corner.h" #include "xfa/fxgraphics/cfx_color.h" #include "xfa/fxgraphics/cfx_path.h" #include "xfa/fxgraphics/cfx_pattern.h" #include "xfa/fxgraphics/cfx_shading.h" #include "xfa/fxgraphics/include/cfx_graphics.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffdocview.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" CXFA_FFWidget::CXFA_FFWidget(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) diff --git a/xfa/fxfa/app/xfa_ffwidgetacc.cpp b/xfa/fxfa/app/xfa_ffwidgetacc.cpp index e5b70d6a81..073fbfe8aa 100644 --- a/xfa/fxfa/app/xfa_ffwidgetacc.cpp +++ b/xfa/fxfa/app/xfa_ffwidgetacc.cpp @@ -15,16 +15,16 @@ #include "xfa/fxfa/app/xfa_fffield.h" #include "xfa/fxfa/app/xfa_fwladapter.h" #include "xfa/fxfa/app/xfa_textlayout.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffdocview.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_fontmgr.h" #include "xfa/fxfa/parser/xfa_document_layout_imp.h" #include "xfa/fxfa/parser/xfa_localevalue.h" #include "xfa/fxfa/parser/xfa_script.h" #include "xfa/fxfa/parser/xfa_script_imp.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffdocview.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" -#include "xfa/include/fxfa/xfa_fontmgr.h" static void XFA_FFDeleteCalcData(void* pData) { if (pData) { diff --git a/xfa/fxfa/app/xfa_ffwidgethandler.cpp b/xfa/fxfa/app/xfa_ffwidgethandler.cpp index b79082965a..b4d268920c 100644 --- a/xfa/fxfa/app/xfa_ffwidgethandler.cpp +++ b/xfa/fxfa/app/xfa_ffwidgethandler.cpp @@ -4,19 +4,19 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/include/fxfa/xfa_ffwidgethandler.h" +#include "xfa/fxfa/include/xfa_ffwidgethandler.h" #include <vector> #include "xfa/fxfa/app/xfa_ffchoicelist.h" #include "xfa/fxfa/app/xfa_fffield.h" #include "xfa/fxfa/app/xfa_fwladapter.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffdocview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" #include "xfa/fxfa/parser/xfa_document_layout_imp.h" #include "xfa/fxfa/parser/xfa_parser.h" #include "xfa/fxfa/parser/xfa_parser_imp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffdocview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" CXFA_FFWidgetHandler::CXFA_FFWidgetHandler(CXFA_FFDocView* pDocView) : m_pDocView(pDocView) {} diff --git a/xfa/fxfa/app/xfa_fontmgr.cpp b/xfa/fxfa/app/xfa_fontmgr.cpp index facce24177..c2de4115cb 100644 --- a/xfa/fxfa/app/xfa_fontmgr.cpp +++ b/xfa/fxfa/app/xfa_fontmgr.cpp @@ -4,15 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/include/fxfa/xfa_fontmgr.h" +#include "xfa/fxfa/include/xfa_fontmgr.h" #include <algorithm> #include "core/fpdfapi/fpdf_font/include/cpdf_font.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ static const XFA_FONTINFO g_XFAFontsMap[] = { diff --git a/xfa/fxfa/app/xfa_fwladapter.cpp b/xfa/fxfa/app/xfa_fwladapter.cpp index c1732776b2..5821a729eb 100644 --- a/xfa/fxfa/app/xfa_fwladapter.cpp +++ b/xfa/fxfa/app/xfa_fwladapter.cpp @@ -7,7 +7,7 @@ #include "xfa/fxfa/app/xfa_fwladapter.h" #include "xfa/fxfa/app/xfa_fffield.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" FWL_ERR CXFA_FWLAdapterWidgetMgr::RepaintWidget(IFWL_Widget* pWidget, const CFX_RectF* pRect) { diff --git a/xfa/fxfa/app/xfa_fwltheme.cpp b/xfa/fxfa/app/xfa_fwltheme.cpp index f36c1bcc97..4d987b08b9 100644 --- a/xfa/fxfa/app/xfa_fwltheme.cpp +++ b/xfa/fxfa/app/xfa_fwltheme.cpp @@ -21,9 +21,9 @@ #include "xfa/fwl/basewidget/ifwl_scrollbar.h" #include "xfa/fwl/core/cfwl_themebackground.h" #include "xfa/fwl/core/cfwl_themetext.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" #include "xfa/fxgraphics/cfx_color.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" namespace { diff --git a/xfa/fxfa/app/xfa_fwltheme.h b/xfa/fxfa/app/xfa_fwltheme.h index 72a516b755..a33dfe133e 100644 --- a/xfa/fxfa/app/xfa_fwltheme.h +++ b/xfa/fxfa/app/xfa_fwltheme.h @@ -21,7 +21,7 @@ #include "xfa/fwl/theme/cfwl_pushbuttontp.h" #include "xfa/fwl/theme/cfwl_scrollbartp.h" #include "xfa/fwl/theme/cfwl_widgettp.h" -#include "xfa/include/fxfa/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffapp.h" class CXFA_FWLTheme : public IFWL_ThemeProvider { public: diff --git a/xfa/fxfa/app/xfa_rendercontext.cpp b/xfa/fxfa/app/xfa_rendercontext.cpp index 59ed31a21d..cc2ea4b9ac 100644 --- a/xfa/fxfa/app/xfa_rendercontext.cpp +++ b/xfa/fxfa/app/xfa_rendercontext.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/include/fxfa/xfa_rendercontext.h" +#include "xfa/fxfa/include/xfa_rendercontext.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" #include "xfa/fxgraphics/include/cfx_graphics.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" #define XFA_RENDERCONTEXT_MaxCount 30 diff --git a/xfa/fxfa/app/xfa_textlayout.cpp b/xfa/fxfa/app/xfa_textlayout.cpp index f92dbeffdf..7db66fdf88 100644 --- a/xfa/fxfa/app/xfa_textlayout.cpp +++ b/xfa/fxfa/app/xfa_textlayout.cpp @@ -14,9 +14,9 @@ #include "xfa/fgas/crt/fgas_algorithm.h" #include "xfa/fgas/crt/fgas_codepage.h" #include "xfa/fxfa/app/xfa_ffwidgetacc.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_fontmgr.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_fontmgr.h" CXFA_CSSTagProvider::~CXFA_CSSTagProvider() { FX_POSITION pos = m_Attributes.GetStartPosition(); diff --git a/xfa/fxfa/app/xfa_textlayout.h b/xfa/fxfa/app/xfa_textlayout.h index d92a2f4058..65e0c038c0 100644 --- a/xfa/fxfa/app/xfa_textlayout.h +++ b/xfa/fxfa/app/xfa_textlayout.h @@ -11,8 +11,8 @@ #include "xfa/fde/fde_brush.h" #include "xfa/fde/fde_renderdevice.h" #include "xfa/fgas/layout/fgas_rtfbreak.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" #include "xfa/fxfa/parser/xfa_object.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" #define XFA_LOADERCNTXTFLG_FILTERSPACE 0x001 diff --git a/xfa/fxfa/include/DEPS b/xfa/fxfa/include/DEPS new file mode 100644 index 0000000000..97ccb1faa6 --- /dev/null +++ b/xfa/fxfa/include/DEPS @@ -0,0 +1,3 @@ +include_rules = [ + '+core/fxcodec/include', +] diff --git a/xfa/include/fxfa/fxfa.h b/xfa/fxfa/include/fxfa.h index 624502aa83..eb99e59110 100644 --- a/xfa/include/fxfa/fxfa.h +++ b/xfa/fxfa/include/fxfa.h @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_INCLUDE_FXFA_FXFA_H_ -#define XFA_INCLUDE_FXFA_FXFA_H_ +#ifndef XFA_FXFA_INCLUDE_FXFA_H_ +#define XFA_FXFA_INCLUDE_FXFA_H_ #include <vector> -#include "xfa/include/fxfa/fxfa_basic.h" -#include "xfa/include/fxfa/fxfa_widget.h" +#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/include/fxfa_widget.h" class CFX_Graphics; class CPDF_Document; @@ -552,4 +552,4 @@ class IXFA_WidgetIterator { ~IXFA_WidgetIterator() {} }; -#endif // XFA_INCLUDE_FXFA_FXFA_H_ +#endif // XFA_FXFA_INCLUDE_FXFA_H_ diff --git a/xfa/include/fxfa/fxfa_basic.h b/xfa/fxfa/include/fxfa_basic.h index ff151d19ab..15fbc85ef4 100644 --- a/xfa/include/fxfa/fxfa_basic.h +++ b/xfa/fxfa/include/fxfa_basic.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_INCLUDE_FXFA_FXFA_BASIC_H_ -#define XFA_INCLUDE_FXFA_FXFA_BASIC_H_ +#ifndef XFA_FXFA_INCLUDE_FXFA_BASIC_H_ +#define XFA_FXFA_INCLUDE_FXFA_BASIC_H_ #include "xfa/fxjse/cfxjse_arguments.h" #include "xfa/fxjse/include/fxjse.h" @@ -1076,4 +1076,4 @@ const XFA_SCRIPTATTRIBUTEINFO* XFA_GetScriptAttributeByName( XFA_ELEMENT eElement, const CFX_WideStringC& wsAttributeName); -#endif // XFA_INCLUDE_FXFA_FXFA_BASIC_H_ +#endif // XFA_FXFA_INCLUDE_FXFA_BASIC_H_ diff --git a/xfa/include/fxfa/fxfa_widget.h b/xfa/fxfa/include/fxfa_widget.h index 6ab7a6f0da..0f1de8526b 100644 --- a/xfa/include/fxfa/fxfa_widget.h +++ b/xfa/fxfa/include/fxfa_widget.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_INCLUDE_FXFA_FXFA_WIDGET_H_ -#define XFA_INCLUDE_FXFA_FXFA_WIDGET_H_ +#ifndef XFA_FXFA_INCLUDE_FXFA_WIDGET_H_ +#define XFA_FXFA_INCLUDE_FXFA_WIDGET_H_ #include "core/fxcrt/include/fx_coordinates.h" #include "core/fxge/include/fx_dib.h" @@ -125,4 +125,4 @@ class CXFA_WidgetAcc : public CXFA_WidgetData { uint32_t m_nRecursionDepth; }; -#endif // XFA_INCLUDE_FXFA_FXFA_WIDGET_H_ +#endif // XFA_FXFA_INCLUDE_FXFA_WIDGET_H_ diff --git a/xfa/include/fxfa/xfa_checksum.h b/xfa/fxfa/include/xfa_checksum.h index 3ca79efe58..6c24b2a5af 100644 --- a/xfa/include/fxfa/xfa_checksum.h +++ b/xfa/fxfa/include/xfa_checksum.h @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_INCLUDE_FXFA_XFA_CHECKSUM_H_ -#define XFA_INCLUDE_FXFA_XFA_CHECKSUM_H_ +#ifndef XFA_FXFA_INCLUDE_XFA_CHECKSUM_H_ +#define XFA_FXFA_INCLUDE_XFA_CHECKSUM_H_ #include "xfa/fgas/xml/fgas_sax.h" -#include "xfa/include/fxfa/fxfa.h" +#include "xfa/fxfa/include/fxfa.h" class CXFA_SAXReaderHandler; class CXFA_ChecksumContext; @@ -71,4 +71,4 @@ class CXFA_ChecksumContext { CFX_ByteString m_bsChecksum; }; -#endif // XFA_INCLUDE_FXFA_XFA_CHECKSUM_H_ +#endif // XFA_FXFA_INCLUDE_XFA_CHECKSUM_H_ diff --git a/xfa/include/fxfa/xfa_ffapp.h b/xfa/fxfa/include/xfa_ffapp.h index c17b9e66de..cad4e88e58 100644 --- a/xfa/include/fxfa/xfa_ffapp.h +++ b/xfa/fxfa/include/xfa_ffapp.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_INCLUDE_FXFA_XFA_FFAPP_H_ -#define XFA_INCLUDE_FXFA_XFA_FFAPP_H_ +#ifndef XFA_FXFA_INCLUDE_XFA_FFAPP_H_ +#define XFA_FXFA_INCLUDE_XFA_FFAPP_H_ #include "core/fpdfapi/fpdf_parser/include/cpdf_stream.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h" @@ -13,7 +13,7 @@ #include "xfa/fwl/core/fwl_sdadapterimp.h" #include "xfa/fwl/core/ifwl_adapternative.h" #include "xfa/fwl/core/ifwl_app.h" -#include "xfa/include/fxfa/fxfa.h" +#include "xfa/fxfa/include/fxfa.h" class CXFA_DefFontMgr; class CXFA_FWLAdapterWidgetMgr; @@ -75,4 +75,4 @@ class CXFA_FFApp : public IFWL_AdapterNative { CFWL_SDAdapterThreadMgr* m_pAdapterThreadMgr; }; -#endif // XFA_INCLUDE_FXFA_XFA_FFAPP_H_ +#endif // XFA_FXFA_INCLUDE_XFA_FFAPP_H_ diff --git a/xfa/include/fxfa/xfa_ffdoc.h b/xfa/fxfa/include/xfa_ffdoc.h index ebae04b791..9d9af3d9bc 100644 --- a/xfa/include/fxfa/xfa_ffdoc.h +++ b/xfa/fxfa/include/xfa_ffdoc.h @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_INCLUDE_FXFA_XFA_FFDOC_H_ -#define XFA_INCLUDE_FXFA_XFA_FFDOC_H_ +#ifndef XFA_FXFA_INCLUDE_XFA_FFDOC_H_ +#define XFA_FXFA_INCLUDE_XFA_FFDOC_H_ +#include "xfa/fxfa/include/fxfa.h" #include "xfa/fxfa/parser/xfa_document.h" -#include "xfa/include/fxfa/fxfa.h" class CXFA_ChecksumContext; class CXFA_FFApp; @@ -62,4 +62,4 @@ class CXFA_FFDoc { FX_BOOL m_bOwnStream; }; -#endif // XFA_INCLUDE_FXFA_XFA_FFDOC_H_ +#endif // XFA_FXFA_INCLUDE_XFA_FFDOC_H_ diff --git a/xfa/include/fxfa/xfa_ffdochandler.h b/xfa/fxfa/include/xfa_ffdochandler.h index 6350d65079..9cd9b0e632 100644 --- a/xfa/include/fxfa/xfa_ffdochandler.h +++ b/xfa/fxfa/include/xfa_ffdochandler.h @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_INCLUDE_FXFA_XFA_FFDOCHANDLER_H_ -#define XFA_INCLUDE_FXFA_XFA_FFDOCHANDLER_H_ +#ifndef XFA_FXFA_INCLUDE_XFA_FFDOCHANDLER_H_ +#define XFA_FXFA_INCLUDE_XFA_FFDOCHANDLER_H_ -#include "xfa/include/fxfa/fxfa.h" +#include "xfa/fxfa/include/fxfa.h" class CXFA_ChecksumContext; @@ -28,4 +28,4 @@ class CXFA_FFDocHandler { protected: }; -#endif // XFA_INCLUDE_FXFA_XFA_FFDOCHANDLER_H_ +#endif // XFA_FXFA_INCLUDE_XFA_FFDOCHANDLER_H_ diff --git a/xfa/include/fxfa/xfa_ffdocview.h b/xfa/fxfa/include/xfa_ffdocview.h index e8a29111a7..27ef8e96d4 100644 --- a/xfa/include/fxfa/xfa_ffdocview.h +++ b/xfa/fxfa/include/xfa_ffdocview.h @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_INCLUDE_FXFA_XFA_FFDOCVIEW_H_ -#define XFA_INCLUDE_FXFA_XFA_FFDOCVIEW_H_ +#ifndef XFA_FXFA_INCLUDE_XFA_FFDOCVIEW_H_ +#define XFA_FXFA_INCLUDE_XFA_FFDOCVIEW_H_ -#include "xfa/include/fxfa/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" class CXFA_FFWidgetHandler; class CXFA_FFDoc; @@ -169,4 +169,4 @@ class CXFA_WidgetAccIterator { CXFA_WidgetAcc* m_pCurWidgetAcc; }; -#endif // XFA_INCLUDE_FXFA_XFA_FFDOCVIEW_H_ +#endif // XFA_FXFA_INCLUDE_XFA_FFDOCVIEW_H_ diff --git a/xfa/include/fxfa/xfa_ffpageview.h b/xfa/fxfa/include/xfa_ffpageview.h index cce1cc13e1..56d1a7312c 100644 --- a/xfa/include/fxfa/xfa_ffpageview.h +++ b/xfa/fxfa/include/xfa_ffpageview.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_INCLUDE_FXFA_XFA_FFPAGEVIEW_H_ -#define XFA_INCLUDE_FXFA_XFA_FFPAGEVIEW_H_ +#ifndef XFA_FXFA_INCLUDE_XFA_FFPAGEVIEW_H_ +#define XFA_FXFA_INCLUDE_XFA_FFPAGEVIEW_H_ #include "xfa/fxfa/parser/xfa_doclayout.h" @@ -110,4 +110,4 @@ class CXFA_FFTabOrderPageWidgetIterator : public IXFA_WidgetIterator { FX_BOOL m_bIgnorerelevant; }; -#endif // XFA_INCLUDE_FXFA_XFA_FFPAGEVIEW_H_ +#endif // XFA_FXFA_INCLUDE_XFA_FFPAGEVIEW_H_ diff --git a/xfa/include/fxfa/xfa_ffwidget.h b/xfa/fxfa/include/xfa_ffwidget.h index 66e24f7043..0c0ba75791 100644 --- a/xfa/include/fxfa/xfa_ffwidget.h +++ b/xfa/fxfa/include/xfa_ffwidget.h @@ -4,15 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_INCLUDE_FXFA_XFA_FFWIDGET_H_ -#define XFA_INCLUDE_FXFA_XFA_FFWIDGET_H_ +#ifndef XFA_FXFA_INCLUDE_XFA_FFWIDGET_H_ +#define XFA_FXFA_INCLUDE_XFA_FFWIDGET_H_ #include <vector> #include "core/fxcodec/include/fx_codec_def.h" #include "core/fxge/include/fx_ge.h" +#include "xfa/fxfa/include/fxfa.h" #include "xfa/fxfa/parser/xfa_doclayout.h" -#include "xfa/include/fxfa/fxfa.h" class CXFA_FFPageView; class CXFA_FFDocView; @@ -179,4 +179,4 @@ void XFA_DrawBox(CXFA_Box box, CFX_Matrix* pMatrix, uint32_t dwFlags = 0); -#endif // XFA_INCLUDE_FXFA_XFA_FFWIDGET_H_ +#endif // XFA_FXFA_INCLUDE_XFA_FFWIDGET_H_ diff --git a/xfa/include/fxfa/xfa_ffwidgethandler.h b/xfa/fxfa/include/xfa_ffwidgethandler.h index 5247208431..f6cd2170a5 100644 --- a/xfa/include/fxfa/xfa_ffwidgethandler.h +++ b/xfa/fxfa/include/xfa_ffwidgethandler.h @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_INCLUDE_FXFA_XFA_FFWIDGETHANDLER_H_ -#define XFA_INCLUDE_FXFA_XFA_FFWIDGETHANDLER_H_ +#ifndef XFA_FXFA_INCLUDE_XFA_FFWIDGETHANDLER_H_ +#define XFA_FXFA_INCLUDE_XFA_FFWIDGETHANDLER_H_ #include <vector> +#include "xfa/fxfa/include/fxfa.h" #include "xfa/fxfa/parser/xfa_document.h" -#include "xfa/include/fxfa/fxfa.h" class CXFA_FFDocView; @@ -124,4 +124,4 @@ class CXFA_FFWidgetHandler { CXFA_FFDocView* m_pDocView; }; -#endif // XFA_INCLUDE_FXFA_XFA_FFWIDGETHANDLER_H_ +#endif // XFA_FXFA_INCLUDE_XFA_FFWIDGETHANDLER_H_ diff --git a/xfa/include/fxfa/xfa_fontmgr.h b/xfa/fxfa/include/xfa_fontmgr.h index 082c672805..cab3cfb219 100644 --- a/xfa/include/fxfa/xfa_fontmgr.h +++ b/xfa/fxfa/include/xfa_fontmgr.h @@ -4,15 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_INCLUDE_FXFA_XFA_FONTMGR_H_ -#define XFA_INCLUDE_FXFA_XFA_FONTMGR_H_ +#ifndef XFA_FXFA_INCLUDE_XFA_FONTMGR_H_ +#define XFA_FXFA_INCLUDE_XFA_FONTMGR_H_ #include <map> #include "core/fxcrt/include/fx_ext.h" #include "core/fxcrt/include/fx_system.h" #include "xfa/fgas/font/fgas_font.h" -#include "xfa/include/fxfa/fxfa.h" +#include "xfa/fxfa/include/fxfa.h" class CPDF_Font; @@ -96,4 +96,4 @@ class CXFA_FontMgr { std::map<CFX_ByteString, IFX_Font*> m_FontMap; }; -#endif // XFA_INCLUDE_FXFA_XFA_FONTMGR_H_ +#endif // XFA_FXFA_INCLUDE_XFA_FONTMGR_H_ diff --git a/xfa/include/fxfa/xfa_rendercontext.h b/xfa/fxfa/include/xfa_rendercontext.h index d6205275df..cd7949d78b 100644 --- a/xfa/include/fxfa/xfa_rendercontext.h +++ b/xfa/fxfa/include/xfa_rendercontext.h @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_INCLUDE_FXFA_XFA_RENDERCONTEXT_H_ -#define XFA_INCLUDE_FXFA_XFA_RENDERCONTEXT_H_ +#ifndef XFA_FXFA_INCLUDE_XFA_RENDERCONTEXT_H_ +#define XFA_FXFA_INCLUDE_XFA_RENDERCONTEXT_H_ -#include "xfa/include/fxfa/fxfa.h" +#include "xfa/fxfa/include/fxfa.h" class CXFA_RenderContext { public: @@ -33,4 +33,4 @@ class CXFA_RenderContext { CFX_RectF m_rtClipRect; }; -#endif // XFA_INCLUDE_FXFA_XFA_RENDERCONTEXT_H_ +#endif // XFA_FXFA_INCLUDE_XFA_RENDERCONTEXT_H_ diff --git a/xfa/fxfa/parser/cxfa_data.h b/xfa/fxfa/parser/cxfa_data.h index e6750d5ff7..e591393153 100644 --- a/xfa/fxfa/parser/cxfa_data.h +++ b/xfa/fxfa/parser/cxfa_data.h @@ -9,7 +9,7 @@ #include "core/fxcrt/include/fx_system.h" #include "core/fxge/include/fx_dib.h" -#include "xfa/include/fxfa/fxfa_basic.h" +#include "xfa/fxfa/include/fxfa_basic.h" class CXFA_Node; diff --git a/xfa/fxfa/parser/cxfa_stroke.h b/xfa/fxfa/parser/cxfa_stroke.h index 34ec8dd42a..719ac1bbcf 100644 --- a/xfa/fxfa/parser/cxfa_stroke.h +++ b/xfa/fxfa/parser/cxfa_stroke.h @@ -9,8 +9,8 @@ #include "core/fxcrt/include/fx_system.h" #include "core/fxge/include/fx_dib.h" +#include "xfa/fxfa/include/fxfa_basic.h" #include "xfa/fxfa/parser/cxfa_data.h" -#include "xfa/include/fxfa/fxfa_basic.h" enum StrokeSameStyle { XFA_STROKE_SAMESTYLE_NoPresence = 1, diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp index f3c2bde8d2..91bb348b91 100644 --- a/xfa/fxfa/parser/cxfa_widgetdata.cpp +++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp @@ -6,13 +6,13 @@ #include "xfa/fxfa/parser/cxfa_widgetdata.h" -#include "xfa/fxfa/parser/xfa_object.h" -#include "xfa/fxfa/parser/cxfa_event.h" -#include "xfa/fxfa/parser/xfa_document.h" #include "core/fxcrt/include/fx_ext.h" -#include "xfa/fxfa/app/xfa_ffnotify.h" #include "xfa/fxbarcode/include/BC_Library.h" +#include "xfa/fxfa/app/xfa_ffnotify.h" +#include "xfa/fxfa/parser/cxfa_event.h" +#include "xfa/fxfa/parser/xfa_document.h" #include "xfa/fxfa/parser/xfa_localevalue.h" +#include "xfa/fxfa/parser/xfa_object.h" namespace { diff --git a/xfa/fxfa/parser/xfa_basic_data.h b/xfa/fxfa/parser/xfa_basic_data.h index 9bc6dcb23b..b3f67dca07 100644 --- a/xfa/fxfa/parser/xfa_basic_data.h +++ b/xfa/fxfa/parser/xfa_basic_data.h @@ -7,8 +7,8 @@ #ifndef XFA_FXFA_PARSER_XFA_BASIC_DATA_H_ #define XFA_FXFA_PARSER_XFA_BASIC_DATA_H_ +#include "xfa/fxfa/include/fxfa_basic.h" #include "xfa/fxfa/parser/xfa_basic_imp.h" -#include "xfa/include/fxfa/fxfa_basic.h" extern const XFA_PACKETINFO g_XFAPacketData[]; extern const int32_t g_iXFAPacketCount; diff --git a/xfa/fxfa/parser/xfa_basic_imp.h b/xfa/fxfa/parser/xfa_basic_imp.h index ac0f8692ee..108b00d00f 100644 --- a/xfa/fxfa/parser/xfa_basic_imp.h +++ b/xfa/fxfa/parser/xfa_basic_imp.h @@ -8,7 +8,7 @@ #define XFA_FXFA_PARSER_XFA_BASIC_IMP_H_ #include "xfa/fgas/crt/fgas_stream.h" -#include "xfa/include/fxfa/fxfa_basic.h" +#include "xfa/fxfa/include/fxfa_basic.h" struct XFA_NOTSUREATTRIBUTE { XFA_ELEMENT eElement; diff --git a/xfa/fxfa/parser/xfa_document.h b/xfa/fxfa/parser/xfa_document.h index 3c96e9a711..4e98813b95 100644 --- a/xfa/fxfa/parser/xfa_document.h +++ b/xfa/fxfa/parser/xfa_document.h @@ -7,9 +7,9 @@ #ifndef XFA_FXFA_PARSER_XFA_DOCUMENT_H_ #define XFA_FXFA_PARSER_XFA_DOCUMENT_H_ +#include "xfa/fxfa/include/fxfa.h" #include "xfa/fxfa/parser/xfa_localemgr.h" #include "xfa/fxfa/parser/xfa_object.h" -#include "xfa/include/fxfa/fxfa.h" class CXFA_Document; class CXFA_LayoutItem; diff --git a/xfa/fxfa/parser/xfa_parser_imp.cpp b/xfa/fxfa/parser/xfa_parser_imp.cpp index 4c831d5b8f..7b8e73410e 100644 --- a/xfa/fxfa/parser/xfa_parser_imp.cpp +++ b/xfa/fxfa/parser/xfa_parser_imp.cpp @@ -9,6 +9,7 @@ #include "xfa/fde/xml/fde_xml_imp.h" #include "xfa/fgas/crt/fgas_codepage.h" #include "xfa/fxfa/fm2js/xfa_fm2jsapi.h" +#include "xfa/fxfa/include/xfa_checksum.h" #include "xfa/fxfa/parser/xfa_basic_imp.h" #include "xfa/fxfa/parser/xfa_docdata.h" #include "xfa/fxfa/parser/xfa_doclayout.h" @@ -18,7 +19,6 @@ #include "xfa/fxfa/parser/xfa_parser.h" #include "xfa/fxfa/parser/xfa_script.h" #include "xfa/fxfa/parser/xfa_utils.h" -#include "xfa/include/fxfa/xfa_checksum.h" IXFA_Parser* IXFA_Parser::Create(CXFA_Document* pFactory, FX_BOOL bDocumentParser) { diff --git a/xfa/fxfa/parser/xfa_script.h b/xfa/fxfa/parser/xfa_script.h index d92ede37c5..e608d4feec 100644 --- a/xfa/fxfa/parser/xfa_script.h +++ b/xfa/fxfa/parser/xfa_script.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_XFA_SCRIPT_H_ #define XFA_FXFA_PARSER_XFA_SCRIPT_H_ -#include "xfa/include/fxfa/fxfa.h" +#include "xfa/fxfa/include/fxfa.h" #define XFA_RESOLVENODE_Children 0x0001 #define XFA_RESOLVENODE_Attributes 0x0004 diff --git a/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp b/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp index 1daf55a79d..5d48e3eaf7 100644 --- a/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp +++ b/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp @@ -8,6 +8,7 @@ #include "xfa/fxfa/app/xfa_ffnotify.h" #include "xfa/fxfa/fm2js/xfa_fm2jsapi.h" +#include "xfa/fxfa/include/xfa_ffwidgethandler.h" #include "xfa/fxfa/parser/xfa_docdata.h" #include "xfa/fxfa/parser/xfa_doclayout.h" #include "xfa/fxfa/parser/xfa_document.h" @@ -19,7 +20,6 @@ #include "xfa/fxfa/parser/xfa_script_imp.h" #include "xfa/fxfa/parser/xfa_utils.h" #include "xfa/fxjse/cfxjse_arguments.h" -#include "xfa/include/fxfa/xfa_ffwidgethandler.h" CScript_EventPseudoModel::CScript_EventPseudoModel(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_EventPseudoModel) { diff --git a/xfa/fxfa/parser/xfa_utils.h b/xfa/fxfa/parser/xfa_utils.h index 83d0e23e21..a3e7afa25b 100644 --- a/xfa/fxfa/parser/xfa_utils.h +++ b/xfa/fxfa/parser/xfa_utils.h @@ -8,7 +8,7 @@ #define XFA_FXFA_PARSER_XFA_UTILS_H_ #include "xfa/fde/xml/fde_xml.h" -#include "xfa/include/fxfa/fxfa_basic.h" +#include "xfa/fxfa/include/fxfa_basic.h" class CFDE_XMLElement; class CFDE_XMLNode; |