diff options
Diffstat (limited to 'fpdfsdk')
50 files changed, 71 insertions, 71 deletions
diff --git a/fpdfsdk/DEPS b/fpdfsdk/DEPS index 286d5888e7..d01574dd3f 100644 --- a/fpdfsdk/DEPS +++ b/fpdfsdk/DEPS @@ -7,7 +7,7 @@ include_rules = [ '+core/fpdfapi/fpdf_render', '+core/fpdfdoc', '+core/fxcodec', - '+core/fxcrt/include', + '+core/fxcrt', '+core/fxge/include', '+public', '+v8', diff --git a/fpdfsdk/cfx_systemhandler.h b/fpdfsdk/cfx_systemhandler.h index 5f8a871f05..53043904e6 100644 --- a/fpdfsdk/cfx_systemhandler.h +++ b/fpdfsdk/cfx_systemhandler.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_CFX_SYSTEMHANDLER_H_ #define FPDFSDK_CFX_SYSTEMHANDLER_H_ -#include "core/fxcrt/include/fx_coordinates.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/fx_system.h" using TimerCallback = void (*)(int32_t idEvent); diff --git a/fpdfsdk/cpdfsdk_datetime.cpp b/fpdfsdk/cpdfsdk_datetime.cpp index 5bcce1327b..3f54e21dca 100644 --- a/fpdfsdk/cpdfsdk_datetime.cpp +++ b/fpdfsdk/cpdfsdk_datetime.cpp @@ -6,7 +6,7 @@ #include "fpdfsdk/include/cpdfsdk_datetime.h" -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" namespace { diff --git a/fpdfsdk/formfiller/cffl_combobox.h b/fpdfsdk/formfiller/cffl_combobox.h index 31e4d8bba8..acc61af0b1 100644 --- a/fpdfsdk/formfiller/cffl_combobox.h +++ b/fpdfsdk/formfiller/cffl_combobox.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_FORMFILLER_CFFL_COMBOBOX_H_ #define FPDFSDK_FORMFILLER_CFFL_COMBOBOX_H_ -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" #include "fpdfsdk/formfiller/cffl_formfiller.h" class CBA_FontMap; diff --git a/fpdfsdk/fpdf_ext.cpp b/fpdfsdk/fpdf_ext.cpp index f9ae0c0cde..b77e751a38 100644 --- a/fpdfsdk/fpdf_ext.cpp +++ b/fpdfsdk/fpdf_ext.cpp @@ -14,9 +14,9 @@ #include "core/fpdfdoc/cpdf_annot.h" #include "core/fpdfdoc/cpdf_interform.h" #include "core/fpdfdoc/cpdf_metadata.h" -#include "core/fxcrt/include/fx_basic.h" -#include "core/fxcrt/include/fx_memory.h" -#include "core/fxcrt/include/fx_xml.h" +#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/fx_memory.h" +#include "core/fxcrt/fx_xml.h" #include "fpdfsdk/include/fsdk_define.h" #ifdef PDF_ENABLE_XFA diff --git a/fpdfsdk/fpdf_progressive.cpp b/fpdfsdk/fpdf_progressive.cpp index 8de4d3fa74..4722a9f0bc 100644 --- a/fpdfsdk/fpdf_progressive.cpp +++ b/fpdfsdk/fpdf_progressive.cpp @@ -9,7 +9,7 @@ #include "core/fpdfapi/cpdf_pagerendercontext.h" #include "core/fpdfapi/fpdf_page/cpdf_page.h" #include "core/fpdfapi/fpdf_render/cpdf_progressiverenderer.h" -#include "core/fxcrt/include/fx_memory.h" +#include "core/fxcrt/fx_memory.h" #include "core/fxge/include/cfx_fxgedevice.h" #include "core/fxge/include/cfx_renderdevice.h" #include "fpdfsdk/include/fsdk_define.h" diff --git a/fpdfsdk/fpdfdoc_embeddertest.cpp b/fpdfsdk/fpdfdoc_embeddertest.cpp index e0880deca5..39b36c4bee 100644 --- a/fpdfsdk/fpdfdoc_embeddertest.cpp +++ b/fpdfsdk/fpdfdoc_embeddertest.cpp @@ -4,7 +4,7 @@ #include <string> -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" #include "public/fpdf_doc.h" #include "public/fpdf_edit.h" #include "public/fpdfview.h" diff --git a/fpdfsdk/fpdfsave.cpp b/fpdfsdk/fpdfsave.cpp index 2d886400c7..b6def4d8ff 100644 --- a/fpdfsdk/fpdfsave.cpp +++ b/fpdfsdk/fpdfsave.cpp @@ -14,7 +14,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_reference.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h" #include "core/fpdfapi/fpdf_parser/cpdf_string.h" -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" #include "fpdfsdk/include/fsdk_define.h" #include "public/fpdf_edit.h" diff --git a/fpdfsdk/fpdfsave_embeddertest.cpp b/fpdfsdk/fpdfsave_embeddertest.cpp index 5dbff36327..55a58c2de3 100644 --- a/fpdfsdk/fpdfsave_embeddertest.cpp +++ b/fpdfsdk/fpdfsave_embeddertest.cpp @@ -4,7 +4,7 @@ #include <string.h> -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" #include "public/fpdf_save.h" #include "public/fpdfview.h" #include "testing/embedder_test.h" diff --git a/fpdfsdk/fpdftext_embeddertest.cpp b/fpdfsdk/fpdftext_embeddertest.cpp index 957e813f64..46168c8ac7 100644 --- a/fpdfsdk/fpdftext_embeddertest.cpp +++ b/fpdfsdk/fpdftext_embeddertest.cpp @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" #include "public/fpdf_text.h" #include "public/fpdfview.h" #include "testing/embedder_test.h" diff --git a/fpdfsdk/fpdfview.cpp b/fpdfsdk/fpdfview.cpp index 2f00afad33..5f115f2db5 100644 --- a/fpdfsdk/fpdfview.cpp +++ b/fpdfsdk/fpdfview.cpp @@ -22,8 +22,8 @@ #include "core/fpdfdoc/cpdf_occontext.h" #include "core/fpdfdoc/cpdf_viewerpreferences.h" #include "core/fxcodec/fx_codec.h" -#include "core/fxcrt/include/fx_memory.h" -#include "core/fxcrt/include/fx_safe_types.h" +#include "core/fxcrt/fx_memory.h" +#include "core/fxcrt/fx_safe_types.h" #include "core/fxge/include/cfx_fxgedevice.h" #include "core/fxge/include/cfx_gemodule.h" #include "fpdfsdk/include/cpdfsdk_pageview.h" diff --git a/fpdfsdk/fpdfxfa/include/fpdfxfa_page.h b/fpdfsdk/fpdfxfa/include/fpdfxfa_page.h index 7b60c669cc..bd60366a6b 100644 --- a/fpdfsdk/fpdfxfa/include/fpdfxfa_page.h +++ b/fpdfsdk/fpdfxfa/include/fpdfxfa_page.h @@ -9,7 +9,7 @@ #include <memory> -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" class CFX_Matrix; class CPDFXFA_Document; diff --git a/fpdfsdk/fxedit/include/fx_edit.h b/fpdfsdk/fxedit/include/fx_edit.h index e460416e18..da93071f23 100644 --- a/fpdfsdk/fxedit/include/fx_edit.h +++ b/fpdfsdk/fxedit/include/fx_edit.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_FXEDIT_INCLUDE_FX_EDIT_H_ #define FPDFSDK_FXEDIT_INCLUDE_FX_EDIT_H_ -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" class IPVT_FontMap; diff --git a/fpdfsdk/fxedit/include/fxet_list.h b/fpdfsdk/fxedit/include/fxet_list.h index b5cd392eda..1d738c0dcc 100644 --- a/fpdfsdk/fxedit/include/fxet_list.h +++ b/fpdfsdk/fxedit/include/fxet_list.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_FXEDIT_INCLUDE_FXET_LIST_H_ #define FPDFSDK_FXEDIT_INCLUDE_FXET_LIST_H_ -#include "core/fxcrt/include/fx_coordinates.h" +#include "core/fxcrt/fx_coordinates.h" #include "fpdfsdk/fxedit/include/fx_edit.h" class CFX_Edit; diff --git a/fpdfsdk/include/cba_annotiterator.h b/fpdfsdk/include/cba_annotiterator.h index 7d9078e23d..38332db718 100644 --- a/fpdfsdk/include/cba_annotiterator.h +++ b/fpdfsdk/include/cba_annotiterator.h @@ -10,8 +10,8 @@ #include <vector> #include "core/fpdfdoc/cpdf_annot.h" -#include "core/fxcrt/include/fx_coordinates.h" -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/fx_string.h" class CPDFSDK_Annot; class CPDFSDK_PageView; diff --git a/fpdfsdk/include/cpdfsdk_annot.h b/fpdfsdk/include/cpdfsdk_annot.h index 7356ce821b..b7b7399373 100644 --- a/fpdfsdk/include/cpdfsdk_annot.h +++ b/fpdfsdk/include/cpdfsdk_annot.h @@ -10,8 +10,8 @@ #include "core/fpdfdoc/cpdf_aaction.h" #include "core/fpdfdoc/cpdf_annot.h" #include "core/fpdfdoc/cpdf_defaultappearance.h" -#include "core/fxcrt/include/cfx_observable.h" -#include "core/fxcrt/include/fx_basic.h" +#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" diff --git a/fpdfsdk/include/cpdfsdk_annothandlermgr.h b/fpdfsdk/include/cpdfsdk_annothandlermgr.h index da54c7e54b..717f87fcef 100644 --- a/fpdfsdk/include/cpdfsdk_annothandlermgr.h +++ b/fpdfsdk/include/cpdfsdk_annothandlermgr.h @@ -11,8 +11,8 @@ #include <memory> #include "core/fpdfdoc/cpdf_annot.h" -#include "core/fxcrt/include/fx_basic.h" -#include "core/fxcrt/include/fx_coordinates.h" +#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/fx_coordinates.h" #include "fpdfsdk/include/cpdfsdk_annot.h" class CFX_Matrix; diff --git a/fpdfsdk/include/cpdfsdk_baannot.h b/fpdfsdk/include/cpdfsdk_baannot.h index 9cc1680bee..dea717a5e0 100644 --- a/fpdfsdk/include/cpdfsdk_baannot.h +++ b/fpdfsdk/include/cpdfsdk_baannot.h @@ -11,8 +11,8 @@ #include "core/fpdfdoc/cpdf_action.h" #include "core/fpdfdoc/cpdf_annot.h" #include "core/fpdfdoc/cpdf_defaultappearance.h" -#include "core/fxcrt/include/fx_coordinates.h" -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/fx_string.h" #include "fpdfsdk/cfx_systemhandler.h" #include "fpdfsdk/include/cpdfsdk_annot.h" diff --git a/fpdfsdk/include/cpdfsdk_baannothandler.h b/fpdfsdk/include/cpdfsdk_baannothandler.h index ae884526a0..44e0cbb0b7 100644 --- a/fpdfsdk/include/cpdfsdk_baannothandler.h +++ b/fpdfsdk/include/cpdfsdk_baannothandler.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_INCLUDE_CPDFSDK_BAANNOTHANDLER_H_ #define FPDFSDK_INCLUDE_CPDFSDK_BAANNOTHANDLER_H_ -#include "core/fxcrt/include/fx_basic.h" -#include "core/fxcrt/include/fx_coordinates.h" +#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/fx_coordinates.h" #include "fpdfsdk/include/ipdfsdk_annothandler.h" class CFFL_InteractiveFormFiller; diff --git a/fpdfsdk/include/cpdfsdk_document.h b/fpdfsdk/include/cpdfsdk_document.h index c1420555b8..fe6ac94c12 100644 --- a/fpdfsdk/include/cpdfsdk_document.h +++ b/fpdfsdk/include/cpdfsdk_document.h @@ -11,7 +11,7 @@ #include <memory> #include "core/fpdfapi/fpdf_parser/cpdf_document.h" -#include "core/fxcrt/include/cfx_observable.h" +#include "core/fxcrt/cfx_observable.h" #include "fpdfsdk/include/cpdfsdk_annot.h" #include "fpdfsdk/include/fsdk_define.h" #include "public/fpdf_formfill.h" diff --git a/fpdfsdk/include/cpdfsdk_environment.h b/fpdfsdk/include/cpdfsdk_environment.h index 35b48507ad..1bf541e870 100644 --- a/fpdfsdk/include/cpdfsdk_environment.h +++ b/fpdfsdk/include/cpdfsdk_environment.h @@ -12,7 +12,7 @@ #include "core/fpdfapi/fpdf_page/cpdf_page.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "core/fpdfdoc/cpdf_occontext.h" -#include "core/fxcrt/include/cfx_observable.h" +#include "core/fxcrt/cfx_observable.h" #include "fpdfsdk/cfx_systemhandler.h" #include "fpdfsdk/include/fsdk_define.h" #include "public/fpdf_formfill.h" diff --git a/fpdfsdk/include/cpdfsdk_interform.h b/fpdfsdk/include/cpdfsdk_interform.h index b186ceb8cc..6bea3cfac0 100644 --- a/fpdfsdk/include/cpdfsdk_interform.h +++ b/fpdfsdk/include/cpdfsdk_interform.h @@ -12,7 +12,7 @@ #include "core/fpdfdoc/cpdf_action.h" #include "core/fpdfdoc/ipdf_formnotify.h" -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" #include "core/fxge/include/fx_dib.h" class CPDF_Dictionary; diff --git a/fpdfsdk/include/cpdfsdk_pageview.h b/fpdfsdk/include/cpdfsdk_pageview.h index 0bcce28feb..c31f6d3fb1 100644 --- a/fpdfsdk/include/cpdfsdk_pageview.h +++ b/fpdfsdk/include/cpdfsdk_pageview.h @@ -11,7 +11,7 @@ #include <vector> #include "core/fpdfapi/fpdf_page/cpdf_page.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" #include "fpdfsdk/include/cpdfsdk_annot.h" #include "fpdfsdk/include/cpdfsdk_document.h" diff --git a/fpdfsdk/include/cpdfsdk_widget.h b/fpdfsdk/include/cpdfsdk_widget.h index 01710917ff..8c10a21b9c 100644 --- a/fpdfsdk/include/cpdfsdk_widget.h +++ b/fpdfsdk/include/cpdfsdk_widget.h @@ -12,8 +12,8 @@ #include "core/fpdfdoc/cpdf_aaction.h" #include "core/fpdfdoc/cpdf_action.h" #include "core/fpdfdoc/cpdf_annot.h" -#include "core/fxcrt/include/fx_coordinates.h" -#include "core/fxcrt/include/fx_string.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/pdfwindow/PWL_Wnd.h" diff --git a/fpdfsdk/include/cpdfsdk_widgethandler.h b/fpdfsdk/include/cpdfsdk_widgethandler.h index b18f623b3f..ca3da87ff6 100644 --- a/fpdfsdk/include/cpdfsdk_widgethandler.h +++ b/fpdfsdk/include/cpdfsdk_widgethandler.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_INCLUDE_CPDFSDK_WIDGETHANDLER_H_ #define FPDFSDK_INCLUDE_CPDFSDK_WIDGETHANDLER_H_ -#include "core/fxcrt/include/fx_basic.h" -#include "core/fxcrt/include/fx_coordinates.h" +#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/fx_coordinates.h" #include "fpdfsdk/include/ipdfsdk_annothandler.h" class CFFL_InteractiveFormFiller; diff --git a/fpdfsdk/include/cpdfsdk_xfawidget.h b/fpdfsdk/include/cpdfsdk_xfawidget.h index 311c22587b..99309b9684 100644 --- a/fpdfsdk/include/cpdfsdk_xfawidget.h +++ b/fpdfsdk/include/cpdfsdk_xfawidget.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_INCLUDE_CPDFSDK_XFAWIDGET_H_ #define FPDFSDK_INCLUDE_CPDFSDK_XFAWIDGET_H_ -#include "core/fxcrt/include/fx_coordinates.h" -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/fx_string.h" #include "fpdfsdk/include/cpdfsdk_annot.h" class CPDFSDK_InterForm; diff --git a/fpdfsdk/include/cpdfsdk_xfawidgethandler.h b/fpdfsdk/include/cpdfsdk_xfawidgethandler.h index 2bf977951c..425c57c03d 100644 --- a/fpdfsdk/include/cpdfsdk_xfawidgethandler.h +++ b/fpdfsdk/include/cpdfsdk_xfawidgethandler.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_INCLUDE_CPDFSDK_XFAWIDGETHANDLER_H_ #define FPDFSDK_INCLUDE_CPDFSDK_XFAWIDGETHANDLER_H_ -#include "core/fxcrt/include/fx_basic.h" -#include "core/fxcrt/include/fx_coordinates.h" +#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/fx_coordinates.h" #include "fpdfsdk/include/ipdfsdk_annothandler.h" class CFX_Matrix; diff --git a/fpdfsdk/include/fsdk_actionhandler.h b/fpdfsdk/include/fsdk_actionhandler.h index fc6758898f..ce15b83295 100644 --- a/fpdfsdk/include/fsdk_actionhandler.h +++ b/fpdfsdk/include/fsdk_actionhandler.h @@ -12,7 +12,7 @@ #include "core/fpdfdoc/cpdf_aaction.h" #include "core/fpdfdoc/cpdf_action.h" -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" #include "fpdfsdk/include/pdfsdk_fieldaction.h" class CPDFSDK_Annot; diff --git a/fpdfsdk/include/fsdk_pauseadapter.h b/fpdfsdk/include/fsdk_pauseadapter.h index 793e8f2772..4a37f5ce52 100644 --- a/fpdfsdk/include/fsdk_pauseadapter.h +++ b/fpdfsdk/include/fsdk_pauseadapter.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_INCLUDE_FSDK_PAUSEADAPTER_H_ #define FPDFSDK_INCLUDE_FSDK_PAUSEADAPTER_H_ -#include "core/fxcrt/include/fx_basic.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/fx_system.h" #include "public/fpdf_progressive.h" class IFSDK_PAUSE_Adapter : public IFX_Pause { diff --git a/fpdfsdk/include/ipdfsdk_annothandler.h b/fpdfsdk/include/ipdfsdk_annothandler.h index f1db6983c0..3102cb48db 100644 --- a/fpdfsdk/include/ipdfsdk_annothandler.h +++ b/fpdfsdk/include/ipdfsdk_annothandler.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_INCLUDE_IPDFSDK_ANNOTHANDLER_H_ #define FPDFSDK_INCLUDE_IPDFSDK_ANNOTHANDLER_H_ -#include "core/fxcrt/include/fx_basic.h" -#include "core/fxcrt/include/fx_coordinates.h" +#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/fx_coordinates.h" #include "fpdfsdk/include/cpdfsdk_annot.h" class CFX_Matrix; diff --git a/fpdfsdk/include/pdfsdk_fieldaction.h b/fpdfsdk/include/pdfsdk_fieldaction.h index 385fbf6845..4ed8b943c9 100644 --- a/fpdfsdk/include/pdfsdk_fieldaction.h +++ b/fpdfsdk/include/pdfsdk_fieldaction.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_INCLUDE_PDFSDK_FIELDACTION_H_ #define FPDFSDK_INCLUDE_PDFSDK_FIELDACTION_H_ -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" #ifdef PDF_ENABLE_XFA typedef enum { diff --git a/fpdfsdk/javascript/Field.h b/fpdfsdk/javascript/Field.h index 56cfd20d83..e559780154 100644 --- a/fpdfsdk/javascript/Field.h +++ b/fpdfsdk/javascript/Field.h @@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "core/fxcrt/include/cfx_observable.h" +#include "core/fxcrt/cfx_observable.h" #include "fpdfsdk/include/cpdfsdk_document.h" #include "fpdfsdk/javascript/JS_Define.h" #include "fpdfsdk/pdfwindow/PWL_Wnd.h" // For CPWL_Color. diff --git a/fpdfsdk/javascript/JS_EventHandler.h b/fpdfsdk/javascript/JS_EventHandler.h index 41d37056a5..02d5e82595 100644 --- a/fpdfsdk/javascript/JS_EventHandler.h +++ b/fpdfsdk/javascript/JS_EventHandler.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_JAVASCRIPT_JS_EVENTHANDLER_H_ #define FPDFSDK_JAVASCRIPT_JS_EVENTHANDLER_H_ -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" class CJS_Context; class CPDFSDK_Annot; diff --git a/fpdfsdk/javascript/JS_GlobalData.h b/fpdfsdk/javascript/JS_GlobalData.h index cda8533fad..38ab9256f9 100644 --- a/fpdfsdk/javascript/JS_GlobalData.h +++ b/fpdfsdk/javascript/JS_GlobalData.h @@ -10,7 +10,7 @@ #include <memory> #include <vector> -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" #include "fpdfsdk/javascript/JS_KeyValue.h" class CPDFSDK_Environment; diff --git a/fpdfsdk/javascript/JS_KeyValue.h b/fpdfsdk/javascript/JS_KeyValue.h index 43f6687b8d..a571588870 100644 --- a/fpdfsdk/javascript/JS_KeyValue.h +++ b/fpdfsdk/javascript/JS_KeyValue.h @@ -10,7 +10,7 @@ #include <memory> #include <vector> -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" enum class JS_GlobalDataType { NUMBER = 0, BOOLEAN, STRING, OBJECT, NULLOBJ }; diff --git a/fpdfsdk/javascript/JS_Value.h b/fpdfsdk/javascript/JS_Value.h index c567a7cbf2..ef79d7b91b 100644 --- a/fpdfsdk/javascript/JS_Value.h +++ b/fpdfsdk/javascript/JS_Value.h @@ -9,7 +9,7 @@ #include <vector> -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" #include "fxjs/include/fxjs_v8.h" class CJS_Array; diff --git a/fpdfsdk/javascript/PublicMethods.cpp b/fpdfsdk/javascript/PublicMethods.cpp index c7f7b85f45..6a96466b5a 100644 --- a/fpdfsdk/javascript/PublicMethods.cpp +++ b/fpdfsdk/javascript/PublicMethods.cpp @@ -10,7 +10,7 @@ #include <vector> #include "core/fpdfdoc/cpdf_interform.h" -#include "core/fxcrt/include/fx_ext.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" diff --git a/fpdfsdk/javascript/cjs_context.h b/fpdfsdk/javascript/cjs_context.h index 41f2042b7e..ef65486269 100644 --- a/fpdfsdk/javascript/cjs_context.h +++ b/fpdfsdk/javascript/cjs_context.h @@ -9,8 +9,8 @@ #include <memory> -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #include "fpdfsdk/javascript/ijs_context.h" class CJS_EventHandler; diff --git a/fpdfsdk/javascript/cjs_runtime.h b/fpdfsdk/javascript/cjs_runtime.h index da7e384321..d438e46a6d 100644 --- a/fpdfsdk/javascript/cjs_runtime.h +++ b/fpdfsdk/javascript/cjs_runtime.h @@ -13,8 +13,8 @@ #include <utility> #include <vector> -#include "core/fxcrt/include/cfx_observable.h" -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/cfx_observable.h" +#include "core/fxcrt/fx_basic.h" #include "fpdfsdk/javascript/JS_EventHandler.h" #include "fpdfsdk/javascript/ijs_runtime.h" #include "fxjs/include/fxjs_v8.h" diff --git a/fpdfsdk/javascript/global.cpp b/fpdfsdk/javascript/global.cpp index b55953907f..144b5ee42a 100644 --- a/fpdfsdk/javascript/global.cpp +++ b/fpdfsdk/javascript/global.cpp @@ -8,7 +8,7 @@ #include <vector> -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" #include "fpdfsdk/javascript/JS_Define.h" #include "fpdfsdk/javascript/JS_EventHandler.h" #include "fpdfsdk/javascript/JS_GlobalData.h" diff --git a/fpdfsdk/javascript/ijs_context.h b/fpdfsdk/javascript/ijs_context.h index 587ff8110c..cfeed3050d 100644 --- a/fpdfsdk/javascript/ijs_context.h +++ b/fpdfsdk/javascript/ijs_context.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_JAVASCRIPT_IJS_CONTEXT_H_ #define FPDFSDK_JAVASCRIPT_IJS_CONTEXT_H_ -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" class CPDF_Bookmark; class CPDF_FormField; diff --git a/fpdfsdk/javascript/ijs_runtime.h b/fpdfsdk/javascript/ijs_runtime.h index ee024fe2fd..be0cd042d2 100644 --- a/fpdfsdk/javascript/ijs_runtime.h +++ b/fpdfsdk/javascript/ijs_runtime.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_JAVASCRIPT_IJS_RUNTIME_H_ #define FPDFSDK_JAVASCRIPT_IJS_RUNTIME_H_ -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #ifdef PDF_ENABLE_XFA #include "fxjs/include/fxjse.h" diff --git a/fpdfsdk/javascript/public_methods_embeddertest.cpp b/fpdfsdk/javascript/public_methods_embeddertest.cpp index 80ec6492ee..24793667b0 100644 --- a/fpdfsdk/javascript/public_methods_embeddertest.cpp +++ b/fpdfsdk/javascript/public_methods_embeddertest.cpp @@ -4,7 +4,7 @@ #include <cmath> -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" #include "fpdfsdk/javascript/PublicMethods.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/js_embedder_test.h" diff --git a/fpdfsdk/javascript/resource.h b/fpdfsdk/javascript/resource.h index 7f041cd21a..663cf3b04d 100644 --- a/fpdfsdk/javascript/resource.h +++ b/fpdfsdk/javascript/resource.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_JAVASCRIPT_RESOURCE_H_ #define FPDFSDK_JAVASCRIPT_RESOURCE_H_ -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" class CJS_Context; diff --git a/fpdfsdk/javascript/util.cpp b/fpdfsdk/javascript/util.cpp index 44511f591f..50c4c56ee9 100644 --- a/fpdfsdk/javascript/util.cpp +++ b/fpdfsdk/javascript/util.cpp @@ -12,7 +12,7 @@ #include <string> #include <vector> -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" #include "fpdfsdk/javascript/JS_Define.h" #include "fpdfsdk/javascript/JS_EventHandler.h" #include "fpdfsdk/javascript/JS_Object.h" diff --git a/fpdfsdk/pdfwindow/PWL_Edit.cpp b/fpdfsdk/pdfwindow/PWL_Edit.cpp index b87d3390ea..8c02607719 100644 --- a/fpdfsdk/pdfwindow/PWL_Edit.cpp +++ b/fpdfsdk/pdfwindow/PWL_Edit.cpp @@ -10,8 +10,8 @@ #include "core/fpdfapi/fpdf_font/cpdf_font.h" #include "core/fpdfdoc/cpvt_word.h" -#include "core/fxcrt/include/fx_safe_types.h" -#include "core/fxcrt/include/fx_xml.h" +#include "core/fxcrt/fx_safe_types.h" +#include "core/fxcrt/fx_xml.h" #include "core/fxge/include/cfx_graphstatedata.h" #include "core/fxge/include/cfx_pathdata.h" #include "core/fxge/include/cfx_renderdevice.h" diff --git a/fpdfsdk/pdfwindow/PWL_Edit.h b/fpdfsdk/pdfwindow/PWL_Edit.h index e6993bd16b..2ca61316e1 100644 --- a/fpdfsdk/pdfwindow/PWL_Edit.h +++ b/fpdfsdk/pdfwindow/PWL_Edit.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_PDFWINDOW_PWL_EDIT_H_ #define FPDFSDK_PDFWINDOW_PWL_EDIT_H_ -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" #include "fpdfsdk/fxedit/include/fx_edit.h" #include "fpdfsdk/pdfwindow/PWL_EditCtrl.h" #include "fpdfsdk/pdfwindow/PWL_Wnd.h" diff --git a/fpdfsdk/pdfwindow/PWL_EditCtrl.h b/fpdfsdk/pdfwindow/PWL_EditCtrl.h index 8be2b00821..9c97f2f55b 100644 --- a/fpdfsdk/pdfwindow/PWL_EditCtrl.h +++ b/fpdfsdk/pdfwindow/PWL_EditCtrl.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_PDFWINDOW_PWL_EDITCTRL_H_ #define FPDFSDK_PDFWINDOW_PWL_EDITCTRL_H_ -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" #include "fpdfsdk/fxedit/include/fx_edit.h" #include "fpdfsdk/pdfwindow/PWL_Wnd.h" diff --git a/fpdfsdk/pdfwindow/PWL_Icon.h b/fpdfsdk/pdfwindow/PWL_Icon.h index 04d13a1411..b3b59ca1ba 100644 --- a/fpdfsdk/pdfwindow/PWL_Icon.h +++ b/fpdfsdk/pdfwindow/PWL_Icon.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_PDFWINDOW_PWL_ICON_H_ #define FPDFSDK_PDFWINDOW_PWL_ICON_H_ -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" #include "fpdfsdk/pdfwindow/PWL_Wnd.h" class CPWL_Image : public CPWL_Wnd { diff --git a/fpdfsdk/pdfwindow/PWL_Wnd.h b/fpdfsdk/pdfwindow/PWL_Wnd.h index 37209ed8f8..8fd538f7c4 100644 --- a/fpdfsdk/pdfwindow/PWL_Wnd.h +++ b/fpdfsdk/pdfwindow/PWL_Wnd.h @@ -11,7 +11,7 @@ #include <vector> #include "core/fpdfdoc/cpdf_formcontrol.h" -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" #include "fpdfsdk/cfx_systemhandler.h" class CPDFSDK_Widget; |