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/fpdfdoc/cpdf_action.h | 2 +- core/fpdfdoc/cpdf_annot.cpp | 2 +- core/fpdfdoc/cpdf_annot.h | 6 +++--- core/fpdfdoc/cpdf_annotlist.h | 4 ++-- core/fpdfdoc/cpdf_apsettings.h | 4 ++-- core/fpdfdoc/cpdf_bookmark.h | 2 +- core/fpdfdoc/cpdf_defaultappearance.h | 6 +++--- core/fpdfdoc/cpdf_dest.h | 4 ++-- core/fpdfdoc/cpdf_docjsactions.h | 2 +- core/fpdfdoc/cpdf_filespec.cpp | 2 +- core/fpdfdoc/cpdf_filespec.h | 6 +++--- core/fpdfdoc/cpdf_formcontrol.h | 4 ++-- core/fpdfdoc/cpdf_formfield.h | 6 +++--- core/fpdfdoc/cpdf_iconfit.cpp | 2 +- core/fpdfdoc/cpdf_iconfit.h | 2 +- core/fpdfdoc/cpdf_interform.h | 4 ++-- core/fpdfdoc/cpdf_link.h | 2 +- core/fpdfdoc/cpdf_linklist.h | 2 +- core/fpdfdoc/cpdf_metadata.cpp | 2 +- core/fpdfdoc/cpdf_nametree.h | 2 +- core/fpdfdoc/cpdf_occontext.h | 2 +- core/fpdfdoc/cpdf_pagelabel.h | 2 +- core/fpdfdoc/cpdf_variabletext.h | 6 +++--- core/fpdfdoc/cpdf_viewerpreferences.h | 4 ++-- core/fpdfdoc/cpvt_arraytemplate.h | 4 ++-- core/fpdfdoc/cpvt_color.h | 4 ++-- core/fpdfdoc/cpvt_floatrect.h | 2 +- core/fpdfdoc/cpvt_fontmap.h | 2 +- core/fpdfdoc/cpvt_generateap.h | 6 +++--- core/fpdfdoc/cpvt_line.h | 4 ++-- core/fpdfdoc/cpvt_lineinfo.h | 2 +- core/fpdfdoc/cpvt_secprops.h | 2 +- core/fpdfdoc/cpvt_section.h | 2 +- core/fpdfdoc/cpvt_word.h | 2 +- core/fpdfdoc/cpvt_wordinfo.h | 2 +- core/fpdfdoc/cpvt_wordplace.h | 2 +- core/fpdfdoc/cpvt_wordprops.h | 2 +- core/fpdfdoc/cpvt_wordrange.h | 2 +- core/fpdfdoc/csection.h | 4 ++-- core/fpdfdoc/ctypeset.h | 2 +- core/fpdfdoc/ipdf_formnotify.h | 2 +- core/fpdfdoc/ipvt_fontmap.h | 2 +- core/fpdfdoc/tagged_int.h | 2 +- 43 files changed, 65 insertions(+), 65 deletions(-) (limited to 'core/fpdfdoc') diff --git a/core/fpdfdoc/cpdf_action.h b/core/fpdfdoc/cpdf_action.h index 7bef84d2e4..5b985fb855 100644 --- a/core/fpdfdoc/cpdf_action.h +++ b/core/fpdfdoc/cpdf_action.h @@ -9,7 +9,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" #include "core/fpdfdoc/cpdf_dest.h" -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" class CPDF_Document; diff --git a/core/fpdfdoc/cpdf_annot.cpp b/core/fpdfdoc/cpdf_annot.cpp index 17b2d56bef..ed43e5bab8 100644 --- a/core/fpdfdoc/cpdf_annot.cpp +++ b/core/fpdfdoc/cpdf_annot.cpp @@ -13,7 +13,7 @@ #include "core/fpdfapi/fpdf_render/cpdf_rendercontext.h" #include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h" #include "core/fpdfdoc/cpvt_generateap.h" -#include "core/fxcrt/include/fx_memory.h" +#include "core/fxcrt/fx_memory.h" #include "core/fxge/include/cfx_graphstatedata.h" #include "core/fxge/include/cfx_pathdata.h" #include "core/fxge/include/cfx_renderdevice.h" diff --git a/core/fpdfdoc/cpdf_annot.h b/core/fpdfdoc/cpdf_annot.h index f3166256d6..d4bbca91f7 100644 --- a/core/fpdfdoc/cpdf_annot.h +++ b/core/fpdfdoc/cpdf_annot.h @@ -10,9 +10,9 @@ #include #include -#include "core/fxcrt/include/fx_coordinates.h" -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" class CFX_RenderDevice; class CPDF_Dictionary; diff --git a/core/fpdfdoc/cpdf_annotlist.h b/core/fpdfdoc/cpdf_annotlist.h index afe85f33af..2488c68b0b 100644 --- a/core/fpdfdoc/cpdf_annotlist.h +++ b/core/fpdfdoc/cpdf_annotlist.h @@ -10,8 +10,8 @@ #include #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_RenderDevice; class CPDF_Annot; diff --git a/core/fpdfdoc/cpdf_apsettings.h b/core/fpdfdoc/cpdf_apsettings.h index 4354ac071f..b2ae2488a1 100644 --- a/core/fpdfdoc/cpdf_apsettings.h +++ b/core/fpdfdoc/cpdf_apsettings.h @@ -8,8 +8,8 @@ #define CORE_FPDFDOC_CPDF_APSETTINGS_H_ #include "core/fpdfdoc/cpdf_iconfit.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" #include "core/fxge/include/fx_dib.h" class CPDF_Dictionary; diff --git a/core/fpdfdoc/cpdf_bookmark.h b/core/fpdfdoc/cpdf_bookmark.h index b19ebbbd8c..30a8a512cc 100644 --- a/core/fpdfdoc/cpdf_bookmark.h +++ b/core/fpdfdoc/cpdf_bookmark.h @@ -9,7 +9,7 @@ #include "core/fpdfdoc/cpdf_action.h" #include "core/fpdfdoc/cpdf_dest.h" -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" class CPDF_Dictionary; class CPDF_Document; diff --git a/core/fpdfdoc/cpdf_defaultappearance.h b/core/fpdfdoc/cpdf_defaultappearance.h index c09a5aacf4..70b1bd4583 100644 --- a/core/fpdfdoc/cpdf_defaultappearance.h +++ b/core/fpdfdoc/cpdf_defaultappearance.h @@ -8,9 +8,9 @@ #define CORE_FPDFDOC_CPDF_DEFAULTAPPEARANCE_H_ #include "core/fpdfdoc/cpdf_defaultappearance.h" -#include "core/fxcrt/include/fx_coordinates.h" -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #include "core/fxge/include/fx_dib.h" enum class BorderStyle { SOLID, DASH, BEVELED, INSET, UNDERLINE }; diff --git a/core/fpdfdoc/cpdf_dest.h b/core/fpdfdoc/cpdf_dest.h index 7a966e26fe..8f38192fd8 100644 --- a/core/fpdfdoc/cpdf_dest.h +++ b/core/fpdfdoc/cpdf_dest.h @@ -7,8 +7,8 @@ #ifndef CORE_FPDFDOC_CPDF_DEST_H_ #define CORE_FPDFDOC_CPDF_DEST_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_Document; class CPDF_Object; diff --git a/core/fpdfdoc/cpdf_docjsactions.h b/core/fpdfdoc/cpdf_docjsactions.h index 34b8b7ed9e..8a8d03d364 100644 --- a/core/fpdfdoc/cpdf_docjsactions.h +++ b/core/fpdfdoc/cpdf_docjsactions.h @@ -8,7 +8,7 @@ #define CORE_FPDFDOC_CPDF_DOCJSACTIONS_H_ #include "core/fpdfdoc/cpdf_action.h" -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" class CPDF_Document; diff --git a/core/fpdfdoc/cpdf_filespec.cpp b/core/fpdfdoc/cpdf_filespec.cpp index 51b8b356a5..c361113df5 100644 --- a/core/fpdfdoc/cpdf_filespec.cpp +++ b/core/fpdfdoc/cpdf_filespec.cpp @@ -9,7 +9,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/cpdf_object.h" #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" namespace { diff --git a/core/fpdfdoc/cpdf_filespec.h b/core/fpdfdoc/cpdf_filespec.h index c960a839f4..6266c37a47 100644 --- a/core/fpdfdoc/cpdf_filespec.h +++ b/core/fpdfdoc/cpdf_filespec.h @@ -7,9 +7,9 @@ #ifndef CORE_FPDFDOC_CPDF_FILESPEC_H_ #define CORE_FPDFDOC_CPDF_FILESPEC_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" class CPDF_Object; diff --git a/core/fpdfdoc/cpdf_formcontrol.h b/core/fpdfdoc/cpdf_formcontrol.h index 3f6cb537ce..1ad79ee6f7 100644 --- a/core/fpdfdoc/cpdf_formcontrol.h +++ b/core/fpdfdoc/cpdf_formcontrol.h @@ -16,8 +16,8 @@ #include "core/fpdfdoc/cpdf_formfield.h" #include "core/fpdfdoc/cpdf_iconfit.h" #include "core/fpdfdoc/ipdf_formnotify.h" -#include "core/fxcrt/include/fx_coordinates.h" -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/fx_string.h" #include "core/fxge/include/fx_dib.h" #define TEXTPOS_CAPTION 0 diff --git a/core/fpdfdoc/cpdf_formfield.h b/core/fpdfdoc/cpdf_formfield.h index 1d83eb060c..abdd6f78b9 100644 --- a/core/fpdfdoc/cpdf_formfield.h +++ b/core/fpdfdoc/cpdf_formfield.h @@ -9,9 +9,9 @@ #include "core/fpdfdoc/cpdf_aaction.h" #include "core/fpdfdoc/cpdf_formfield.h" -#include "core/fxcrt/include/fx_basic.h" -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #define FIELDTYPE_UNKNOWN 0 #define FIELDTYPE_PUSHBUTTON 1 diff --git a/core/fpdfdoc/cpdf_iconfit.cpp b/core/fpdfdoc/cpdf_iconfit.cpp index 1b800b6be9..dacd521c80 100644 --- a/core/fpdfdoc/cpdf_iconfit.cpp +++ b/core/fpdfdoc/cpdf_iconfit.cpp @@ -8,7 +8,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" CPDF_IconFit::ScaleMethod CPDF_IconFit::GetScaleMethod() { if (!m_pDict) diff --git a/core/fpdfdoc/cpdf_iconfit.h b/core/fpdfdoc/cpdf_iconfit.h index 746161475e..1ef023ab5f 100644 --- a/core/fpdfdoc/cpdf_iconfit.h +++ b/core/fpdfdoc/cpdf_iconfit.h @@ -7,7 +7,7 @@ #ifndef CORE_FPDFDOC_CPDF_ICONFIT_H_ #define CORE_FPDFDOC_CPDF_ICONFIT_H_ -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" class CPDF_Dictionary; diff --git a/core/fpdfdoc/cpdf_interform.h b/core/fpdfdoc/cpdf_interform.h index 4c62a401b7..71d4517cbb 100644 --- a/core/fpdfdoc/cpdf_interform.h +++ b/core/fpdfdoc/cpdf_interform.h @@ -13,8 +13,8 @@ #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h" #include "core/fpdfdoc/cpdf_defaultappearance.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 CFieldTree; class CFDF_Document; diff --git a/core/fpdfdoc/cpdf_link.h b/core/fpdfdoc/cpdf_link.h index ce99573e91..162630d6ac 100644 --- a/core/fpdfdoc/cpdf_link.h +++ b/core/fpdfdoc/cpdf_link.h @@ -9,7 +9,7 @@ #include "core/fpdfdoc/cpdf_action.h" #include "core/fpdfdoc/cpdf_dest.h" -#include "core/fxcrt/include/fx_coordinates.h" +#include "core/fxcrt/fx_coordinates.h" class CPDF_Dictionary; diff --git a/core/fpdfdoc/cpdf_linklist.h b/core/fpdfdoc/cpdf_linklist.h index d5c0432671..21d69fdd1d 100644 --- a/core/fpdfdoc/cpdf_linklist.h +++ b/core/fpdfdoc/cpdf_linklist.h @@ -11,7 +11,7 @@ #include #include "core/fpdfdoc/cpdf_link.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" class CPDF_Page; class CPDF_Dictionary; diff --git a/core/fpdfdoc/cpdf_metadata.cpp b/core/fpdfdoc/cpdf_metadata.cpp index 8186c70c54..3f90b66a64 100644 --- a/core/fpdfdoc/cpdf_metadata.cpp +++ b/core/fpdfdoc/cpdf_metadata.cpp @@ -9,7 +9,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h" -#include "core/fxcrt/include/fx_xml.h" +#include "core/fxcrt/fx_xml.h" CPDF_Metadata::CPDF_Metadata(CPDF_Document* pDoc) { CPDF_Dictionary* pRoot = pDoc->GetRoot(); diff --git a/core/fpdfdoc/cpdf_nametree.h b/core/fpdfdoc/cpdf_nametree.h index 45308b7de5..d6763ad987 100644 --- a/core/fpdfdoc/cpdf_nametree.h +++ b/core/fpdfdoc/cpdf_nametree.h @@ -7,7 +7,7 @@ #ifndef CORE_FPDFDOC_CPDF_NAMETREE_H_ #define CORE_FPDFDOC_CPDF_NAMETREE_H_ -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" class CPDF_Array; class CPDF_Dictionary; diff --git a/core/fpdfdoc/cpdf_occontext.h b/core/fpdfdoc/cpdf_occontext.h index 5c850b9400..49bbd76d0c 100644 --- a/core/fpdfdoc/cpdf_occontext.h +++ b/core/fpdfdoc/cpdf_occontext.h @@ -9,7 +9,7 @@ #include -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" class CPDF_Array; class CPDF_Dictionary; diff --git a/core/fpdfdoc/cpdf_pagelabel.h b/core/fpdfdoc/cpdf_pagelabel.h index 16acf3b701..6a0664bfca 100644 --- a/core/fpdfdoc/cpdf_pagelabel.h +++ b/core/fpdfdoc/cpdf_pagelabel.h @@ -7,7 +7,7 @@ #ifndef CORE_FPDFDOC_CPDF_PAGELABEL_H_ #define CORE_FPDFDOC_CPDF_PAGELABEL_H_ -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" class CPDF_Document; diff --git a/core/fpdfdoc/cpdf_variabletext.h b/core/fpdfdoc/cpdf_variabletext.h index cc13b33f30..e57636e821 100644 --- a/core/fpdfdoc/cpdf_variabletext.h +++ b/core/fpdfdoc/cpdf_variabletext.h @@ -15,9 +15,9 @@ #include "core/fpdfdoc/cpvt_lineinfo.h" #include "core/fpdfdoc/cpvt_wordplace.h" #include "core/fpdfdoc/cpvt_wordrange.h" -#include "core/fxcrt/include/fx_coordinates.h" -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" #include "core/fxge/include/fx_font.h" class CSection; diff --git a/core/fpdfdoc/cpdf_viewerpreferences.h b/core/fpdfdoc/cpdf_viewerpreferences.h index 9375e85b25..f400c37b97 100644 --- a/core/fpdfdoc/cpdf_viewerpreferences.h +++ b/core/fpdfdoc/cpdf_viewerpreferences.h @@ -7,8 +7,8 @@ #ifndef CORE_FPDFDOC_CPDF_VIEWERPREFERENCES_H_ #define CORE_FPDFDOC_CPDF_VIEWERPREFERENCES_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_Array; class CPDF_Dictionary; diff --git a/core/fpdfdoc/cpvt_arraytemplate.h b/core/fpdfdoc/cpvt_arraytemplate.h index a0f129d083..5274bd9ba4 100644 --- a/core/fpdfdoc/cpvt_arraytemplate.h +++ b/core/fpdfdoc/cpvt_arraytemplate.h @@ -7,8 +7,8 @@ #ifndef CORE_FPDFDOC_CPVT_ARRAYTEMPLATE_H_ #define CORE_FPDFDOC_CPVT_ARRAYTEMPLATE_H_ -#include "core/fxcrt/include/fx_basic.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/fx_system.h" template class CPVT_ArrayTemplate : public CFX_ArrayTemplate { diff --git a/core/fpdfdoc/cpvt_color.h b/core/fpdfdoc/cpvt_color.h index 1be6bebae7..0eec252703 100644 --- a/core/fpdfdoc/cpvt_color.h +++ b/core/fpdfdoc/cpvt_color.h @@ -8,8 +8,8 @@ #define CORE_FPDFDOC_CPVT_COLOR_H_ #include "core/fpdfapi/fpdf_parser/cpdf_array.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" struct CPVT_Color { enum Type { kTransparent = 0, kGray, kRGB, kCMYK }; diff --git a/core/fpdfdoc/cpvt_floatrect.h b/core/fpdfdoc/cpvt_floatrect.h index d58161034b..6fc4b8ebce 100644 --- a/core/fpdfdoc/cpvt_floatrect.h +++ b/core/fpdfdoc/cpvt_floatrect.h @@ -7,7 +7,7 @@ #ifndef CORE_FPDFDOC_CPVT_FLOATRECT_H_ #define CORE_FPDFDOC_CPVT_FLOATRECT_H_ -#include "core/fxcrt/include/fx_coordinates.h" +#include "core/fxcrt/fx_coordinates.h" class CPVT_FloatRect : public CFX_FloatRect { public: diff --git a/core/fpdfdoc/cpvt_fontmap.h b/core/fpdfdoc/cpvt_fontmap.h index d5ec87948d..98e390f409 100644 --- a/core/fpdfdoc/cpvt_fontmap.h +++ b/core/fpdfdoc/cpvt_fontmap.h @@ -10,7 +10,7 @@ #include #include "core/fpdfdoc/ipvt_fontmap.h" -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" class CPDF_Document; class CPDF_Dictionary; diff --git a/core/fpdfdoc/cpvt_generateap.h b/core/fpdfdoc/cpvt_generateap.h index 603d4458f4..5a52d87250 100644 --- a/core/fpdfdoc/cpvt_generateap.h +++ b/core/fpdfdoc/cpvt_generateap.h @@ -11,9 +11,9 @@ #include "core/fpdfdoc/cpdf_variabletext.h" #include "core/fpdfdoc/cpvt_color.h" #include "core/fpdfdoc/cpvt_dash.h" -#include "core/fxcrt/include/fx_coordinates.h" -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" class CPDF_Dictionary; class CPDF_Document; diff --git a/core/fpdfdoc/cpvt_line.h b/core/fpdfdoc/cpvt_line.h index 70e3b7f40b..25ae34af16 100644 --- a/core/fpdfdoc/cpvt_line.h +++ b/core/fpdfdoc/cpvt_line.h @@ -8,8 +8,8 @@ #define CORE_FPDFDOC_CPVT_LINE_H_ #include "core/fpdfdoc/cpvt_wordplace.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" struct CPVT_Line { CPVT_Line() : fLineWidth(0.0f), fLineAscent(0.0f), fLineDescent(0.0f) {} diff --git a/core/fpdfdoc/cpvt_lineinfo.h b/core/fpdfdoc/cpvt_lineinfo.h index ab66d8c540..2ebc51cb8e 100644 --- a/core/fpdfdoc/cpvt_lineinfo.h +++ b/core/fpdfdoc/cpvt_lineinfo.h @@ -7,7 +7,7 @@ #ifndef CORE_FPDFDOC_CPVT_LINEINFO_H_ #define CORE_FPDFDOC_CPVT_LINEINFO_H_ -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" struct CPVT_LineInfo { CPVT_LineInfo() diff --git a/core/fpdfdoc/cpvt_secprops.h b/core/fpdfdoc/cpvt_secprops.h index e5c633f2c4..d1c4b589f1 100644 --- a/core/fpdfdoc/cpvt_secprops.h +++ b/core/fpdfdoc/cpvt_secprops.h @@ -7,7 +7,7 @@ #ifndef CORE_FPDFDOC_CPVT_SECPROPS_H_ #define CORE_FPDFDOC_CPVT_SECPROPS_H_ -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" struct CPVT_SecProps { CPVT_SecProps() : fLineLeading(0.0f), fLineIndent(0.0f), nAlignment(0) {} diff --git a/core/fpdfdoc/cpvt_section.h b/core/fpdfdoc/cpvt_section.h index ae122902d8..42b16fd310 100644 --- a/core/fpdfdoc/cpvt_section.h +++ b/core/fpdfdoc/cpvt_section.h @@ -10,7 +10,7 @@ #include "core/fpdfdoc/cpvt_secprops.h" #include "core/fpdfdoc/cpvt_wordplace.h" #include "core/fpdfdoc/cpvt_wordprops.h" -#include "core/fxcrt/include/fx_coordinates.h" +#include "core/fxcrt/fx_coordinates.h" struct CPVT_Section { CPVT_WordPlace secplace; diff --git a/core/fpdfdoc/cpvt_word.h b/core/fpdfdoc/cpvt_word.h index 1e3b5aa0bd..92a4ce1e94 100644 --- a/core/fpdfdoc/cpvt_word.h +++ b/core/fpdfdoc/cpvt_word.h @@ -9,7 +9,7 @@ #include "core/fpdfdoc/cpvt_wordplace.h" #include "core/fpdfdoc/cpvt_wordprops.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" struct CPVT_Word { CPVT_Word(); diff --git a/core/fpdfdoc/cpvt_wordinfo.h b/core/fpdfdoc/cpvt_wordinfo.h index 3bb452a005..861534b0a5 100644 --- a/core/fpdfdoc/cpvt_wordinfo.h +++ b/core/fpdfdoc/cpvt_wordinfo.h @@ -10,7 +10,7 @@ #include #include "core/fpdfdoc/cpvt_wordprops.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" struct CPVT_WordInfo { CPVT_WordInfo(); diff --git a/core/fpdfdoc/cpvt_wordplace.h b/core/fpdfdoc/cpvt_wordplace.h index 33ba7c9ce1..00b5215d57 100644 --- a/core/fpdfdoc/cpvt_wordplace.h +++ b/core/fpdfdoc/cpvt_wordplace.h @@ -7,7 +7,7 @@ #ifndef CORE_FPDFDOC_CPVT_WORDPLACE_H_ #define CORE_FPDFDOC_CPVT_WORDPLACE_H_ -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" struct CPVT_WordPlace { CPVT_WordPlace() : nSecIndex(-1), nLineIndex(-1), nWordIndex(-1) {} diff --git a/core/fpdfdoc/cpvt_wordprops.h b/core/fpdfdoc/cpvt_wordprops.h index 25d8d76f00..ca95755dbd 100644 --- a/core/fpdfdoc/cpvt_wordprops.h +++ b/core/fpdfdoc/cpvt_wordprops.h @@ -8,7 +8,7 @@ #define CORE_FPDFDOC_CPVT_WORDPROPS_H_ #include "core/fpdfdoc/cpdf_variabletext.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" #include "core/fxge/include/fx_dib.h" struct CPVT_WordProps { diff --git a/core/fpdfdoc/cpvt_wordrange.h b/core/fpdfdoc/cpvt_wordrange.h index 3cd0ecfb99..a92613c6a7 100644 --- a/core/fpdfdoc/cpvt_wordrange.h +++ b/core/fpdfdoc/cpvt_wordrange.h @@ -8,7 +8,7 @@ #define CORE_FPDFDOC_CPVT_WORDRANGE_H_ #include "core/fpdfdoc/cpvt_wordplace.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" struct CPVT_WordRange { CPVT_WordRange() {} diff --git a/core/fpdfdoc/csection.h b/core/fpdfdoc/csection.h index 8629be71a7..706f5b67bb 100644 --- a/core/fpdfdoc/csection.h +++ b/core/fpdfdoc/csection.h @@ -10,8 +10,8 @@ #include "core/fpdfdoc/clines.h" #include "core/fpdfdoc/cpvt_sectioninfo.h" #include "core/fpdfdoc/ctypeset.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_VariableText; diff --git a/core/fpdfdoc/ctypeset.h b/core/fpdfdoc/ctypeset.h index 1ead422f6b..3f6551d18c 100644 --- a/core/fpdfdoc/ctypeset.h +++ b/core/fpdfdoc/ctypeset.h @@ -8,7 +8,7 @@ #define CORE_FPDFDOC_CTYPESET_H_ #include "core/fpdfdoc/cpvt_floatrect.h" -#include "core/fxcrt/include/fx_system.h" +#include "core/fxcrt/fx_system.h" class CPDF_VariableText; class CSection; diff --git a/core/fpdfdoc/ipdf_formnotify.h b/core/fpdfdoc/ipdf_formnotify.h index 4937bb1f0e..bf6127dce2 100644 --- a/core/fpdfdoc/ipdf_formnotify.h +++ b/core/fpdfdoc/ipdf_formnotify.h @@ -7,7 +7,7 @@ #ifndef CORE_FPDFDOC_IPDF_FORMNOTIFY_H_ #define CORE_FPDFDOC_IPDF_FORMNOTIFY_H_ -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" class CPDF_FormField; class CPDF_InterForm; diff --git a/core/fpdfdoc/ipvt_fontmap.h b/core/fpdfdoc/ipvt_fontmap.h index 072783b70c..740cb19eb8 100644 --- a/core/fpdfdoc/ipvt_fontmap.h +++ b/core/fpdfdoc/ipvt_fontmap.h @@ -9,7 +9,7 @@ #include -#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/fx_string.h" class CPDF_Font; diff --git a/core/fpdfdoc/tagged_int.h b/core/fpdfdoc/tagged_int.h index 871a01eeb7..14dfaf58b4 100644 --- a/core/fpdfdoc/tagged_int.h +++ b/core/fpdfdoc/tagged_int.h @@ -12,7 +12,7 @@ #include #include "core/fpdfdoc/fpdf_tagged.h" -#include "core/fxcrt/include/cfx_retain_ptr.h" +#include "core/fxcrt/cfx_retain_ptr.h" #include "third_party/base/stl_util.h" class CPDF_StructElementImpl; -- cgit v1.2.3