diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-09-29 17:18:21 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-09-29 17:18:21 -0700 |
| commit | 114e46a1d97587973515e9aad7955e469c7486a8 (patch) | |
| tree | 73c08ee682b99301c3cdd0e8345ee0501dea1227 /fpdfsdk | |
| parent | 0bb385b1093740cc03c5d19847819d852aecc4bf (diff) | |
| download | pdfium-114e46a1d97587973515e9aad7955e469c7486a8.tar.xz | |
Move fpdfsdk/include to fpdfsdk
BUG=pdfium:611
Review-Url: https://codereview.chromium.org/2384503003
Diffstat (limited to 'fpdfsdk')
79 files changed, 261 insertions, 261 deletions
diff --git a/fpdfsdk/cba_annotiterator.cpp b/fpdfsdk/cba_annotiterator.cpp index 4b4a38de30..762f6346c1 100644 --- a/fpdfsdk/cba_annotiterator.cpp +++ b/fpdfsdk/cba_annotiterator.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/include/cba_annotiterator.h" +#include "fpdfsdk/cba_annotiterator.h" #include "core/fpdfapi/fpdf_page/cpdf_page.h" -#include "fpdfsdk/include/cpdfsdk_annot.h" -#include "fpdfsdk/include/cpdfsdk_pageview.h" +#include "fpdfsdk/cpdfsdk_annot.h" +#include "fpdfsdk/cpdfsdk_pageview.h" // static bool CBA_AnnotIterator::CompareByLeftAscending(const CPDFSDK_Annot* p1, diff --git a/fpdfsdk/include/cba_annotiterator.h b/fpdfsdk/cba_annotiterator.h index 38332db718..a896c862c7 100644 --- a/fpdfsdk/include/cba_annotiterator.h +++ b/fpdfsdk/cba_annotiterator.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_INCLUDE_CBA_ANNOTITERATOR_H_ -#define FPDFSDK_INCLUDE_CBA_ANNOTITERATOR_H_ +#ifndef FPDFSDK_CBA_ANNOTITERATOR_H_ +#define FPDFSDK_CBA_ANNOTITERATOR_H_ #include <vector> @@ -45,4 +45,4 @@ class CBA_AnnotIterator { std::vector<CPDFSDK_Annot*> m_Annots; }; -#endif // FPDFSDK_INCLUDE_CBA_ANNOTITERATOR_H_ +#endif // FPDFSDK_CBA_ANNOTITERATOR_H_ diff --git a/fpdfsdk/cfx_systemhandler.cpp b/fpdfsdk/cfx_systemhandler.cpp index 03a737459f..ffc0a79147 100644 --- a/fpdfsdk/cfx_systemhandler.cpp +++ b/fpdfsdk/cfx_systemhandler.cpp @@ -12,12 +12,12 @@ #include "core/fxge/cfx_fontmapper.h" #include "core/fxge/cfx_fontmgr.h" #include "core/fxge/cfx_gemodule.h" +#include "fpdfsdk/cpdfsdk_annot.h" +#include "fpdfsdk/cpdfsdk_document.h" +#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_pageview.h" +#include "fpdfsdk/cpdfsdk_widget.h" #include "fpdfsdk/formfiller/cffl_formfiller.h" -#include "fpdfsdk/include/cpdfsdk_annot.h" -#include "fpdfsdk/include/cpdfsdk_document.h" -#include "fpdfsdk/include/cpdfsdk_environment.h" -#include "fpdfsdk/include/cpdfsdk_pageview.h" -#include "fpdfsdk/include/cpdfsdk_widget.h" namespace { diff --git a/fpdfsdk/cpdfsdk_annot.cpp b/fpdfsdk/cpdfsdk_annot.cpp index a6166efa72..f42da24475 100644 --- a/fpdfsdk/cpdfsdk_annot.cpp +++ b/fpdfsdk/cpdfsdk_annot.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/include/cpdfsdk_annot.h" +#include "fpdfsdk/cpdfsdk_annot.h" #include <algorithm> -#include "fpdfsdk/include/cpdfsdk_pageview.h" +#include "fpdfsdk/cpdfsdk_pageview.h" #include "third_party/base/stl_util.h" #ifdef PDF_ENABLE_XFA diff --git a/fpdfsdk/include/cpdfsdk_annot.h b/fpdfsdk/cpdfsdk_annot.h index b7b7399373..874da2d5dc 100644 --- a/fpdfsdk/include/cpdfsdk_annot.h +++ b/fpdfsdk/cpdfsdk_annot.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_INCLUDE_CPDFSDK_ANNOT_H_ -#define FPDFSDK_INCLUDE_CPDFSDK_ANNOT_H_ +#ifndef FPDFSDK_CPDFSDK_ANNOT_H_ +#define FPDFSDK_CPDFSDK_ANNOT_H_ #include "core/fpdfdoc/cpdf_aaction.h" #include "core/fpdfdoc/cpdf_annot.h" @@ -13,8 +13,8 @@ #include "core/fxcrt/cfx_observable.h" #include "core/fxcrt/fx_basic.h" #include "fpdfsdk/cfx_systemhandler.h" -#include "fpdfsdk/include/fsdk_common.h" -#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/fsdk_common.h" +#include "fpdfsdk/fsdk_define.h" class CFX_Matrix; class CFX_RenderDevice; @@ -62,4 +62,4 @@ class CPDFSDK_Annot : public CFX_Observable<CPDFSDK_Annot> { FX_BOOL m_bSelected; }; -#endif // FPDFSDK_INCLUDE_CPDFSDK_ANNOT_H_ +#endif // FPDFSDK_CPDFSDK_ANNOT_H_ diff --git a/fpdfsdk/cpdfsdk_annothandlermgr.cpp b/fpdfsdk/cpdfsdk_annothandlermgr.cpp index 9057d6bed5..709c0806fd 100644 --- a/fpdfsdk/cpdfsdk_annothandlermgr.cpp +++ b/fpdfsdk/cpdfsdk_annothandlermgr.cpp @@ -4,22 +4,22 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/include/cpdfsdk_annothandlermgr.h" +#include "fpdfsdk/cpdfsdk_annothandlermgr.h" #include "core/fpdfdoc/cpdf_annot.h" -#include "fpdfsdk/include/cba_annotiterator.h" -#include "fpdfsdk/include/cpdfsdk_annot.h" -#include "fpdfsdk/include/cpdfsdk_baannot.h" -#include "fpdfsdk/include/cpdfsdk_baannothandler.h" -#include "fpdfsdk/include/cpdfsdk_datetime.h" -#include "fpdfsdk/include/cpdfsdk_document.h" -#include "fpdfsdk/include/cpdfsdk_environment.h" -#include "fpdfsdk/include/cpdfsdk_pageview.h" -#include "fpdfsdk/include/cpdfsdk_widgethandler.h" +#include "fpdfsdk/cba_annotiterator.h" +#include "fpdfsdk/cpdfsdk_annot.h" +#include "fpdfsdk/cpdfsdk_baannot.h" +#include "fpdfsdk/cpdfsdk_baannothandler.h" +#include "fpdfsdk/cpdfsdk_datetime.h" +#include "fpdfsdk/cpdfsdk_document.h" +#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_pageview.h" +#include "fpdfsdk/cpdfsdk_widgethandler.h" #ifdef PDF_ENABLE_XFA +#include "fpdfsdk/cpdfsdk_xfawidgethandler.h" #include "fpdfsdk/fpdfxfa/fpdfxfa_page.h" -#include "fpdfsdk/include/cpdfsdk_xfawidgethandler.h" #include "xfa/fxfa/include/xfa_ffpageview.h" #include "xfa/fxfa/include/xfa_ffwidget.h" #endif // PDF_ENABLE_XFA diff --git a/fpdfsdk/include/cpdfsdk_annothandlermgr.h b/fpdfsdk/cpdfsdk_annothandlermgr.h index 717f87fcef..c87b91b22c 100644 --- a/fpdfsdk/include/cpdfsdk_annothandlermgr.h +++ b/fpdfsdk/cpdfsdk_annothandlermgr.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_INCLUDE_CPDFSDK_ANNOTHANDLERMGR_H_ -#define FPDFSDK_INCLUDE_CPDFSDK_ANNOTHANDLERMGR_H_ +#ifndef FPDFSDK_CPDFSDK_ANNOTHANDLERMGR_H_ +#define FPDFSDK_CPDFSDK_ANNOTHANDLERMGR_H_ #include <map> #include <memory> @@ -13,7 +13,7 @@ #include "core/fpdfdoc/cpdf_annot.h" #include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_coordinates.h" -#include "fpdfsdk/include/cpdfsdk_annot.h" +#include "fpdfsdk/cpdfsdk_annot.h" class CFX_Matrix; class CFX_RenderDevice; @@ -115,4 +115,4 @@ class CPDFSDK_AnnotHandlerMgr { CPDFSDK_Environment* m_pEnv; }; -#endif // FPDFSDK_INCLUDE_CPDFSDK_ANNOTHANDLERMGR_H_ +#endif // FPDFSDK_CPDFSDK_ANNOTHANDLERMGR_H_ diff --git a/fpdfsdk/cpdfsdk_annotiterator.cpp b/fpdfsdk/cpdfsdk_annotiterator.cpp index 0505ce0b6e..f2c997b7f1 100644 --- a/fpdfsdk/cpdfsdk_annotiterator.cpp +++ b/fpdfsdk/cpdfsdk_annotiterator.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/include/cpdfsdk_annotiterator.h" +#include "fpdfsdk/cpdfsdk_annotiterator.h" #include <algorithm> -#include "fpdfsdk/include/cpdfsdk_annot.h" -#include "fpdfsdk/include/cpdfsdk_pageview.h" +#include "fpdfsdk/cpdfsdk_annot.h" +#include "fpdfsdk/cpdfsdk_pageview.h" CPDFSDK_AnnotIterator::CPDFSDK_AnnotIterator(CPDFSDK_PageView* pPageView, bool bReverse) diff --git a/fpdfsdk/include/cpdfsdk_annotiterator.h b/fpdfsdk/cpdfsdk_annotiterator.h index f0fb872817..9918630b11 100644 --- a/fpdfsdk/include/cpdfsdk_annotiterator.h +++ b/fpdfsdk/cpdfsdk_annotiterator.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_INCLUDE_CPDFSDK_ANNOTITERATOR_H_ -#define FPDFSDK_INCLUDE_CPDFSDK_ANNOTITERATOR_H_ +#ifndef FPDFSDK_CPDFSDK_ANNOTITERATOR_H_ +#define FPDFSDK_CPDFSDK_ANNOTITERATOR_H_ #include <vector> @@ -28,4 +28,4 @@ class CPDFSDK_AnnotIterator { std::size_t m_pos; }; -#endif // FPDFSDK_INCLUDE_CPDFSDK_ANNOTITERATOR_H_ +#endif // FPDFSDK_CPDFSDK_ANNOTITERATOR_H_ diff --git a/fpdfsdk/cpdfsdk_baannot.cpp b/fpdfsdk/cpdfsdk_baannot.cpp index 6d81c9865b..163eb2574e 100644 --- a/fpdfsdk/cpdfsdk_baannot.cpp +++ b/fpdfsdk/cpdfsdk_baannot.cpp @@ -4,16 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/include/cpdfsdk_baannot.h" +#include "fpdfsdk/cpdfsdk_baannot.h" #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "core/fpdfapi/fpdf_parser/cpdf_number.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream.h" #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h" -#include "fpdfsdk/include/cpdfsdk_datetime.h" -#include "fpdfsdk/include/cpdfsdk_document.h" -#include "fpdfsdk/include/cpdfsdk_pageview.h" +#include "fpdfsdk/cpdfsdk_datetime.h" +#include "fpdfsdk/cpdfsdk_document.h" +#include "fpdfsdk/cpdfsdk_pageview.h" CPDFSDK_BAAnnot::CPDFSDK_BAAnnot(CPDF_Annot* pAnnot, CPDFSDK_PageView* pPageView) diff --git a/fpdfsdk/include/cpdfsdk_baannot.h b/fpdfsdk/cpdfsdk_baannot.h index dea717a5e0..96b4962ca5 100644 --- a/fpdfsdk/include/cpdfsdk_baannot.h +++ b/fpdfsdk/cpdfsdk_baannot.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_INCLUDE_CPDFSDK_BAANNOT_H_ -#define FPDFSDK_INCLUDE_CPDFSDK_BAANNOT_H_ +#ifndef FPDFSDK_CPDFSDK_BAANNOT_H_ +#define FPDFSDK_CPDFSDK_BAANNOT_H_ #include "core/fpdfdoc/cpdf_aaction.h" #include "core/fpdfdoc/cpdf_action.h" @@ -14,7 +14,7 @@ #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_string.h" #include "fpdfsdk/cfx_systemhandler.h" -#include "fpdfsdk/include/cpdfsdk_annot.h" +#include "fpdfsdk/cpdfsdk_annot.h" class CFX_Matrix; class CFX_RenderDevice; @@ -103,4 +103,4 @@ class CPDFSDK_BAAnnot : public CPDFSDK_Annot { CPDF_Annot* m_pAnnot; }; -#endif // FPDFSDK_INCLUDE_CPDFSDK_BAANNOT_H_ +#endif // FPDFSDK_CPDFSDK_BAANNOT_H_ diff --git a/fpdfsdk/cpdfsdk_baannothandler.cpp b/fpdfsdk/cpdfsdk_baannothandler.cpp index 5811218417..02ffff4265 100644 --- a/fpdfsdk/cpdfsdk_baannothandler.cpp +++ b/fpdfsdk/cpdfsdk_baannothandler.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/include/cpdfsdk_baannothandler.h" +#include "fpdfsdk/cpdfsdk_baannothandler.h" #include <memory> #include <vector> @@ -12,10 +12,10 @@ #include "core/fpdfapi/fpdf_page/cpdf_page.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "core/fpdfdoc/cpdf_interform.h" +#include "fpdfsdk/cpdfsdk_annot.h" +#include "fpdfsdk/cpdfsdk_baannot.h" +#include "fpdfsdk/cpdfsdk_pageview.h" #include "fpdfsdk/formfiller/cffl_formfiller.h" -#include "fpdfsdk/include/cpdfsdk_annot.h" -#include "fpdfsdk/include/cpdfsdk_baannot.h" -#include "fpdfsdk/include/cpdfsdk_pageview.h" #ifdef PDF_ENABLE_XFA #include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" diff --git a/fpdfsdk/include/cpdfsdk_baannothandler.h b/fpdfsdk/cpdfsdk_baannothandler.h index 44e0cbb0b7..aca646f88e 100644 --- a/fpdfsdk/include/cpdfsdk_baannothandler.h +++ b/fpdfsdk/cpdfsdk_baannothandler.h @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_INCLUDE_CPDFSDK_BAANNOTHANDLER_H_ -#define FPDFSDK_INCLUDE_CPDFSDK_BAANNOTHANDLER_H_ +#ifndef FPDFSDK_CPDFSDK_BAANNOTHANDLER_H_ +#define FPDFSDK_CPDFSDK_BAANNOTHANDLER_H_ #include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_coordinates.h" -#include "fpdfsdk/include/ipdfsdk_annothandler.h" +#include "fpdfsdk/ipdfsdk_annothandler.h" class CFFL_InteractiveFormFiller; class CFX_Matrix; @@ -107,4 +107,4 @@ class CPDFSDK_BAAnnotHandler : public IPDFSDK_AnnotHandler { #endif // PDF_ENABLE_XFA }; -#endif // FPDFSDK_INCLUDE_CPDFSDK_BAANNOTHANDLER_H_ +#endif // FPDFSDK_CPDFSDK_BAANNOTHANDLER_H_ diff --git a/fpdfsdk/cpdfsdk_datetime.cpp b/fpdfsdk/cpdfsdk_datetime.cpp index 3f54e21dca..72f50a6b44 100644 --- a/fpdfsdk/cpdfsdk_datetime.cpp +++ b/fpdfsdk/cpdfsdk_datetime.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/include/cpdfsdk_datetime.h" +#include "fpdfsdk/cpdfsdk_datetime.h" #include "core/fxcrt/fx_ext.h" diff --git a/fpdfsdk/include/cpdfsdk_datetime.h b/fpdfsdk/cpdfsdk_datetime.h index 564ebbeeb4..70c6e0aee3 100644 --- a/fpdfsdk/include/cpdfsdk_datetime.h +++ b/fpdfsdk/cpdfsdk_datetime.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_INCLUDE_CPDFSDK_DATETIME_H_ -#define FPDFSDK_INCLUDE_CPDFSDK_DATETIME_H_ +#ifndef FPDFSDK_CPDFSDK_DATETIME_H_ +#define FPDFSDK_CPDFSDK_DATETIME_H_ #if _FX_OS_ == _FX_ANDROID_ #include "time.h" @@ -46,4 +46,4 @@ class CPDFSDK_DateTime { uint8_t m_tzMinute; }; -#endif // FPDFSDK_INCLUDE_CPDFSDK_DATETIME_H_ +#endif // FPDFSDK_CPDFSDK_DATETIME_H_ diff --git a/fpdfsdk/cpdfsdk_document.cpp b/fpdfsdk/cpdfsdk_document.cpp index 7c4686f4b3..ad4516d53c 100644 --- a/fpdfsdk/cpdfsdk_document.cpp +++ b/fpdfsdk/cpdfsdk_document.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/include/cpdfsdk_document.h" +#include "fpdfsdk/cpdfsdk_document.h" #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" @@ -13,13 +13,13 @@ #include "core/fpdfdoc/cpdf_action.h" #include "core/fpdfdoc/cpdf_docjsactions.h" #include "core/fpdfdoc/cpdf_occontext.h" -#include "fpdfsdk/include/cpdfsdk_annot.h" -#include "fpdfsdk/include/cpdfsdk_annothandlermgr.h" -#include "fpdfsdk/include/cpdfsdk_environment.h" -#include "fpdfsdk/include/cpdfsdk_interform.h" -#include "fpdfsdk/include/cpdfsdk_pageview.h" -#include "fpdfsdk/include/cpdfsdk_widget.h" -#include "fpdfsdk/include/fsdk_actionhandler.h" +#include "fpdfsdk/cpdfsdk_annot.h" +#include "fpdfsdk/cpdfsdk_annothandlermgr.h" +#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_interform.h" +#include "fpdfsdk/cpdfsdk_pageview.h" +#include "fpdfsdk/cpdfsdk_widget.h" +#include "fpdfsdk/fsdk_actionhandler.h" // static CPDFSDK_Document* CPDFSDK_Document::FromFPDFFormHandle( diff --git a/fpdfsdk/include/cpdfsdk_document.h b/fpdfsdk/cpdfsdk_document.h index fe6ac94c12..f693588da0 100644 --- a/fpdfsdk/include/cpdfsdk_document.h +++ b/fpdfsdk/cpdfsdk_document.h @@ -4,16 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_INCLUDE_CPDFSDK_DOCUMENT_H_ -#define FPDFSDK_INCLUDE_CPDFSDK_DOCUMENT_H_ +#ifndef FPDFSDK_CPDFSDK_DOCUMENT_H_ +#define FPDFSDK_CPDFSDK_DOCUMENT_H_ #include <map> #include <memory> #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "core/fxcrt/cfx_observable.h" -#include "fpdfsdk/include/cpdfsdk_annot.h" -#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_annot.h" +#include "fpdfsdk/fsdk_define.h" #include "public/fpdf_formfill.h" class CPDF_OCContext; @@ -105,4 +105,4 @@ class CPDFSDK_Document : public CFX_Observable<CPDFSDK_Document> { FX_BOOL m_bBeingDestroyed; }; -#endif // FPDFSDK_INCLUDE_CPDFSDK_DOCUMENT_H_ +#endif // FPDFSDK_CPDFSDK_DOCUMENT_H_ diff --git a/fpdfsdk/cpdfsdk_environment.cpp b/fpdfsdk/cpdfsdk_environment.cpp index 94a89eea7c..6ea95ad3f5 100644 --- a/fpdfsdk/cpdfsdk_environment.cpp +++ b/fpdfsdk/cpdfsdk_environment.cpp @@ -4,14 +4,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/include/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_environment.h" #include <memory> +#include "fpdfsdk/cpdfsdk_annothandlermgr.h" +#include "fpdfsdk/cpdfsdk_document.h" #include "fpdfsdk/formfiller/cffl_interactiveformfiller.h" -#include "fpdfsdk/include/cpdfsdk_annothandlermgr.h" -#include "fpdfsdk/include/cpdfsdk_document.h" -#include "fpdfsdk/include/fsdk_actionhandler.h" +#include "fpdfsdk/fsdk_actionhandler.h" #include "fpdfsdk/javascript/ijs_runtime.h" #ifdef PDF_ENABLE_XFA diff --git a/fpdfsdk/include/cpdfsdk_environment.h b/fpdfsdk/cpdfsdk_environment.h index 1bf541e870..f8e0218b59 100644 --- a/fpdfsdk/include/cpdfsdk_environment.h +++ b/fpdfsdk/cpdfsdk_environment.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_INCLUDE_CPDFSDK_ENVIRONMENT_H_ -#define FPDFSDK_INCLUDE_CPDFSDK_ENVIRONMENT_H_ +#ifndef FPDFSDK_CPDFSDK_ENVIRONMENT_H_ +#define FPDFSDK_CPDFSDK_ENVIRONMENT_H_ #include <memory> @@ -14,7 +14,7 @@ #include "core/fpdfdoc/cpdf_occontext.h" #include "core/fxcrt/cfx_observable.h" #include "fpdfsdk/cfx_systemhandler.h" -#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/fsdk_define.h" #include "public/fpdf_formfill.h" #include "public/fpdf_fwlevent.h" @@ -175,4 +175,4 @@ class CPDFSDK_Environment final { std::unique_ptr<CFX_SystemHandler> m_pSysHandler; }; -#endif // FPDFSDK_INCLUDE_CPDFSDK_ENVIRONMENT_H_ +#endif // FPDFSDK_CPDFSDK_ENVIRONMENT_H_ diff --git a/fpdfsdk/cpdfsdk_interform.cpp b/fpdfsdk/cpdfsdk_interform.cpp index 650e66a54b..7ecaeac310 100644 --- a/fpdfsdk/cpdfsdk_interform.cpp +++ b/fpdfsdk/cpdfsdk_interform.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/include/cpdfsdk_interform.h" +#include "fpdfsdk/cpdfsdk_interform.h" #include <algorithm> #include <memory> @@ -20,26 +20,26 @@ #include "core/fxge/cfx_graphstatedata.h" #include "core/fxge/cfx_pathdata.h" #include "core/fxge/cfx_renderdevice.h" +#include "fpdfsdk/cba_annotiterator.h" +#include "fpdfsdk/cpdfsdk_annot.h" +#include "fpdfsdk/cpdfsdk_document.h" +#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_pageview.h" +#include "fpdfsdk/cpdfsdk_widget.h" #include "fpdfsdk/formfiller/cffl_formfiller.h" +#include "fpdfsdk/fsdk_actionhandler.h" +#include "fpdfsdk/fsdk_define.h" #include "fpdfsdk/fxedit/fxet_edit.h" -#include "fpdfsdk/include/cba_annotiterator.h" -#include "fpdfsdk/include/cpdfsdk_annot.h" -#include "fpdfsdk/include/cpdfsdk_document.h" -#include "fpdfsdk/include/cpdfsdk_environment.h" -#include "fpdfsdk/include/cpdfsdk_pageview.h" -#include "fpdfsdk/include/cpdfsdk_widget.h" -#include "fpdfsdk/include/fsdk_actionhandler.h" -#include "fpdfsdk/include/fsdk_define.h" -#include "fpdfsdk/include/ipdfsdk_annothandler.h" +#include "fpdfsdk/ipdfsdk_annothandler.h" #include "fpdfsdk/javascript/ijs_context.h" #include "fpdfsdk/javascript/ijs_runtime.h" #include "fpdfsdk/pdfwindow/PWL_Utils.h" #include "third_party/base/stl_util.h" #ifdef PDF_ENABLE_XFA +#include "fpdfsdk/cpdfsdk_xfawidget.h" #include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" #include "fpdfsdk/fpdfxfa/fpdfxfa_util.h" -#include "fpdfsdk/include/cpdfsdk_xfawidget.h" #include "xfa/fxfa/include/cxfa_eventparam.h" #include "xfa/fxfa/include/xfa_ffdocview.h" #include "xfa/fxfa/include/xfa_ffwidget.h" diff --git a/fpdfsdk/include/cpdfsdk_interform.h b/fpdfsdk/cpdfsdk_interform.h index 133fe90341..617a1066d7 100644 --- a/fpdfsdk/include/cpdfsdk_interform.h +++ b/fpdfsdk/cpdfsdk_interform.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_INCLUDE_CPDFSDK_INTERFORM_H_ -#define FPDFSDK_INCLUDE_CPDFSDK_INTERFORM_H_ +#ifndef FPDFSDK_CPDFSDK_INTERFORM_H_ +#define FPDFSDK_CPDFSDK_INTERFORM_H_ #include <map> #include <vector> @@ -141,4 +141,4 @@ class CPDFSDK_InterForm : public IPDF_FormNotify { FX_BOOL m_bNeedHightlight[kNumFieldTypes]; }; -#endif // FPDFSDK_INCLUDE_CPDFSDK_INTERFORM_H_ +#endif // FPDFSDK_CPDFSDK_INTERFORM_H_ diff --git a/fpdfsdk/cpdfsdk_pageview.cpp b/fpdfsdk/cpdfsdk_pageview.cpp index 8144a91370..7f1cf76c90 100644 --- a/fpdfsdk/cpdfsdk_pageview.cpp +++ b/fpdfsdk/cpdfsdk_pageview.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/include/cpdfsdk_pageview.h" +#include "fpdfsdk/cpdfsdk_pageview.h" #include <memory> #include <vector> @@ -13,11 +13,11 @@ #include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h" #include "core/fpdfdoc/cpdf_annotlist.h" #include "core/fpdfdoc/cpdf_interform.h" -#include "fpdfsdk/include/cpdfsdk_annot.h" -#include "fpdfsdk/include/cpdfsdk_annothandlermgr.h" -#include "fpdfsdk/include/cpdfsdk_annotiterator.h" -#include "fpdfsdk/include/cpdfsdk_environment.h" -#include "fpdfsdk/include/cpdfsdk_interform.h" +#include "fpdfsdk/cpdfsdk_annot.h" +#include "fpdfsdk/cpdfsdk_annothandlermgr.h" +#include "fpdfsdk/cpdfsdk_annotiterator.h" +#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_interform.h" #ifdef PDF_ENABLE_XFA #include "fpdfsdk/fpdfxfa/fpdfxfa_page.h" diff --git a/fpdfsdk/include/cpdfsdk_pageview.h b/fpdfsdk/cpdfsdk_pageview.h index c31f6d3fb1..ba6001b5e9 100644 --- a/fpdfsdk/include/cpdfsdk_pageview.h +++ b/fpdfsdk/cpdfsdk_pageview.h @@ -4,16 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_INCLUDE_CPDFSDK_PAGEVIEW_H_ -#define FPDFSDK_INCLUDE_CPDFSDK_PAGEVIEW_H_ +#ifndef FPDFSDK_CPDFSDK_PAGEVIEW_H_ +#define FPDFSDK_CPDFSDK_PAGEVIEW_H_ #include <memory> #include <vector> #include "core/fpdfapi/fpdf_page/cpdf_page.h" #include "core/fxcrt/fx_system.h" -#include "fpdfsdk/include/cpdfsdk_annot.h" -#include "fpdfsdk/include/cpdfsdk_document.h" +#include "fpdfsdk/cpdfsdk_annot.h" +#include "fpdfsdk/cpdfsdk_document.h" class CFX_RenderDevice; class CPDF_AnnotList; @@ -121,4 +121,4 @@ class CPDFSDK_PageView final : public CPDF_Page::View { FX_BOOL m_bLocked; }; -#endif // FPDFSDK_INCLUDE_CPDFSDK_PAGEVIEW_H_ +#endif // FPDFSDK_CPDFSDK_PAGEVIEW_H_ diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp index d325d4818d..cbf69c4c48 100644 --- a/fpdfsdk/cpdfsdk_widget.cpp +++ b/fpdfsdk/cpdfsdk_widget.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/include/cpdfsdk_widget.h" +#include "fpdfsdk/cpdfsdk_widget.h" #include <memory> @@ -19,14 +19,14 @@ #include "core/fxge/cfx_graphstatedata.h" #include "core/fxge/cfx_pathdata.h" #include "core/fxge/cfx_renderdevice.h" +#include "fpdfsdk/cpdfsdk_document.h" +#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_interform.h" +#include "fpdfsdk/cpdfsdk_pageview.h" #include "fpdfsdk/formfiller/cba_fontmap.h" +#include "fpdfsdk/fsdk_actionhandler.h" +#include "fpdfsdk/fsdk_define.h" #include "fpdfsdk/fxedit/fxet_edit.h" -#include "fpdfsdk/include/cpdfsdk_document.h" -#include "fpdfsdk/include/cpdfsdk_environment.h" -#include "fpdfsdk/include/cpdfsdk_interform.h" -#include "fpdfsdk/include/cpdfsdk_pageview.h" -#include "fpdfsdk/include/fsdk_actionhandler.h" -#include "fpdfsdk/include/fsdk_define.h" #include "fpdfsdk/pdfwindow/PWL_Edit.h" #include "fpdfsdk/pdfwindow/PWL_Utils.h" diff --git a/fpdfsdk/include/cpdfsdk_widget.h b/fpdfsdk/cpdfsdk_widget.h index 8c10a21b9c..1ab988a660 100644 --- a/fpdfsdk/include/cpdfsdk_widget.h +++ b/fpdfsdk/cpdfsdk_widget.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_INCLUDE_CPDFSDK_WIDGET_H_ -#define FPDFSDK_INCLUDE_CPDFSDK_WIDGET_H_ +#ifndef FPDFSDK_CPDFSDK_WIDGET_H_ +#define FPDFSDK_CPDFSDK_WIDGET_H_ #include <set> @@ -14,8 +14,8 @@ #include "core/fpdfdoc/cpdf_annot.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_string.h" -#include "fpdfsdk/include/cpdfsdk_baannot.h" -#include "fpdfsdk/include/pdfsdk_fieldaction.h" +#include "fpdfsdk/cpdfsdk_baannot.h" +#include "fpdfsdk/pdfsdk_fieldaction.h" #include "fpdfsdk/pdfwindow/PWL_Wnd.h" class CFX_RenderDevice; @@ -173,4 +173,4 @@ class CPDFSDK_Widget : public CPDFSDK_BAAnnot { #endif // PDF_ENABLE_XFA }; -#endif // FPDFSDK_INCLUDE_CPDFSDK_WIDGET_H_ +#endif // FPDFSDK_CPDFSDK_WIDGET_H_ diff --git a/fpdfsdk/cpdfsdk_widgethandler.cpp b/fpdfsdk/cpdfsdk_widgethandler.cpp index 9f945748e6..60ee192685 100644 --- a/fpdfsdk/cpdfsdk_widgethandler.cpp +++ b/fpdfsdk/cpdfsdk_widgethandler.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/include/cpdfsdk_widgethandler.h" +#include "fpdfsdk/cpdfsdk_widgethandler.h" #include <memory> #include <vector> @@ -12,13 +12,13 @@ #include "core/fpdfapi/fpdf_page/cpdf_page.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "core/fpdfdoc/cpdf_interform.h" +#include "fpdfsdk/cpdfsdk_annot.h" +#include "fpdfsdk/cpdfsdk_document.h" +#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_interform.h" +#include "fpdfsdk/cpdfsdk_pageview.h" +#include "fpdfsdk/cpdfsdk_widget.h" #include "fpdfsdk/formfiller/cffl_formfiller.h" -#include "fpdfsdk/include/cpdfsdk_annot.h" -#include "fpdfsdk/include/cpdfsdk_document.h" -#include "fpdfsdk/include/cpdfsdk_environment.h" -#include "fpdfsdk/include/cpdfsdk_interform.h" -#include "fpdfsdk/include/cpdfsdk_pageview.h" -#include "fpdfsdk/include/cpdfsdk_widget.h" #ifdef PDF_ENABLE_XFA #include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" diff --git a/fpdfsdk/include/cpdfsdk_widgethandler.h b/fpdfsdk/cpdfsdk_widgethandler.h index ca3da87ff6..35554a2b10 100644 --- a/fpdfsdk/include/cpdfsdk_widgethandler.h +++ b/fpdfsdk/cpdfsdk_widgethandler.h @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_INCLUDE_CPDFSDK_WIDGETHANDLER_H_ -#define FPDFSDK_INCLUDE_CPDFSDK_WIDGETHANDLER_H_ +#ifndef FPDFSDK_CPDFSDK_WIDGETHANDLER_H_ +#define FPDFSDK_CPDFSDK_WIDGETHANDLER_H_ #include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_coordinates.h" -#include "fpdfsdk/include/ipdfsdk_annothandler.h" +#include "fpdfsdk/ipdfsdk_annothandler.h" class CFFL_InteractiveFormFiller; class CFX_Matrix; @@ -116,4 +116,4 @@ class CPDFSDK_WidgetHandler : public IPDFSDK_AnnotHandler { CFFL_InteractiveFormFiller* m_pFormFiller; }; -#endif // FPDFSDK_INCLUDE_CPDFSDK_WIDGETHANDLER_H_ +#endif // FPDFSDK_CPDFSDK_WIDGETHANDLER_H_ diff --git a/fpdfsdk/cpdfsdk_xfawidget.cpp b/fpdfsdk/cpdfsdk_xfawidget.cpp index b5e26d660a..516f7bd3c0 100644 --- a/fpdfsdk/cpdfsdk_xfawidget.cpp +++ b/fpdfsdk/cpdfsdk_xfawidget.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/include/cpdfsdk_xfawidget.h" +#include "fpdfsdk/cpdfsdk_xfawidget.h" -#include "fpdfsdk/include/ipdfsdk_annothandler.h" +#include "fpdfsdk/ipdfsdk_annothandler.h" #include "xfa/fxfa/include/xfa_ffwidget.h" CPDFSDK_XFAWidget::CPDFSDK_XFAWidget(CXFA_FFWidget* pAnnot, diff --git a/fpdfsdk/include/cpdfsdk_xfawidget.h b/fpdfsdk/cpdfsdk_xfawidget.h index 99309b9684..f261b9a600 100644 --- a/fpdfsdk/include/cpdfsdk_xfawidget.h +++ b/fpdfsdk/cpdfsdk_xfawidget.h @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_INCLUDE_CPDFSDK_XFAWIDGET_H_ -#define FPDFSDK_INCLUDE_CPDFSDK_XFAWIDGET_H_ +#ifndef FPDFSDK_CPDFSDK_XFAWIDGET_H_ +#define FPDFSDK_CPDFSDK_XFAWIDGET_H_ #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_string.h" -#include "fpdfsdk/include/cpdfsdk_annot.h" +#include "fpdfsdk/cpdfsdk_annot.h" class CPDFSDK_InterForm; class CPDFSDK_PageView; @@ -34,4 +34,4 @@ class CPDFSDK_XFAWidget : public CPDFSDK_Annot { CXFA_FFWidget* m_hXFAWidget; }; -#endif // FPDFSDK_INCLUDE_CPDFSDK_XFAWIDGET_H_ +#endif // FPDFSDK_CPDFSDK_XFAWIDGET_H_ diff --git a/fpdfsdk/cpdfsdk_xfawidgethandler.cpp b/fpdfsdk/cpdfsdk_xfawidgethandler.cpp index bf04707cd8..11415c6e85 100644 --- a/fpdfsdk/cpdfsdk_xfawidgethandler.cpp +++ b/fpdfsdk/cpdfsdk_xfawidgethandler.cpp @@ -4,16 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/include/cpdfsdk_xfawidgethandler.h" +#include "fpdfsdk/cpdfsdk_xfawidgethandler.h" #include "core/fpdfdoc/cpdf_interform.h" +#include "fpdfsdk/cpdfsdk_annot.h" +#include "fpdfsdk/cpdfsdk_document.h" +#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_interform.h" +#include "fpdfsdk/cpdfsdk_pageview.h" +#include "fpdfsdk/cpdfsdk_xfawidget.h" #include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" -#include "fpdfsdk/include/cpdfsdk_annot.h" -#include "fpdfsdk/include/cpdfsdk_document.h" -#include "fpdfsdk/include/cpdfsdk_environment.h" -#include "fpdfsdk/include/cpdfsdk_interform.h" -#include "fpdfsdk/include/cpdfsdk_pageview.h" -#include "fpdfsdk/include/cpdfsdk_xfawidget.h" #include "xfa/fwl/core/include/fwl_widgethit.h" #include "xfa/fxfa/include/fxfa_basic.h" #include "xfa/fxfa/include/xfa_ffdocview.h" diff --git a/fpdfsdk/include/cpdfsdk_xfawidgethandler.h b/fpdfsdk/cpdfsdk_xfawidgethandler.h index 425c57c03d..d291cc5e45 100644 --- a/fpdfsdk/include/cpdfsdk_xfawidgethandler.h +++ b/fpdfsdk/cpdfsdk_xfawidgethandler.h @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_INCLUDE_CPDFSDK_XFAWIDGETHANDLER_H_ -#define FPDFSDK_INCLUDE_CPDFSDK_XFAWIDGETHANDLER_H_ +#ifndef FPDFSDK_CPDFSDK_XFAWIDGETHANDLER_H_ +#define FPDFSDK_CPDFSDK_XFAWIDGETHANDLER_H_ #include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_coordinates.h" -#include "fpdfsdk/include/ipdfsdk_annothandler.h" +#include "fpdfsdk/ipdfsdk_annothandler.h" class CFX_Matrix; class CFX_RenderDevice; @@ -105,4 +105,4 @@ class CPDFSDK_XFAWidgetHandler : public IPDFSDK_AnnotHandler { CPDFSDK_Environment* m_pEnv; }; -#endif // FPDFSDK_INCLUDE_CPDFSDK_XFAWIDGETHANDLER_H_ +#endif // FPDFSDK_CPDFSDK_XFAWIDGETHANDLER_H_ diff --git a/fpdfsdk/formfiller/cba_fontmap.cpp b/fpdfsdk/formfiller/cba_fontmap.cpp index 43932a3afd..66562ca7e5 100644 --- a/fpdfsdk/formfiller/cba_fontmap.cpp +++ b/fpdfsdk/formfiller/cba_fontmap.cpp @@ -14,7 +14,7 @@ #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h" #include "core/fpdfdoc/cpdf_formfield.h" #include "core/fxge/cfx_substfont.h" -#include "fpdfsdk/include/cpdfsdk_annot.h" +#include "fpdfsdk/cpdfsdk_annot.h" CBA_FontMap::CBA_FontMap(CPDFSDK_Annot* pAnnot, CFX_SystemHandler* pSystemHandler) diff --git a/fpdfsdk/formfiller/cffl_checkbox.cpp b/fpdfsdk/formfiller/cffl_checkbox.cpp index 334adb68ed..27cf446990 100644 --- a/fpdfsdk/formfiller/cffl_checkbox.cpp +++ b/fpdfsdk/formfiller/cffl_checkbox.cpp @@ -6,9 +6,9 @@ #include "fpdfsdk/formfiller/cffl_checkbox.h" +#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_widget.h" #include "fpdfsdk/formfiller/cffl_formfiller.h" -#include "fpdfsdk/include/cpdfsdk_environment.h" -#include "fpdfsdk/include/cpdfsdk_widget.h" #include "fpdfsdk/pdfwindow/PWL_SpecialButton.h" #include "public/fpdf_fwlevent.h" diff --git a/fpdfsdk/formfiller/cffl_combobox.cpp b/fpdfsdk/formfiller/cffl_combobox.cpp index 8c0cb645c5..fad090fe0c 100644 --- a/fpdfsdk/formfiller/cffl_combobox.cpp +++ b/fpdfsdk/formfiller/cffl_combobox.cpp @@ -6,12 +6,12 @@ #include "fpdfsdk/formfiller/cffl_combobox.h" +#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_widget.h" #include "fpdfsdk/formfiller/cba_fontmap.h" #include "fpdfsdk/formfiller/cffl_formfiller.h" #include "fpdfsdk/formfiller/cffl_interactiveformfiller.h" -#include "fpdfsdk/include/cpdfsdk_environment.h" -#include "fpdfsdk/include/cpdfsdk_widget.h" -#include "fpdfsdk/include/fsdk_common.h" +#include "fpdfsdk/fsdk_common.h" #include "fpdfsdk/pdfwindow/PWL_ComboBox.h" CFFL_ComboBox::CFFL_ComboBox(CPDFSDK_Environment* pApp, CPDFSDK_Annot* pAnnot) diff --git a/fpdfsdk/formfiller/cffl_formfiller.cpp b/fpdfsdk/formfiller/cffl_formfiller.cpp index ca3c8f0acd..35146aa455 100644 --- a/fpdfsdk/formfiller/cffl_formfiller.cpp +++ b/fpdfsdk/formfiller/cffl_formfiller.cpp @@ -8,12 +8,12 @@ #include "core/fpdfapi/fpdf_page/cpdf_page.h" #include "core/fxge/cfx_renderdevice.h" +#include "fpdfsdk/cpdfsdk_document.h" +#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_pageview.h" +#include "fpdfsdk/cpdfsdk_widget.h" #include "fpdfsdk/formfiller/cba_fontmap.h" -#include "fpdfsdk/include/cpdfsdk_document.h" -#include "fpdfsdk/include/cpdfsdk_environment.h" -#include "fpdfsdk/include/cpdfsdk_pageview.h" -#include "fpdfsdk/include/cpdfsdk_widget.h" -#include "fpdfsdk/include/fsdk_common.h" +#include "fpdfsdk/fsdk_common.h" #include "fpdfsdk/pdfwindow/PWL_Utils.h" #define GetRed(rgb) ((uint8_t)(rgb)) diff --git a/fpdfsdk/formfiller/cffl_formfiller.h b/fpdfsdk/formfiller/cffl_formfiller.h index 1d679df536..430717113d 100644 --- a/fpdfsdk/formfiller/cffl_formfiller.h +++ b/fpdfsdk/formfiller/cffl_formfiller.h @@ -11,7 +11,7 @@ #include "fpdfsdk/formfiller/cba_fontmap.h" #include "fpdfsdk/formfiller/cffl_interactiveformfiller.h" -#include "fpdfsdk/include/pdfsdk_fieldaction.h" +#include "fpdfsdk/pdfsdk_fieldaction.h" class CPDFSDK_Annot; class CPDFSDK_Environment; diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp index dd30b8ecf2..bb6b77897c 100644 --- a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp +++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp @@ -11,6 +11,11 @@ #include "core/fxge/cfx_graphstatedata.h" #include "core/fxge/cfx_pathdata.h" #include "core/fxge/cfx_renderdevice.h" +#include "fpdfsdk/cpdfsdk_document.h" +#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_interform.h" +#include "fpdfsdk/cpdfsdk_pageview.h" +#include "fpdfsdk/cpdfsdk_widget.h" #include "fpdfsdk/formfiller/cffl_checkbox.h" #include "fpdfsdk/formfiller/cffl_combobox.h" #include "fpdfsdk/formfiller/cffl_formfiller.h" @@ -18,11 +23,6 @@ #include "fpdfsdk/formfiller/cffl_pushbutton.h" #include "fpdfsdk/formfiller/cffl_radiobutton.h" #include "fpdfsdk/formfiller/cffl_textfield.h" -#include "fpdfsdk/include/cpdfsdk_document.h" -#include "fpdfsdk/include/cpdfsdk_environment.h" -#include "fpdfsdk/include/cpdfsdk_interform.h" -#include "fpdfsdk/include/cpdfsdk_pageview.h" -#include "fpdfsdk/include/cpdfsdk_widget.h" #include "fpdfsdk/pdfwindow/PWL_Utils.h" #define FFL_MAXLISTBOXHEIGHT 140.0f diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.h b/fpdfsdk/formfiller/cffl_interactiveformfiller.h index eec2a34ebf..9a303b48ea 100644 --- a/fpdfsdk/formfiller/cffl_interactiveformfiller.h +++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.h @@ -10,8 +10,8 @@ #include <map> #include <memory> -#include "fpdfsdk/include/cpdfsdk_annot.h" -#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_annot.h" +#include "fpdfsdk/fsdk_define.h" #include "fpdfsdk/pdfwindow/PWL_Edit.h" class CFFL_FormFiller; diff --git a/fpdfsdk/formfiller/cffl_listbox.cpp b/fpdfsdk/formfiller/cffl_listbox.cpp index 50d04a869a..664c02dc36 100644 --- a/fpdfsdk/formfiller/cffl_listbox.cpp +++ b/fpdfsdk/formfiller/cffl_listbox.cpp @@ -6,12 +6,12 @@ #include "fpdfsdk/formfiller/cffl_listbox.h" +#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_widget.h" #include "fpdfsdk/formfiller/cba_fontmap.h" #include "fpdfsdk/formfiller/cffl_formfiller.h" #include "fpdfsdk/formfiller/cffl_interactiveformfiller.h" -#include "fpdfsdk/include/cpdfsdk_environment.h" -#include "fpdfsdk/include/cpdfsdk_widget.h" -#include "fpdfsdk/include/fsdk_common.h" +#include "fpdfsdk/fsdk_common.h" #include "fpdfsdk/pdfwindow/PWL_ListBox.h" #define FFL_DEFAULTLISTBOXFONTSIZE 12.0f diff --git a/fpdfsdk/formfiller/cffl_radiobutton.cpp b/fpdfsdk/formfiller/cffl_radiobutton.cpp index 6f30a9b97f..394521217f 100644 --- a/fpdfsdk/formfiller/cffl_radiobutton.cpp +++ b/fpdfsdk/formfiller/cffl_radiobutton.cpp @@ -6,9 +6,9 @@ #include "fpdfsdk/formfiller/cffl_radiobutton.h" +#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_widget.h" #include "fpdfsdk/formfiller/cffl_formfiller.h" -#include "fpdfsdk/include/cpdfsdk_environment.h" -#include "fpdfsdk/include/cpdfsdk_widget.h" #include "fpdfsdk/pdfwindow/PWL_SpecialButton.h" #include "public/fpdf_fwlevent.h" diff --git a/fpdfsdk/formfiller/cffl_textfield.cpp b/fpdfsdk/formfiller/cffl_textfield.cpp index 242179e6f9..7e2cce1d99 100644 --- a/fpdfsdk/formfiller/cffl_textfield.cpp +++ b/fpdfsdk/formfiller/cffl_textfield.cpp @@ -6,10 +6,10 @@ #include "fpdfsdk/formfiller/cffl_textfield.h" +#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_widget.h" #include "fpdfsdk/formfiller/cba_fontmap.h" -#include "fpdfsdk/include/cpdfsdk_environment.h" -#include "fpdfsdk/include/cpdfsdk_widget.h" -#include "fpdfsdk/include/fsdk_common.h" +#include "fpdfsdk/fsdk_common.h" CFFL_TextField::CFFL_TextField(CPDFSDK_Environment* pApp, CPDFSDK_Annot* pAnnot) : CFFL_FormFiller(pApp, pAnnot) {} diff --git a/fpdfsdk/fpdf_dataavail.cpp b/fpdfsdk/fpdf_dataavail.cpp index 64455ae7b1..cc8376ed2c 100644 --- a/fpdfsdk/fpdf_dataavail.cpp +++ b/fpdfsdk/fpdf_dataavail.cpp @@ -11,7 +11,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_data_avail.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" -#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/fsdk_define.h" #include "public/fpdf_formfill.h" // These checks are here because core/ and public/ cannot depend on each other. diff --git a/fpdfsdk/fpdf_ext.cpp b/fpdfsdk/fpdf_ext.cpp index fed0d8c55f..d9889ef150 100644 --- a/fpdfsdk/fpdf_ext.cpp +++ b/fpdfsdk/fpdf_ext.cpp @@ -17,7 +17,7 @@ #include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_memory.h" #include "core/fxcrt/fx_xml.h" -#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/fsdk_define.h" #ifdef PDF_ENABLE_XFA #include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" diff --git a/fpdfsdk/fpdf_flatten.cpp b/fpdfsdk/fpdf_flatten.cpp index 69c7a32207..58a37d2e6d 100644 --- a/fpdfsdk/fpdf_flatten.cpp +++ b/fpdfsdk/fpdf_flatten.cpp @@ -16,7 +16,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_stream.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h" #include "core/fpdfdoc/cpdf_annot.h" -#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/fsdk_define.h" typedef CFX_ArrayTemplate<CPDF_Dictionary*> CPDF_ObjectArray; typedef CFX_ArrayTemplate<CFX_FloatRect> CPDF_RectArray; diff --git a/fpdfsdk/fpdf_progressive.cpp b/fpdfsdk/fpdf_progressive.cpp index 70eff8b4e2..5a51a322bb 100644 --- a/fpdfsdk/fpdf_progressive.cpp +++ b/fpdfsdk/fpdf_progressive.cpp @@ -12,8 +12,8 @@ #include "core/fxcrt/fx_memory.h" #include "core/fxge/cfx_fxgedevice.h" #include "core/fxge/cfx_renderdevice.h" -#include "fpdfsdk/include/fsdk_define.h" -#include "fpdfsdk/include/fsdk_pauseadapter.h" +#include "fpdfsdk/fsdk_define.h" +#include "fpdfsdk/fsdk_pauseadapter.h" #include "public/fpdfview.h" // These checks are here because core/ and public/ cannot depend on each other. diff --git a/fpdfsdk/fpdf_sysfontinfo.cpp b/fpdfsdk/fpdf_sysfontinfo.cpp index a50a8ba312..5f80ca0860 100644 --- a/fpdfsdk/fpdf_sysfontinfo.cpp +++ b/fpdfsdk/fpdf_sysfontinfo.cpp @@ -10,7 +10,7 @@ #include "core/fxge/cfx_gemodule.h" #include "core/fxge/fx_font.h" #include "core/fxge/ifx_systemfontinfo.h" -#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/fsdk_define.h" #include "fpdfsdk/pdfwindow/PWL_FontMap.h" class CFX_ExternalFontInfo final : public IFX_SystemFontInfo { diff --git a/fpdfsdk/fpdf_transformpage.cpp b/fpdfsdk/fpdf_transformpage.cpp index dfc0ea028f..c269e1379e 100644 --- a/fpdfsdk/fpdf_transformpage.cpp +++ b/fpdfsdk/fpdf_transformpage.cpp @@ -16,7 +16,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_reference.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream.h" #include "core/fxge/cfx_pathdata.h" -#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/fsdk_define.h" namespace { diff --git a/fpdfsdk/fpdfdoc.cpp b/fpdfsdk/fpdfdoc.cpp index 4e0d05c30b..7abeca38c4 100644 --- a/fpdfsdk/fpdfdoc.cpp +++ b/fpdfsdk/fpdfdoc.cpp @@ -13,7 +13,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "core/fpdfdoc/cpdf_bookmark.h" #include "core/fpdfdoc/cpdf_bookmarktree.h" -#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/fsdk_define.h" #include "third_party/base/stl_util.h" namespace { diff --git a/fpdfsdk/fpdfeditimg.cpp b/fpdfsdk/fpdfeditimg.cpp index 0f4a427df3..64908408a9 100644 --- a/fpdfsdk/fpdfeditimg.cpp +++ b/fpdfsdk/fpdfeditimg.cpp @@ -10,7 +10,7 @@ #include "core/fpdfapi/fpdf_page/cpdf_image.h" #include "core/fpdfapi/fpdf_page/cpdf_imageobject.h" #include "core/fpdfapi/fpdf_page/cpdf_pageobject.h" -#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/fsdk_define.h" DLLEXPORT FPDF_PAGEOBJECT STDCALL FPDFPageObj_NewImgeObj(FPDF_DOCUMENT document) { diff --git a/fpdfsdk/fpdfeditpage.cpp b/fpdfsdk/fpdfeditpage.cpp index 812035abcc..5f0fce6cfb 100644 --- a/fpdfsdk/fpdfeditpage.cpp +++ b/fpdfsdk/fpdfeditpage.cpp @@ -24,7 +24,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_string.h" #include "core/fpdfdoc/cpdf_annot.h" #include "core/fpdfdoc/cpdf_annotlist.h" -#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/fsdk_define.h" #include "public/fpdf_formfill.h" #include "third_party/base/stl_util.h" diff --git a/fpdfsdk/fpdfformfill.cpp b/fpdfsdk/fpdfformfill.cpp index 97730bad09..2e497b27b1 100644 --- a/fpdfsdk/fpdfformfill.cpp +++ b/fpdfsdk/fpdfformfill.cpp @@ -17,12 +17,12 @@ #include "core/fpdfdoc/cpdf_interform.h" #include "core/fpdfdoc/cpdf_occontext.h" #include "core/fxge/cfx_fxgedevice.h" -#include "fpdfsdk/include/cpdfsdk_document.h" -#include "fpdfsdk/include/cpdfsdk_environment.h" -#include "fpdfsdk/include/cpdfsdk_interform.h" -#include "fpdfsdk/include/cpdfsdk_pageview.h" -#include "fpdfsdk/include/fsdk_actionhandler.h" -#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_document.h" +#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_interform.h" +#include "fpdfsdk/cpdfsdk_pageview.h" +#include "fpdfsdk/fsdk_actionhandler.h" +#include "fpdfsdk/fsdk_define.h" #include "public/fpdfview.h" #include "third_party/base/stl_util.h" diff --git a/fpdfsdk/fpdfppo.cpp b/fpdfsdk/fpdfppo.cpp index c4dfdfb3fa..d0dde33cb6 100644 --- a/fpdfsdk/fpdfppo.cpp +++ b/fpdfsdk/fpdfppo.cpp @@ -17,7 +17,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_reference.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream.h" #include "core/fpdfapi/fpdf_parser/cpdf_string.h" -#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/fsdk_define.h" #include "third_party/base/stl_util.h" class CPDF_PageOrganizer { diff --git a/fpdfsdk/fpdfsave.cpp b/fpdfsdk/fpdfsave.cpp index c9872e2480..e7d88f71c0 100644 --- a/fpdfsdk/fpdfsave.cpp +++ b/fpdfsdk/fpdfsave.cpp @@ -15,7 +15,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h" #include "core/fpdfapi/fpdf_parser/cpdf_string.h" #include "core/fxcrt/fx_ext.h" -#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/fsdk_define.h" #include "public/fpdf_edit.h" #ifdef PDF_ENABLE_XFA diff --git a/fpdfsdk/fpdftext.cpp b/fpdfsdk/fpdftext.cpp index d2149eda6d..73c78bcfd0 100644 --- a/fpdfsdk/fpdftext.cpp +++ b/fpdfsdk/fpdftext.cpp @@ -11,7 +11,7 @@ #include "core/fpdftext/cpdf_linkextract.h" #include "core/fpdftext/cpdf_textpage.h" #include "core/fpdftext/cpdf_textpagefind.h" -#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/fsdk_define.h" #include "third_party/base/numerics/safe_conversions.h" #include "third_party/base/stl_util.h" diff --git a/fpdfsdk/fpdfview.cpp b/fpdfsdk/fpdfview.cpp index a8a7a0b5ac..5c5532e024 100644 --- a/fpdfsdk/fpdfview.cpp +++ b/fpdfsdk/fpdfview.cpp @@ -26,9 +26,9 @@ #include "core/fxcrt/fx_safe_types.h" #include "core/fxge/cfx_fxgedevice.h" #include "core/fxge/cfx_gemodule.h" -#include "fpdfsdk/include/cpdfsdk_pageview.h" -#include "fpdfsdk/include/fsdk_define.h" -#include "fpdfsdk/include/fsdk_pauseadapter.h" +#include "fpdfsdk/cpdfsdk_pageview.h" +#include "fpdfsdk/fsdk_define.h" +#include "fpdfsdk/fsdk_pauseadapter.h" #include "fpdfsdk/javascript/ijs_runtime.h" #include "public/fpdf_ext.h" #include "public/fpdf_progressive.h" diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp index 3096b4ba8b..454f044ce4 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp +++ b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp @@ -9,12 +9,12 @@ #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h" #include "core/fpdfapi/fpdf_parser/cpdf_string.h" +#include "fpdfsdk/cpdfsdk_document.h" +#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_interform.h" +#include "fpdfsdk/cpdfsdk_pageview.h" #include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" #include "fpdfsdk/fpdfxfa/fpdfxfa_page.h" -#include "fpdfsdk/include/cpdfsdk_document.h" -#include "fpdfsdk/include/cpdfsdk_environment.h" -#include "fpdfsdk/include/cpdfsdk_interform.h" -#include "fpdfsdk/include/cpdfsdk_pageview.h" #include "fpdfsdk/javascript/ijs_runtime.h" #include "xfa/fxfa/include/xfa_ffdocview.h" #include "xfa/fxfa/include/xfa_ffwidget.h" diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp index 28b9981d6c..f26a95dff1 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp +++ b/fpdfsdk/fpdfxfa/fpdfxfa_app.cpp @@ -8,9 +8,9 @@ #include <memory> +#include "fpdfsdk/cpdfsdk_environment.h" #include "fpdfsdk/fpdfxfa/fpdfxfa_util.h" -#include "fpdfsdk/include/cpdfsdk_environment.h" -#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/fsdk_define.h" #include "xfa/fxbarcode/include/BC_Library.h" #include "xfa/fxfa/include/xfa_ffapp.h" #include "xfa/fxfa/include/xfa_fontmgr.h" diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp index f99fcb2716..e3e0d1c5a2 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp +++ b/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp @@ -7,14 +7,14 @@ #include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" +#include "fpdfsdk/cpdfsdk_document.h" +#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_interform.h" +#include "fpdfsdk/cpdfsdk_pageview.h" #include "fpdfsdk/fpdfxfa/fpdfxfa_app.h" #include "fpdfsdk/fpdfxfa/fpdfxfa_page.h" #include "fpdfsdk/fpdfxfa/fpdfxfa_util.h" -#include "fpdfsdk/include/cpdfsdk_document.h" -#include "fpdfsdk/include/cpdfsdk_environment.h" -#include "fpdfsdk/include/cpdfsdk_interform.h" -#include "fpdfsdk/include/cpdfsdk_pageview.h" -#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/fsdk_define.h" #include "fpdfsdk/javascript/ijs_runtime.h" #include "public/fpdf_formfill.h" #include "xfa/fxfa/include/cxfa_eventparam.h" diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp index 6f6b35239f..665467e6f1 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp +++ b/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp @@ -10,7 +10,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h" #include "fpdfsdk/fpdfxfa/fpdfxfa_util.h" -#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/fsdk_define.h" #include "public/fpdf_formfill.h" #include "xfa/fxfa/include/xfa_ffdocview.h" #include "xfa/fxfa/include/xfa_ffpageview.h" diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp index 13501df949..b4e44c834e 100644 --- a/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp +++ b/fpdfsdk/fpdfxfa/fpdfxfa_util.cpp @@ -8,8 +8,8 @@ #include <vector> -#include "fpdfsdk/include/cpdfsdk_environment.h" -#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/fsdk_define.h" std::vector<CFWL_TimerInfo*>* CXFA_FWLAdapterTimerMgr::s_TimerArray = nullptr; diff --git a/fpdfsdk/fsdk_actionhandler.cpp b/fpdfsdk/fsdk_actionhandler.cpp index d904352915..58734e08dc 100644 --- a/fpdfsdk/fsdk_actionhandler.cpp +++ b/fpdfsdk/fsdk_actionhandler.cpp @@ -4,17 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/include/fsdk_actionhandler.h" +#include "fpdfsdk/fsdk_actionhandler.h" #include <set> #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfdoc/cpdf_formfield.h" #include "core/fpdfdoc/cpdf_interform.h" -#include "fpdfsdk/include/cpdfsdk_document.h" -#include "fpdfsdk/include/cpdfsdk_environment.h" -#include "fpdfsdk/include/cpdfsdk_interform.h" -#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/cpdfsdk_document.h" +#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_interform.h" +#include "fpdfsdk/fsdk_define.h" #include "fpdfsdk/javascript/ijs_context.h" #include "fpdfsdk/javascript/ijs_runtime.h" #include "third_party/base/stl_util.h" diff --git a/fpdfsdk/include/fsdk_actionhandler.h b/fpdfsdk/fsdk_actionhandler.h index ce15b83295..0745fa32f8 100644 --- a/fpdfsdk/include/fsdk_actionhandler.h +++ b/fpdfsdk/fsdk_actionhandler.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_INCLUDE_FSDK_ACTIONHANDLER_H_ -#define FPDFSDK_INCLUDE_FSDK_ACTIONHANDLER_H_ +#ifndef FPDFSDK_FSDK_ACTIONHANDLER_H_ +#define FPDFSDK_FSDK_ACTIONHANDLER_H_ #include <memory> #include <set> @@ -13,7 +13,7 @@ #include "core/fpdfdoc/cpdf_aaction.h" #include "core/fpdfdoc/cpdf_action.h" #include "core/fxcrt/fx_string.h" -#include "fpdfsdk/include/pdfsdk_fieldaction.h" +#include "fpdfsdk/pdfsdk_fieldaction.h" class CPDFSDK_Annot; class CPDFSDK_Document; @@ -115,4 +115,4 @@ class CPDFSDK_ActionHandler { CPDFSDK_Document* pDocument); }; -#endif // FPDFSDK_INCLUDE_FSDK_ACTIONHANDLER_H_ +#endif // FPDFSDK_FSDK_ACTIONHANDLER_H_ diff --git a/fpdfsdk/fsdk_baseform_embeddertest.cpp b/fpdfsdk/fsdk_baseform_embeddertest.cpp index 1bb081d9a0..66ee156a7e 100644 --- a/fpdfsdk/fsdk_baseform_embeddertest.cpp +++ b/fpdfsdk/fsdk_baseform_embeddertest.cpp @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "fpdfsdk/include/cba_annotiterator.h" -#include "fpdfsdk/include/cpdfsdk_annot.h" -#include "fpdfsdk/include/cpdfsdk_document.h" -#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/cba_annotiterator.h" +#include "fpdfsdk/cpdfsdk_annot.h" +#include "fpdfsdk/cpdfsdk_document.h" +#include "fpdfsdk/fsdk_define.h" #include "testing/embedder_test.h" #include "testing/embedder_test_mock_delegate.h" #include "testing/embedder_test_timer_handling_delegate.h" diff --git a/fpdfsdk/include/fsdk_common.h b/fpdfsdk/fsdk_common.h index a33958a08d..d8030261c7 100644 --- a/fpdfsdk/include/fsdk_common.h +++ b/fpdfsdk/fsdk_common.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_INCLUDE_FSDK_COMMON_H_ -#define FPDFSDK_INCLUDE_FSDK_COMMON_H_ +#ifndef FPDFSDK_FSDK_COMMON_H_ +#define FPDFSDK_FSDK_COMMON_H_ // for all fields #define FIELDFLAG_READONLY 1 @@ -31,4 +31,4 @@ #define FIELDFLAG_MULTISELECT (1 << 21) #define FIELDFLAG_COMMITONSELCHANGE (1 << 26) -#endif // FPDFSDK_INCLUDE_FSDK_COMMON_H_ +#endif // FPDFSDK_FSDK_COMMON_H_ diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/fsdk_define.h index d6e98731d8..248a1a9d04 100644 --- a/fpdfsdk/include/fsdk_define.h +++ b/fpdfsdk/fsdk_define.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_INCLUDE_FSDK_DEFINE_H_ -#define FPDFSDK_INCLUDE_FSDK_DEFINE_H_ +#ifndef FPDFSDK_FSDK_DEFINE_H_ +#define FPDFSDK_FSDK_DEFINE_H_ #include "core/fpdfapi/fpdf_parser/cpdf_parser.h" #include "core/fxge/fx_dib.h" @@ -118,4 +118,4 @@ void CheckUnSupportError(CPDF_Document* pDoc, uint32_t err_code); void CheckUnSupportAnnot(CPDF_Document* pDoc, const CPDF_Annot* pPDFAnnot); void ProcessParseError(CPDF_Parser::Error err); -#endif // FPDFSDK_INCLUDE_FSDK_DEFINE_H_ +#endif // FPDFSDK_FSDK_DEFINE_H_ diff --git a/fpdfsdk/fsdk_pauseadapter.cpp b/fpdfsdk/fsdk_pauseadapter.cpp index 067177b5e9..a1ea46b43e 100644 --- a/fpdfsdk/fsdk_pauseadapter.cpp +++ b/fpdfsdk/fsdk_pauseadapter.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/include/fsdk_pauseadapter.h" +#include "fpdfsdk/fsdk_pauseadapter.h" IFSDK_PAUSE_Adapter::IFSDK_PAUSE_Adapter(IFSDK_PAUSE* IPause) : m_IPause(IPause) {} diff --git a/fpdfsdk/include/fsdk_pauseadapter.h b/fpdfsdk/fsdk_pauseadapter.h index 4a37f5ce52..a31a77161b 100644 --- a/fpdfsdk/include/fsdk_pauseadapter.h +++ b/fpdfsdk/fsdk_pauseadapter.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_INCLUDE_FSDK_PAUSEADAPTER_H_ -#define FPDFSDK_INCLUDE_FSDK_PAUSEADAPTER_H_ +#ifndef FPDFSDK_FSDK_PAUSEADAPTER_H_ +#define FPDFSDK_FSDK_PAUSEADAPTER_H_ #include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_system.h" @@ -22,4 +22,4 @@ class IFSDK_PAUSE_Adapter : public IFX_Pause { IFSDK_PAUSE* const m_IPause; }; -#endif // FPDFSDK_INCLUDE_FSDK_PAUSEADAPTER_H_ +#endif // FPDFSDK_FSDK_PAUSEADAPTER_H_ diff --git a/fpdfsdk/include/ipdfsdk_annothandler.h b/fpdfsdk/ipdfsdk_annothandler.h index 3102cb48db..84da0c4054 100644 --- a/fpdfsdk/include/ipdfsdk_annothandler.h +++ b/fpdfsdk/ipdfsdk_annothandler.h @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_INCLUDE_IPDFSDK_ANNOTHANDLER_H_ -#define FPDFSDK_INCLUDE_IPDFSDK_ANNOTHANDLER_H_ +#ifndef FPDFSDK_IPDFSDK_ANNOTHANDLER_H_ +#define FPDFSDK_IPDFSDK_ANNOTHANDLER_H_ #include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_coordinates.h" -#include "fpdfsdk/include/cpdfsdk_annot.h" +#include "fpdfsdk/cpdfsdk_annot.h" class CFX_Matrix; class CFX_RenderDevice; @@ -106,4 +106,4 @@ class IPDFSDK_AnnotHandler { #endif // PDF_ENABLE_XFA }; -#endif // FPDFSDK_INCLUDE_IPDFSDK_ANNOTHANDLER_H_ +#endif // FPDFSDK_IPDFSDK_ANNOTHANDLER_H_ diff --git a/fpdfsdk/javascript/Annot.h b/fpdfsdk/javascript/Annot.h index 21ad6d017a..291262d18f 100644 --- a/fpdfsdk/javascript/Annot.h +++ b/fpdfsdk/javascript/Annot.h @@ -9,7 +9,7 @@ #include <memory> -#include "fpdfsdk/include/cpdfsdk_baannot.h" +#include "fpdfsdk/cpdfsdk_baannot.h" #include "fpdfsdk/javascript/JS_Define.h" class Annot : public CJS_EmbedObj { diff --git a/fpdfsdk/javascript/Document.cpp b/fpdfsdk/javascript/Document.cpp index 594a92e099..10db0e75d9 100644 --- a/fpdfsdk/javascript/Document.cpp +++ b/fpdfsdk/javascript/Document.cpp @@ -16,12 +16,12 @@ #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h" #include "core/fpdfdoc/cpdf_interform.h" #include "core/fpdfdoc/cpdf_nametree.h" -#include "fpdfsdk/include/cpdfsdk_annotiterator.h" -#include "fpdfsdk/include/cpdfsdk_document.h" -#include "fpdfsdk/include/cpdfsdk_environment.h" -#include "fpdfsdk/include/cpdfsdk_interform.h" -#include "fpdfsdk/include/cpdfsdk_pageview.h" -#include "fpdfsdk/include/cpdfsdk_widget.h" +#include "fpdfsdk/cpdfsdk_annotiterator.h" +#include "fpdfsdk/cpdfsdk_document.h" +#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_interform.h" +#include "fpdfsdk/cpdfsdk_pageview.h" +#include "fpdfsdk/cpdfsdk_widget.h" #include "fpdfsdk/javascript/Annot.h" #include "fpdfsdk/javascript/Field.h" #include "fpdfsdk/javascript/Icon.h" diff --git a/fpdfsdk/javascript/Document.h b/fpdfsdk/javascript/Document.h index 609d7c506c..ad01cb27c3 100644 --- a/fpdfsdk/javascript/Document.h +++ b/fpdfsdk/javascript/Document.h @@ -13,7 +13,7 @@ #include "core/fpdfapi/fpdf_page/cpdf_pageobject.h" #include "core/fpdfapi/fpdf_page/cpdf_textobject.h" -#include "fpdfsdk/include/cpdfsdk_document.h" +#include "fpdfsdk/cpdfsdk_document.h" #include "fpdfsdk/javascript/JS_Define.h" class PrintParamsObj : public CJS_EmbedObj { diff --git a/fpdfsdk/javascript/Field.cpp b/fpdfsdk/javascript/Field.cpp index 0e65b16619..a3f77096f5 100644 --- a/fpdfsdk/javascript/Field.cpp +++ b/fpdfsdk/javascript/Field.cpp @@ -15,11 +15,11 @@ #include "core/fpdfapi/fpdf_page/cpdf_page.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "core/fpdfdoc/cpdf_interform.h" -#include "fpdfsdk/include/cpdfsdk_document.h" -#include "fpdfsdk/include/cpdfsdk_environment.h" -#include "fpdfsdk/include/cpdfsdk_interform.h" -#include "fpdfsdk/include/cpdfsdk_pageview.h" -#include "fpdfsdk/include/cpdfsdk_widget.h" +#include "fpdfsdk/cpdfsdk_document.h" +#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_interform.h" +#include "fpdfsdk/cpdfsdk_pageview.h" +#include "fpdfsdk/cpdfsdk_widget.h" #include "fpdfsdk/javascript/Document.h" #include "fpdfsdk/javascript/Icon.h" #include "fpdfsdk/javascript/JS_Define.h" diff --git a/fpdfsdk/javascript/Field.h b/fpdfsdk/javascript/Field.h index e559780154..7d1867cc1e 100644 --- a/fpdfsdk/javascript/Field.h +++ b/fpdfsdk/javascript/Field.h @@ -11,7 +11,7 @@ #include <vector> #include "core/fxcrt/cfx_observable.h" -#include "fpdfsdk/include/cpdfsdk_document.h" +#include "fpdfsdk/cpdfsdk_document.h" #include "fpdfsdk/javascript/JS_Define.h" #include "fpdfsdk/pdfwindow/PWL_Wnd.h" // For CPWL_Color. diff --git a/fpdfsdk/javascript/JS_Object.h b/fpdfsdk/javascript/JS_Object.h index ede64a7e20..7653115ec3 100644 --- a/fpdfsdk/javascript/JS_Object.h +++ b/fpdfsdk/javascript/JS_Object.h @@ -10,7 +10,7 @@ #include <map> #include <memory> -#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/fsdk_define.h" #include "fpdfsdk/javascript/cjs_runtime.h" #include "fxjs/include/fxjs_v8.h" diff --git a/fpdfsdk/javascript/PublicMethods.cpp b/fpdfsdk/javascript/PublicMethods.cpp index 6a96466b5a..106f27e870 100644 --- a/fpdfsdk/javascript/PublicMethods.cpp +++ b/fpdfsdk/javascript/PublicMethods.cpp @@ -11,9 +11,9 @@ #include "core/fpdfdoc/cpdf_interform.h" #include "core/fxcrt/fx_ext.h" -#include "fpdfsdk/include/cpdfsdk_document.h" -#include "fpdfsdk/include/cpdfsdk_environment.h" -#include "fpdfsdk/include/cpdfsdk_interform.h" +#include "fpdfsdk/cpdfsdk_document.h" +#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_interform.h" #include "fpdfsdk/javascript/Field.h" #include "fpdfsdk/javascript/JS_Define.h" #include "fpdfsdk/javascript/JS_EventHandler.h" diff --git a/fpdfsdk/javascript/app.cpp b/fpdfsdk/javascript/app.cpp index a6c6c73528..eba8d4d74f 100644 --- a/fpdfsdk/javascript/app.cpp +++ b/fpdfsdk/javascript/app.cpp @@ -9,9 +9,9 @@ #include <memory> #include <vector> -#include "fpdfsdk/include/cpdfsdk_document.h" -#include "fpdfsdk/include/cpdfsdk_environment.h" -#include "fpdfsdk/include/cpdfsdk_interform.h" +#include "fpdfsdk/cpdfsdk_document.h" +#include "fpdfsdk/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_interform.h" #include "fpdfsdk/javascript/Document.h" #include "fpdfsdk/javascript/JS_Define.h" #include "fpdfsdk/javascript/JS_EventHandler.h" diff --git a/fpdfsdk/javascript/cjs_runtime.cpp b/fpdfsdk/javascript/cjs_runtime.cpp index 074061436a..e078564ff9 100644 --- a/fpdfsdk/javascript/cjs_runtime.cpp +++ b/fpdfsdk/javascript/cjs_runtime.cpp @@ -8,7 +8,7 @@ #include <algorithm> -#include "fpdfsdk/include/cpdfsdk_environment.h" +#include "fpdfsdk/cpdfsdk_environment.h" #include "fpdfsdk/javascript/Annot.h" #include "fpdfsdk/javascript/Consts.h" #include "fpdfsdk/javascript/Document.h" diff --git a/fpdfsdk/pdfsdk_fieldaction.cpp b/fpdfsdk/pdfsdk_fieldaction.cpp index 1157fb1520..c5356cb0b8 100644 --- a/fpdfsdk/pdfsdk_fieldaction.cpp +++ b/fpdfsdk/pdfsdk_fieldaction.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fpdfsdk/include/pdfsdk_fieldaction.h" +#include "fpdfsdk/pdfsdk_fieldaction.h" PDFSDK_FieldAction::PDFSDK_FieldAction() : bModifier(FALSE), diff --git a/fpdfsdk/include/pdfsdk_fieldaction.h b/fpdfsdk/pdfsdk_fieldaction.h index 4ed8b943c9..192bfc2075 100644 --- a/fpdfsdk/include/pdfsdk_fieldaction.h +++ b/fpdfsdk/pdfsdk_fieldaction.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FPDFSDK_INCLUDE_PDFSDK_FIELDACTION_H_ -#define FPDFSDK_INCLUDE_PDFSDK_FIELDACTION_H_ +#ifndef FPDFSDK_PDFSDK_FIELDACTION_H_ +#define FPDFSDK_PDFSDK_FIELDACTION_H_ #include "core/fxcrt/fx_string.h" @@ -36,4 +36,4 @@ struct PDFSDK_FieldAction { FX_BOOL bRC; }; -#endif // FPDFSDK_INCLUDE_PDFSDK_FIELDACTION_H_ +#endif // FPDFSDK_PDFSDK_FIELDACTION_H_ |