From 74a34fc71ab02400a4c958709138302a1ab4c0e7 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 29 Sep 2016 16:41:42 -0700 Subject: Move core/fxge/include to core/fxge BUG=pdfium:611 Review-Url: https://codereview.chromium.org/2377393002 --- core/fpdfdoc/cpdf_annot.cpp | 6 +++--- core/fpdfdoc/cpdf_annotlist.cpp | 2 +- core/fpdfdoc/cpdf_apsettings.h | 2 +- core/fpdfdoc/cpdf_bookmark.cpp | 2 +- core/fpdfdoc/cpdf_defaultappearance.h | 2 +- core/fpdfdoc/cpdf_formcontrol.cpp | 2 +- core/fpdfdoc/cpdf_formcontrol.h | 2 +- core/fpdfdoc/cpdf_interform.cpp | 4 ++-- core/fpdfdoc/cpdf_variabletext.h | 2 +- core/fpdfdoc/cpvt_wordprops.h | 2 +- core/fpdfdoc/fpdf_tagged.h | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) (limited to 'core/fpdfdoc') diff --git a/core/fpdfdoc/cpdf_annot.cpp b/core/fpdfdoc/cpdf_annot.cpp index ed43e5bab8..3df5ca5144 100644 --- a/core/fpdfdoc/cpdf_annot.cpp +++ b/core/fpdfdoc/cpdf_annot.cpp @@ -14,9 +14,9 @@ #include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h" #include "core/fpdfdoc/cpvt_generateap.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" +#include "core/fxge/cfx_graphstatedata.h" +#include "core/fxge/cfx_pathdata.h" +#include "core/fxge/cfx_renderdevice.h" namespace { diff --git a/core/fpdfdoc/cpdf_annotlist.cpp b/core/fpdfdoc/cpdf_annotlist.cpp index d19f9b4b70..7ddbab38a6 100644 --- a/core/fpdfdoc/cpdf_annotlist.cpp +++ b/core/fpdfdoc/cpdf_annotlist.cpp @@ -14,7 +14,7 @@ #include "core/fpdfdoc/cpdf_interform.h" #include "core/fpdfdoc/cpdf_occontext.h" #include "core/fpdfdoc/cpvt_generateap.h" -#include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/cfx_renderdevice.h" namespace { diff --git a/core/fpdfdoc/cpdf_apsettings.h b/core/fpdfdoc/cpdf_apsettings.h index b2ae2488a1..ffddffdbe0 100644 --- a/core/fpdfdoc/cpdf_apsettings.h +++ b/core/fpdfdoc/cpdf_apsettings.h @@ -10,7 +10,7 @@ #include "core/fpdfdoc/cpdf_iconfit.h" #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" class CPDF_Dictionary; class CPDF_FormControl; diff --git a/core/fpdfdoc/cpdf_bookmark.cpp b/core/fpdfdoc/cpdf_bookmark.cpp index fb74567938..191a26df14 100644 --- a/core/fpdfdoc/cpdf_bookmark.cpp +++ b/core/fpdfdoc/cpdf_bookmark.cpp @@ -9,7 +9,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_string.h" #include "core/fpdfdoc/cpdf_nametree.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" uint32_t CPDF_Bookmark::GetColorRef() const { if (!m_pDict) diff --git a/core/fpdfdoc/cpdf_defaultappearance.h b/core/fpdfdoc/cpdf_defaultappearance.h index 70b1bd4583..4507f4f78f 100644 --- a/core/fpdfdoc/cpdf_defaultappearance.h +++ b/core/fpdfdoc/cpdf_defaultappearance.h @@ -11,7 +11,7 @@ #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" +#include "core/fxge/fx_dib.h" enum class BorderStyle { SOLID, DASH, BEVELED, INSET, UNDERLINE }; enum class PaintOperation { STROKE, FILL }; diff --git a/core/fpdfdoc/cpdf_formcontrol.cpp b/core/fpdfdoc/cpdf_formcontrol.cpp index 82a416f942..dab59d773a 100644 --- a/core/fpdfdoc/cpdf_formcontrol.cpp +++ b/core/fpdfdoc/cpdf_formcontrol.cpp @@ -15,7 +15,7 @@ #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h" #include "core/fpdfapi/fpdf_render/cpdf_rendercontext.h" #include "core/fpdfdoc/cpdf_interform.h" -#include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/cfx_renderdevice.h" namespace { diff --git a/core/fpdfdoc/cpdf_formcontrol.h b/core/fpdfdoc/cpdf_formcontrol.h index 1ad79ee6f7..e86443402d 100644 --- a/core/fpdfdoc/cpdf_formcontrol.h +++ b/core/fpdfdoc/cpdf_formcontrol.h @@ -18,7 +18,7 @@ #include "core/fpdfdoc/ipdf_formnotify.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_string.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #define TEXTPOS_CAPTION 0 #define TEXTPOS_ICON 1 diff --git a/core/fpdfdoc/cpdf_interform.cpp b/core/fpdfdoc/cpdf_interform.cpp index 00fff1acb4..624bb45de4 100644 --- a/core/fpdfdoc/cpdf_interform.cpp +++ b/core/fpdfdoc/cpdf_interform.cpp @@ -16,8 +16,8 @@ #include "core/fpdfdoc/cpdf_filespec.h" #include "core/fpdfdoc/cpdf_formcontrol.h" #include "core/fpdfdoc/cpdf_interform.h" -#include "core/fxge/include/cfx_substfont.h" -#include "core/fxge/include/fx_font.h" +#include "core/fxge/cfx_substfont.h" +#include "core/fxge/fx_font.h" #include "third_party/base/stl_util.h" namespace { diff --git a/core/fpdfdoc/cpdf_variabletext.h b/core/fpdfdoc/cpdf_variabletext.h index e57636e821..21edc35b5b 100644 --- a/core/fpdfdoc/cpdf_variabletext.h +++ b/core/fpdfdoc/cpdf_variabletext.h @@ -18,7 +18,7 @@ #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" +#include "core/fxge/fx_font.h" class CSection; class IPVT_FontMap; diff --git a/core/fpdfdoc/cpvt_wordprops.h b/core/fpdfdoc/cpvt_wordprops.h index ca95755dbd..2b7084116a 100644 --- a/core/fpdfdoc/cpvt_wordprops.h +++ b/core/fpdfdoc/cpvt_wordprops.h @@ -9,7 +9,7 @@ #include "core/fpdfdoc/cpdf_variabletext.h" #include "core/fxcrt/fx_system.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" struct CPVT_WordProps { CPVT_WordProps() diff --git a/core/fpdfdoc/fpdf_tagged.h b/core/fpdfdoc/fpdf_tagged.h index da05b79674..da382579ae 100644 --- a/core/fpdfdoc/fpdf_tagged.h +++ b/core/fpdfdoc/fpdf_tagged.h @@ -7,7 +7,7 @@ #ifndef CORE_FPDFDOC_FPDF_TAGGED_H_ #define CORE_FPDFDOC_FPDF_TAGGED_H_ -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" class CPDF_Dictionary; class CPDF_Document; -- cgit v1.2.3