From a52ab741019342fbca0468e43a01deb44fa5f1bd Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 29 Sep 2016 13:59:29 -0700 Subject: Move core/fxcrt/include to core/fxcrt BUG=pdfium:611 Review-Url: https://codereview.chromium.org/2382723003 --- 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_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_gefont.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 | 4 ++-- xfa/fgas/layout/fgas_rtfbreak.h | 4 ++-- xfa/fgas/layout/fgas_textbreak.cpp | 6 +++--- 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 +- 21 files changed, 28 insertions(+), 28 deletions(-) (limited to 'xfa/fgas') diff --git a/xfa/fgas/crt/fgas_codepage.cpp b/xfa/fgas/crt/fgas_codepage.cpp index 57f3e1e322..86aeb7b983 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/fxcrt/include/fx_ext.h" +#include "core/fxcrt/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 78aee83219..2beed27552 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/fxcrt/include/fx_basic.h" +#include "core/fxcrt/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 1034c417d7..4e4e33f7fc 100644 --- a/xfa/fgas/crt/fgas_memory.h +++ b/xfa/fgas/crt/fgas_memory.h @@ -9,8 +9,8 @@ #include -#include "core/fxcrt/include/fx_memory.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_memory.h" +#include "core/fxcrt/fx_system.h" enum FX_ALLOCTYPE { FX_ALLOCTYPE_Static, diff --git a/xfa/fgas/crt/fgas_stream.h b/xfa/fgas/crt/fgas_stream.h index 443e8c7f5c..637402f1f5 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/fxcrt/include/fx_stream.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_stream.h" +#include "core/fxcrt/fx_system.h" class IFX_Stream; diff --git a/xfa/fgas/crt/fgas_utils.cpp b/xfa/fgas/crt/fgas_utils.cpp index e1f7c477fd..150a65af19 100644 --- a/xfa/fgas/crt/fgas_utils.cpp +++ b/xfa/fgas/crt/fgas_utils.cpp @@ -8,7 +8,7 @@ #include -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/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 d7b753994c..c45f42405f 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/fxcrt/include/fx_coordinates.h" +#include "core/fxcrt/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 c31e1e08ca..8e923c1209 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/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" #include "xfa/fgas/font/fgas_font.h" uint32_t FGAS_GetFontHashCode(uint16_t wCodePage, uint32_t dwFontStyles) { diff --git a/xfa/fgas/font/fgas_fontutils.h b/xfa/fgas/font/fgas_fontutils.h index 4cb4671238..d7055ced9b 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/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" struct FGAS_FONTUSB { uint16_t wStartUnicode; diff --git a/xfa/fgas/font/fgas_gefont.h b/xfa/fgas/font/fgas_gefont.h index 7f3cc60478..5a13aec372 100644 --- a/xfa/fgas/font/fgas_gefont.h +++ b/xfa/fgas/font/fgas_gefont.h @@ -9,7 +9,7 @@ #include -#include "core/fxcrt/include/fx_memory.h" +#include "core/fxcrt/fx_memory.h" #include "xfa/fgas/crt/fgas_utils.h" #include "xfa/fgas/font/fgas_font.h" diff --git a/xfa/fgas/font/fgas_stdfontmgr.cpp b/xfa/fgas/font/fgas_stdfontmgr.cpp index 96081f5799..93f1a7a436 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/fxcrt/include/fx_stream.h" +#include "core/fxcrt/fx_stream.h" #include "core/fxge/include/cfx_fontmapper.h" #include "core/fxge/include/cfx_fontmgr.h" #include "core/fxge/include/cfx_gemodule.h" diff --git a/xfa/fgas/font/fgas_stdfontmgr.h b/xfa/fgas/font/fgas_stdfontmgr.h index 6fed90da50..f2d87b9002 100644 --- a/xfa/fgas/font/fgas_stdfontmgr.h +++ b/xfa/fgas/font/fgas_stdfontmgr.h @@ -9,7 +9,7 @@ #include -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" #include "core/fxge/include/cfx_fontmapper.h" #include "core/fxge/include/fx_freetype.h" #include "core/fxge/include/ifx_systemfontinfo.h" diff --git a/xfa/fgas/layout/fgas_linebreak.cpp b/xfa/fgas/layout/fgas_linebreak.cpp index 519ccc590a..2a9e3be522 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/fxcrt/include/fx_ucd.h" +#include "core/fxcrt/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 a96841ef7e..99333dfa47 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/fxcrt/include/fx_system.h" +#include "core/fxcrt/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 21ed0665b9..dfe066f7f4 100644 --- a/xfa/fgas/layout/fgas_rtfbreak.cpp +++ b/xfa/fgas/layout/fgas_rtfbreak.cpp @@ -8,8 +8,8 @@ #include -#include "core/fxcrt/include/fx_arabic.h" -#include "core/fxcrt/include/fx_arb.h" +#include "core/fxcrt/fx_arabic.h" +#include "core/fxcrt/fx_arb.h" #include "xfa/fgas/font/fgas_gefont.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 35b790f39b..3b8551b72c 100644 --- a/xfa/fgas/layout/fgas_rtfbreak.h +++ b/xfa/fgas/layout/fgas_rtfbreak.h @@ -7,8 +7,8 @@ #ifndef XFA_FGAS_LAYOUT_FGAS_RTFBREAK_H_ #define XFA_FGAS_LAYOUT_FGAS_RTFBREAK_H_ -#include "core/fxcrt/include/fx_basic.h" -#include "core/fxcrt/include/fx_ucd.h" +#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/fx_ucd.h" #include "xfa/fgas/crt/fgas_memory.h" #include "xfa/fgas/crt/fgas_utils.h" #include "xfa/fgas/layout/fgas_textbreak.h" diff --git a/xfa/fgas/layout/fgas_textbreak.cpp b/xfa/fgas/layout/fgas_textbreak.cpp index e10ef01336..d9a0e22e8b 100644 --- a/xfa/fgas/layout/fgas_textbreak.cpp +++ b/xfa/fgas/layout/fgas_textbreak.cpp @@ -8,9 +8,9 @@ #include -#include "core/fxcrt/include/fx_arabic.h" -#include "core/fxcrt/include/fx_arb.h" -#include "core/fxcrt/include/fx_memory.h" +#include "core/fxcrt/fx_arabic.h" +#include "core/fxcrt/fx_arb.h" +#include "core/fxcrt/fx_memory.h" #include "xfa/fgas/font/fgas_gefont.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 b5f8ca1edc..062646f8b4 100644 --- a/xfa/fgas/layout/fgas_textbreak.h +++ b/xfa/fgas/layout/fgas_textbreak.h @@ -9,7 +9,7 @@ #include -#include "core/fxcrt/include/fx_ucd.h" +#include "core/fxcrt/fx_ucd.h" #include "core/fxge/include/cfx_renderdevice.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 f658d3597d..18e30fcb86 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/fxcrt/include/fx_system.h" +#include "core/fxcrt/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 7c8f111bfc..52d665a9c6 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/fxcrt/include/fx_system.h" +#include "core/fxcrt/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 2a77bbe7ed..7393d58096 100644 --- a/xfa/fgas/localization/fgas_locale.cpp +++ b/xfa/fgas/localization/fgas_locale.cpp @@ -6,8 +6,8 @@ #include -#include "core/fxcrt/include/fx_ext.h" -#include "core/fxcrt/include/fx_xml.h" +#include "core/fxcrt/fx_ext.h" +#include "core/fxcrt/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 cc565a6d77..5b4c7f8147 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/fxcrt/include/fx_xml.h" +#include "core/fxcrt/fx_xml.h" #include "xfa/fgas/localization/fgas_datetime.h" class CFX_Unitime; -- cgit v1.2.3