From 7222ea6936cbcff886037e4d8d4018e13a7f720f Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 6 Apr 2016 14:33:07 -0700 Subject: 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 --- fpdfsdk/DEPS | 2 +- fpdfsdk/fpdfformfill.cpp | 8 ++++---- fpdfsdk/fpdfsave.cpp | 8 ++++---- fpdfsdk/fpdfxfa/fpdfxfa_app.cpp | 4 ++-- fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp | 10 +++++----- fpdfsdk/fpdfxfa/fpdfxfa_page.cpp | 4 ++-- fpdfsdk/fpdfxfa/include/fpdfxfa_app.h | 2 +- fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h | 6 +++--- fpdfsdk/fsdk_annothandler.cpp | 2 +- fpdfsdk/fsdk_baseform.cpp | 2 +- fpdfsdk/fsdk_mgr.cpp | 2 +- fpdfsdk/include/fsdk_annothandler.h | 8 ++++---- fpdfsdk/include/fsdk_baseform.h | 2 +- 13 files changed, 30 insertions(+), 30 deletions(-) (limited to 'fpdfsdk') 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 #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_ -- cgit v1.2.3