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 --- core/fpdfapi/fpdf_font/cpdf_cidfont.h | 4 ++-- core/fpdfapi/fpdf_font/cpdf_font.cpp | 2 +- core/fpdfapi/fpdf_font/cpdf_font.h | 4 ++-- core/fpdfapi/fpdf_font/cpdf_fontencoding.h | 6 +++--- core/fpdfapi/fpdf_font/cpdf_simplefont.h | 4 ++-- core/fpdfapi/fpdf_font/cpdf_truetypefont.h | 2 +- core/fpdfapi/fpdf_font/cpdf_type1font.h | 2 +- core/fpdfapi/fpdf_font/cpdf_type3char.h | 4 ++-- core/fpdfapi/fpdf_font/cpdf_type3font.cpp | 2 +- core/fpdfapi/fpdf_font/cpdf_type3font.h | 4 ++-- core/fpdfapi/fpdf_font/font_int.h | 2 +- core/fpdfapi/fpdf_font/fpdf_font.cpp | 2 +- core/fpdfapi/fpdf_font/fpdf_font_cid.cpp | 2 +- core/fpdfapi/fpdf_font/ttgsubtable.h | 2 +- 14 files changed, 21 insertions(+), 21 deletions(-) (limited to 'core/fpdfapi/fpdf_font') diff --git a/core/fpdfapi/fpdf_font/cpdf_cidfont.h b/core/fpdfapi/fpdf_font/cpdf_cidfont.h index c79e97bdf2..2c7df93b64 100644 --- a/core/fpdfapi/fpdf_font/cpdf_cidfont.h +++ b/core/fpdfapi/fpdf_font/cpdf_cidfont.h @@ -10,8 +10,8 @@ #include #include "core/fpdfapi/fpdf_font/cpdf_font.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" enum CIDSet { CIDSET_UNKNOWN, diff --git a/core/fpdfapi/fpdf_font/cpdf_font.cpp b/core/fpdfapi/fpdf_font/cpdf_font.cpp index e431d3d31b..fd9a666d03 100644 --- a/core/fpdfapi/fpdf_font/cpdf_font.cpp +++ b/core/fpdfapi/fpdf_font/cpdf_font.cpp @@ -22,7 +22,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "core/fpdfapi/fpdf_parser/cpdf_name.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h" -#include "core/fxcrt/include/fx_memory.h" +#include "core/fxcrt/fx_memory.h" #include "core/fxge/include/fx_freetype.h" #include "third_party/base/stl_util.h" diff --git a/core/fpdfapi/fpdf_font/cpdf_font.h b/core/fpdfapi/fpdf_font/cpdf_font.h index f94758c309..00fcfd7ddd 100644 --- a/core/fpdfapi/fpdf_font/cpdf_font.h +++ b/core/fpdfapi/fpdf_font/cpdf_font.h @@ -10,8 +10,8 @@ #include #include -#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 "core/fxge/include/fx_font.h" #define PDFFONT_FIXEDPITCH 1 diff --git a/core/fpdfapi/fpdf_font/cpdf_fontencoding.h b/core/fpdfapi/fpdf_font/cpdf_fontencoding.h index da0f262fc4..f8db9e5ea7 100644 --- a/core/fpdfapi/fpdf_font/cpdf_fontencoding.h +++ b/core/fpdfapi/fpdf_font/cpdf_fontencoding.h @@ -7,9 +7,9 @@ #ifndef CORE_FPDFAPI_FPDF_FONT_CPDF_FONTENCODING_H_ #define CORE_FPDFAPI_FPDF_FONT_CPDF_FONTENCODING_H_ -#include "core/fxcrt/include/cfx_string_pool_template.h" -#include "core/fxcrt/include/cfx_weak_ptr.h" -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/cfx_string_pool_template.h" +#include "core/fxcrt/cfx_weak_ptr.h" +#include "core/fxcrt/fx_string.h" #define PDFFONT_ENCODING_BUILTIN 0 #define PDFFONT_ENCODING_WINANSI 1 diff --git a/core/fpdfapi/fpdf_font/cpdf_simplefont.h b/core/fpdfapi/fpdf_font/cpdf_simplefont.h index 0d4da46351..47067687a3 100644 --- a/core/fpdfapi/fpdf_font/cpdf_simplefont.h +++ b/core/fpdfapi/fpdf_font/cpdf_simplefont.h @@ -11,8 +11,8 @@ #include "core/fpdfapi/fpdf_font/cpdf_font.h" #include "core/fpdfapi/fpdf_font/cpdf_fontencoding.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_SimpleFont : public CPDF_Font { public: diff --git a/core/fpdfapi/fpdf_font/cpdf_truetypefont.h b/core/fpdfapi/fpdf_font/cpdf_truetypefont.h index 1131371d18..8711b8f53d 100644 --- a/core/fpdfapi/fpdf_font/cpdf_truetypefont.h +++ b/core/fpdfapi/fpdf_font/cpdf_truetypefont.h @@ -8,7 +8,7 @@ #define CORE_FPDFAPI_FPDF_FONT_CPDF_TRUETYPEFONT_H_ #include "core/fpdfapi/fpdf_font/cpdf_simplefont.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" class CPDF_TrueTypeFont : public CPDF_SimpleFont { public: diff --git a/core/fpdfapi/fpdf_font/cpdf_type1font.h b/core/fpdfapi/fpdf_font/cpdf_type1font.h index e13238f4e4..3cc59aa85b 100644 --- a/core/fpdfapi/fpdf_font/cpdf_type1font.h +++ b/core/fpdfapi/fpdf_font/cpdf_type1font.h @@ -8,7 +8,7 @@ #define CORE_FPDFAPI_FPDF_FONT_CPDF_TYPE1FONT_H_ #include "core/fpdfapi/fpdf_font/cpdf_simplefont.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" class CPDF_Type1Font : public CPDF_SimpleFont { public: diff --git a/core/fpdfapi/fpdf_font/cpdf_type3char.h b/core/fpdfapi/fpdf_font/cpdf_type3char.h index 7b101d3172..325490678d 100644 --- a/core/fpdfapi/fpdf_font/cpdf_type3char.h +++ b/core/fpdfapi/fpdf_font/cpdf_type3char.h @@ -9,8 +9,8 @@ #include -#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" class CFX_DIBitmap; class CPDF_Form; diff --git a/core/fpdfapi/fpdf_font/cpdf_type3font.cpp b/core/fpdfapi/fpdf_font/cpdf_type3font.cpp index da30e447c0..4c81202bc4 100644 --- a/core/fpdfapi/fpdf_font/cpdf_type3font.cpp +++ b/core/fpdfapi/fpdf_font/cpdf_type3font.cpp @@ -13,7 +13,7 @@ #include "core/fpdfapi/fpdf_page/pageint.h" #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" #include "third_party/base/stl_util.h" CPDF_Type3Font::CPDF_Type3Font() diff --git a/core/fpdfapi/fpdf_font/cpdf_type3font.h b/core/fpdfapi/fpdf_font/cpdf_type3font.h index c66b270b18..2b840f2267 100644 --- a/core/fpdfapi/fpdf_font/cpdf_type3font.h +++ b/core/fpdfapi/fpdf_font/cpdf_type3font.h @@ -11,8 +11,8 @@ #include #include "core/fpdfapi/fpdf_font/cpdf_simplefont.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" class CPDF_Dictionary; class CPDF_Type3Char; diff --git a/core/fpdfapi/fpdf_font/font_int.h b/core/fpdfapi/fpdf_font/font_int.h index 3a30b54c02..dce9e0c48f 100644 --- a/core/fpdfapi/fpdf_font/font_int.h +++ b/core/fpdfapi/fpdf_font/font_int.h @@ -11,7 +11,7 @@ #include #include "core/fpdfapi/fpdf_font/cpdf_cidfont.h" -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" class CPDF_CID2UnicodeMap; class CPDF_CMap; diff --git a/core/fpdfapi/fpdf_font/fpdf_font.cpp b/core/fpdfapi/fpdf_font/fpdf_font.cpp index 5302ba75b8..722e74dde5 100644 --- a/core/fpdfapi/fpdf_font/fpdf_font.cpp +++ b/core/fpdfapi/fpdf_font/fpdf_font.cpp @@ -17,7 +17,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_number.h" #include "core/fpdfapi/fpdf_parser/cpdf_simple_parser.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h" -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" #include "core/fxge/include/fx_freetype.h" #include "third_party/base/numerics/safe_conversions.h" #include "third_party/base/stl_util.h" diff --git a/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp index dcb8593591..891ca7f9ea 100644 --- a/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp +++ b/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp @@ -13,7 +13,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/cpdf_simple_parser.h" -#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/fx_ext.h" #include "core/fxge/include/fx_freetype.h" namespace { diff --git a/core/fpdfapi/fpdf_font/ttgsubtable.h b/core/fpdfapi/fpdf_font/ttgsubtable.h index 6e69517c72..759eea4036 100644 --- a/core/fpdfapi/fpdf_font/ttgsubtable.h +++ b/core/fpdfapi/fpdf_font/ttgsubtable.h @@ -12,7 +12,7 @@ #include #include -#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/fx_basic.h" #include "core/fxge/include/fx_font.h" #include "core/fxge/include/fx_freetype.h" -- cgit v1.2.3