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 --- xfa/fxfa/app/xfa_checksum.cpp | 2 +- xfa/fxfa/app/xfa_ffapp.cpp | 10 +++++----- xfa/fxfa/app/xfa_ffbarcode.cpp | 4 ++-- xfa/fxfa/app/xfa_ffbarcode.h | 2 +- xfa/fxfa/app/xfa_ffcheckbutton.cpp | 10 +++++----- xfa/fxfa/app/xfa_ffcheckbutton.h | 2 +- xfa/fxfa/app/xfa_ffchoicelist.cpp | 8 ++++---- xfa/fxfa/app/xfa_ffchoicelist.h | 2 +- xfa/fxfa/app/xfa_ffdoc.cpp | 12 ++++++------ xfa/fxfa/app/xfa_ffdochandler.cpp | 6 +++--- xfa/fxfa/app/xfa_ffdocview.cpp | 12 ++++++------ xfa/fxfa/app/xfa_ffdraw.cpp | 8 ++++---- xfa/fxfa/app/xfa_ffdraw.h | 4 ++-- xfa/fxfa/app/xfa_ffexclgroup.cpp | 8 ++++---- xfa/fxfa/app/xfa_ffexclgroup.h | 4 ++-- xfa/fxfa/app/xfa_fffield.cpp | 10 +++++----- xfa/fxfa/app/xfa_fffield.h | 4 ++-- xfa/fxfa/app/xfa_ffimage.cpp | 8 ++++---- xfa/fxfa/app/xfa_ffimageedit.cpp | 8 ++++---- xfa/fxfa/app/xfa_ffnotify.cpp | 12 ++++++------ xfa/fxfa/app/xfa_ffpageview.cpp | 8 ++++---- xfa/fxfa/app/xfa_ffpath.cpp | 8 ++++---- xfa/fxfa/app/xfa_ffpushbutton.cpp | 6 +++--- xfa/fxfa/app/xfa_ffsignature.cpp | 6 +++--- xfa/fxfa/app/xfa_ffsubform.cpp | 8 ++++---- xfa/fxfa/app/xfa_ffsubform.h | 4 ++-- xfa/fxfa/app/xfa_fftext.cpp | 8 ++++---- xfa/fxfa/app/xfa_fftextedit.cpp | 10 +++++----- xfa/fxfa/app/xfa_ffwidget.cpp | 10 +++++----- xfa/fxfa/app/xfa_ffwidgetacc.cpp | 12 ++++++------ xfa/fxfa/app/xfa_ffwidgethandler.cpp | 8 ++++---- xfa/fxfa/app/xfa_fontmgr.cpp | 6 +++--- xfa/fxfa/app/xfa_fwladapter.cpp | 2 +- xfa/fxfa/app/xfa_fwltheme.cpp | 4 ++-- xfa/fxfa/app/xfa_fwltheme.h | 2 +- xfa/fxfa/app/xfa_rendercontext.cpp | 6 +++--- xfa/fxfa/app/xfa_textlayout.cpp | 6 +++--- xfa/fxfa/app/xfa_textlayout.h | 2 +- 38 files changed, 126 insertions(+), 126 deletions(-) (limited to 'xfa/fxfa/app') diff --git a/xfa/fxfa/app/xfa_checksum.cpp b/xfa/fxfa/app/xfa_checksum.cpp index 318541f05a..39bdb64e47 100644 --- a/xfa/fxfa/app/xfa_checksum.cpp +++ b/xfa/fxfa/app/xfa_checksum.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/include/fxfa/xfa_checksum.h" +#include "xfa/fxfa/include/xfa_checksum.h" #include "core/fdrm/crypto/include/fx_crypt.h" #include "xfa/fgas/crt/fgas_algorithm.h" diff --git a/xfa/fxfa/app/xfa_ffapp.cpp b/xfa/fxfa/app/xfa_ffapp.cpp index f629e408c0..71b8fc44b1 100644 --- a/xfa/fxfa/app/xfa_ffapp.cpp +++ b/xfa/fxfa/app/xfa_ffapp.cpp @@ -4,17 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/include/fxfa/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffapp.h" #include #include "xfa/fwl/core/ifwl_widgetmgrdelegate.h" #include "xfa/fxfa/app/xfa_fwladapter.h" #include "xfa/fxfa/app/xfa_fwltheme.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffdochandler.h" -#include "xfa/include/fxfa/xfa_ffwidgethandler.h" -#include "xfa/include/fxfa/xfa_fontmgr.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffdochandler.h" +#include "xfa/fxfa/include/xfa_ffwidgethandler.h" +#include "xfa/fxfa/include/xfa_fontmgr.h" CXFA_FileRead::CXFA_FileRead(const CFX_ArrayTemplate& streams) { int32_t iCount = streams.GetSize(); diff --git a/xfa/fxfa/app/xfa_ffbarcode.cpp b/xfa/fxfa/app/xfa_ffbarcode.cpp index 5f38fafa9f..5987627f7f 100644 --- a/xfa/fxfa/app/xfa_ffbarcode.cpp +++ b/xfa/fxfa/app/xfa_ffbarcode.cpp @@ -13,8 +13,8 @@ #include "xfa/fxfa/app/xfa_fffield.h" #include "xfa/fxfa/app/xfa_fftextedit.h" #include "xfa/fxfa/app/xfa_fwladapter.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" namespace { diff --git a/xfa/fxfa/app/xfa_ffbarcode.h b/xfa/fxfa/app/xfa_ffbarcode.h index 8a32e8df51..ffa7037839 100644 --- a/xfa/fxfa/app/xfa_ffbarcode.h +++ b/xfa/fxfa/app/xfa_ffbarcode.h @@ -9,7 +9,7 @@ #include "xfa/fxbarcode/include/BC_Library.h" #include "xfa/fxfa/app/xfa_fftextedit.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" class CXFA_FFBarcode : public CXFA_FFTextEdit { public: diff --git a/xfa/fxfa/app/xfa_ffcheckbutton.cpp b/xfa/fxfa/app/xfa_ffcheckbutton.cpp index f741f2598e..85f445fedc 100644 --- a/xfa/fxfa/app/xfa_ffcheckbutton.cpp +++ b/xfa/fxfa/app/xfa_ffcheckbutton.cpp @@ -12,11 +12,11 @@ #include "xfa/fwl/lightwidget/cfwl_checkbox.h" #include "xfa/fxfa/app/xfa_ffexclgroup.h" #include "xfa/fxfa/app/xfa_fffield.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffdocview.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffdocview.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" CXFA_FFCheckButton::CXFA_FFCheckButton(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) diff --git a/xfa/fxfa/app/xfa_ffcheckbutton.h b/xfa/fxfa/app/xfa_ffcheckbutton.h index 2e169041d7..a04284250b 100644 --- a/xfa/fxfa/app/xfa_ffcheckbutton.h +++ b/xfa/fxfa/app/xfa_ffcheckbutton.h @@ -8,7 +8,7 @@ #define XFA_FXFA_APP_XFA_FFCHECKBUTTON_H_ #include "xfa/fxfa/app/xfa_fffield.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" class CXFA_FFCheckButton : public CXFA_FFField { public: diff --git a/xfa/fxfa/app/xfa_ffchoicelist.cpp b/xfa/fxfa/app/xfa_ffchoicelist.cpp index 57ef227a93..41564c6b04 100644 --- a/xfa/fxfa/app/xfa_ffchoicelist.cpp +++ b/xfa/fxfa/app/xfa_ffchoicelist.cpp @@ -13,10 +13,10 @@ #include "xfa/fwl/lightwidget/cfwl_listbox.h" #include "xfa/fxfa/app/xfa_fffield.h" #include "xfa/fxfa/app/xfa_fwladapter.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffdocview.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffdocview.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" CXFA_FFListBox::CXFA_FFListBox(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) diff --git a/xfa/fxfa/app/xfa_ffchoicelist.h b/xfa/fxfa/app/xfa_ffchoicelist.h index 580bb8f647..ba48380138 100644 --- a/xfa/fxfa/app/xfa_ffchoicelist.h +++ b/xfa/fxfa/app/xfa_ffchoicelist.h @@ -8,7 +8,7 @@ #define XFA_FXFA_APP_XFA_FFCHOICELIST_H_ #include "xfa/fxfa/app/xfa_fffield.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" class CXFA_FFListBox : public CXFA_FFField { public: diff --git a/xfa/fxfa/app/xfa_ffdoc.cpp b/xfa/fxfa/app/xfa_ffdoc.cpp index 5baebb152a..37bafca77a 100644 --- a/xfa/fxfa/app/xfa_ffdoc.cpp +++ b/xfa/fxfa/app/xfa_ffdoc.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/include/fxfa/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h" @@ -15,16 +15,16 @@ #include "xfa/fgas/crt/fgas_algorithm.h" #include "xfa/fwl/core/ifwl_notedriver.h" #include "xfa/fxfa/app/xfa_ffnotify.h" +#include "xfa/fxfa/include/xfa_checksum.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdocview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_fontmgr.h" #include "xfa/fxfa/parser/xfa_docdata.h" #include "xfa/fxfa/parser/xfa_document_serialize.h" #include "xfa/fxfa/parser/xfa_parser.h" #include "xfa/fxfa/parser/xfa_parser_imp.h" #include "xfa/fxfa/parser/xfa_parser_imp.h" -#include "xfa/include/fxfa/xfa_checksum.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdocview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" -#include "xfa/include/fxfa/xfa_fontmgr.h" CXFA_FFDoc::CXFA_FFDoc(CXFA_FFApp* pApp, IXFA_DocProvider* pDocProvider) : m_pDocProvider(pDocProvider), diff --git a/xfa/fxfa/app/xfa_ffdochandler.cpp b/xfa/fxfa/app/xfa_ffdochandler.cpp index 6aed551fdb..389e5ac6da 100644 --- a/xfa/fxfa/app/xfa_ffdochandler.cpp +++ b/xfa/fxfa/app/xfa_ffdochandler.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/include/fxfa/xfa_ffdochandler.h" +#include "xfa/fxfa/include/xfa_ffdochandler.h" +#include "xfa/fxfa/include/xfa_checksum.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" #include "xfa/fxfa/parser/xfa_script.h" #include "xfa/fxfa/parser/xfa_script_imp.h" -#include "xfa/include/fxfa/xfa_checksum.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" CXFA_FFDocHandler::CXFA_FFDocHandler() {} diff --git a/xfa/fxfa/app/xfa_ffdocview.cpp b/xfa/fxfa/app/xfa_ffdocview.cpp index dbedbad2e3..b9b3b9a4a8 100644 --- a/xfa/fxfa/app/xfa_ffdocview.cpp +++ b/xfa/fxfa/app/xfa_ffdocview.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/include/fxfa/xfa_ffdocview.h" +#include "xfa/fxfa/include/xfa_ffdocview.h" #include "core/fxcrt/include/fx_ext.h" #include "xfa/fxfa/app/xfa_ffbarcode.h" @@ -24,15 +24,15 @@ #include "xfa/fxfa/app/xfa_ffwidgetacc.h" #include "xfa/fxfa/app/xfa_fwladapter.h" #include "xfa/fxfa/app/xfa_textlayout.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffwidgethandler.h" #include "xfa/fxfa/parser/cxfa_binditems.h" #include "xfa/fxfa/parser/xfa_document_layout_imp.h" #include "xfa/fxfa/parser/xfa_script.h" #include "xfa/fxfa/parser/xfa_script_imp.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" -#include "xfa/include/fxfa/xfa_ffwidgethandler.h" extern const XFA_ATTRIBUTEENUM gs_EventActivity[] = { XFA_ATTRIBUTEENUM_Click, XFA_ATTRIBUTEENUM_Change, diff --git a/xfa/fxfa/app/xfa_ffdraw.cpp b/xfa/fxfa/app/xfa_ffdraw.cpp index 68c1d96f4a..d433003f5c 100644 --- a/xfa/fxfa/app/xfa_ffdraw.cpp +++ b/xfa/fxfa/app/xfa_ffdraw.cpp @@ -6,10 +6,10 @@ #include "xfa/fxfa/app/xfa_ffdraw.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" CXFA_FFDraw::CXFA_FFDraw(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFWidget(pPageView, pDataAcc) {} diff --git a/xfa/fxfa/app/xfa_ffdraw.h b/xfa/fxfa/app/xfa_ffdraw.h index 52ceb2cd0c..c3c1c14445 100644 --- a/xfa/fxfa/app/xfa_ffdraw.h +++ b/xfa/fxfa/app/xfa_ffdraw.h @@ -7,8 +7,8 @@ #ifndef XFA_FXFA_APP_XFA_FFDRAW_H_ #define XFA_FXFA_APP_XFA_FFDRAW_H_ -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" class CXFA_FFDraw : public CXFA_FFWidget { public: diff --git a/xfa/fxfa/app/xfa_ffexclgroup.cpp b/xfa/fxfa/app/xfa_ffexclgroup.cpp index 177738d636..f4a1cfb67b 100644 --- a/xfa/fxfa/app/xfa_ffexclgroup.cpp +++ b/xfa/fxfa/app/xfa_ffexclgroup.cpp @@ -6,10 +6,10 @@ #include "xfa/fxfa/app/xfa_ffexclgroup.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" CXFA_FFExclGroup::CXFA_FFExclGroup(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) diff --git a/xfa/fxfa/app/xfa_ffexclgroup.h b/xfa/fxfa/app/xfa_ffexclgroup.h index 5a1fc945b7..6b59f05384 100644 --- a/xfa/fxfa/app/xfa_ffexclgroup.h +++ b/xfa/fxfa/app/xfa_ffexclgroup.h @@ -7,8 +7,8 @@ #ifndef XFA_FXFA_APP_XFA_FFEXCLGROUP_H_ #define XFA_FXFA_APP_XFA_FFEXCLGROUP_H_ -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" class CXFA_FFExclGroup : public CXFA_FFWidget { public: diff --git a/xfa/fxfa/app/xfa_fffield.cpp b/xfa/fxfa/app/xfa_fffield.cpp index 229ed43733..dc1cebbf66 100644 --- a/xfa/fxfa/app/xfa_fffield.cpp +++ b/xfa/fxfa/app/xfa_fffield.cpp @@ -13,13 +13,13 @@ #include "xfa/fwl/lightwidget/cfwl_picturebox.h" #include "xfa/fxfa/app/xfa_fwltheme.h" #include "xfa/fxfa/app/xfa_textlayout.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffdocview.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" #include "xfa/fxgraphics/cfx_color.h" #include "xfa/fxgraphics/cfx_path.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffdocview.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" CXFA_FFField::CXFA_FFField(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFWidget(pPageView, pDataAcc), m_pNormalWidget(NULL) { diff --git a/xfa/fxfa/app/xfa_fffield.h b/xfa/fxfa/app/xfa_fffield.h index 44ee9bb4f2..70ba9fc661 100644 --- a/xfa/fxfa/app/xfa_fffield.h +++ b/xfa/fxfa/app/xfa_fffield.h @@ -10,8 +10,8 @@ #include "xfa/fwl/core/fwl_sdadapterimp.h" #include "xfa/fwl/core/ifwl_widgetdelegate.h" #include "xfa/fwl/lightwidget/cfwl_widget.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" #define XFA_MINUI_HEIGHT 4.32f #define XFA_DEFAULTUI_HEIGHT 2.0f diff --git a/xfa/fxfa/app/xfa_ffimage.cpp b/xfa/fxfa/app/xfa_ffimage.cpp index 5c28682978..7e4b0a9c34 100644 --- a/xfa/fxfa/app/xfa_ffimage.cpp +++ b/xfa/fxfa/app/xfa_ffimage.cpp @@ -7,10 +7,10 @@ #include "xfa/fxfa/app/xfa_ffimage.h" #include "xfa/fxfa/app/xfa_ffdraw.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" CXFA_FFImage::CXFA_FFImage(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFDraw(pPageView, pDataAcc) {} diff --git a/xfa/fxfa/app/xfa_ffimageedit.cpp b/xfa/fxfa/app/xfa_ffimageedit.cpp index d419fbd37d..343293d64c 100644 --- a/xfa/fxfa/app/xfa_ffimageedit.cpp +++ b/xfa/fxfa/app/xfa_ffimageedit.cpp @@ -11,10 +11,10 @@ #include "xfa/fwl/core/ifwl_notedriver.h" #include "xfa/fwl/lightwidget/cfwl_picturebox.h" #include "xfa/fxfa/app/xfa_fffield.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffdocview.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffdocview.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" CXFA_FFImageEdit::CXFA_FFImageEdit(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) diff --git a/xfa/fxfa/app/xfa_ffnotify.cpp b/xfa/fxfa/app/xfa_ffnotify.cpp index 7851819474..ac4cc27f8d 100644 --- a/xfa/fxfa/app/xfa_ffnotify.cpp +++ b/xfa/fxfa/app/xfa_ffnotify.cpp @@ -23,12 +23,12 @@ #include "xfa/fxfa/app/xfa_ffwidgetacc.h" #include "xfa/fxfa/app/xfa_fwladapter.h" #include "xfa/fxfa/app/xfa_textlayout.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffdocview.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" -#include "xfa/include/fxfa/xfa_ffwidgethandler.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffdocview.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffwidgethandler.h" static void XFA_FFDeleteWidgetAcc(void* pData) { delete static_cast(pData); diff --git a/xfa/fxfa/app/xfa_ffpageview.cpp b/xfa/fxfa/app/xfa_ffpageview.cpp index 21eb8554da..54e315f466 100644 --- a/xfa/fxfa/app/xfa_ffpageview.cpp +++ b/xfa/fxfa/app/xfa_ffpageview.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/include/fxfa/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" #include "xfa/fde/fde_render.h" #include "xfa/fxfa/app/xfa_ffcheckbutton.h" @@ -14,9 +14,9 @@ #include "xfa/fxfa/app/xfa_ffpushbutton.h" #include "xfa/fxfa/app/xfa_fftextedit.h" #include "xfa/fxfa/app/xfa_fwladapter.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffdocview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffdocview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" CXFA_FFPageView::CXFA_FFPageView(CXFA_FFDocView* pDocView, CXFA_Node* pPageArea) : CXFA_ContainerLayoutItem(pPageArea), diff --git a/xfa/fxfa/app/xfa_ffpath.cpp b/xfa/fxfa/app/xfa_ffpath.cpp index 6f30612942..2aad39f99c 100644 --- a/xfa/fxfa/app/xfa_ffpath.cpp +++ b/xfa/fxfa/app/xfa_ffpath.cpp @@ -7,12 +7,12 @@ #include "xfa/fxfa/app/xfa_ffpath.h" #include "xfa/fxfa/app/xfa_ffdraw.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" #include "xfa/fxgraphics/cfx_color.h" #include "xfa/fxgraphics/cfx_path.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" CXFA_FFLine::CXFA_FFLine(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFDraw(pPageView, pDataAcc) {} diff --git a/xfa/fxfa/app/xfa_ffpushbutton.cpp b/xfa/fxfa/app/xfa_ffpushbutton.cpp index 4c54868f55..d070223751 100644 --- a/xfa/fxfa/app/xfa_ffpushbutton.cpp +++ b/xfa/fxfa/app/xfa_ffpushbutton.cpp @@ -12,11 +12,11 @@ #include "xfa/fxfa/app/xfa_fffield.h" #include "xfa/fxfa/app/xfa_ffwidgetacc.h" #include "xfa/fxfa/app/xfa_textlayout.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" #include "xfa/fxgraphics/cfx_color.h" #include "xfa/fxgraphics/cfx_path.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" CXFA_FFPushButton::CXFA_FFPushButton(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) diff --git a/xfa/fxfa/app/xfa_ffsignature.cpp b/xfa/fxfa/app/xfa_ffsignature.cpp index e5dba34985..1cb77a4df1 100644 --- a/xfa/fxfa/app/xfa_ffsignature.cpp +++ b/xfa/fxfa/app/xfa_ffsignature.cpp @@ -7,9 +7,9 @@ #include "xfa/fxfa/app/xfa_ffsignature.h" #include "xfa/fxfa/app/xfa_fffield.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" CXFA_FFSignature::CXFA_FFSignature(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) diff --git a/xfa/fxfa/app/xfa_ffsubform.cpp b/xfa/fxfa/app/xfa_ffsubform.cpp index 0ba4858b72..a2add4f6a4 100644 --- a/xfa/fxfa/app/xfa_ffsubform.cpp +++ b/xfa/fxfa/app/xfa_ffsubform.cpp @@ -6,10 +6,10 @@ #include "xfa/fxfa/app/xfa_ffsubform.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" CXFA_FFSubForm::CXFA_FFSubForm(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) diff --git a/xfa/fxfa/app/xfa_ffsubform.h b/xfa/fxfa/app/xfa_ffsubform.h index 5a705a6a00..fd3da98670 100644 --- a/xfa/fxfa/app/xfa_ffsubform.h +++ b/xfa/fxfa/app/xfa_ffsubform.h @@ -7,8 +7,8 @@ #ifndef XFA_FXFA_APP_XFA_FFSUBFORM_H_ #define XFA_FXFA_APP_XFA_FFSUBFORM_H_ -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" class CXFA_FFSubForm : public CXFA_FFWidget { public: diff --git a/xfa/fxfa/app/xfa_fftext.cpp b/xfa/fxfa/app/xfa_fftext.cpp index d4bce5419f..b529f7e58a 100644 --- a/xfa/fxfa/app/xfa_fftext.cpp +++ b/xfa/fxfa/app/xfa_fftext.cpp @@ -9,11 +9,11 @@ #include "xfa/fwl/core/fwl_widgetdef.h" #include "xfa/fxfa/app/xfa_ffdraw.h" #include "xfa/fxfa/app/xfa_textlayout.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" #include "xfa/fxgraphics/include/cfx_graphics.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" CXFA_FFText::CXFA_FFText(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFDraw(pPageView, pDataAcc) {} diff --git a/xfa/fxfa/app/xfa_fftextedit.cpp b/xfa/fxfa/app/xfa_fftextedit.cpp index de93c031b5..69d445e2ab 100644 --- a/xfa/fxfa/app/xfa_fftextedit.cpp +++ b/xfa/fxfa/app/xfa_fftextedit.cpp @@ -17,12 +17,12 @@ #include "xfa/fxfa/app/xfa_fffield.h" #include "xfa/fxfa/app/xfa_fwladapter.h" #include "xfa/fxfa/app/xfa_textlayout.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffdocview.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" #include "xfa/fxfa/parser/xfa_localevalue.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffdocview.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" CXFA_FFTextEdit::CXFA_FFTextEdit(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) diff --git a/xfa/fxfa/app/xfa_ffwidget.cpp b/xfa/fxfa/app/xfa_ffwidget.cpp index 6f67654e96..c484b9afa8 100644 --- a/xfa/fxfa/app/xfa_ffwidget.cpp +++ b/xfa/fxfa/app/xfa_ffwidget.cpp @@ -4,23 +4,23 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/include/fxfa/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" #include #include "core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h" #include "core/fxcodec/include/fx_codec.h" #include "xfa/fxfa/app/xfa_textlayout.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffdocview.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" #include "xfa/fxfa/parser/cxfa_corner.h" #include "xfa/fxgraphics/cfx_color.h" #include "xfa/fxgraphics/cfx_path.h" #include "xfa/fxgraphics/cfx_pattern.h" #include "xfa/fxgraphics/cfx_shading.h" #include "xfa/fxgraphics/include/cfx_graphics.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffdocview.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" CXFA_FFWidget::CXFA_FFWidget(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) diff --git a/xfa/fxfa/app/xfa_ffwidgetacc.cpp b/xfa/fxfa/app/xfa_ffwidgetacc.cpp index e5b70d6a81..073fbfe8aa 100644 --- a/xfa/fxfa/app/xfa_ffwidgetacc.cpp +++ b/xfa/fxfa/app/xfa_ffwidgetacc.cpp @@ -15,16 +15,16 @@ #include "xfa/fxfa/app/xfa_fffield.h" #include "xfa/fxfa/app/xfa_fwladapter.h" #include "xfa/fxfa/app/xfa_textlayout.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffdocview.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" +#include "xfa/fxfa/include/xfa_fontmgr.h" #include "xfa/fxfa/parser/xfa_document_layout_imp.h" #include "xfa/fxfa/parser/xfa_localevalue.h" #include "xfa/fxfa/parser/xfa_script.h" #include "xfa/fxfa/parser/xfa_script_imp.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffdocview.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" -#include "xfa/include/fxfa/xfa_fontmgr.h" static void XFA_FFDeleteCalcData(void* pData) { if (pData) { diff --git a/xfa/fxfa/app/xfa_ffwidgethandler.cpp b/xfa/fxfa/app/xfa_ffwidgethandler.cpp index b79082965a..b4d268920c 100644 --- a/xfa/fxfa/app/xfa_ffwidgethandler.cpp +++ b/xfa/fxfa/app/xfa_ffwidgethandler.cpp @@ -4,19 +4,19 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/include/fxfa/xfa_ffwidgethandler.h" +#include "xfa/fxfa/include/xfa_ffwidgethandler.h" #include #include "xfa/fxfa/app/xfa_ffchoicelist.h" #include "xfa/fxfa/app/xfa_fffield.h" #include "xfa/fxfa/app/xfa_fwladapter.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffdocview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" #include "xfa/fxfa/parser/xfa_document_layout_imp.h" #include "xfa/fxfa/parser/xfa_parser.h" #include "xfa/fxfa/parser/xfa_parser_imp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_ffdocview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" CXFA_FFWidgetHandler::CXFA_FFWidgetHandler(CXFA_FFDocView* pDocView) : m_pDocView(pDocView) {} diff --git a/xfa/fxfa/app/xfa_fontmgr.cpp b/xfa/fxfa/app/xfa_fontmgr.cpp index facce24177..c2de4115cb 100644 --- a/xfa/fxfa/app/xfa_fontmgr.cpp +++ b/xfa/fxfa/app/xfa_fontmgr.cpp @@ -4,15 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/include/fxfa/xfa_fontmgr.h" +#include "xfa/fxfa/include/xfa_fontmgr.h" #include #include "core/fpdfapi/fpdf_font/include/cpdf_font.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ static const XFA_FONTINFO g_XFAFontsMap[] = { diff --git a/xfa/fxfa/app/xfa_fwladapter.cpp b/xfa/fxfa/app/xfa_fwladapter.cpp index c1732776b2..5821a729eb 100644 --- a/xfa/fxfa/app/xfa_fwladapter.cpp +++ b/xfa/fxfa/app/xfa_fwladapter.cpp @@ -7,7 +7,7 @@ #include "xfa/fxfa/app/xfa_fwladapter.h" #include "xfa/fxfa/app/xfa_fffield.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" FWL_ERR CXFA_FWLAdapterWidgetMgr::RepaintWidget(IFWL_Widget* pWidget, const CFX_RectF* pRect) { diff --git a/xfa/fxfa/app/xfa_fwltheme.cpp b/xfa/fxfa/app/xfa_fwltheme.cpp index f36c1bcc97..4d987b08b9 100644 --- a/xfa/fxfa/app/xfa_fwltheme.cpp +++ b/xfa/fxfa/app/xfa_fwltheme.cpp @@ -21,9 +21,9 @@ #include "xfa/fwl/basewidget/ifwl_scrollbar.h" #include "xfa/fwl/core/cfwl_themebackground.h" #include "xfa/fwl/core/cfwl_themetext.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" #include "xfa/fxgraphics/cfx_color.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" namespace { diff --git a/xfa/fxfa/app/xfa_fwltheme.h b/xfa/fxfa/app/xfa_fwltheme.h index 72a516b755..a33dfe133e 100644 --- a/xfa/fxfa/app/xfa_fwltheme.h +++ b/xfa/fxfa/app/xfa_fwltheme.h @@ -21,7 +21,7 @@ #include "xfa/fwl/theme/cfwl_pushbuttontp.h" #include "xfa/fwl/theme/cfwl_scrollbartp.h" #include "xfa/fwl/theme/cfwl_widgettp.h" -#include "xfa/include/fxfa/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffapp.h" class CXFA_FWLTheme : public IFWL_ThemeProvider { public: diff --git a/xfa/fxfa/app/xfa_rendercontext.cpp b/xfa/fxfa/app/xfa_rendercontext.cpp index 59ed31a21d..cc2ea4b9ac 100644 --- a/xfa/fxfa/app/xfa_rendercontext.cpp +++ b/xfa/fxfa/app/xfa_rendercontext.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/include/fxfa/xfa_rendercontext.h" +#include "xfa/fxfa/include/xfa_rendercontext.h" +#include "xfa/fxfa/include/xfa_ffpageview.h" +#include "xfa/fxfa/include/xfa_ffwidget.h" #include "xfa/fxgraphics/include/cfx_graphics.h" -#include "xfa/include/fxfa/xfa_ffpageview.h" -#include "xfa/include/fxfa/xfa_ffwidget.h" #define XFA_RENDERCONTEXT_MaxCount 30 diff --git a/xfa/fxfa/app/xfa_textlayout.cpp b/xfa/fxfa/app/xfa_textlayout.cpp index f92dbeffdf..7db66fdf88 100644 --- a/xfa/fxfa/app/xfa_textlayout.cpp +++ b/xfa/fxfa/app/xfa_textlayout.cpp @@ -14,9 +14,9 @@ #include "xfa/fgas/crt/fgas_algorithm.h" #include "xfa/fgas/crt/fgas_codepage.h" #include "xfa/fxfa/app/xfa_ffwidgetacc.h" -#include "xfa/include/fxfa/xfa_ffapp.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" -#include "xfa/include/fxfa/xfa_fontmgr.h" +#include "xfa/fxfa/include/xfa_ffapp.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" +#include "xfa/fxfa/include/xfa_fontmgr.h" CXFA_CSSTagProvider::~CXFA_CSSTagProvider() { FX_POSITION pos = m_Attributes.GetStartPosition(); diff --git a/xfa/fxfa/app/xfa_textlayout.h b/xfa/fxfa/app/xfa_textlayout.h index d92a2f4058..65e0c038c0 100644 --- a/xfa/fxfa/app/xfa_textlayout.h +++ b/xfa/fxfa/app/xfa_textlayout.h @@ -11,8 +11,8 @@ #include "xfa/fde/fde_brush.h" #include "xfa/fde/fde_renderdevice.h" #include "xfa/fgas/layout/fgas_rtfbreak.h" +#include "xfa/fxfa/include/xfa_ffdoc.h" #include "xfa/fxfa/parser/xfa_object.h" -#include "xfa/include/fxfa/xfa_ffdoc.h" #define XFA_LOADERCNTXTFLG_FILTERSPACE 0x001 -- cgit v1.2.3