From 04d02dbdd511aed4ddd61d8648edc633a0fb8c43 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 22 Feb 2016 13:04:17 -0500 Subject: Expand XFA includes to be relative to pdfium/. This Cl updates the includes in the XFA directory to be relative to the pdfium/ directory instead of the current directory. This does not sort the includes as that is a larger IWYU task that will be handled separately. BUG=pdfium:65 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1723533002 . --- xfa/src/fgas/include/fgas.h | 30 +++++++++++++------------- xfa/src/fgas/include/fx_utl.h | 2 +- xfa/src/fgas/src/crt/fx_memory.cpp | 2 +- xfa/src/fgas/src/crt/fx_stream.cpp | 2 +- xfa/src/fgas/src/crt/fx_utils.cpp | 2 +- xfa/src/fgas/src/font/fx_fontutils.cpp | 2 +- xfa/src/fgas/src/font/fx_gdifont.cpp | 4 ++-- xfa/src/fgas/src/font/fx_gefont.cpp | 4 ++-- xfa/src/fgas/src/layout/fx_unicode.cpp | 2 +- xfa/src/fgas/src/localization/fx_locale.cpp | 2 +- xfa/src/fgas/src/localization/fx_localemgr.cpp | 2 +- xfa/src/fgas/src/xml/fx_sax_imp.cpp | 2 +- 12 files changed, 28 insertions(+), 28 deletions(-) (limited to 'xfa/src/fgas') diff --git a/xfa/src/fgas/include/fgas.h b/xfa/src/fgas/include/fgas.h index ba72ff3e25..8031269f1e 100644 --- a/xfa/src/fgas/include/fgas.h +++ b/xfa/src/fgas/include/fgas.h @@ -9,20 +9,20 @@ #ifndef XFA_SRC_FGAS_INCLUDE_FGAS_H_ #define XFA_SRC_FGAS_INCLUDE_FGAS_H_ -#include "fx_sys.h" -#include "fx_mem.h" -#include "fx_lgg.h" -#include "fx_utl.h" -#include "fx_alg.h" -#include "fx_cpg.h" -#include "fx_stm.h" -#include "fx_datetime.h" -#include "fx_locale.h" -#include "fx_sax.h" -#include "fx_fnt.h" -#include "fx_ucd.h" -#include "fx_lbk.h" -#include "fx_tbk.h" -#include "fx_rbk.h" +#include "xfa/src/fgas/include/fx_sys.h" +#include "xfa/src/fgas/include/fx_mem.h" +#include "xfa/src/fgas/include/fx_lgg.h" +#include "xfa/src/fgas/include/fx_utl.h" +#include "xfa/src/fgas/include/fx_alg.h" +#include "xfa/src/fgas/include/fx_cpg.h" +#include "xfa/src/fgas/include/fx_stm.h" +#include "xfa/src/fgas/include/fx_datetime.h" +#include "xfa/src/fgas/include/fx_locale.h" +#include "xfa/src/fgas/include/fx_sax.h" +#include "xfa/src/fgas/include/fx_fnt.h" +#include "xfa/src/fgas/include/fx_ucd.h" +#include "xfa/src/fgas/include/fx_lbk.h" +#include "xfa/src/fgas/include/fx_tbk.h" +#include "xfa/src/fgas/include/fx_rbk.h" #endif // XFA_SRC_FGAS_INCLUDE_FGAS_H_ diff --git a/xfa/src/fgas/include/fx_utl.h b/xfa/src/fgas/include/fx_utl.h index cd7f2a7ef2..c8d943e920 100644 --- a/xfa/src/fgas/include/fx_utl.h +++ b/xfa/src/fgas/include/fx_utl.h @@ -7,7 +7,7 @@ #ifndef XFA_SRC_FGAS_INCLUDE_FX_UTL_H_ #define XFA_SRC_FGAS_INCLUDE_FX_UTL_H_ -#include "fx_mem.h" +#include "xfa/src/fgas/include/fx_mem.h" #include "core/include/fxcrt/fx_coordinates.h" // For CFX_Rect. class CFX_ThreadLock; diff --git a/xfa/src/fgas/src/crt/fx_memory.cpp b/xfa/src/fgas/src/crt/fx_memory.cpp index 497512d8e2..6c0f98c382 100644 --- a/xfa/src/fgas/src/crt/fx_memory.cpp +++ b/xfa/src/fgas/src/crt/fx_memory.cpp @@ -7,7 +7,7 @@ #include #include "xfa/src/fgas/src/fgas_base.h" -#include "fx_memory.h" +#include "xfa/src/fgas/src/crt/fx_memory.h" #define FX_4BYTEALIGN(size) (((size) + 3) / 4 * 4) IFX_MEMAllocator* FX_CreateAllocator(FX_ALLOCTYPE eType, size_t chunkSize, diff --git a/xfa/src/fgas/src/crt/fx_stream.cpp b/xfa/src/fgas/src/crt/fx_stream.cpp index 243a5c3c43..93cdb5ec2c 100644 --- a/xfa/src/fgas/src/crt/fx_stream.cpp +++ b/xfa/src/fgas/src/crt/fx_stream.cpp @@ -7,7 +7,7 @@ #include #include "xfa/src/fgas/src/fgas_base.h" -#include "fx_stream.h" +#include "xfa/src/fgas/src/crt/fx_stream.h" IFX_Stream* IFX_Stream::CreateStream(IFX_BufferRead* pBufferRead, FX_DWORD dwAccess, int32_t iFileSize, diff --git a/xfa/src/fgas/src/crt/fx_utils.cpp b/xfa/src/fgas/src/crt/fx_utils.cpp index 7f62eb0993..2818e07035 100644 --- a/xfa/src/fgas/src/crt/fx_utils.cpp +++ b/xfa/src/fgas/src/crt/fx_utils.cpp @@ -8,7 +8,7 @@ #include "xfa/src/fgas/include/fx_utl.h" #include "xfa/src/fgas/src/fgas_base.h" -#include "fx_utils.h" +#include "xfa/src/fgas/src/crt/fx_utils.h" CFX_ThreadLock::CFX_ThreadLock() { } diff --git a/xfa/src/fgas/src/font/fx_fontutils.cpp b/xfa/src/fgas/src/font/fx_fontutils.cpp index 9372f6a572..0affb52ecf 100644 --- a/xfa/src/fgas/src/font/fx_fontutils.cpp +++ b/xfa/src/fgas/src/font/fx_fontutils.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/fgas/src/fgas_base.h" -#include "fx_fontutils.h" +#include "xfa/src/fgas/src/font/fx_fontutils.h" FX_DWORD FGAS_GetFontHashCode(FX_WORD wCodePage, FX_DWORD dwFontStyles) { FX_DWORD dwHash = wCodePage; if (dwFontStyles & FX_FONTSTYLE_FixedPitch) { diff --git a/xfa/src/fgas/src/font/fx_gdifont.cpp b/xfa/src/fgas/src/font/fx_gdifont.cpp index c14db35709..25365dd2a3 100644 --- a/xfa/src/fgas/src/font/fx_gdifont.cpp +++ b/xfa/src/fgas/src/font/fx_gdifont.cpp @@ -5,8 +5,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/fgas/src/fgas_base.h" -#include "fx_gdifont.h" -#include "fx_stdfontmgr.h" +#include "xfa/src/fgas/src/font/fx_gdifont.h" +#include "xfa/src/fgas/src/font/fx_stdfontmgr.h" #ifdef _FXPLUS #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN32_MOBILE_ || \ _FX_OS_ == _FX_WIN64_ diff --git a/xfa/src/fgas/src/font/fx_gefont.cpp b/xfa/src/fgas/src/font/fx_gefont.cpp index 93f2b7bfc2..cc8421cd5d 100644 --- a/xfa/src/fgas/src/font/fx_gefont.cpp +++ b/xfa/src/fgas/src/font/fx_gefont.cpp @@ -5,8 +5,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/fgas/src/fgas_base.h" -#include "fx_gefont.h" -#include "fx_fontutils.h" +#include "xfa/src/fgas/src/font/fx_gefont.h" +#include "xfa/src/fgas/src/font/fx_fontutils.h" #ifndef _FXPLUS IFX_Font* IFX_Font::LoadFont(const FX_WCHAR* pszFontFamily, FX_DWORD dwFontStyles, diff --git a/xfa/src/fgas/src/layout/fx_unicode.cpp b/xfa/src/fgas/src/layout/fx_unicode.cpp index 3734d5f4a6..946b8d7049 100644 --- a/xfa/src/fgas/src/layout/fx_unicode.cpp +++ b/xfa/src/fgas/src/layout/fx_unicode.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/fgas/src/fgas_base.h" -#include "fx_unicode.h" +#include "xfa/src/fgas/src/layout/fx_unicode.h" void FX_TEXTLAYOUT_PieceSort(CFX_TPOArray& tpos, int32_t iStart, int32_t iEnd) { FXSYS_assert(iStart > -1 && iStart < tpos.GetSize()); FXSYS_assert(iEnd > -1 && iEnd < tpos.GetSize()); diff --git a/xfa/src/fgas/src/localization/fx_locale.cpp b/xfa/src/fgas/src/localization/fx_locale.cpp index 072d351a3a..13939f6433 100644 --- a/xfa/src/fgas/src/localization/fx_locale.cpp +++ b/xfa/src/fgas/src/localization/fx_locale.cpp @@ -8,7 +8,7 @@ #include "core/include/fxcrt/fx_xml.h" #include "xfa/src/fgas/src/fgas_base.h" -#include "fx_localeimp.h" +#include "xfa/src/fgas/src/localization/fx_localeimp.h" #define FX_LOCALECATEGORY_DateHash 0xbde9abde #define FX_LOCALECATEGORY_TimeHash 0x2d71b00f diff --git a/xfa/src/fgas/src/localization/fx_localemgr.cpp b/xfa/src/fgas/src/localization/fx_localemgr.cpp index b7362633c6..656be0a494 100644 --- a/xfa/src/fgas/src/localization/fx_localemgr.cpp +++ b/xfa/src/fgas/src/localization/fx_localemgr.cpp @@ -6,7 +6,7 @@ #include "core/include/fxcrt/fx_xml.h" #include "xfa/src/fgas/src/fgas_base.h" -#include "fx_localemgr.h" +#include "xfa/src/fgas/src/localization/fx_localemgr.h" IFX_LocaleMgr* FX_LocaleMgr_Create(const FX_WCHAR* pszLocalPath, FX_WORD wDefaultLCID) { diff --git a/xfa/src/fgas/src/xml/fx_sax_imp.cpp b/xfa/src/fgas/src/xml/fx_sax_imp.cpp index bb1602ca72..679df907f2 100644 --- a/xfa/src/fgas/src/xml/fx_sax_imp.cpp +++ b/xfa/src/fgas/src/xml/fx_sax_imp.cpp @@ -7,7 +7,7 @@ #include #include "xfa/src/fgas/src/fgas_base.h" -#include "fx_sax_imp.h" +#include "xfa/src/fgas/src/xml/fx_sax_imp.h" namespace { -- cgit v1.2.3