diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-09-29 20:20:24 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-09-29 20:20:24 -0700 |
| commit | 5b4930967676088f2f0e5ce3b25aed77831d678c (patch) | |
| tree | 12f6dc7c0a0ee471f11ec8d9b52691e846076b3a | |
| parent | 202ad7238489934ba0c64760de5f95782b36a213 (diff) | |
| download | pdfium-5b4930967676088f2f0e5ce3b25aed77831d678c.tar.xz | |
Move xfa/fxfa/include to xfa/fxfa
BUG=pdfium:611
Review-Url: https://codereview.chromium.org/2383593002
104 files changed, 286 insertions, 288 deletions
@@ -1449,6 +1449,7 @@ if (pdf_enable_xfa) { "xfa/fxfa/app/xfa_rendercontext.cpp", "xfa/fxfa/app/xfa_textlayout.cpp", "xfa/fxfa/app/xfa_textlayout.h", + "xfa/fxfa/cxfa_eventparam.h", "xfa/fxfa/fm2js/xfa_error.cpp", "xfa/fxfa/fm2js/xfa_error.h", "xfa/fxfa/fm2js/xfa_expression.cpp", @@ -1463,20 +1464,9 @@ 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/cxfa_eventparam.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/fxfa.h", + "xfa/fxfa/fxfa_basic.h", + "xfa/fxfa/fxfa_widget.h", "xfa/fxfa/parser/cscript_datawindow.cpp", "xfa/fxfa/parser/cscript_datawindow.h", "xfa/fxfa/parser/cscript_eventpseudomodel.cpp", @@ -1607,6 +1597,16 @@ if (pdf_enable_xfa) { "xfa/fxfa/parser/xfa_resolvenode_rs.h", "xfa/fxfa/parser/xfa_utils.cpp", "xfa/fxfa/parser/xfa_utils.h", + "xfa/fxfa/xfa_checksum.h", + "xfa/fxfa/xfa_ffapp.h", + "xfa/fxfa/xfa_ffdoc.h", + "xfa/fxfa/xfa_ffdochandler.h", + "xfa/fxfa/xfa_ffdocview.h", + "xfa/fxfa/xfa_ffpageview.h", + "xfa/fxfa/xfa_ffwidget.h", + "xfa/fxfa/xfa_ffwidgethandler.h", + "xfa/fxfa/xfa_fontmgr.h", + "xfa/fxfa/xfa_rendercontext.h", "xfa/fxgraphics/cagg_graphics.cpp", "xfa/fxgraphics/cagg_graphics.h", "xfa/fxgraphics/cfx_color.cpp", diff --git a/fpdfsdk/DEPS b/fpdfsdk/DEPS index 840666d996..89f247e9fe 100644 --- a/fpdfsdk/DEPS +++ b/fpdfsdk/DEPS @@ -12,6 +12,6 @@ include_rules = [ '+public', '+v8', '+xfa/fwl/core', - '+xfa/fxfa/include', + '+xfa/fxfa', '+xfa/fxgraphics', ] diff --git a/fpdfsdk/cpdfsdk_annothandlermgr.cpp b/fpdfsdk/cpdfsdk_annothandlermgr.cpp index 709c0806fd..0fac080886 100644 --- a/fpdfsdk/cpdfsdk_annothandlermgr.cpp +++ b/fpdfsdk/cpdfsdk_annothandlermgr.cpp @@ -20,8 +20,8 @@ #ifdef PDF_ENABLE_XFA #include "fpdfsdk/cpdfsdk_xfawidgethandler.h" #include "fpdfsdk/fpdfxfa/fpdfxfa_page.h" -#include "xfa/fxfa/include/xfa_ffpageview.h" -#include "xfa/fxfa/include/xfa_ffwidget.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/xfa_ffwidget.h" #endif // PDF_ENABLE_XFA CPDFSDK_AnnotHandlerMgr::CPDFSDK_AnnotHandlerMgr(CPDFSDK_Environment* pEnv) diff --git a/fpdfsdk/cpdfsdk_interform.cpp b/fpdfsdk/cpdfsdk_interform.cpp index 7ecaeac310..855dc96da9 100644 --- a/fpdfsdk/cpdfsdk_interform.cpp +++ b/fpdfsdk/cpdfsdk_interform.cpp @@ -40,10 +40,10 @@ #include "fpdfsdk/cpdfsdk_xfawidget.h" #include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" #include "fpdfsdk/fpdfxfa/fpdfxfa_util.h" -#include "xfa/fxfa/include/cxfa_eventparam.h" -#include "xfa/fxfa/include/xfa_ffdocview.h" -#include "xfa/fxfa/include/xfa_ffwidget.h" -#include "xfa/fxfa/include/xfa_ffwidgethandler.h" +#include "xfa/fxfa/cxfa_eventparam.h" +#include "xfa/fxfa/xfa_ffdocview.h" +#include "xfa/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/xfa_ffwidgethandler.h" #endif // PDF_ENABLE_XFA CPDFSDK_InterForm::CPDFSDK_InterForm(CPDFSDK_Document* pDocument) diff --git a/fpdfsdk/cpdfsdk_pageview.cpp b/fpdfsdk/cpdfsdk_pageview.cpp index 0e4266774c..bf4d8c6979 100644 --- a/fpdfsdk/cpdfsdk_pageview.cpp +++ b/fpdfsdk/cpdfsdk_pageview.cpp @@ -21,10 +21,10 @@ #ifdef PDF_ENABLE_XFA #include "fpdfsdk/fpdfxfa/fpdfxfa_page.h" -#include "xfa/fxfa/include/xfa_ffdocview.h" -#include "xfa/fxfa/include/xfa_ffpageview.h" -#include "xfa/fxfa/include/xfa_ffwidgethandler.h" -#include "xfa/fxfa/include/xfa_rendercontext.h" +#include "xfa/fxfa/xfa_ffdocview.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/xfa_ffwidgethandler.h" +#include "xfa/fxfa/xfa_rendercontext.h" #include "xfa/fxgraphics/cfx_graphics.h" #endif // PDF_ENABLE_XFA diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp index cbf69c4c48..76cfa2a1f8 100644 --- a/fpdfsdk/cpdfsdk_widget.cpp +++ b/fpdfsdk/cpdfsdk_widget.cpp @@ -32,11 +32,11 @@ #ifdef PDF_ENABLE_XFA #include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" -#include "xfa/fxfa/include/cxfa_eventparam.h" -#include "xfa/fxfa/include/fxfa_widget.h" -#include "xfa/fxfa/include/xfa_ffdocview.h" -#include "xfa/fxfa/include/xfa_ffwidget.h" -#include "xfa/fxfa/include/xfa_ffwidgethandler.h" +#include "xfa/fxfa/cxfa_eventparam.h" +#include "xfa/fxfa/fxfa_widget.h" +#include "xfa/fxfa/xfa_ffdocview.h" +#include "xfa/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/xfa_ffwidgethandler.h" #endif // PDF_ENABLE_XFA namespace { diff --git a/fpdfsdk/cpdfsdk_xfawidget.cpp b/fpdfsdk/cpdfsdk_xfawidget.cpp index 516f7bd3c0..de4bd23866 100644 --- a/fpdfsdk/cpdfsdk_xfawidget.cpp +++ b/fpdfsdk/cpdfsdk_xfawidget.cpp @@ -7,7 +7,7 @@ #include "fpdfsdk/cpdfsdk_xfawidget.h" #include "fpdfsdk/ipdfsdk_annothandler.h" -#include "xfa/fxfa/include/xfa_ffwidget.h" +#include "xfa/fxfa/xfa_ffwidget.h" CPDFSDK_XFAWidget::CPDFSDK_XFAWidget(CXFA_FFWidget* pAnnot, CPDFSDK_PageView* pPageView, diff --git a/fpdfsdk/cpdfsdk_xfawidgethandler.cpp b/fpdfsdk/cpdfsdk_xfawidgethandler.cpp index 74a6a8e401..f21f4d2af9 100644 --- a/fpdfsdk/cpdfsdk_xfawidgethandler.cpp +++ b/fpdfsdk/cpdfsdk_xfawidgethandler.cpp @@ -15,11 +15,11 @@ #include "fpdfsdk/cpdfsdk_xfawidget.h" #include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" #include "xfa/fwl/core/fwl_widgethit.h" -#include "xfa/fxfa/include/fxfa_basic.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" +#include "xfa/fxfa/fxfa_basic.h" +#include "xfa/fxfa/xfa_ffdocview.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/xfa_ffwidgethandler.h" #include "xfa/fxgraphics/cfx_graphics.h" CPDFSDK_XFAWidgetHandler::CPDFSDK_XFAWidgetHandler(CPDFSDK_Environment* pEnv) diff --git a/fpdfsdk/fpdfformfill.cpp b/fpdfsdk/fpdfformfill.cpp index 2e497b27b1..8839a61afd 100644 --- a/fpdfsdk/fpdfformfill.cpp +++ b/fpdfsdk/fpdfformfill.cpp @@ -30,9 +30,9 @@ #include "fpdfsdk/fpdfxfa/fpdfxfa_app.h" #include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" #include "fpdfsdk/fpdfxfa/fpdfxfa_page.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/xfa_ffdocview.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/xfa_ffwidget.h" #endif // PDF_ENABLE_XFA namespace { diff --git a/fpdfsdk/fpdfsave.cpp b/fpdfsdk/fpdfsave.cpp index e7d88f71c0..d0cdd89eab 100644 --- a/fpdfsdk/fpdfsave.cpp +++ b/fpdfsdk/fpdfsave.cpp @@ -23,11 +23,11 @@ #include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" #include "fpdfsdk/fpdfxfa/fpdfxfa_util.h" #include "public/fpdf_formfill.h" -#include "xfa/fxfa/include/cxfa_eventparam.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" +#include "xfa/fxfa/cxfa_eventparam.h" +#include "xfa/fxfa/xfa_checksum.h" +#include "xfa/fxfa/xfa_ffapp.h" +#include "xfa/fxfa/xfa_ffdocview.h" +#include "xfa/fxfa/xfa_ffwidgethandler.h" #endif #if _FX_OS_ == _FX_ANDROID_ diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp index 454f044ce4..207f320865 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp +++ b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp @@ -16,9 +16,9 @@ #include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" #include "fpdfsdk/fpdfxfa/fpdfxfa_page.h" #include "fpdfsdk/javascript/ijs_runtime.h" -#include "xfa/fxfa/include/xfa_ffdocview.h" -#include "xfa/fxfa/include/xfa_ffwidget.h" -#include "xfa/fxfa/include/xfa_ffwidgethandler.h" +#include "xfa/fxfa/xfa_ffdocview.h" +#include "xfa/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/xfa_ffwidgethandler.h" #define IDS_XFA_Validate_Input \ "At least one required field was empty. Please fill in the required " \ diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h index 5b6c89dd42..537e1ebed3 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h +++ b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h @@ -8,7 +8,7 @@ #define FPDFSDK_FPDFXFA_CPDFXFA_DOCENVIRONMENT_H_ #include "public/fpdfview.h" -#include "xfa/fxfa/include/fxfa.h" +#include "xfa/fxfa/fxfa.h" class CPDFXFA_Document; class IJS_Context; diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp index 91dca08a86..88c31ef006 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp +++ b/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp @@ -12,8 +12,8 @@ #include "fpdfsdk/fpdfxfa/fpdfxfa_util.h" #include "fpdfsdk/fsdk_define.h" #include "xfa/fxbarcode/BC_Library.h" -#include "xfa/fxfa/include/xfa_ffapp.h" -#include "xfa/fxfa/include/xfa_fontmgr.h" +#include "xfa/fxfa/xfa_ffapp.h" +#include "xfa/fxfa/xfa_fontmgr.h" namespace { diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_app.h b/fpdfsdk/fpdfxfa/fpdfxfa_app.h index c8e00cbe0b..59cb220cee 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_app.h +++ b/fpdfsdk/fpdfxfa/fpdfxfa_app.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_FPDFXFA_FPDFXFA_APP_H_ #define FPDFSDK_FPDFXFA_FPDFXFA_APP_H_ -#include "xfa/fxfa/include/fxfa.h" +#include "xfa/fxfa/fxfa.h" class CPDFSDK_Environment; class IFXJS_Runtime; diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp index e3e0d1c5a2..3bbcfe46bd 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp +++ b/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp @@ -17,12 +17,12 @@ #include "fpdfsdk/fsdk_define.h" #include "fpdfsdk/javascript/ijs_runtime.h" #include "public/fpdf_formfill.h" -#include "xfa/fxfa/include/cxfa_eventparam.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_ffwidgethandler.h" +#include "xfa/fxfa/cxfa_eventparam.h" +#include "xfa/fxfa/xfa_ffapp.h" +#include "xfa/fxfa/xfa_ffdoc.h" +#include "xfa/fxfa/xfa_ffdocview.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/xfa_ffwidgethandler.h" #ifndef _WIN32 extern void SetLastError(int err); diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_doc.h b/fpdfsdk/fpdfxfa/fpdfxfa_doc.h index 3f3ea21a7d..e3bafd7203 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_doc.h +++ b/fpdfsdk/fpdfxfa/fpdfxfa_doc.h @@ -10,7 +10,7 @@ #include <memory> #include "fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h" -#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/xfa_ffdoc.h" class CPDFSDK_Document; class CPDFSDK_Environment; diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp index 665467e6f1..fdbd2d08e4 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp +++ b/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp @@ -12,8 +12,8 @@ #include "fpdfsdk/fpdfxfa/fpdfxfa_util.h" #include "fpdfsdk/fsdk_define.h" #include "public/fpdf_formfill.h" -#include "xfa/fxfa/include/xfa_ffdocview.h" -#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/xfa_ffdocview.h" +#include "xfa/fxfa/xfa_ffpageview.h" CPDFXFA_Page::CPDFXFA_Page(CPDFXFA_Document* pDoc, int page_index) : m_pXFAPageView(nullptr), diff --git a/xfa/fde/xml/cfx_saxreader.cpp b/xfa/fde/xml/cfx_saxreader.cpp index ec22c73541..2fde9d90f1 100644 --- a/xfa/fde/xml/cfx_saxreader.cpp +++ b/xfa/fde/xml/cfx_saxreader.cpp @@ -8,7 +8,7 @@ #include <algorithm> -#include "xfa/fxfa/include/xfa_checksum.h" +#include "xfa/fxfa/xfa_checksum.h" enum class CFX_SaxMode { Text = 0, diff --git a/xfa/fgas/font/fgas_gefont.cpp b/xfa/fgas/font/fgas_gefont.cpp index 08cb80e1ef..d83db63343 100644 --- a/xfa/fgas/font/fgas_gefont.cpp +++ b/xfa/fgas/font/fgas_gefont.cpp @@ -14,7 +14,7 @@ #include "core/fxge/cfx_unicodeencodingex.h" #include "xfa/fgas/crt/fgas_codepage.h" #include "xfa/fgas/font/fgas_fontutils.h" -#include "xfa/fxfa/include/xfa_fontmgr.h" +#include "xfa/fxfa/xfa_fontmgr.h" // static CFGAS_GEFont* CFGAS_GEFont::LoadFont(const FX_WCHAR* pszFontFamily, diff --git a/xfa/fwl/basewidget/fwl_editimp.cpp b/xfa/fwl/basewidget/fwl_editimp.cpp index 93f5dd8ac6..0da315cf9b 100644 --- a/xfa/fwl/basewidget/fwl_editimp.cpp +++ b/xfa/fwl/basewidget/fwl_editimp.cpp @@ -28,8 +28,8 @@ #include "xfa/fwl/core/fwl_noteimp.h" #include "xfa/fwl/core/fwl_widgetimp.h" #include "xfa/fwl/core/ifwl_themeprovider.h" -#include "xfa/fxfa/include/xfa_ffdoc.h" -#include "xfa/fxfa/include/xfa_ffwidget.h" +#include "xfa/fxfa/xfa_ffdoc.h" +#include "xfa/fxfa/xfa_ffwidget.h" #include "xfa/fxgraphics/cfx_path.h" namespace { diff --git a/xfa/fwl/basewidget/ifwl_spinbutton.h b/xfa/fwl/basewidget/ifwl_spinbutton.h index 6080f0c347..93e2712094 100644 --- a/xfa/fwl/basewidget/ifwl_spinbutton.h +++ b/xfa/fwl/basewidget/ifwl_spinbutton.h @@ -8,7 +8,7 @@ #define XFA_FWL_BASEWIDGET_IFWL_SPINBUTTON_H_ #include "xfa/fwl/core/cfwl_event.h" -#include "xfa/fxfa/include/cxfa_eventparam.h" +#include "xfa/fxfa/cxfa_eventparam.h" #define FWL_CLASS_SpinButton L"FWL_SPINBUTTON" #define FWL_STYLEEXE_SPB_Vert (1L << 0) diff --git a/xfa/fwl/core/cfwl_widgetmgr.cpp b/xfa/fwl/core/cfwl_widgetmgr.cpp index b4f3a864bf..db1035005f 100644 --- a/xfa/fwl/core/cfwl_widgetmgr.cpp +++ b/xfa/fwl/core/cfwl_widgetmgr.cpp @@ -13,7 +13,7 @@ #include "xfa/fwl/core/ifwl_app.h" #include "xfa/fwl/core/ifwl_form.h" #include "xfa/fxfa/app/xfa_fwladapter.h" -#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/xfa_ffapp.h" namespace { diff --git a/xfa/fwl/core/fwl_timerimp.cpp b/xfa/fwl/core/fwl_timerimp.cpp index 0fcbc24b01..a46469391d 100644 --- a/xfa/fwl/core/fwl_timerimp.cpp +++ b/xfa/fwl/core/fwl_timerimp.cpp @@ -8,7 +8,7 @@ #include "xfa/fwl/core/ifwl_adaptertimermgr.h" #include "xfa/fwl/core/ifwl_app.h" #include "xfa/fwl/core/ifwl_timer.h" -#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/xfa_ffapp.h" IFWL_TimerInfo* IFWL_Timer::StartTimer(uint32_t dwElapse, bool bImmediately) { CXFA_FFApp* pAdapterNative = FWL_GetAdapterNative(); diff --git a/xfa/fwl/core/fwl_widgetimp.cpp b/xfa/fwl/core/fwl_widgetimp.cpp index 3aa6233ae5..a7338b18a6 100644 --- a/xfa/fwl/core/fwl_widgetimp.cpp +++ b/xfa/fwl/core/fwl_widgetimp.cpp @@ -21,7 +21,7 @@ #include "xfa/fwl/core/ifwl_form.h" #include "xfa/fwl/core/ifwl_themeprovider.h" #include "xfa/fwl/core/ifwl_widget.h" -#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/xfa_ffapp.h" #define FWL_STYLEEXT_MNU_Vert (1L << 0) diff --git a/xfa/fxfa/DEPS b/xfa/fxfa/DEPS index 886ee8e2b7..3170149ce2 100644 --- a/xfa/fxfa/DEPS +++ b/xfa/fxfa/DEPS @@ -1,3 +1,4 @@ include_rules = [ + '+core/fxcodec', '+fxjs', ] diff --git a/xfa/fxfa/app/cxfa_eventparam.cpp b/xfa/fxfa/app/cxfa_eventparam.cpp index 5f9d752969..551f7f87d7 100644 --- a/xfa/fxfa/app/cxfa_eventparam.cpp +++ b/xfa/fxfa/app/cxfa_eventparam.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/fxfa/include/cxfa_eventparam.h" +#include "xfa/fxfa/cxfa_eventparam.h" -#include "xfa/fxfa/include/fxfa.h" +#include "xfa/fxfa/fxfa.h" CXFA_EventParam::CXFA_EventParam() : m_pTarget(nullptr), diff --git a/xfa/fxfa/app/xfa_checksum.cpp b/xfa/fxfa/app/xfa_checksum.cpp index 73f6c1edd5..5e2b1feb0f 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/fxfa/include/xfa_checksum.h" +#include "xfa/fxfa/xfa_checksum.h" #include "core/fdrm/crypto/fx_crypt.h" diff --git a/xfa/fxfa/app/xfa_ffapp.cpp b/xfa/fxfa/app/xfa_ffapp.cpp index 9e86c3aa68..bc16ddf101 100644 --- a/xfa/fxfa/app/xfa_ffapp.cpp +++ b/xfa/fxfa/app/xfa_ffapp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/xfa_ffapp.h" #include <algorithm> #include <utility> @@ -13,10 +13,10 @@ #include "xfa/fwl/core/cfwl_widgetmgr.h" #include "xfa/fxfa/app/xfa_fwladapter.h" #include "xfa/fxfa/app/xfa_fwltheme.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" +#include "xfa/fxfa/xfa_ffdoc.h" +#include "xfa/fxfa/xfa_ffdochandler.h" +#include "xfa/fxfa/xfa_ffwidgethandler.h" +#include "xfa/fxfa/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 927f38b35b..728a701c1f 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/fxfa/include/xfa_ffpageview.h" -#include "xfa/fxfa/include/xfa_ffwidget.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/xfa_ffwidget.h" namespace { diff --git a/xfa/fxfa/app/xfa_ffbarcode.h b/xfa/fxfa/app/xfa_ffbarcode.h index 84753773c5..5d0484a4bd 100644 --- a/xfa/fxfa/app/xfa_ffbarcode.h +++ b/xfa/fxfa/app/xfa_ffbarcode.h @@ -9,7 +9,7 @@ #include "xfa/fxbarcode/BC_Library.h" #include "xfa/fxfa/app/xfa_fftextedit.h" -#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/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 5b651b6561..15ff960a15 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/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/xfa_ffapp.h" +#include "xfa/fxfa/xfa_ffdoc.h" +#include "xfa/fxfa/xfa_ffdocview.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/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 b8158acc7e..0c2cb755ac 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/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/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 94090d6123..641b163ce7 100644 --- a/xfa/fxfa/app/xfa_ffchoicelist.cpp +++ b/xfa/fxfa/app/xfa_ffchoicelist.cpp @@ -13,11 +13,11 @@ #include "xfa/fwl/lightwidget/cfwl_listbox.h" #include "xfa/fxfa/app/xfa_fffield.h" #include "xfa/fxfa/app/xfa_fwladapter.h" -#include "xfa/fxfa/include/cxfa_eventparam.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/cxfa_eventparam.h" +#include "xfa/fxfa/xfa_ffdoc.h" +#include "xfa/fxfa/xfa_ffdocview.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/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 c9ea0fa248..712959d56c 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/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/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 c75c84adc0..600f8bb264 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/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/xfa_ffdoc.h" #include <algorithm> @@ -17,14 +17,14 @@ #include "xfa/fde/xml/fde_xml_imp.h" #include "xfa/fwl/core/fwl_noteimp.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/cxfa_dataexporter.h" #include "xfa/fxfa/parser/cxfa_dataimporter.h" #include "xfa/fxfa/parser/cxfa_document.h" +#include "xfa/fxfa/xfa_checksum.h" +#include "xfa/fxfa/xfa_ffapp.h" +#include "xfa/fxfa/xfa_ffdocview.h" +#include "xfa/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/xfa_fontmgr.h" namespace { diff --git a/xfa/fxfa/app/xfa_ffdochandler.cpp b/xfa/fxfa/app/xfa_ffdochandler.cpp index fdaba40b4b..fae72cb3a1 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/fxfa/include/xfa_ffdochandler.h" +#include "xfa/fxfa/xfa_ffdochandler.h" -#include "xfa/fxfa/include/xfa_checksum.h" -#include "xfa/fxfa/include/xfa_ffdoc.h" #include "xfa/fxfa/parser/cxfa_scriptcontext.h" #include "xfa/fxfa/parser/xfa_resolvenode_rs.h" +#include "xfa/fxfa/xfa_checksum.h" +#include "xfa/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 939fc099ff..efda0430d3 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/fxfa/include/xfa_ffdocview.h" +#include "xfa/fxfa/xfa_ffdocview.h" #include "core/fxcrt/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/cxfa_layoutprocessor.h" #include "xfa/fxfa/parser/cxfa_scriptcontext.h" #include "xfa/fxfa/parser/xfa_resolvenode_rs.h" +#include "xfa/fxfa/xfa_ffapp.h" +#include "xfa/fxfa/xfa_ffdoc.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/xfa_ffwidgethandler.h" 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 d433003f5c..da1ae65ba9 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/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/xfa_ffapp.h" +#include "xfa/fxfa/xfa_ffdoc.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/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 ee66871217..bf9fd84a12 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/fxfa/include/xfa_ffpageview.h" -#include "xfa/fxfa/include/xfa_ffwidget.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/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 892ee309c3..a6b94475aa 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/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/xfa_ffapp.h" +#include "xfa/fxfa/xfa_ffdoc.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/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 58d05623f9..90e82510a7 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/fxfa/include/xfa_ffpageview.h" -#include "xfa/fxfa/include/xfa_ffwidget.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/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 b1a6b5f915..04fbb8afe3 100644 --- a/xfa/fxfa/app/xfa_fffield.cpp +++ b/xfa/fxfa/app/xfa_fffield.cpp @@ -13,11 +13,11 @@ #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/fxfa/xfa_ffapp.h" +#include "xfa/fxfa/xfa_ffdoc.h" +#include "xfa/fxfa/xfa_ffdocview.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/xfa_ffwidget.h" #include "xfa/fxgraphics/cfx_color.h" #include "xfa/fxgraphics/cfx_path.h" diff --git a/xfa/fxfa/app/xfa_fffield.h b/xfa/fxfa/app/xfa_fffield.h index ffe5b6563a..d7cd601381 100644 --- a/xfa/fxfa/app/xfa_fffield.h +++ b/xfa/fxfa/app/xfa_fffield.h @@ -9,8 +9,8 @@ #include "xfa/fwl/core/ifwl_widgetdelegate.h" #include "xfa/fwl/lightwidget/cfwl_widget.h" -#include "xfa/fxfa/include/xfa_ffpageview.h" -#include "xfa/fxfa/include/xfa_ffwidget.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/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 7c152a196e..bcd1d4a9ce 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/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/xfa_ffapp.h" +#include "xfa/fxfa/xfa_ffdoc.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/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 77de97019b..bda3fdd757 100644 --- a/xfa/fxfa/app/xfa_ffimageedit.cpp +++ b/xfa/fxfa/app/xfa_ffimageedit.cpp @@ -11,10 +11,10 @@ #include "xfa/fwl/core/ifwl_app.h" #include "xfa/fwl/lightwidget/cfwl_picturebox.h" #include "xfa/fxfa/app/xfa_fffield.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/xfa_ffdoc.h" +#include "xfa/fxfa/xfa_ffdocview.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/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 2be27ca528..2f3eac6e16 100644 --- a/xfa/fxfa/app/xfa_ffnotify.cpp +++ b/xfa/fxfa/app/xfa_ffnotify.cpp @@ -24,12 +24,12 @@ #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_ffdocview.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/xfa_ffapp.h" +#include "xfa/fxfa/xfa_ffdoc.h" +#include "xfa/fxfa/xfa_ffdocview.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/xfa_ffwidgethandler.h" static void XFA_FFDeleteWidgetAcc(void* pData) { delete static_cast<CXFA_WidgetAcc*>(pData); diff --git a/xfa/fxfa/app/xfa_ffnotify.h b/xfa/fxfa/app/xfa_ffnotify.h index fae683c29e..bc764e1533 100644 --- a/xfa/fxfa/app/xfa_ffnotify.h +++ b/xfa/fxfa/app/xfa_ffnotify.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_APP_XFA_FFNOTIFY_H_ #define XFA_FXFA_APP_XFA_FFNOTIFY_H_ -#include "xfa/fxfa/include/cxfa_eventparam.h" +#include "xfa/fxfa/cxfa_eventparam.h" #include "xfa/fxfa/parser/cxfa_document.h" class CXFA_FFWidgetHandler; diff --git a/xfa/fxfa/app/xfa_ffpageview.cpp b/xfa/fxfa/app/xfa_ffpageview.cpp index 347174c7f2..899a311d6c 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/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/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/fxfa/include/xfa_ffdoc.h" -#include "xfa/fxfa/include/xfa_ffdocview.h" -#include "xfa/fxfa/include/xfa_ffwidget.h" +#include "xfa/fxfa/xfa_ffdoc.h" +#include "xfa/fxfa/xfa_ffdocview.h" +#include "xfa/fxfa/xfa_ffwidget.h" namespace { diff --git a/xfa/fxfa/app/xfa_ffpath.cpp b/xfa/fxfa/app/xfa_ffpath.cpp index 60cfa38397..7ef13b63ff 100644 --- a/xfa/fxfa/app/xfa_ffpath.cpp +++ b/xfa/fxfa/app/xfa_ffpath.cpp @@ -7,10 +7,10 @@ #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/fxfa/xfa_ffapp.h" +#include "xfa/fxfa/xfa_ffdoc.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/xfa_ffwidget.h" #include "xfa/fxgraphics/cfx_color.h" #include "xfa/fxgraphics/cfx_path.h" diff --git a/xfa/fxfa/app/xfa_ffpushbutton.cpp b/xfa/fxfa/app/xfa_ffpushbutton.cpp index 3af1e34db9..cd395b4703 100644 --- a/xfa/fxfa/app/xfa_ffpushbutton.cpp +++ b/xfa/fxfa/app/xfa_ffpushbutton.cpp @@ -12,9 +12,9 @@ #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/fxfa/xfa_ffapp.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/xfa_ffwidget.h" #include "xfa/fxgraphics/cfx_color.h" #include "xfa/fxgraphics/cfx_path.h" diff --git a/xfa/fxfa/app/xfa_ffsignature.cpp b/xfa/fxfa/app/xfa_ffsignature.cpp index 3d92f286b9..3402d43fcb 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/fxfa/include/xfa_ffdoc.h" -#include "xfa/fxfa/include/xfa_ffpageview.h" -#include "xfa/fxfa/include/xfa_ffwidget.h" +#include "xfa/fxfa/xfa_ffdoc.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/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 a2add4f6a4..38c21fbb69 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/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/xfa_ffapp.h" +#include "xfa/fxfa/xfa_ffdoc.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/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 6607edf23b..98ce739b17 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/fxfa/include/xfa_ffpageview.h" -#include "xfa/fxfa/include/xfa_ffwidget.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/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 174325e94f..9fa6bafdf4 100644 --- a/xfa/fxfa/app/xfa_fftext.cpp +++ b/xfa/fxfa/app/xfa_fftext.cpp @@ -9,10 +9,10 @@ #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/fxfa/xfa_ffapp.h" +#include "xfa/fxfa/xfa_ffdoc.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/xfa_ffwidget.h" #include "xfa/fxgraphics/cfx_graphics.h" CXFA_FFText::CXFA_FFText(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) diff --git a/xfa/fxfa/app/xfa_fftextedit.cpp b/xfa/fxfa/app/xfa_fftextedit.cpp index 1dc11adbef..9d0f35e303 100644 --- a/xfa/fxfa/app/xfa_fftextedit.cpp +++ b/xfa/fxfa/app/xfa_fftextedit.cpp @@ -16,13 +16,13 @@ #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/cxfa_eventparam.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/cxfa_eventparam.h" #include "xfa/fxfa/parser/xfa_localevalue.h" +#include "xfa/fxfa/xfa_ffapp.h" +#include "xfa/fxfa/xfa_ffdoc.h" +#include "xfa/fxfa/xfa_ffdocview.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/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 e8bd80b6e0..1a1ff49ab1 100644 --- a/xfa/fxfa/app/xfa_ffwidget.cpp +++ b/xfa/fxfa/app/xfa_ffwidget.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/fxfa/include/xfa_ffwidget.h" +#include "xfa/fxfa/xfa_ffwidget.h" #include <algorithm> #include <memory> @@ -16,13 +16,13 @@ #include "core/fxge/cfx_pathdata.h" #include "core/fxge/cfx_renderdevice.h" #include "xfa/fxfa/app/xfa_textlayout.h" -#include "xfa/fxfa/include/cxfa_eventparam.h" -#include "xfa/fxfa/include/fxfa_widget.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/cxfa_eventparam.h" +#include "xfa/fxfa/fxfa_widget.h" #include "xfa/fxfa/parser/cxfa_corner.h" +#include "xfa/fxfa/xfa_ffapp.h" +#include "xfa/fxfa/xfa_ffdoc.h" +#include "xfa/fxfa/xfa_ffdocview.h" +#include "xfa/fxfa/xfa_ffpageview.h" #include "xfa/fxgraphics/cfx_color.h" #include "xfa/fxgraphics/cfx_graphics.h" #include "xfa/fxgraphics/cfx_path.h" diff --git a/xfa/fxfa/app/xfa_ffwidgetacc.cpp b/xfa/fxfa/app/xfa_ffwidgetacc.cpp index 47ce0968c7..a5cfafc5f7 100644 --- a/xfa/fxfa/app/xfa_ffwidgetacc.cpp +++ b/xfa/fxfa/app/xfa_ffwidgetacc.cpp @@ -17,17 +17,17 @@ #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/cxfa_eventparam.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/cxfa_eventparam.h" #include "xfa/fxfa/parser/cxfa_layoutprocessor.h" #include "xfa/fxfa/parser/cxfa_scriptcontext.h" #include "xfa/fxfa/parser/xfa_localevalue.h" #include "xfa/fxfa/parser/xfa_resolvenode_rs.h" +#include "xfa/fxfa/xfa_ffapp.h" +#include "xfa/fxfa/xfa_ffdoc.h" +#include "xfa/fxfa/xfa_ffdocview.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/xfa_ffwidget.h" +#include "xfa/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 1c8e5f793b..3df2d2a473 100644 --- a/xfa/fxfa/app/xfa_ffwidgethandler.cpp +++ b/xfa/fxfa/app/xfa_ffwidgethandler.cpp @@ -4,18 +4,18 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/fxfa/include/xfa_ffwidgethandler.h" +#include "xfa/fxfa/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/cxfa_layoutprocessor.h" #include "xfa/fxfa/parser/cxfa_measurement.h" +#include "xfa/fxfa/xfa_ffdoc.h" +#include "xfa/fxfa/xfa_ffdocview.h" +#include "xfa/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 d5e2c67746..771228175b 100644 --- a/xfa/fxfa/app/xfa_fontmgr.cpp +++ b/xfa/fxfa/app/xfa_fontmgr.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/fxfa/include/xfa_fontmgr.h" +#include "xfa/fxfa/xfa_fontmgr.h" #include <algorithm> #include <memory> @@ -14,8 +14,8 @@ #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "xfa/fgas/font/fgas_gefont.h" -#include "xfa/fxfa/include/xfa_ffapp.h" -#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/xfa_ffapp.h" +#include "xfa/fxfa/xfa_ffdoc.h" namespace { diff --git a/xfa/fxfa/app/xfa_fwladapter.cpp b/xfa/fxfa/app/xfa_fwladapter.cpp index b0b5f4bc32..693dfaebf4 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/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/xfa_ffdoc.h" CXFA_FWLAdapterWidgetMgr::CXFA_FWLAdapterWidgetMgr() {} diff --git a/xfa/fxfa/app/xfa_fwltheme.cpp b/xfa/fxfa/app/xfa_fwltheme.cpp index 8e1b23c05d..14222dcbd1 100644 --- a/xfa/fxfa/app/xfa_fwltheme.cpp +++ b/xfa/fxfa/app/xfa_fwltheme.cpp @@ -22,8 +22,8 @@ #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/fxfa/xfa_ffapp.h" +#include "xfa/fxfa/xfa_ffwidget.h" #include "xfa/fxgraphics/cfx_color.h" namespace { diff --git a/xfa/fxfa/app/xfa_fwltheme.h b/xfa/fxfa/app/xfa_fwltheme.h index 81f33b2944..77659236ee 100644 --- a/xfa/fxfa/app/xfa_fwltheme.h +++ b/xfa/fxfa/app/xfa_fwltheme.h @@ -22,7 +22,7 @@ #include "xfa/fwl/theme/cfwl_pushbuttontp.h" #include "xfa/fwl/theme/cfwl_scrollbartp.h" #include "xfa/fwl/theme/cfwl_widgettp.h" -#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/xfa_ffapp.h" class CXFA_FWLTheme final : public IFWL_ThemeProvider { public: diff --git a/xfa/fxfa/app/xfa_rendercontext.cpp b/xfa/fxfa/app/xfa_rendercontext.cpp index e1abb75a3f..75e7e7d84e 100644 --- a/xfa/fxfa/app/xfa_rendercontext.cpp +++ b/xfa/fxfa/app/xfa_rendercontext.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/fxfa/include/xfa_rendercontext.h" +#include "xfa/fxfa/xfa_rendercontext.h" -#include "xfa/fxfa/include/xfa_ffpageview.h" -#include "xfa/fxfa/include/xfa_ffwidget.h" +#include "xfa/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/xfa_ffwidget.h" #include "xfa/fxgraphics/cfx_graphics.h" namespace { diff --git a/xfa/fxfa/app/xfa_textlayout.cpp b/xfa/fxfa/app/xfa_textlayout.cpp index fcda599125..0c7acffa9e 100644 --- a/xfa/fxfa/app/xfa_textlayout.cpp +++ b/xfa/fxfa/app/xfa_textlayout.cpp @@ -17,10 +17,10 @@ #include "xfa/fde/xml/fde_xml_imp.h" #include "xfa/fgas/crt/fgas_codepage.h" #include "xfa/fxfa/app/xfa_ffwidgetacc.h" -#include "xfa/fxfa/include/xfa_ffapp.h" -#include "xfa/fxfa/include/xfa_ffdoc.h" -#include "xfa/fxfa/include/xfa_fontmgr.h" #include "xfa/fxfa/parser/cxfa_measurement.h" +#include "xfa/fxfa/xfa_ffapp.h" +#include "xfa/fxfa/xfa_ffdoc.h" +#include "xfa/fxfa/xfa_fontmgr.h" CXFA_CSSTagProvider::CXFA_CSSTagProvider() : m_bTagAvailable(FALSE), m_bContent(FALSE) {} diff --git a/xfa/fxfa/app/xfa_textlayout.h b/xfa/fxfa/app/xfa_textlayout.h index 30265de7e9..36bf87d6d9 100644 --- a/xfa/fxfa/app/xfa_textlayout.h +++ b/xfa/fxfa/app/xfa_textlayout.h @@ -13,8 +13,8 @@ #include "xfa/fde/css/fde_css.h" #include "xfa/fde/fde_gedevice.h" #include "xfa/fgas/layout/fgas_rtfbreak.h" -#include "xfa/fxfa/include/xfa_ffdoc.h" #include "xfa/fxfa/parser/xfa_object.h" +#include "xfa/fxfa/xfa_ffdoc.h" #define XFA_LOADERCNTXTFLG_FILTERSPACE 0x001 diff --git a/xfa/fxfa/include/cxfa_eventparam.h b/xfa/fxfa/cxfa_eventparam.h index 9bc46fdc66..cc548f6e4d 100644 --- a/xfa/fxfa/include/cxfa_eventparam.h +++ b/xfa/fxfa/cxfa_eventparam.h @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FXFA_INCLUDE_CXFA_EVENTPARAM_H_ -#define XFA_FXFA_INCLUDE_CXFA_EVENTPARAM_H_ +#ifndef XFA_FXFA_CXFA_EVENTPARAM_H_ +#define XFA_FXFA_CXFA_EVENTPARAM_H_ -#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/fxfa_basic.h" class CXFA_WidgetAcc; @@ -76,4 +76,4 @@ class CXFA_EventParam { int32_t m_iValidateActivities; }; -#endif // XFA_FXFA_INCLUDE_CXFA_EVENTPARAM_H_ +#endif // XFA_FXFA_CXFA_EVENTPARAM_H_ diff --git a/xfa/fxfa/include/fxfa.h b/xfa/fxfa/fxfa.h index 1ffcbf7dbb..412d36b7c2 100644 --- a/xfa/fxfa/include/fxfa.h +++ b/xfa/fxfa/fxfa.h @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FXFA_INCLUDE_FXFA_H_ -#define XFA_FXFA_INCLUDE_FXFA_H_ +#ifndef XFA_FXFA_FXFA_H_ +#define XFA_FXFA_FXFA_H_ #include <vector> -#include "xfa/fxfa/include/fxfa_basic.h" -#include "xfa/fxfa/include/fxfa_widget.h" +#include "xfa/fxfa/fxfa_basic.h" +#include "xfa/fxfa/fxfa_widget.h" class CFGAS_GEFont; class CFX_Graphics; @@ -355,4 +355,4 @@ class IXFA_WidgetIterator { virtual FX_BOOL SetCurrentWidget(CXFA_FFWidget* hWidget) = 0; }; -#endif // XFA_FXFA_INCLUDE_FXFA_H_ +#endif // XFA_FXFA_FXFA_H_ diff --git a/xfa/fxfa/include/fxfa_basic.h b/xfa/fxfa/fxfa_basic.h index e2d5330cc8..77b64fa6b9 100644 --- a/xfa/fxfa/include/fxfa_basic.h +++ b/xfa/fxfa/fxfa_basic.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FXFA_INCLUDE_FXFA_BASIC_H_ -#define XFA_FXFA_INCLUDE_FXFA_BASIC_H_ +#ifndef XFA_FXFA_FXFA_BASIC_H_ +#define XFA_FXFA_FXFA_BASIC_H_ #include "fxjs/cfxjse_arguments.h" #include "fxjs/fxjse.h" @@ -1023,4 +1023,4 @@ struct XFA_SCRIPTATTRIBUTEINFO { uint16_t eValueType; }; -#endif // XFA_FXFA_INCLUDE_FXFA_BASIC_H_ +#endif // XFA_FXFA_FXFA_BASIC_H_ diff --git a/xfa/fxfa/include/fxfa_widget.h b/xfa/fxfa/fxfa_widget.h index 07b25ef5ab..eaf7d3e3bd 100644 --- a/xfa/fxfa/include/fxfa_widget.h +++ b/xfa/fxfa/fxfa_widget.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FXFA_INCLUDE_FXFA_WIDGET_H_ -#define XFA_FXFA_INCLUDE_FXFA_WIDGET_H_ +#ifndef XFA_FXFA_FXFA_WIDGET_H_ +#define XFA_FXFA_FXFA_WIDGET_H_ #include "core/fxcrt/fx_coordinates.h" #include "core/fxge/fx_dib.h" @@ -120,4 +120,4 @@ class CXFA_WidgetAcc : public CXFA_WidgetData { uint32_t m_nRecursionDepth; }; -#endif // XFA_FXFA_INCLUDE_FXFA_WIDGET_H_ +#endif // XFA_FXFA_FXFA_WIDGET_H_ diff --git a/xfa/fxfa/include/DEPS b/xfa/fxfa/include/DEPS deleted file mode 100644 index 1519ceaa93..0000000000 --- a/xfa/fxfa/include/DEPS +++ /dev/null @@ -1,3 +0,0 @@ -include_rules = [ - '+core/fxcodec', -] diff --git a/xfa/fxfa/parser/cscript_eventpseudomodel.cpp b/xfa/fxfa/parser/cscript_eventpseudomodel.cpp index 73356af8bf..dd6142c47c 100644 --- a/xfa/fxfa/parser/cscript_eventpseudomodel.cpp +++ b/xfa/fxfa/parser/cscript_eventpseudomodel.cpp @@ -8,13 +8,13 @@ #include "fxjs/cfxjse_arguments.h" #include "xfa/fxfa/app/xfa_ffnotify.h" -#include "xfa/fxfa/include/cxfa_eventparam.h" -#include "xfa/fxfa/include/xfa_ffwidgethandler.h" +#include "xfa/fxfa/cxfa_eventparam.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/cxfa_scriptcontext.h" #include "xfa/fxfa/parser/xfa_localemgr.h" #include "xfa/fxfa/parser/xfa_object.h" #include "xfa/fxfa/parser/xfa_utils.h" +#include "xfa/fxfa/xfa_ffwidgethandler.h" namespace { diff --git a/xfa/fxfa/parser/cxfa_data.h b/xfa/fxfa/parser/cxfa_data.h index e3c6390d80..829c84cc9f 100644 --- a/xfa/fxfa/parser/cxfa_data.h +++ b/xfa/fxfa/parser/cxfa_data.h @@ -9,7 +9,7 @@ #include "core/fxcrt/fx_system.h" #include "core/fxge/fx_dib.h" -#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/fxfa_basic.h" class CXFA_Node; diff --git a/xfa/fxfa/parser/cxfa_dataimporter.cpp b/xfa/fxfa/parser/cxfa_dataimporter.cpp index c5bcc99cb9..92559a1239 100644 --- a/xfa/fxfa/parser/cxfa_dataimporter.cpp +++ b/xfa/fxfa/parser/cxfa_dataimporter.cpp @@ -10,8 +10,8 @@ #include "core/fxcrt/fx_stream.h" #include "xfa/fde/xml/fde_xml_imp.h" -#include "xfa/fxfa/include/fxfa.h" -#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/fxfa.h" +#include "xfa/fxfa/fxfa_basic.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/cxfa_simple_parser.h" #include "xfa/fxfa/parser/xfa_object.h" diff --git a/xfa/fxfa/parser/cxfa_document.h b/xfa/fxfa/parser/cxfa_document.h index dbcfa47b53..919be5da2d 100644 --- a/xfa/fxfa/parser/cxfa_document.h +++ b/xfa/fxfa/parser/cxfa_document.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_CXFA_DOCUMENT_H_ #define XFA_FXFA_PARSER_CXFA_DOCUMENT_H_ -#include "xfa/fxfa/include/fxfa.h" +#include "xfa/fxfa/fxfa.h" #include "xfa/fxfa/parser/xfa_localemgr.h" #include "xfa/fxfa/parser/xfa_object.h" diff --git a/xfa/fxfa/parser/cxfa_document_parser.cpp b/xfa/fxfa/parser/cxfa_document_parser.cpp index daf5221489..459edfa5ec 100644 --- a/xfa/fxfa/parser/cxfa_document_parser.cpp +++ b/xfa/fxfa/parser/cxfa_document_parser.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/cxfa_document_parser.h" -#include "xfa/fxfa/include/fxfa.h" +#include "xfa/fxfa/fxfa.h" #include "xfa/fxfa/parser/cxfa_document.h" CXFA_DocumentParser::CXFA_DocumentParser(CXFA_FFNotify* pNotify) diff --git a/xfa/fxfa/parser/cxfa_measurement.h b/xfa/fxfa/parser/cxfa_measurement.h index d1b83bda40..cf43f7625a 100644 --- a/xfa/fxfa/parser/cxfa_measurement.h +++ b/xfa/fxfa/parser/cxfa_measurement.h @@ -9,7 +9,7 @@ #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" -#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/fxfa_basic.h" class CXFA_Measurement { public: diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp index 5152436aeb..bf5b6bf964 100644 --- a/xfa/fxfa/parser/cxfa_node.cpp +++ b/xfa/fxfa/parser/cxfa_node.cpp @@ -15,7 +15,7 @@ #include "xfa/fde/xml/fde_xml_imp.h" #include "xfa/fgas/crt/fgas_codepage.h" #include "xfa/fxfa/app/xfa_ffnotify.h" -#include "xfa/fxfa/include/cxfa_eventparam.h" +#include "xfa/fxfa/cxfa_eventparam.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/cxfa_layoutprocessor.h" #include "xfa/fxfa/parser/cxfa_measurement.h" diff --git a/xfa/fxfa/parser/cxfa_scriptcontext.cpp b/xfa/fxfa/parser/cxfa_scriptcontext.cpp index 0a0e5bde5d..e7d45e3074 100644 --- a/xfa/fxfa/parser/cxfa_scriptcontext.cpp +++ b/xfa/fxfa/parser/cxfa_scriptcontext.cpp @@ -11,7 +11,7 @@ #include "fxjs/cfxjse_class.h" #include "fxjs/cfxjse_value.h" #include "xfa/fxfa/app/xfa_ffnotify.h" -#include "xfa/fxfa/include/cxfa_eventparam.h" +#include "xfa/fxfa/cxfa_eventparam.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/cxfa_nodehelper.h" #include "xfa/fxfa/parser/cxfa_resolveprocessor.h" diff --git a/xfa/fxfa/parser/cxfa_scriptcontext.h b/xfa/fxfa/parser/cxfa_scriptcontext.h index 2816d26808..656c51a8c8 100644 --- a/xfa/fxfa/parser/cxfa_scriptcontext.h +++ b/xfa/fxfa/parser/cxfa_scriptcontext.h @@ -12,8 +12,8 @@ #include <vector> #include "fxjs/cfxjse_arguments.h" +#include "xfa/fxfa/cxfa_eventparam.h" #include "xfa/fxfa/fm2js/xfa_fm2jscontext.h" -#include "xfa/fxfa/include/cxfa_eventparam.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/xfa_resolvenode_rs.h" diff --git a/xfa/fxfa/parser/cxfa_simple_parser.cpp b/xfa/fxfa/parser/cxfa_simple_parser.cpp index 3f431e08b3..b8d9fcb318 100644 --- a/xfa/fxfa/parser/cxfa_simple_parser.cpp +++ b/xfa/fxfa/parser/cxfa_simple_parser.cpp @@ -8,13 +8,13 @@ #include "core/fxcrt/fx_ext.h" #include "xfa/fgas/crt/fgas_codepage.h" -#include "xfa/fxfa/include/fxfa.h" -#include "xfa/fxfa/include/xfa_checksum.h" +#include "xfa/fxfa/fxfa.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/cxfa_widetextread.h" #include "xfa/fxfa/parser/cxfa_xml_parser.h" #include "xfa/fxfa/parser/xfa_basic_data.h" #include "xfa/fxfa/parser/xfa_utils.h" +#include "xfa/fxfa/xfa_checksum.h" namespace { diff --git a/xfa/fxfa/parser/cxfa_simple_parser.h b/xfa/fxfa/parser/cxfa_simple_parser.h index 270dcd2a30..f4d0095c1c 100644 --- a/xfa/fxfa/parser/cxfa_simple_parser.h +++ b/xfa/fxfa/parser/cxfa_simple_parser.h @@ -10,7 +10,7 @@ #include <memory> #include "xfa/fde/xml/fde_xml_imp.h" -#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/fxfa_basic.h" class CXFA_Document; class CXFA_Node; diff --git a/xfa/fxfa/parser/cxfa_stroke.h b/xfa/fxfa/parser/cxfa_stroke.h index 8db1b29959..d42ece32c8 100644 --- a/xfa/fxfa/parser/cxfa_stroke.h +++ b/xfa/fxfa/parser/cxfa_stroke.h @@ -9,7 +9,7 @@ #include "core/fxcrt/fx_system.h" #include "core/fxge/fx_dib.h" -#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/fxfa_basic.h" #include "xfa/fxfa/parser/cxfa_data.h" enum StrokeSameStyle { diff --git a/xfa/fxfa/parser/cxfa_valuearray.h b/xfa/fxfa/parser/cxfa_valuearray.h index c1af419c10..2c4ea29779 100644 --- a/xfa/fxfa/parser/cxfa_valuearray.h +++ b/xfa/fxfa/parser/cxfa_valuearray.h @@ -8,7 +8,7 @@ #define XFA_FXFA_PARSER_CXFA_VALUEARRAY_H_ #include "fxjs/cfxjse_value.h" -#include "xfa/fxfa/include/fxfa.h" +#include "xfa/fxfa/fxfa.h" class CXFA_ValueArray : public CFX_ArrayTemplate<CFXJSE_Value*> { public: diff --git a/xfa/fxfa/parser/xfa_basic_data.cpp b/xfa/fxfa/parser/xfa_basic_data.cpp index 308090e1cf..fecc942c7d 100644 --- a/xfa/fxfa/parser/xfa_basic_data.cpp +++ b/xfa/fxfa/parser/xfa_basic_data.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/xfa_basic_data.h" -#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/fxfa_basic.h" #include "xfa/fxfa/parser/xfa_object.h" const XFA_ELEMENTINFO g_XFAElementData[] = { diff --git a/xfa/fxfa/parser/xfa_basic_data.h b/xfa/fxfa/parser/xfa_basic_data.h index 119ef85e76..5b97ee2faa 100644 --- a/xfa/fxfa/parser/xfa_basic_data.h +++ b/xfa/fxfa/parser/xfa_basic_data.h @@ -7,7 +7,7 @@ #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/fxfa_basic.h" extern const XFA_PACKETINFO g_XFAPacketData[]; extern const int32_t g_iXFAPacketCount; diff --git a/xfa/fxfa/parser/xfa_basic_data_attributes.cpp b/xfa/fxfa/parser/xfa_basic_data_attributes.cpp index 66d4be23cc..6ed16a0c3d 100644 --- a/xfa/fxfa/parser/xfa_basic_data_attributes.cpp +++ b/xfa/fxfa/parser/xfa_basic_data_attributes.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/xfa_basic_data.h" -#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/fxfa_basic.h" #include "xfa/fxfa/parser/cxfa_measurement.h" static const CXFA_Measurement g_XFAMeasurementData[] = { diff --git a/xfa/fxfa/parser/xfa_basic_data_element_attributes.cpp b/xfa/fxfa/parser/xfa_basic_data_element_attributes.cpp index e6d4402503..640af338e6 100644 --- a/xfa/fxfa/parser/xfa_basic_data_element_attributes.cpp +++ b/xfa/fxfa/parser/xfa_basic_data_element_attributes.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/xfa_basic_data.h" -#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/fxfa_basic.h" const XFA_ELEMENTHIERARCHY g_XFAElementAttributeIndex[] = { {0, 3}, {3, 2}, {5, 3}, {8, 10}, {18, 2}, {20, 6}, {26, 2}, diff --git a/xfa/fxfa/parser/xfa_basic_data_element_properties.cpp b/xfa/fxfa/parser/xfa_basic_data_element_properties.cpp index 268a5ea8e5..1b47b033e8 100644 --- a/xfa/fxfa/parser/xfa_basic_data_element_properties.cpp +++ b/xfa/fxfa/parser/xfa_basic_data_element_properties.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/xfa_basic_data.h" -#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/fxfa_basic.h" const XFA_ELEMENTHIERARCHY g_XFAElementPropertyIndex[] = { {0, 8}, {8, 0}, {8, 14}, {22, 0}, {22, 0}, {22, 6}, {28, 0}, diff --git a/xfa/fxfa/parser/xfa_basic_data_element_script.cpp b/xfa/fxfa/parser/xfa_basic_data_element_script.cpp index c4b3818686..675fb8a39a 100644 --- a/xfa/fxfa/parser/xfa_basic_data_element_script.cpp +++ b/xfa/fxfa/parser/xfa_basic_data_element_script.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/xfa_basic_data.h" -#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/fxfa_basic.h" #include "xfa/fxfa/parser/cscript_datawindow.h" #include "xfa/fxfa/parser/cscript_eventpseudomodel.h" #include "xfa/fxfa/parser/cscript_hostpseudomodel.h" diff --git a/xfa/fxfa/parser/xfa_basic_data_enum.cpp b/xfa/fxfa/parser/xfa_basic_data_enum.cpp index 89305da16f..06cd764e6d 100644 --- a/xfa/fxfa/parser/xfa_basic_data_enum.cpp +++ b/xfa/fxfa/parser/xfa_basic_data_enum.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/xfa_basic_data.h" -#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/fxfa_basic.h" const XFA_ATTRIBUTEENUMINFO g_XFAEnumData[] = { {0x2a, L"*", XFA_ATTRIBUTEENUM_Asterisk}, diff --git a/xfa/fxfa/parser/xfa_basic_data_packets.cpp b/xfa/fxfa/parser/xfa_basic_data_packets.cpp index bfd1d91004..39a09dabd0 100644 --- a/xfa/fxfa/parser/xfa_basic_data_packets.cpp +++ b/xfa/fxfa/parser/xfa_basic_data_packets.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/xfa_basic_data.h" -#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/fxfa_basic.h" const XFA_PACKETINFO g_XFAPacketData[] = { {0x0, nullptr, XFA_XDPPACKET_USER, nullptr, diff --git a/xfa/fxfa/parser/xfa_layout_itemlayout.h b/xfa/fxfa/parser/xfa_layout_itemlayout.h index ee9e29d8b4..6da09cb3f7 100644 --- a/xfa/fxfa/parser/xfa_layout_itemlayout.h +++ b/xfa/fxfa/parser/xfa_layout_itemlayout.h @@ -13,7 +13,7 @@ #include <map> #include "core/fxcrt/fx_basic.h" -#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/fxfa_basic.h" #define XFA_LAYOUT_INVALIDNODE ((CXFA_Node*)(intptr_t)-1) #define XFA_LAYOUT_FLOAT_PERCISION (0.0005f) diff --git a/xfa/fxfa/parser/xfa_resolvenode_rs.h b/xfa/fxfa/parser/xfa_resolvenode_rs.h index 407352e8c9..633d080876 100644 --- a/xfa/fxfa/parser/xfa_resolvenode_rs.h +++ b/xfa/fxfa/parser/xfa_resolvenode_rs.h @@ -8,7 +8,7 @@ #define XFA_FXFA_PARSER_XFA_RESOLVENODE_RS_H_ #include "fxjs/cfxjse_value.h" -#include "xfa/fxfa/include/fxfa.h" +#include "xfa/fxfa/fxfa.h" #include "xfa/fxfa/parser/cxfa_valuearray.h" #define XFA_RESOLVENODE_Children 0x0001 diff --git a/xfa/fxfa/parser/xfa_utils.h b/xfa/fxfa/parser/xfa_utils.h index a5bdc905d0..90168604eb 100644 --- a/xfa/fxfa/parser/xfa_utils.h +++ b/xfa/fxfa/parser/xfa_utils.h @@ -10,7 +10,7 @@ #include "xfa/fde/xml/fde_xml.h" #include "xfa/fgas/crt/fgas_stream.h" #include "xfa/fgas/crt/fgas_utils.h" -#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/fxfa_basic.h" class CFDE_XMLElement; class CFDE_XMLNode; diff --git a/xfa/fxfa/include/xfa_checksum.h b/xfa/fxfa/xfa_checksum.h index e959a8053a..69adc0a023 100644 --- a/xfa/fxfa/include/xfa_checksum.h +++ b/xfa/fxfa/xfa_checksum.h @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FXFA_INCLUDE_XFA_CHECKSUM_H_ -#define XFA_FXFA_INCLUDE_XFA_CHECKSUM_H_ +#ifndef XFA_FXFA_XFA_CHECKSUM_H_ +#define XFA_FXFA_XFA_CHECKSUM_H_ #include "xfa/fde/xml/cfx_saxreader.h" -#include "xfa/fxfa/include/fxfa.h" +#include "xfa/fxfa/fxfa.h" class CXFA_SAXReaderHandler; class CXFA_ChecksumContext; @@ -74,4 +74,4 @@ class CXFA_ChecksumContext { CFX_ByteString m_bsChecksum; }; -#endif // XFA_FXFA_INCLUDE_XFA_CHECKSUM_H_ +#endif // XFA_FXFA_XFA_CHECKSUM_H_ diff --git a/xfa/fxfa/include/xfa_ffapp.h b/xfa/fxfa/xfa_ffapp.h index 0a417da42a..d7465b145d 100644 --- a/xfa/fxfa/include/xfa_ffapp.h +++ b/xfa/fxfa/xfa_ffapp.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FXFA_INCLUDE_XFA_FFAPP_H_ -#define XFA_FXFA_INCLUDE_XFA_FFAPP_H_ +#ifndef XFA_FXFA_XFA_FFAPP_H_ +#define XFA_FXFA_XFA_FFAPP_H_ #include <memory> @@ -13,7 +13,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h" #include "xfa/fgas/font/fgas_font.h" #include "xfa/fwl/core/ifwl_app.h" -#include "xfa/fxfa/include/fxfa.h" +#include "xfa/fxfa/fxfa.h" class CFWL_WidgetMgrDelegate; class CXFA_DefFontMgr; @@ -90,4 +90,4 @@ class CXFA_FFApp { std::unique_ptr<IFWL_App> m_pFWLApp; }; -#endif // XFA_FXFA_INCLUDE_XFA_FFAPP_H_ +#endif // XFA_FXFA_XFA_FFAPP_H_ diff --git a/xfa/fxfa/include/xfa_ffdoc.h b/xfa/fxfa/xfa_ffdoc.h index 927301893b..26b56faa82 100644 --- a/xfa/fxfa/include/xfa_ffdoc.h +++ b/xfa/fxfa/xfa_ffdoc.h @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FXFA_INCLUDE_XFA_FFDOC_H_ -#define XFA_FXFA_INCLUDE_XFA_FFDOC_H_ +#ifndef XFA_FXFA_XFA_FFDOC_H_ +#define XFA_FXFA_XFA_FFDOC_H_ #include <map> #include <memory> -#include "xfa/fxfa/include/fxfa.h" +#include "xfa/fxfa/fxfa.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/cxfa_document_parser.h" @@ -66,4 +66,4 @@ class CXFA_FFDoc { FX_BOOL m_bOwnStream; }; -#endif // XFA_FXFA_INCLUDE_XFA_FFDOC_H_ +#endif // XFA_FXFA_XFA_FFDOC_H_ diff --git a/xfa/fxfa/include/xfa_ffdochandler.h b/xfa/fxfa/xfa_ffdochandler.h index b5a73d1d10..3ffdae729a 100644 --- a/xfa/fxfa/include/xfa_ffdochandler.h +++ b/xfa/fxfa/xfa_ffdochandler.h @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FXFA_INCLUDE_XFA_FFDOCHANDLER_H_ -#define XFA_FXFA_INCLUDE_XFA_FFDOCHANDLER_H_ +#ifndef XFA_FXFA_XFA_FFDOCHANDLER_H_ +#define XFA_FXFA_XFA_FFDOCHANDLER_H_ -#include "xfa/fxfa/include/fxfa.h" +#include "xfa/fxfa/fxfa.h" class CXFA_ChecksumContext; @@ -28,4 +28,4 @@ class CXFA_FFDocHandler { protected: }; -#endif // XFA_FXFA_INCLUDE_XFA_FFDOCHANDLER_H_ +#endif // XFA_FXFA_XFA_FFDOCHANDLER_H_ diff --git a/xfa/fxfa/include/xfa_ffdocview.h b/xfa/fxfa/xfa_ffdocview.h index 8372981cfd..dcc2f469da 100644 --- a/xfa/fxfa/include/xfa_ffdocview.h +++ b/xfa/fxfa/xfa_ffdocview.h @@ -4,14 +4,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FXFA_INCLUDE_XFA_FFDOCVIEW_H_ -#define XFA_FXFA_INCLUDE_XFA_FFDOCVIEW_H_ +#ifndef XFA_FXFA_XFA_FFDOCVIEW_H_ +#define XFA_FXFA_XFA_FFDOCVIEW_H_ #include <map> #include <memory> -#include "xfa/fxfa/include/cxfa_eventparam.h" -#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/cxfa_eventparam.h" +#include "xfa/fxfa/xfa_ffdoc.h" class CXFA_FFWidgetHandler; class CXFA_FFDoc; @@ -149,4 +149,4 @@ class CXFA_WidgetAccIterator { CXFA_WidgetAcc* m_pCurWidgetAcc; // not owned. }; -#endif // XFA_FXFA_INCLUDE_XFA_FFDOCVIEW_H_ +#endif // XFA_FXFA_XFA_FFDOCVIEW_H_ diff --git a/xfa/fxfa/include/xfa_ffpageview.h b/xfa/fxfa/xfa_ffpageview.h index 6b22dfe7b8..cd0f68c080 100644 --- a/xfa/fxfa/include/xfa_ffpageview.h +++ b/xfa/fxfa/xfa_ffpageview.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FXFA_INCLUDE_XFA_FFPAGEVIEW_H_ -#define XFA_FXFA_INCLUDE_XFA_FFPAGEVIEW_H_ +#ifndef XFA_FXFA_XFA_FFPAGEVIEW_H_ +#define XFA_FXFA_XFA_FFPAGEVIEW_H_ #include "xfa/fxfa/parser/cxfa_containerlayoutitem.h" #include "xfa/fxfa/parser/cxfa_contentlayoutitem.h" @@ -105,4 +105,4 @@ class CXFA_FFTabOrderPageWidgetIterator : public IXFA_WidgetIterator { FX_BOOL m_bIgnorerelevant; }; -#endif // XFA_FXFA_INCLUDE_XFA_FFPAGEVIEW_H_ +#endif // XFA_FXFA_XFA_FFPAGEVIEW_H_ diff --git a/xfa/fxfa/include/xfa_ffwidget.h b/xfa/fxfa/xfa_ffwidget.h index a44dd783b5..fe7c136a17 100644 --- a/xfa/fxfa/include/xfa_ffwidget.h +++ b/xfa/fxfa/xfa_ffwidget.h @@ -4,14 +4,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FXFA_INCLUDE_XFA_FFWIDGET_H_ -#define XFA_FXFA_INCLUDE_XFA_FFWIDGET_H_ +#ifndef XFA_FXFA_XFA_FFWIDGET_H_ +#define XFA_FXFA_XFA_FFWIDGET_H_ #include <vector> #include "core/fxcodec/fx_codec_def.h" #include "core/fxge/cfx_graphstatedata.h" -#include "xfa/fxfa/include/fxfa.h" +#include "xfa/fxfa/fxfa.h" #include "xfa/fxfa/parser/cxfa_contentlayoutitem.h" class CXFA_FFPageView; @@ -183,4 +183,4 @@ void XFA_DrawBox(CXFA_Box box, CFX_Matrix* pMatrix, uint32_t dwFlags = 0); -#endif // XFA_FXFA_INCLUDE_XFA_FFWIDGET_H_ +#endif // XFA_FXFA_XFA_FFWIDGET_H_ diff --git a/xfa/fxfa/include/xfa_ffwidgethandler.h b/xfa/fxfa/xfa_ffwidgethandler.h index 40447f7533..720ec66f4c 100644 --- a/xfa/fxfa/include/xfa_ffwidgethandler.h +++ b/xfa/fxfa/xfa_ffwidgethandler.h @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FXFA_INCLUDE_XFA_FFWIDGETHANDLER_H_ -#define XFA_FXFA_INCLUDE_XFA_FFWIDGETHANDLER_H_ +#ifndef XFA_FXFA_XFA_FFWIDGETHANDLER_H_ +#define XFA_FXFA_XFA_FFWIDGETHANDLER_H_ #include <vector> -#include "xfa/fxfa/include/cxfa_eventparam.h" -#include "xfa/fxfa/include/fxfa.h" +#include "xfa/fxfa/cxfa_eventparam.h" +#include "xfa/fxfa/fxfa.h" #include "xfa/fxfa/parser/cxfa_document.h" class CXFA_FFDocView; @@ -126,4 +126,4 @@ class CXFA_FFWidgetHandler { CXFA_FFDocView* m_pDocView; }; -#endif // XFA_FXFA_INCLUDE_XFA_FFWIDGETHANDLER_H_ +#endif // XFA_FXFA_XFA_FFWIDGETHANDLER_H_ diff --git a/xfa/fxfa/include/xfa_fontmgr.h b/xfa/fxfa/xfa_fontmgr.h index a996adc2ed..8838bbcd0c 100644 --- a/xfa/fxfa/include/xfa_fontmgr.h +++ b/xfa/fxfa/xfa_fontmgr.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FXFA_INCLUDE_XFA_FONTMGR_H_ -#define XFA_FXFA_INCLUDE_XFA_FONTMGR_H_ +#ifndef XFA_FXFA_XFA_FONTMGR_H_ +#define XFA_FXFA_XFA_FONTMGR_H_ #include <map> #include <memory> @@ -13,7 +13,7 @@ #include "core/fxcrt/fx_ext.h" #include "core/fxcrt/fx_system.h" #include "xfa/fgas/font/fgas_font.h" -#include "xfa/fxfa/include/fxfa.h" +#include "xfa/fxfa/fxfa.h" class CPDF_Font; @@ -97,4 +97,4 @@ class CXFA_FontMgr { std::map<CFX_ByteString, CFGAS_GEFont*> m_FontMap; }; -#endif // XFA_FXFA_INCLUDE_XFA_FONTMGR_H_ +#endif // XFA_FXFA_XFA_FONTMGR_H_ diff --git a/xfa/fxfa/include/xfa_rendercontext.h b/xfa/fxfa/xfa_rendercontext.h index 8bd6a287a3..de2449eded 100644 --- a/xfa/fxfa/include/xfa_rendercontext.h +++ b/xfa/fxfa/xfa_rendercontext.h @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FXFA_INCLUDE_XFA_RENDERCONTEXT_H_ -#define XFA_FXFA_INCLUDE_XFA_RENDERCONTEXT_H_ +#ifndef XFA_FXFA_XFA_RENDERCONTEXT_H_ +#define XFA_FXFA_XFA_RENDERCONTEXT_H_ #include <memory> -#include "xfa/fxfa/include/fxfa.h" +#include "xfa/fxfa/fxfa.h" class CXFA_RenderOptions { public: @@ -42,4 +42,4 @@ class CXFA_RenderContext { CFX_RectF m_rtClipRect; }; -#endif // XFA_FXFA_INCLUDE_XFA_RENDERCONTEXT_H_ +#endif // XFA_FXFA_XFA_RENDERCONTEXT_H_ |