From a8a28e0702a1874d29d3c9f2b155bce1557eb4fd Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 23 Mar 2016 15:41:39 -0400 Subject: Move core/include/fxcrt to core/fxcrt/include. This CL moves the fxcrt code into the core/fxcrt directory. The only exception was fx_bidi.h which was moved into core/fxcrt as it is not used outside of core/. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1825953002 . --- fpdfsdk/include/fpdfxfa/fpdfxfa_page.h | 4 ++-- fpdfsdk/include/fsdk_actionhandler.h | 2 +- fpdfsdk/include/fsdk_annothandler.h | 4 ++-- fpdfsdk/include/fsdk_baseannot.h | 2 +- fpdfsdk/include/fsdk_baseform.h | 2 +- fpdfsdk/include/fx_systemhandler.h | 4 ++-- fpdfsdk/include/fxedit/fx_edit.h | 2 +- fpdfsdk/include/javascript/IJavaScript.h | 4 ++-- fpdfsdk/include/jsapi/fxjs_v8.h | 2 +- fpdfsdk/include/pdfwindow/PWL_Edit.h | 2 +- fpdfsdk/include/pdfwindow/PWL_EditCtrl.h | 2 +- fpdfsdk/include/pdfwindow/PWL_Icon.h | 2 +- fpdfsdk/include/pdfwindow/PWL_IconList.h | 2 +- fpdfsdk/include/pdfwindow/PWL_Wnd.h | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) (limited to 'fpdfsdk/include') diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_page.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_page.h index 19d36e4494..d686fe9bae 100644 --- a/fpdfsdk/include/fpdfxfa/fpdfxfa_page.h +++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_page.h @@ -9,8 +9,8 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h" #include "core/fpdfapi/include/cpdf_modulemgr.h" -#include "core/include/fxcrt/fx_coordinates.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_coordinates.h" +#include "core/fxcrt/include/fx_system.h" class CPDFXFA_Document; class CPDF_Page; diff --git a/fpdfsdk/include/fsdk_actionhandler.h b/fpdfsdk/include/fsdk_actionhandler.h index 920ea64e08..a8022b0695 100644 --- a/fpdfsdk/include/fsdk_actionhandler.h +++ b/fpdfsdk/include/fsdk_actionhandler.h @@ -10,8 +10,8 @@ #include #include +#include "core/fxcrt/include/fx_string.h" #include "core/include/fpdfdoc/fpdf_doc.h" -#include "core/include/fxcrt/fx_string.h" #include "fpdfsdk/include/fsdk_baseform.h" class CPDFSDK_Annot; diff --git a/fpdfsdk/include/fsdk_annothandler.h b/fpdfsdk/include/fsdk_annothandler.h index 09f997fbbc..f94d7d0592 100644 --- a/fpdfsdk/include/fsdk_annothandler.h +++ b/fpdfsdk/include/fsdk_annothandler.h @@ -10,8 +10,8 @@ #include #include -#include "core/include/fxcrt/fx_basic.h" -#include "core/include/fxcrt/fx_coordinates.h" +#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/include/fx_coordinates.h" #ifdef PDF_ENABLE_XFA #include "xfa/include/fxfa/fxfa.h" diff --git a/fpdfsdk/include/fsdk_baseannot.h b/fpdfsdk/include/fsdk_baseannot.h index afaa3bc9f9..2024c2ca2d 100644 --- a/fpdfsdk/include/fsdk_baseannot.h +++ b/fpdfsdk/include/fsdk_baseannot.h @@ -13,8 +13,8 @@ #include #endif +#include "core/fxcrt/include/fx_basic.h" #include "core/include/fpdfdoc/fpdf_doc.h" -#include "core/include/fxcrt/fx_basic.h" #include "fpdfsdk/include/fsdk_define.h" #include "fpdfsdk/include/fx_systemhandler.h" diff --git a/fpdfsdk/include/fsdk_baseform.h b/fpdfsdk/include/fsdk_baseform.h index c2d09e8d4d..aa96215d1c 100644 --- a/fpdfsdk/include/fsdk_baseform.h +++ b/fpdfsdk/include/fsdk_baseform.h @@ -10,8 +10,8 @@ #include #include +#include "core/fxcrt/include/fx_basic.h" #include "core/include/fpdfdoc/fpdf_doc.h" -#include "core/include/fxcrt/fx_basic.h" #include "core/include/fxge/fx_dib.h" #include "fpdfsdk/include/fsdk_baseannot.h" diff --git a/fpdfsdk/include/fx_systemhandler.h b/fpdfsdk/include/fx_systemhandler.h index ab0bc46017..6619f3ed04 100644 --- a/fpdfsdk/include/fx_systemhandler.h +++ b/fpdfsdk/include/fx_systemhandler.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_INCLUDE_FX_SYSTEMHANDLER_H_ #define FPDFSDK_INCLUDE_FX_SYSTEMHANDLER_H_ -#include "core/include/fxcrt/fx_coordinates.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_coordinates.h" +#include "core/fxcrt/include/fx_system.h" class CPDF_Document; class CPDF_Font; diff --git a/fpdfsdk/include/fxedit/fx_edit.h b/fpdfsdk/include/fxedit/fx_edit.h index d2222a04af..905ad392a9 100644 --- a/fpdfsdk/include/fxedit/fx_edit.h +++ b/fpdfsdk/include/fxedit/fx_edit.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_INCLUDE_FXEDIT_FX_EDIT_H_ #define FPDFSDK_INCLUDE_FXEDIT_FX_EDIT_H_ -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" #include "core/include/fxge/fx_dib.h" class CFX_RenderDevice; diff --git a/fpdfsdk/include/javascript/IJavaScript.h b/fpdfsdk/include/javascript/IJavaScript.h index 319634882f..8aab367983 100644 --- a/fpdfsdk/include/javascript/IJavaScript.h +++ b/fpdfsdk/include/javascript/IJavaScript.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_INCLUDE_JAVASCRIPT_IJAVASCRIPT_H_ #define FPDFSDK_INCLUDE_JAVASCRIPT_IJAVASCRIPT_H_ -#include "core/include/fxcrt/fx_string.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/include/fx_system.h" #ifdef PDF_ENABLE_XFA #include "xfa/fxjse/include/fxjse.h" diff --git a/fpdfsdk/include/jsapi/fxjs_v8.h b/fpdfsdk/include/jsapi/fxjs_v8.h index dccb261b06..dad1eaa888 100644 --- a/fpdfsdk/include/jsapi/fxjs_v8.h +++ b/fpdfsdk/include/jsapi/fxjs_v8.h @@ -19,7 +19,7 @@ #include -#include "core/include/fxcrt/fx_string.h" +#include "core/fxcrt/include/fx_string.h" class CFXJS_ObjDefinition; diff --git a/fpdfsdk/include/pdfwindow/PWL_Edit.h b/fpdfsdk/include/pdfwindow/PWL_Edit.h index 0d764c0f89..1e7dd8c274 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Edit.h +++ b/fpdfsdk/include/pdfwindow/PWL_Edit.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDIT_H_ #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDIT_H_ -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" #include "fpdfsdk/include/fxedit/fx_edit.h" #include "fpdfsdk/include/pdfwindow/PWL_EditCtrl.h" #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" diff --git a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h index f2e166385e..b64b576fff 100644 --- a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h +++ b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDITCTRL_H_ #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDITCTRL_H_ -#include "core/include/fxcrt/fx_string.h" +#include "core/fxcrt/include/fx_string.h" #include "fpdfsdk/include/fxedit/fx_edit.h" #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" diff --git a/fpdfsdk/include/pdfwindow/PWL_Icon.h b/fpdfsdk/include/pdfwindow/PWL_Icon.h index 4db62f81be..57c431647b 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Icon.h +++ b/fpdfsdk/include/pdfwindow/PWL_Icon.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICON_H_ #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICON_H_ -#include "core/include/fxcrt/fx_string.h" +#include "core/fxcrt/include/fx_string.h" #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" class CPWL_Image : public CPWL_Wnd { diff --git a/fpdfsdk/include/pdfwindow/PWL_IconList.h b/fpdfsdk/include/pdfwindow/PWL_IconList.h index a11a73c41a..e4fd68a4c1 100644 --- a/fpdfsdk/include/pdfwindow/PWL_IconList.h +++ b/fpdfsdk/include/pdfwindow/PWL_IconList.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICONLIST_H_ #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICONLIST_H_ -#include "core/include/fxcrt/fx_string.h" +#include "core/fxcrt/include/fx_string.h" #include "fpdfsdk/include/pdfwindow/PWL_ListCtrl.h" #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" diff --git a/fpdfsdk/include/pdfwindow/PWL_Wnd.h b/fpdfsdk/include/pdfwindow/PWL_Wnd.h index 6ad356d80d..3b324a7d7a 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Wnd.h +++ b/fpdfsdk/include/pdfwindow/PWL_Wnd.h @@ -9,8 +9,8 @@ #include +#include "core/fxcrt/include/fx_basic.h" #include "core/include/fpdfdoc/fpdf_doc.h" -#include "core/include/fxcrt/fx_basic.h" #include "fpdfsdk/include/fx_systemhandler.h" class CPWL_MsgControl; -- cgit v1.2.3