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 . --- xfa/fgas/crt/fgas_algorithm.cpp | 2 +- xfa/fgas/crt/fgas_algorithm.h | 2 +- xfa/fgas/crt/fgas_codepage.cpp | 2 +- xfa/fgas/crt/fgas_codepage.h | 2 +- xfa/fgas/crt/fgas_memory.h | 4 ++-- xfa/fgas/crt/fgas_stream.h | 4 ++-- xfa/fgas/crt/fgas_system.cpp | 2 +- xfa/fgas/crt/fgas_system.h | 2 +- xfa/fgas/crt/fgas_utils.cpp | 2 +- xfa/fgas/crt/fgas_utils.h | 2 +- xfa/fgas/font/fgas_fontutils.cpp | 2 +- xfa/fgas/font/fgas_fontutils.h | 2 +- xfa/fgas/font/fgas_stdfontmgr.cpp | 2 +- xfa/fgas/font/fgas_stdfontmgr.h | 2 +- xfa/fgas/layout/fgas_linebreak.cpp | 2 +- xfa/fgas/layout/fgas_linebreak.h | 2 +- xfa/fgas/layout/fgas_rtfbreak.cpp | 2 +- xfa/fgas/layout/fgas_rtfbreak.h | 2 +- xfa/fgas/layout/fgas_textbreak.cpp | 4 ++-- xfa/fgas/layout/fgas_textbreak.h | 2 +- xfa/fgas/localization/fgas_datetime.cpp | 2 +- xfa/fgas/localization/fgas_datetime.h | 2 +- xfa/fgas/localization/fgas_locale.cpp | 4 ++-- xfa/fgas/localization/fgas_locale.h | 2 +- xfa/fgas/localization/fgas_localemgr.cpp | 2 +- xfa/fgas/xml/fgas_sax.h | 2 +- 26 files changed, 30 insertions(+), 30 deletions(-) (limited to 'xfa/fgas') diff --git a/xfa/fgas/crt/fgas_algorithm.cpp b/xfa/fgas/crt/fgas_algorithm.cpp index b351292519..8f13cb3045 100644 --- a/xfa/fgas/crt/fgas_algorithm.cpp +++ b/xfa/fgas/crt/fgas_algorithm.cpp @@ -6,7 +6,7 @@ #include "xfa/fgas/crt/fgas_algorithm.h" -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" #ifdef __cplusplus extern "C" { diff --git a/xfa/fgas/crt/fgas_algorithm.h b/xfa/fgas/crt/fgas_algorithm.h index 662b1b62a9..94a0d06f9e 100644 --- a/xfa/fgas/crt/fgas_algorithm.h +++ b/xfa/fgas/crt/fgas_algorithm.h @@ -9,7 +9,7 @@ #include -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" #ifdef __cplusplus extern "C" { diff --git a/xfa/fgas/crt/fgas_codepage.cpp b/xfa/fgas/crt/fgas_codepage.cpp index dcf3dfa690..57d97db83c 100644 --- a/xfa/fgas/crt/fgas_codepage.cpp +++ b/xfa/fgas/crt/fgas_codepage.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/include/fxcrt/fx_ext.h" +#include "core/fxcrt/include/fx_ext.h" #include "xfa/fgas/crt/fgas_codepage.h" #include "xfa/fgas/crt/fgas_language.h" diff --git a/xfa/fgas/crt/fgas_codepage.h b/xfa/fgas/crt/fgas_codepage.h index fe69f7ce93..15bdd74487 100644 --- a/xfa/fgas/crt/fgas_codepage.h +++ b/xfa/fgas/crt/fgas_codepage.h @@ -7,7 +7,7 @@ #ifndef XFA_FGAS_CRT_FGAS_CODEPAGE_H_ #define XFA_FGAS_CRT_FGAS_CODEPAGE_H_ -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" #define FX_CODEPAGE_DefANSI 0 #define FX_CODEPAGE_DefOEM 1 diff --git a/xfa/fgas/crt/fgas_memory.h b/xfa/fgas/crt/fgas_memory.h index a9c5cc97e7..ac27755cac 100644 --- a/xfa/fgas/crt/fgas_memory.h +++ b/xfa/fgas/crt/fgas_memory.h @@ -7,8 +7,8 @@ #ifndef XFA_FGAS_CRT_FGAS_MEMORY_H_ #define XFA_FGAS_CRT_FGAS_MEMORY_H_ -#include "core/include/fxcrt/fx_memory.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_memory.h" +#include "core/fxcrt/include/fx_system.h" class IFX_MEMAllocator; class CFX_Target; diff --git a/xfa/fgas/crt/fgas_stream.h b/xfa/fgas/crt/fgas_stream.h index 94b7f01ed6..fd977c4a1b 100644 --- a/xfa/fgas/crt/fgas_stream.h +++ b/xfa/fgas/crt/fgas_stream.h @@ -7,8 +7,8 @@ #ifndef XFA_FGAS_CRT_FGAS_STREAM_H_ #define XFA_FGAS_CRT_FGAS_STREAM_H_ -#include "core/include/fxcrt/fx_stream.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_stream.h" +#include "core/fxcrt/include/fx_system.h" class IFX_Stream; diff --git a/xfa/fgas/crt/fgas_system.cpp b/xfa/fgas/crt/fgas_system.cpp index 9d76a60118..e6d89a50af 100644 --- a/xfa/fgas/crt/fgas_system.cpp +++ b/xfa/fgas/crt/fgas_system.cpp @@ -8,7 +8,7 @@ #include -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_system.h" #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN32_MOBILE_ || \ _FX_OS_ == _FX_WIN64_ diff --git a/xfa/fgas/crt/fgas_system.h b/xfa/fgas/crt/fgas_system.h index 4335c35541..d4bebcadff 100644 --- a/xfa/fgas/crt/fgas_system.h +++ b/xfa/fgas/crt/fgas_system.h @@ -7,7 +7,7 @@ #ifndef XFA_FGAS_CRT_FGAS_SYSTEM_H_ #define XFA_FGAS_CRT_FGAS_SYSTEM_H_ -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_system.h" #define FX_RAD2DEG(r) ((r)*180.0f / FX_PI) #define FX_DEG2RAD(a) ((a)*FX_PI / 180.0f) diff --git a/xfa/fgas/crt/fgas_utils.cpp b/xfa/fgas/crt/fgas_utils.cpp index 7a85fbb7ba..0d020ec38f 100644 --- a/xfa/fgas/crt/fgas_utils.cpp +++ b/xfa/fgas/crt/fgas_utils.cpp @@ -8,7 +8,7 @@ #include -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class FX_BASEARRAYDATA : public CFX_Target { public: diff --git a/xfa/fgas/crt/fgas_utils.h b/xfa/fgas/crt/fgas_utils.h index 1138cfd7c9..cb133b0c33 100644 --- a/xfa/fgas/crt/fgas_utils.h +++ b/xfa/fgas/crt/fgas_utils.h @@ -7,7 +7,7 @@ #ifndef XFA_FGAS_CRT_FGAS_UTILS_H_ #define XFA_FGAS_CRT_FGAS_UTILS_H_ -#include "core/include/fxcrt/fx_coordinates.h" +#include "core/fxcrt/include/fx_coordinates.h" #include "xfa/fgas/crt/fgas_memory.h" class FX_BASEARRAYDATA; diff --git a/xfa/fgas/font/fgas_fontutils.cpp b/xfa/fgas/font/fgas_fontutils.cpp index e115e0f42d..a0767d74f5 100644 --- a/xfa/fgas/font/fgas_fontutils.cpp +++ b/xfa/fgas/font/fgas_fontutils.cpp @@ -6,7 +6,7 @@ #include "xfa/fgas/font/fgas_fontutils.h" -#include "core/include/fxcrt/fx_ext.h" +#include "core/fxcrt/include/fx_ext.h" #include "xfa/fgas/font/fgas_font.h" FX_DWORD FGAS_GetFontHashCode(uint16_t wCodePage, FX_DWORD dwFontStyles) { diff --git a/xfa/fgas/font/fgas_fontutils.h b/xfa/fgas/font/fgas_fontutils.h index d5608063ca..764aa6b937 100644 --- a/xfa/fgas/font/fgas_fontutils.h +++ b/xfa/fgas/font/fgas_fontutils.h @@ -7,7 +7,7 @@ #ifndef XFA_FGAS_FONT_FGAS_FONTUTILS_H_ #define XFA_FGAS_FONT_FGAS_FONTUTILS_H_ -#include "core/include/fxcrt/fx_string.h" +#include "core/fxcrt/include/fx_string.h" struct FGAS_FONTUSB { uint16_t wStartUnicode; diff --git a/xfa/fgas/font/fgas_stdfontmgr.cpp b/xfa/fgas/font/fgas_stdfontmgr.cpp index 331ea86582..a2eae837da 100644 --- a/xfa/fgas/font/fgas_stdfontmgr.cpp +++ b/xfa/fgas/font/fgas_stdfontmgr.cpp @@ -6,7 +6,7 @@ #include "xfa/fgas/font/fgas_stdfontmgr.h" -#include "core/include/fxcrt/fx_stream.h" +#include "core/fxcrt/include/fx_stream.h" #include "xfa/fgas/crt/fgas_codepage.h" #include "xfa/fgas/font/fgas_fontutils.h" diff --git a/xfa/fgas/font/fgas_stdfontmgr.h b/xfa/fgas/font/fgas_stdfontmgr.h index e548cf5d2b..574eefad23 100644 --- a/xfa/fgas/font/fgas_stdfontmgr.h +++ b/xfa/fgas/font/fgas_stdfontmgr.h @@ -7,7 +7,7 @@ #ifndef XFA_FGAS_FONT_FGAS_STDFONTMGR_H_ #define XFA_FGAS_FONT_FGAS_STDFONTMGR_H_ -#include "core/include/fxcrt/fx_ext.h" +#include "core/fxcrt/include/fx_ext.h" #include "core/include/fxge/fx_freetype.h" #include "core/include/fxge/fx_ge.h" #include "third_party/freetype/include/freetype/fttypes.h" diff --git a/xfa/fgas/layout/fgas_linebreak.cpp b/xfa/fgas/layout/fgas_linebreak.cpp index 4e5b405f5a..295b5b6b86 100644 --- a/xfa/fgas/layout/fgas_linebreak.cpp +++ b/xfa/fgas/layout/fgas_linebreak.cpp @@ -6,7 +6,7 @@ #include "xfa/fgas/layout/fgas_linebreak.h" -#include "core/include/fxcrt/fx_ucd.h" +#include "core/fxcrt/include/fx_ucd.h" const FX_LINEBREAKTYPE gs_FX_LineBreak_PairTable[64][32] = { {FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, FX_LBPB, diff --git a/xfa/fgas/layout/fgas_linebreak.h b/xfa/fgas/layout/fgas_linebreak.h index f1ecad74d0..1333937db1 100644 --- a/xfa/fgas/layout/fgas_linebreak.h +++ b/xfa/fgas/layout/fgas_linebreak.h @@ -7,7 +7,7 @@ #ifndef XFA_FGAS_LAYOUT_FGAS_LINEBREAK_H_ #define XFA_FGAS_LAYOUT_FGAS_LINEBREAK_H_ -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_system.h" #include "xfa/fgas/crt/fgas_utils.h" enum FX_LINEBREAKTYPE : uint8_t { diff --git a/xfa/fgas/layout/fgas_rtfbreak.cpp b/xfa/fgas/layout/fgas_rtfbreak.cpp index dd150a3002..c856b27b70 100644 --- a/xfa/fgas/layout/fgas_rtfbreak.cpp +++ b/xfa/fgas/layout/fgas_rtfbreak.cpp @@ -8,7 +8,7 @@ #include -#include "core/include/fxcrt/fx_arb.h" +#include "core/fxcrt/include/fx_arb.h" #include "xfa/fgas/layout/fgas_linebreak.h" #include "xfa/fgas/layout/fgas_unicode.h" diff --git a/xfa/fgas/layout/fgas_rtfbreak.h b/xfa/fgas/layout/fgas_rtfbreak.h index 7e395f6918..8549d0c93c 100644 --- a/xfa/fgas/layout/fgas_rtfbreak.h +++ b/xfa/fgas/layout/fgas_rtfbreak.h @@ -7,7 +7,7 @@ #ifndef XFA_FGAS_LAYOUT_FGAS_RTFBREAK_H_ #define XFA_FGAS_LAYOUT_FGAS_RTFBREAK_H_ -#include "core/include/fxcrt/fx_ucd.h" +#include "core/fxcrt/include/fx_ucd.h" #include "core/include/fxge/fx_ge.h" #include "xfa/fgas/crt/fgas_memory.h" #include "xfa/fgas/crt/fgas_utils.h" diff --git a/xfa/fgas/layout/fgas_textbreak.cpp b/xfa/fgas/layout/fgas_textbreak.cpp index f182a6d413..990656b1d1 100644 --- a/xfa/fgas/layout/fgas_textbreak.cpp +++ b/xfa/fgas/layout/fgas_textbreak.cpp @@ -8,8 +8,8 @@ #include -#include "core/include/fxcrt/fx_arb.h" -#include "core/include/fxcrt/fx_memory.h" +#include "core/fxcrt/include/fx_arb.h" +#include "core/fxcrt/include/fx_memory.h" #include "xfa/fgas/layout/fgas_linebreak.h" #include "xfa/fgas/layout/fgas_unicode.h" diff --git a/xfa/fgas/layout/fgas_textbreak.h b/xfa/fgas/layout/fgas_textbreak.h index 28731d436c..dd42fdf030 100644 --- a/xfa/fgas/layout/fgas_textbreak.h +++ b/xfa/fgas/layout/fgas_textbreak.h @@ -7,7 +7,7 @@ #ifndef XFA_FGAS_LAYOUT_FGAS_TEXTBREAK_H_ #define XFA_FGAS_LAYOUT_FGAS_TEXTBREAK_H_ -#include "core/include/fxcrt/fx_ucd.h" +#include "core/fxcrt/include/fx_ucd.h" #include "core/include/fxge/fx_ge.h" #include "xfa/fgas/crt/fgas_utils.h" #include "xfa/fgas/layout/fgas_unicode.h" diff --git a/xfa/fgas/localization/fgas_datetime.cpp b/xfa/fgas/localization/fgas_datetime.cpp index ac5ee4a01d..456e476dee 100644 --- a/xfa/fgas/localization/fgas_datetime.cpp +++ b/xfa/fgas/localization/fgas_datetime.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_system.h" #include "xfa/fgas/localization/fgas_datetime.h" #if _FX_OS_ == _FX_LINUX_DESKTOP_ || _FX_OS_ == _FX_ANDROID_ || \ diff --git a/xfa/fgas/localization/fgas_datetime.h b/xfa/fgas/localization/fgas_datetime.h index 0a3d14d240..df2989fc58 100644 --- a/xfa/fgas/localization/fgas_datetime.h +++ b/xfa/fgas/localization/fgas_datetime.h @@ -7,7 +7,7 @@ #ifndef XFA_FGAS_LOCALIZATION_FGAS_DATETIME_H_ #define XFA_FGAS_LOCALIZATION_FGAS_DATETIME_H_ -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_system.h" class CFX_Unitime; class CFX_DateTime; diff --git a/xfa/fgas/localization/fgas_locale.cpp b/xfa/fgas/localization/fgas_locale.cpp index db94f766b5..a0dcf8e3f4 100644 --- a/xfa/fgas/localization/fgas_locale.cpp +++ b/xfa/fgas/localization/fgas_locale.cpp @@ -6,8 +6,8 @@ #include -#include "core/include/fxcrt/fx_ext.h" -#include "core/include/fxcrt/fx_xml.h" +#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/include/fx_xml.h" #include "xfa/fgas/localization/fgas_localeimp.h" #define FX_LOCALECATEGORY_DateHash 0xbde9abde diff --git a/xfa/fgas/localization/fgas_locale.h b/xfa/fgas/localization/fgas_locale.h index 3dd6c79fb7..20b6c1232e 100644 --- a/xfa/fgas/localization/fgas_locale.h +++ b/xfa/fgas/localization/fgas_locale.h @@ -7,7 +7,7 @@ #ifndef XFA_FGAS_LOCALIZATION_FGAS_LOCALE_H_ #define XFA_FGAS_LOCALIZATION_FGAS_LOCALE_H_ -#include "core/include/fxcrt/fx_xml.h" +#include "core/fxcrt/include/fx_xml.h" #include "xfa/fgas/localization/fgas_datetime.h" class CFX_Unitime; diff --git a/xfa/fgas/localization/fgas_localemgr.cpp b/xfa/fgas/localization/fgas_localemgr.cpp index 02061f75f3..ba617a0f3f 100644 --- a/xfa/fgas/localization/fgas_localemgr.cpp +++ b/xfa/fgas/localization/fgas_localemgr.cpp @@ -6,7 +6,7 @@ #include "xfa/fgas/localization/fgas_localemgr.h" -#include "core/include/fxcrt/fx_xml.h" +#include "core/fxcrt/include/fx_xml.h" IFX_LocaleMgr* FX_LocaleMgr_Create(const FX_WCHAR* pszLocalPath, uint16_t wDefaultLCID) { diff --git a/xfa/fgas/xml/fgas_sax.h b/xfa/fgas/xml/fgas_sax.h index 222b109080..de5d91493d 100644 --- a/xfa/fgas/xml/fgas_sax.h +++ b/xfa/fgas/xml/fgas_sax.h @@ -7,7 +7,7 @@ #ifndef XFA_FGAS_XML_FGAS_SAX_H_ #define XFA_FGAS_XML_FGAS_SAX_H_ -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" #define FX_SAXPARSEMODE_NotConvert_amp 0x0001 #define FX_SAXPARSEMODE_NotConvert_lt 0x0002 -- cgit v1.2.3