From c909ce872d999a17ffd44afdc88caf2de43e6cba Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 8 Jan 2016 15:44:36 -0800 Subject: XFA: Remove many relative includes in xfa/ Also remove useless files. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1570743002 . --- xfa/src/fxfa/src/app/xfa_checksum.cpp | 4 ++-- xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp | 4 ++-- xfa/src/fxfa/src/app/xfa_ffapp.cpp | 4 ++-- xfa/src/fxfa/src/app/xfa_ffbarcode.cpp | 4 ++-- xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp | 4 ++-- xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp | 4 ++-- xfa/src/fxfa/src/app/xfa_ffdoc.cpp | 4 ++-- xfa/src/fxfa/src/app/xfa_ffdoc.h | 2 +- xfa/src/fxfa/src/app/xfa_ffdochandler.cpp | 4 ++-- xfa/src/fxfa/src/app/xfa_ffdocview.cpp | 4 ++-- xfa/src/fxfa/src/app/xfa_ffdraw.cpp | 4 ++-- xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp | 4 ++-- xfa/src/fxfa/src/app/xfa_fffield.cpp | 4 ++-- xfa/src/fxfa/src/app/xfa_ffimage.cpp | 4 ++-- xfa/src/fxfa/src/app/xfa_ffimageedit.cpp | 4 ++-- xfa/src/fxfa/src/app/xfa_ffnotify.cpp | 4 ++-- xfa/src/fxfa/src/app/xfa_ffpageview.cpp | 4 ++-- xfa/src/fxfa/src/app/xfa_ffpath.cpp | 4 ++-- xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp | 4 ++-- xfa/src/fxfa/src/app/xfa_ffsignature.cpp | 4 ++-- xfa/src/fxfa/src/app/xfa_ffsubform.cpp | 4 ++-- xfa/src/fxfa/src/app/xfa_fftext.cpp | 4 ++-- xfa/src/fxfa/src/app/xfa_fftextedit.cpp | 4 ++-- xfa/src/fxfa/src/app/xfa_ffwidget.cpp | 4 ++-- xfa/src/fxfa/src/app/xfa_ffwidget.h | 2 +- xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp | 4 ++-- xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp | 4 ++-- xfa/src/fxfa/src/app/xfa_fontmgr.cpp | 4 ++-- xfa/src/fxfa/src/app/xfa_fwladapter.cpp | 4 ++-- xfa/src/fxfa/src/app/xfa_fwltheme.cpp | 4 ++-- xfa/src/fxfa/src/app/xfa_rendercontext.cpp | 4 ++-- xfa/src/fxfa/src/app/xfa_textlayout.cpp | 4 ++-- xfa/src/fxfa/src/common/xfa_common.h | 3 ++- xfa/src/fxfa/src/common/xfa_debug.h | 9 -------- xfa/src/fxfa/src/fm2js/xfa_fm2js.cpp | 7 ------- xfa/src/fxfa/src/fm2js/xfa_fm2js.h | 21 +++++++++---------- xfa/src/fxfa/src/parser/xfa_basic_data.cpp | 22 +++++++++----------- xfa/src/fxfa/src/parser/xfa_basic_imp.cpp | 22 +++++++++----------- xfa/src/fxfa/src/parser/xfa_debug_parser.cpp | 18 ---------------- xfa/src/fxfa/src/parser/xfa_debug_parser.h | 9 -------- .../parser/xfa_document_datadescription_imp.cpp | 22 +++++++++----------- .../src/parser/xfa_document_datamerger_imp.cpp | 23 +++++++++------------ xfa/src/fxfa/src/parser/xfa_document_imp.cpp | 22 +++++++++----------- xfa/src/fxfa/src/parser/xfa_document_imp.h | 9 -------- .../fxfa/src/parser/xfa_document_layout_imp.cpp | 23 +++++++++------------ xfa/src/fxfa/src/parser/xfa_document_serialize.cpp | 22 +++++++++----------- xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp | 22 +++++++++----------- xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp | 22 +++++++++----------- xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp | 22 +++++++++----------- xfa/src/fxfa/src/parser/xfa_locale.cpp | 24 ++++++++++------------ xfa/src/fxfa/src/parser/xfa_localemgr.cpp | 24 ++++++++++------------ xfa/src/fxfa/src/parser/xfa_localevalue.cpp | 22 +++++++++----------- xfa/src/fxfa/src/parser/xfa_object_imp.cpp | 22 +++++++++----------- xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp | 22 +++++++++----------- xfa/src/fxfa/src/parser/xfa_parser_imp.cpp | 22 +++++++++----------- xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp | 22 +++++++++----------- .../src/parser/xfa_script_eventpseudomodel.cpp | 22 +++++++++----------- .../fxfa/src/parser/xfa_script_hostpseudomodel.cpp | 22 +++++++++----------- xfa/src/fxfa/src/parser/xfa_script_imp.cpp | 22 +++++++++----------- .../src/parser/xfa_script_layoutpseudomodel.cpp | 22 +++++++++----------- .../fxfa/src/parser/xfa_script_logpseudomodel.cpp | 22 +++++++++----------- xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp | 22 +++++++++----------- .../src/parser/xfa_script_resolveprocessor.cpp | 22 +++++++++----------- .../src/parser/xfa_script_signaturepseudomodel.cpp | 22 +++++++++----------- xfa/src/fxfa/src/parser/xfa_utils_imp.cpp | 22 +++++++++----------- xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp | 6 +++--- 66 files changed, 339 insertions(+), 445 deletions(-) delete mode 100644 xfa/src/fxfa/src/common/xfa_debug.h delete mode 100644 xfa/src/fxfa/src/fm2js/xfa_fm2js.cpp delete mode 100644 xfa/src/fxfa/src/parser/xfa_debug_parser.cpp delete mode 100644 xfa/src/fxfa/src/parser/xfa_debug_parser.h delete mode 100644 xfa/src/fxfa/src/parser/xfa_document_imp.h (limited to 'xfa/src/fxfa') diff --git a/xfa/src/fxfa/src/app/xfa_checksum.cpp b/xfa/src/fxfa/src/app/xfa_checksum.cpp index 311c84111f..87c3cdbe25 100644 --- a/xfa/src/fxfa/src/app/xfa_checksum.cpp +++ b/xfa/src/fxfa/src/app/xfa_checksum.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_checksum.h" CXFA_SAXReaderHandler::CXFA_SAXReaderHandler(CXFA_ChecksumContext* pContext) : m_pContext(pContext) { diff --git a/xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp b/xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp index d172b6b157..e5b7e8789b 100644 --- a/xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffConfigAcc.h" CXFA_FFConfigAcc::CXFA_FFConfigAcc(CXFA_Node* pNode) : m_pNode(pNode), m_pPsMapNode(NULL) {} diff --git a/xfa/src/fxfa/src/app/xfa_ffapp.cpp b/xfa/src/fxfa/src/app/xfa_ffapp.cpp index 363b5b5742..0ce79e05db 100644 --- a/xfa/src/fxfa/src/app/xfa_ffapp.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffapp.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffdochandler.h" #include "xfa_fwladapter.h" #include "xfa_ffdoc.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp b/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp index b5c60b2711..a3e842676f 100644 --- a/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_fwladapter.h" #include "xfa_ffwidget.h" #include "xfa_fffield.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp index 9de1039010..778775f7c5 100644 --- a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffwidget.h" #include "xfa_fffield.h" #include "xfa_ffpageview.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp b/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp index 81d5be5f5e..e6a4d4b0ad 100644 --- a/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_fwladapter.h" #include "xfa_ffwidget.h" #include "xfa_fffield.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp index f53fe63f1a..448e4cfc8e 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffapp.h" #include "xfa_ffdoc.h" #include "xfa_ffdocview.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffdoc.h b/xfa/src/fxfa/src/app/xfa_ffdoc.h index 4a1196ad76..1dcbd414fb 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdoc.h +++ b/xfa/src/fxfa/src/app/xfa_ffdoc.h @@ -7,7 +7,7 @@ #ifndef FXFA_SRC_APP_XFA_FFDOC_H_ #define FXFA_SRC_APP_XFA_FFDOC_H_ -#include "../../../../include/fxfa/fxfa.h" +#include "xfa/include/fxfa/fxfa.h" class CXFA_FFApp; class CXFA_FFNotify; diff --git a/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp b/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp index 51a89479bf..502da6d14a 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffdochandler.h" #include "xfa_ffdoc.h" CXFA_FFDocHandler::CXFA_FFDocHandler() {} diff --git a/xfa/src/fxfa/src/app/xfa_ffdocview.cpp b/xfa/src/fxfa/src/app/xfa_ffdocview.cpp index cb5b6afdca..f85ba65855 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdocview.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdocview.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_fwladapter.h" #include "xfa_ffdocview.h" #include "xfa_ffpageview.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffdraw.cpp b/xfa/src/fxfa/src/app/xfa_ffdraw.cpp index b21c25fa93..a241b18d1c 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdraw.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdraw.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffwidget.h" #include "xfa_ffdraw.h" #include "xfa_ffpageview.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp b/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp index cdb9421b1c..0d57e4a613 100644 --- a/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffwidget.h" #include "xfa_ffexclgroup.h" #include "xfa_ffpageview.h" diff --git a/xfa/src/fxfa/src/app/xfa_fffield.cpp b/xfa/src/fxfa/src/app/xfa_fffield.cpp index 45d8d69c8c..b9c7f7a751 100644 --- a/xfa/src/fxfa/src/app/xfa_fffield.cpp +++ b/xfa/src/fxfa/src/app/xfa_fffield.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffwidget.h" #include "xfa_fffield.h" #include "xfa_ffpageview.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffimage.cpp b/xfa/src/fxfa/src/app/xfa_ffimage.cpp index 65ad5ae46b..3b6396b224 100644 --- a/xfa/src/fxfa/src/app/xfa_ffimage.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffimage.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffwidget.h" #include "xfa_ffdraw.h" #include "xfa_ffimage.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp index 890169621a..01088354ac 100644 --- a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffwidget.h" #include "xfa_fffield.h" #include "xfa_ffpageview.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffnotify.cpp b/xfa/src/fxfa/src/app/xfa_ffnotify.cpp index b2aef0be80..9c7875cd3c 100644 --- a/xfa/src/fxfa/src/app/xfa_ffnotify.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffnotify.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_fwladapter.h" #include "xfa_ffdocview.h" #include "xfa_ffpageview.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffpageview.cpp b/xfa/src/fxfa/src/app/xfa_ffpageview.cpp index 0780ab7e0f..87fe5cd1b4 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpageview.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffpageview.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_fwladapter.h" #include "xfa_ffpageview.h" #include "xfa_ffwidget.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffpath.cpp b/xfa/src/fxfa/src/app/xfa_ffpath.cpp index 6b021b4642..965f9cbe9e 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpath.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffpath.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffwidget.h" #include "xfa_ffdraw.h" #include "xfa_ffpath.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp b/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp index 8efa450865..47ad803944 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffwidget.h" #include "xfa_ffwidgetacc.h" #include "xfa_fffield.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffsignature.cpp b/xfa/src/fxfa/src/app/xfa_ffsignature.cpp index 7b5930d1e4..b810292a89 100644 --- a/xfa/src/fxfa/src/app/xfa_ffsignature.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffsignature.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffwidget.h" #include "xfa_fffield.h" #include "xfa_ffpageview.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffsubform.cpp b/xfa/src/fxfa/src/app/xfa_ffsubform.cpp index a435d5a0ec..b4c2e06e1e 100644 --- a/xfa/src/fxfa/src/app/xfa_ffsubform.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffsubform.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffwidget.h" #include "xfa_ffsubform.h" #include "xfa_ffpageview.h" diff --git a/xfa/src/fxfa/src/app/xfa_fftext.cpp b/xfa/src/fxfa/src/app/xfa_fftext.cpp index 0f3cea3647..a4dc78eb00 100644 --- a/xfa/src/fxfa/src/app/xfa_fftext.cpp +++ b/xfa/src/fxfa/src/app/xfa_fftext.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffwidget.h" #include "xfa_ffdraw.h" #include "xfa_fftext.h" diff --git a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp b/xfa/src/fxfa/src/app/xfa_fftextedit.cpp index 3ba8072ee6..f90a2ccaba 100644 --- a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp +++ b/xfa/src/fxfa/src/app/xfa_fftextedit.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_fwladapter.h" #include "xfa_ffwidget.h" #include "xfa_fffield.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp b/xfa/src/fxfa/src/app/xfa_ffwidget.cpp index 0c37dc5f68..58047302e0 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffwidget.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffapp.h" #include "xfa_ffdoc.h" #include "xfa_ffdocview.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffwidget.h b/xfa/src/fxfa/src/app/xfa_ffwidget.h index 500a23f035..20a7d80443 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidget.h +++ b/xfa/src/fxfa/src/app/xfa_ffwidget.h @@ -7,7 +7,7 @@ #ifndef _FXFA_FORMFILLER_WIDGET_IMP_H #define _FXFA_FORMFILLER_WIDGET_IMP_H -#include "../../../../include/fxfa/fxfa.h" +#include "xfa/include/fxfa/fxfa.h" class CXFA_FFPageView; class CXFA_FFDocView; diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp index 285ea544ac..92b6fe920c 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_ffwidget.h" #include "xfa_ffdoc.h" #include "xfa_ffdocview.h" diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp index 1c439788b7..6af98a6456 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_fwladapter.h" #include "xfa_ffwidgethandler.h" #include "xfa_ffwidget.h" diff --git a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp index 015ff1f476..d6a5677e85 100644 --- a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp +++ b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_fontmgr.h" #include "xfa_ffdoc.h" #include "xfa_ffConfigAcc.h" diff --git a/xfa/src/fxfa/src/app/xfa_fwladapter.cpp b/xfa/src/fxfa/src/app/xfa_fwladapter.cpp index 077fa648f3..4382d0bbf3 100644 --- a/xfa/src/fxfa/src/app/xfa_fwladapter.cpp +++ b/xfa/src/fxfa/src/app/xfa_fwladapter.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_fwladapter.h" #include "xfa_ffwidget.h" #include "xfa_fffield.h" diff --git a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp b/xfa/src/fxfa/src/app/xfa_fwltheme.cpp index cbf81ad46c..1aa6242b4d 100644 --- a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp +++ b/xfa/src/fxfa/src/app/xfa_fwltheme.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_fwltheme.h" #include "xfa_ffwidget.h" #include "xfa_ffapp.h" diff --git a/xfa/src/fxfa/src/app/xfa_rendercontext.cpp b/xfa/src/fxfa/src/app/xfa_rendercontext.cpp index 0ebda0ccc8..2d8ed0dd02 100644 --- a/xfa/src/fxfa/src/app/xfa_rendercontext.cpp +++ b/xfa/src/fxfa/src/app/xfa_rendercontext.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_rendercontext.h" #include "xfa_ffwidget.h" #define XFA_RENDERCONTEXT_MaxCount 30 diff --git a/xfa/src/fxfa/src/app/xfa_textlayout.cpp b/xfa/src/fxfa/src/app/xfa_textlayout.cpp index e620924441..45eac17884 100644 --- a/xfa/src/fxfa/src/app/xfa_textlayout.cpp +++ b/xfa/src/fxfa/src/app/xfa_textlayout.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_common.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa_textlayout.h" #include "xfa_ffapp.h" #include "xfa_ffdoc.h" diff --git a/xfa/src/fxfa/src/common/xfa_common.h b/xfa/src/fxfa/src/common/xfa_common.h index b7bafa7505..42201cc148 100644 --- a/xfa/src/fxfa/src/common/xfa_common.h +++ b/xfa/src/fxfa/src/common/xfa_common.h @@ -4,6 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +// TODO(thestig): Remove this file and do IWYU. + #ifndef _XFA_COMMON_H_ #define _XFA_COMMON_H_ #include "xfa_utils.h" @@ -13,7 +15,6 @@ #include "xfa_script.h" #include "xfa_docdata.h" #include "xfa_doclayout.h" -#include "xfa_debug.h" #include "xfa_localemgr.h" #include "xfa_fm2jsapi.h" #endif diff --git a/xfa/src/fxfa/src/common/xfa_debug.h b/xfa/src/fxfa/src/common/xfa_debug.h deleted file mode 100644 index dee70a688e..0000000000 --- a/xfa/src/fxfa/src/common/xfa_debug.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef _XFA_COMMON_DEBUG_H_ -#define _XFA_COMMON_DEBUG_H_ -#endif diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2js.cpp b/xfa/src/fxfa/src/fm2js/xfa_fm2js.cpp deleted file mode 100644 index 3cf1330277..0000000000 --- a/xfa/src/fxfa/src/fm2js/xfa_fm2js.cpp +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#include "xfa_fm2js.h" diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2js.h b/xfa/src/fxfa/src/fm2js/xfa_fm2js.h index 68dae71810..6bf7bbb063 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_fm2js.h +++ b/xfa/src/fxfa/src/fm2js/xfa_fm2js.h @@ -6,17 +6,16 @@ #ifndef _XFA_FM2JS_H #define _XFA_FM2JS_H -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #define RUNTIMEFUNCTIONRETURNVALUE \ (FX_WSTRC(L"foxit_xfa_formcalc_runtime_func_return_value")) #define EXCLAMATION_IN_IDENTIFIER \ diff --git a/xfa/src/fxfa/src/parser/xfa_basic_data.cpp b/xfa/src/fxfa/src/parser/xfa_basic_data.cpp index 99b02b8b79..e55cf7335c 100644 --- a/xfa/src/fxfa/src/parser/xfa_basic_data.cpp +++ b/xfa/src/fxfa/src/parser/xfa_basic_data.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_basic_imp.h" #include "xfa_script_datawindow.h" #include "xfa_script_eventpseudomodel.h" diff --git a/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp b/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp index 0b5f63efa6..fbd0d95dcb 100644 --- a/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_basic_imp.h" extern const XFA_PACKETINFO g_XFAPacketData[]; extern const int32_t g_iXFAPacketCount; diff --git a/xfa/src/fxfa/src/parser/xfa_debug_parser.cpp b/xfa/src/fxfa/src/parser/xfa_debug_parser.cpp deleted file mode 100644 index 4f5365e1d8..0000000000 --- a/xfa/src/fxfa/src/parser/xfa_debug_parser.cpp +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" diff --git a/xfa/src/fxfa/src/parser/xfa_debug_parser.h b/xfa/src/fxfa/src/parser/xfa_debug_parser.h deleted file mode 100644 index 90dce89d3e..0000000000 --- a/xfa/src/fxfa/src/parser/xfa_debug_parser.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef _XFA_DEBUG_PARSER_H_ -#define _XFA_DEBUG_PARSER_H_ -#endif diff --git a/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp index 5e2b31a723..7f0de75619 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #define XFA_HASHCODE_Group 0xf7f75fcd class CXFA_TraverseStrategy_DDGroup { public: diff --git a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp index 93ec1da24e..baab5eb02c 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp @@ -4,20 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_basic_imp.h" -#include "xfa_document_imp.h" #include "xfa_document_datadescription_imp.h" #include "xfa_document_datamerger_imp.h" #include "xfa_document_layout_imp.h" diff --git a/xfa/src/fxfa/src/parser/xfa_document_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_imp.cpp index 644a29bb2b..d5067cdacf 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_imp.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_basic_imp.h" #include "xfa_document_layout_imp.h" #include "xfa_script_datawindow.h" diff --git a/xfa/src/fxfa/src/parser/xfa_document_imp.h b/xfa/src/fxfa/src/parser/xfa_document_imp.h deleted file mode 100644 index 53404c0d9e..0000000000 --- a/xfa/src/fxfa/src/parser/xfa_document_imp.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef _XFA_DOCUMENT_IMP_H_ -#define _XFA_DOCUMENT_IMP_H_ -#endif diff --git a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp index 4d678bf75d..861ff1f67b 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp @@ -4,20 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_basic_imp.h" -#include "xfa_document_imp.h" #include "xfa_document_layout_imp.h" #include "xfa_document_datamerger_imp.h" #include "xfa_layout_itemlayout.h" diff --git a/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp b/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp index 558765270a..c381aa9e97 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_document_serialize.h" IXFA_PacketImport* IXFA_PacketImport::Create(CXFA_Document* pDocument) { return new CXFA_DataImporter(pDocument); diff --git a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp b/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp index e98795b5c9..562beb9001 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp +++ b/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_document_layout_imp.h" #include "xfa_layout_itemlayout.h" #include "xfa_layout_pagemgr_new.h" diff --git a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp index 1f24c565b1..7d12a289e8 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp +++ b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_document_layout_imp.h" #include "xfa_layout_itemlayout.h" #include "xfa_layout_pagemgr_new.h" diff --git a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp index f83b772003..aedd090371 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp +++ b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_document_datamerger_imp.h" #include "xfa_document_layout_imp.h" #include "xfa_layout_itemlayout.h" diff --git a/xfa/src/fxfa/src/parser/xfa_locale.cpp b/xfa/src/fxfa/src/parser/xfa_locale.cpp index 50157aa83f..bfadefcf4c 100644 --- a/xfa/src/fxfa/src/parser/xfa_locale.cpp +++ b/xfa/src/fxfa/src/parser/xfa_locale.cpp @@ -4,19 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../../../core/include/fxcrt/fx_xml.h" -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "core/include/fxcrt/fx_xml.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_locale.h" static const FX_WCHAR* g_FX_Percent = L"z,zzz,zzz,zzz,zzz,zzz%"; diff --git a/xfa/src/fxfa/src/parser/xfa_localemgr.cpp b/xfa/src/fxfa/src/parser/xfa_localemgr.cpp index 62310f5845..f4b20668ee 100644 --- a/xfa/src/fxfa/src/parser/xfa_localemgr.cpp +++ b/xfa/src/fxfa/src/parser/xfa_localemgr.cpp @@ -4,19 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../../../core/include/fxcrt/fx_xml.h" -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "core/include/fxcrt/fx_xml.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_locale.h" const uint8_t g_enUS_Locale[] = { diff --git a/xfa/src/fxfa/src/parser/xfa_localevalue.cpp b/xfa/src/fxfa/src/parser/xfa_localevalue.cpp index 93c371d996..24731b0668 100644 --- a/xfa/src/fxfa/src/parser/xfa_localevalue.cpp +++ b/xfa/src/fxfa/src/parser/xfa_localevalue.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" static const FX_DOUBLE fraction_scales[] = {0.1, 0.01, 0.001, diff --git a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp index 9f77d7e75a..be2bed9334 100644 --- a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_basic_imp.h" #include "xfa_document_layout_imp.h" CXFA_Object::CXFA_Object(CXFA_Document* pDocument, FX_DWORD uFlags) diff --git a/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp b/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp index 86276483b6..6eb0adf647 100644 --- a/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" static FX_ARGB XFA_WStringToColor(const CFX_WideStringC& wsValue) { uint8_t r = 0, g = 0, b = 0; if (wsValue.GetLength() == 0) { diff --git a/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp b/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp index 937d6fa2ce..6064c0158f 100644 --- a/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_basic_imp.h" #include "xfa_parser_imp.h" IXFA_Parser* IXFA_Parser::Create(IXFA_ObjFactory* pFactory, diff --git a/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp b/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp index e0f4fee342..80258b45aa 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_script_datawindow.h" CScript_DataWindow::CScript_DataWindow(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_DataWindow) { diff --git a/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp index 479c2592bd..74786ad75c 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_script_eventpseudomodel.h" CScript_EventPseudoModel::CScript_EventPseudoModel(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_EventPseudoModel) { diff --git a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp index 21a4fa1997..bf79220ccb 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_script_hostpseudomodel.h" CScript_HostPseudoModel::CScript_HostPseudoModel(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_HostPseudoModel) { diff --git a/xfa/src/fxfa/src/parser/xfa_script_imp.cpp b/xfa/src/fxfa/src/parser/xfa_script_imp.cpp index d35c48f1a9..9f4f0232ef 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_imp.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_script_imp.h" #include "xfa_script_resolveprocessor.h" #include "xfa_script_nodehelper.h" diff --git a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp index da4ad54017..0b344129dc 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_script_layoutpseudomodel.h" #include "xfa_document_layout_imp.h" #include "xfa_layout_appadapter.h" diff --git a/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp index bdb8c0b309..910d148f57 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_script_logpseudomodel.h" CScript_LogPseudoModel::CScript_LogPseudoModel(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_LogPseudoModel) { diff --git a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp index 44eb698a54..96ceeb5318 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_script_nodehelper.h" #include "xfa_script_imp.h" CXFA_NodeHelper::CXFA_NodeHelper(void) diff --git a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp index befff73141..9645a9d2c2 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_script_resolveprocessor.h" #include "xfa_script_nodehelper.h" #include "xfa_script_imp.h" diff --git a/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp index f5ca9e2a19..53fb24dee1 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #include "xfa_script_signaturepseudomodel.h" CScript_SignaturePseudoModel::CScript_SignaturePseudoModel( CXFA_Document* pDocument) diff --git a/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp b/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp index abe5fdbd48..3e4bc303e1 100644 --- a/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp @@ -4,18 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" -#include "../common/xfa_object.h" -#include "../common/xfa_document.h" -#include "../common/xfa_parser.h" -#include "../common/xfa_script.h" -#include "../common/xfa_docdata.h" -#include "../common/xfa_doclayout.h" -#include "../common/xfa_debug.h" -#include "../common/xfa_localemgr.h" -#include "../common/xfa_fm2jsapi.h" -#include "xfa_debug_parser.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" CXFA_Node* XFA_CreateUIChild(CXFA_Node* pNode, XFA_ELEMENT& eWidgetType) { XFA_ELEMENT eType = pNode->GetClassID(); eWidgetType = eType; diff --git a/xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp b/xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp index 174673eb72..81fdc4e322 100644 --- a/xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp +++ b/xfa/src/fxfa/src/parser/xfa_utils_imp_unittest.cpp @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "../../../testing/gtest/include/gtest/gtest.h" -#include "../../../foxitlib.h" -#include "../common/xfa_utils.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" TEST(XfaUtilsImp, XFA_MapRotation) { struct TestCase { -- cgit v1.2.3