diff options
Diffstat (limited to 'xfa')
52 files changed, 85 insertions, 85 deletions
@@ -1,6 +1,6 @@ include_rules = [ '+core/fxcrt', '+core/fpdfapi/fpdf_parser', - '+core/fxge/include', + '+core/fxge', '+third_party/bigint' ] diff --git a/xfa/fde/cfde_path.h b/xfa/fde/cfde_path.h index 54bebf3bc8..34619d45ef 100644 --- a/xfa/fde/cfde_path.h +++ b/xfa/fde/cfde_path.h @@ -7,8 +7,8 @@ #ifndef XFA_FDE_CFDE_PATH_H_ #define XFA_FDE_CFDE_PATH_H_ -#include "core/fxge/include/cfx_pathdata.h" -#include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/cfx_pathdata.h" +#include "core/fxge/cfx_renderdevice.h" #include "xfa/fgas/crt/fgas_memory.h" class CFDE_Path : public CFX_Target { diff --git a/xfa/fde/css/fde_css.h b/xfa/fde/css/fde_css.h index 74a0ef609a..5b033cf014 100644 --- a/xfa/fde/css/fde_css.h +++ b/xfa/fde/css/fde_css.h @@ -7,7 +7,7 @@ #ifndef XFA_FDE_CSS_FDE_CSS_H_ #define XFA_FDE_CSS_FDE_CSS_H_ -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fgas/crt/fgas_stream.h" #include "xfa/fgas/crt/fgas_utils.h" #include "xfa/fgas/font/fgas_font.h" diff --git a/xfa/fde/fde_gedevice.cpp b/xfa/fde/fde_gedevice.cpp index 15c849f71f..076e70dedf 100644 --- a/xfa/fde/fde_gedevice.cpp +++ b/xfa/fde/fde_gedevice.cpp @@ -8,10 +8,10 @@ #include <algorithm> -#include "core/fxge/include/cfx_gemodule.h" -#include "core/fxge/include/cfx_graphstatedata.h" -#include "core/fxge/include/cfx_renderdevice.h" -#include "core/fxge/include/cfx_substfont.h" +#include "core/fxge/cfx_gemodule.h" +#include "core/fxge/cfx_graphstatedata.h" +#include "core/fxge/cfx_renderdevice.h" +#include "core/fxge/cfx_substfont.h" #include "xfa/fde/cfde_path.h" #include "xfa/fde/fde_object.h" #include "xfa/fgas/font/fgas_font.h" diff --git a/xfa/fde/fde_gedevice.h b/xfa/fde/fde_gedevice.h index e3b9208d93..d290f166a8 100644 --- a/xfa/fde/fde_gedevice.h +++ b/xfa/fde/fde_gedevice.h @@ -7,7 +7,7 @@ #ifndef XFA_FDE_FDE_GEDEVICE_H_ #define XFA_FDE_FDE_GEDEVICE_H_ -#include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/cfx_renderdevice.h" #include "xfa/fgas/crt/fgas_memory.h" class CFDE_Brush; diff --git a/xfa/fde/fde_object.h b/xfa/fde/fde_object.h index 2af18ec3b7..bf1ec41dac 100644 --- a/xfa/fde/fde_object.h +++ b/xfa/fde/fde_object.h @@ -9,7 +9,7 @@ #include <cstdint> -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fgas/crt/fgas_memory.h" class CFDE_Brush : public CFX_Target { diff --git a/xfa/fde/fde_visualset.h b/xfa/fde/fde_visualset.h index 45b9391e63..103e7258ca 100644 --- a/xfa/fde/fde_visualset.h +++ b/xfa/fde/fde_visualset.h @@ -9,7 +9,7 @@ #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_system.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fde/cfde_path.h" #include "xfa/fde/fde_object.h" #include "xfa/fgas/crt/fgas_memory.h" diff --git a/xfa/fde/ifde_txtedtengine.h b/xfa/fde/ifde_txtedtengine.h index cf760035cf..cb9ec559e3 100644 --- a/xfa/fde/ifde_txtedtengine.h +++ b/xfa/fde/ifde_txtedtengine.h @@ -7,7 +7,7 @@ #ifndef XFA_FDE_IFDE_TXTEDTENGINE_H_ #define XFA_FDE_IFDE_TXTEDTENGINE_H_ -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fgas/font/fgas_font.h" class CFDE_TxtEdtEngine; diff --git a/xfa/fde/tto/fde_textout.h b/xfa/fde/tto/fde_textout.h index 6ce32d2fe8..341547185c 100644 --- a/xfa/fde/tto/fde_textout.h +++ b/xfa/fde/tto/fde_textout.h @@ -10,9 +10,9 @@ #include <memory> #include <vector> -#include "core/fxge/include/cfx_fxgedevice.h" -#include "core/fxge/include/cfx_renderdevice.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/cfx_fxgedevice.h" +#include "core/fxge/cfx_renderdevice.h" +#include "core/fxge/fx_dib.h" #include "xfa/fde/fde_object.h" #include "xfa/fgas/crt/fgas_utils.h" #include "xfa/fgas/font/fgas_font.h" diff --git a/xfa/fgas/font/fgas_font.h b/xfa/fgas/font/fgas_font.h index f91c015dae..07bfc1daea 100644 --- a/xfa/fgas/font/fgas_font.h +++ b/xfa/fgas/font/fgas_font.h @@ -7,7 +7,7 @@ #ifndef XFA_FGAS_FONT_FGAS_FONT_H_ #define XFA_FGAS_FONT_FGAS_FONT_H_ -#include "core/fxge/include/fx_font.h" +#include "core/fxge/fx_font.h" #include "xfa/fgas/crt/fgas_stream.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ diff --git a/xfa/fgas/font/fgas_gefont.cpp b/xfa/fgas/font/fgas_gefont.cpp index c272f9160d..08cb80e1ef 100644 --- a/xfa/fgas/font/fgas_gefont.cpp +++ b/xfa/fgas/font/fgas_gefont.cpp @@ -9,9 +9,9 @@ #include <memory> #include <utility> -#include "core/fxge/include/cfx_substfont.h" -#include "core/fxge/include/cfx_unicodeencoding.h" -#include "core/fxge/include/cfx_unicodeencodingex.h" +#include "core/fxge/cfx_substfont.h" +#include "core/fxge/cfx_unicodeencoding.h" +#include "core/fxge/cfx_unicodeencodingex.h" #include "xfa/fgas/crt/fgas_codepage.h" #include "xfa/fgas/font/fgas_fontutils.h" #include "xfa/fxfa/include/xfa_fontmgr.h" diff --git a/xfa/fgas/font/fgas_stdfontmgr.cpp b/xfa/fgas/font/fgas_stdfontmgr.cpp index 93f1a7a436..de72628760 100644 --- a/xfa/fgas/font/fgas_stdfontmgr.cpp +++ b/xfa/fgas/font/fgas_stdfontmgr.cpp @@ -7,10 +7,10 @@ #include "xfa/fgas/font/fgas_stdfontmgr.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" -#include "core/fxge/include/ifx_systemfontinfo.h" +#include "core/fxge/cfx_fontmapper.h" +#include "core/fxge/cfx_fontmgr.h" +#include "core/fxge/cfx_gemodule.h" +#include "core/fxge/ifx_systemfontinfo.h" #include "xfa/fgas/crt/fgas_codepage.h" #include "xfa/fgas/font/fgas_fontutils.h" #include "xfa/fgas/font/fgas_gefont.h" diff --git a/xfa/fgas/font/fgas_stdfontmgr.h b/xfa/fgas/font/fgas_stdfontmgr.h index f2d87b9002..9d5cb68070 100644 --- a/xfa/fgas/font/fgas_stdfontmgr.h +++ b/xfa/fgas/font/fgas_stdfontmgr.h @@ -10,9 +10,9 @@ #include <vector> #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" +#include "core/fxge/cfx_fontmapper.h" +#include "core/fxge/fx_freetype.h" +#include "core/fxge/ifx_systemfontinfo.h" #include "third_party/freetype/include/freetype/fttypes.h" #include "xfa/fgas/font/fgas_font.h" diff --git a/xfa/fgas/layout/fgas_textbreak.h b/xfa/fgas/layout/fgas_textbreak.h index 062646f8b4..d8464ab0cb 100644 --- a/xfa/fgas/layout/fgas_textbreak.h +++ b/xfa/fgas/layout/fgas_textbreak.h @@ -10,7 +10,7 @@ #include <memory> #include "core/fxcrt/fx_ucd.h" -#include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/cfx_renderdevice.h" #include "xfa/fgas/crt/fgas_utils.h" #include "xfa/fgas/layout/fgas_unicode.h" diff --git a/xfa/fwl/basewidget/cfx_barcode.h b/xfa/fwl/basewidget/cfx_barcode.h index 7665476780..da2aabf575 100644 --- a/xfa/fwl/basewidget/cfx_barcode.h +++ b/xfa/fwl/basewidget/cfx_barcode.h @@ -12,7 +12,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" #include "xfa/fxbarcode/include/BC_Library.h" class CBC_CodeBase; diff --git a/xfa/fwl/core/cfwl_themebackground.h b/xfa/fwl/core/cfwl_themebackground.h index 9761183011..54d58b38f6 100644 --- a/xfa/fwl/core/cfwl_themebackground.h +++ b/xfa/fwl/core/cfwl_themebackground.h @@ -7,7 +7,7 @@ #ifndef XFA_FWL_CORE_CFWL_THEMEBACKGROUND_H_ #define XFA_FWL_CORE_CFWL_THEMEBACKGROUND_H_ -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fwl/core/cfwl_themepart.h" class CFX_DIBitmpa; diff --git a/xfa/fwl/theme/cfwl_arrowdata.h b/xfa/fwl/theme/cfwl_arrowdata.h index e549c157e5..efec1b50b1 100644 --- a/xfa/fwl/theme/cfwl_arrowdata.h +++ b/xfa/fwl/theme/cfwl_arrowdata.h @@ -10,7 +10,7 @@ #include <memory> #include "core/fxcrt/fx_system.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" class CFWL_ArrowData { public: diff --git a/xfa/fwl/theme/cfwl_checkboxtp.cpp b/xfa/fwl/theme/cfwl_checkboxtp.cpp index 45b0154bd6..033ee14ef3 100644 --- a/xfa/fwl/theme/cfwl_checkboxtp.cpp +++ b/xfa/fwl/theme/cfwl_checkboxtp.cpp @@ -6,7 +6,7 @@ #include "xfa/fwl/theme/cfwl_checkboxtp.h" -#include "core/fxge/include/cfx_pathdata.h" +#include "core/fxge/cfx_pathdata.h" #include "xfa/fde/tto/fde_textout.h" #include "xfa/fwl/basewidget/ifwl_checkbox.h" #include "xfa/fwl/core/cfwl_themebackground.h" diff --git a/xfa/fxbarcode/BC_TwoDimWriter.cpp b/xfa/fxbarcode/BC_TwoDimWriter.cpp index cda0467fe1..2ad60bbde3 100644 --- a/xfa/fxbarcode/BC_TwoDimWriter.cpp +++ b/xfa/fxbarcode/BC_TwoDimWriter.cpp @@ -6,9 +6,9 @@ #include <algorithm> -#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" #include "third_party/base/numerics/safe_math.h" #include "xfa/fxbarcode/BC_TwoDimWriter.h" #include "xfa/fxbarcode/BC_Writer.h" diff --git a/xfa/fxbarcode/BC_Writer.h b/xfa/fxbarcode/BC_Writer.h index 8e4eaf1f5e..888db560ae 100644 --- a/xfa/fxbarcode/BC_Writer.h +++ b/xfa/fxbarcode/BC_Writer.h @@ -8,7 +8,7 @@ #define XFA_FXBARCODE_BC_WRITER_H_ #include "core/fxcrt/fx_string.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fxbarcode/utils.h" class CBC_Writer { diff --git a/xfa/fxbarcode/cbc_codabar.h b/xfa/fxbarcode/cbc_codabar.h index b0a587b2d9..2a4ee79e68 100644 --- a/xfa/fxbarcode/cbc_codabar.h +++ b/xfa/fxbarcode/cbc_codabar.h @@ -9,7 +9,7 @@ #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_system.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fxbarcode/cbc_onecode.h" class CBC_Codabar : public CBC_OneCode { diff --git a/xfa/fxbarcode/cbc_code128.h b/xfa/fxbarcode/cbc_code128.h index 2088bdd714..4404f6c1e3 100644 --- a/xfa/fxbarcode/cbc_code128.h +++ b/xfa/fxbarcode/cbc_code128.h @@ -9,7 +9,7 @@ #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_system.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fxbarcode/cbc_onecode.h" class CBC_Code128 : public CBC_OneCode { diff --git a/xfa/fxbarcode/cbc_code39.h b/xfa/fxbarcode/cbc_code39.h index 51f1759ca0..42edf8e35f 100644 --- a/xfa/fxbarcode/cbc_code39.h +++ b/xfa/fxbarcode/cbc_code39.h @@ -9,7 +9,7 @@ #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" #include "xfa/fxbarcode/cbc_onecode.h" class CBC_Code39 : public CBC_OneCode { diff --git a/xfa/fxbarcode/cbc_codebase.h b/xfa/fxbarcode/cbc_codebase.h index a6448db741..d185d0ead2 100644 --- a/xfa/fxbarcode/cbc_codebase.h +++ b/xfa/fxbarcode/cbc_codebase.h @@ -10,7 +10,7 @@ #include <memory> #include "core/fxcrt/fx_system.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fxbarcode/include/BC_Library.h" class CBC_Writer; diff --git a/xfa/fxbarcode/cbc_datamatrix.h b/xfa/fxbarcode/cbc_datamatrix.h index 51d7c3d3f9..df2e5ad241 100644 --- a/xfa/fxbarcode/cbc_datamatrix.h +++ b/xfa/fxbarcode/cbc_datamatrix.h @@ -9,7 +9,7 @@ #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" #include "xfa/fxbarcode/cbc_codebase.h" class CBC_DataMatrix : public CBC_CodeBase { diff --git a/xfa/fxbarcode/cbc_ean13.h b/xfa/fxbarcode/cbc_ean13.h index fae8c50915..d42c2fdbc1 100644 --- a/xfa/fxbarcode/cbc_ean13.h +++ b/xfa/fxbarcode/cbc_ean13.h @@ -9,7 +9,7 @@ #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" #include "xfa/fxbarcode/cbc_onecode.h" class CBC_EAN13 : public CBC_OneCode { diff --git a/xfa/fxbarcode/cbc_ean8.h b/xfa/fxbarcode/cbc_ean8.h index c345af3a9c..ffd06e51d5 100644 --- a/xfa/fxbarcode/cbc_ean8.h +++ b/xfa/fxbarcode/cbc_ean8.h @@ -9,7 +9,7 @@ #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" #include "xfa/fxbarcode/cbc_onecode.h" class CBC_EAN8 : public CBC_OneCode { diff --git a/xfa/fxbarcode/cbc_pdf417i.h b/xfa/fxbarcode/cbc_pdf417i.h index ca6ac11b26..6067282de8 100644 --- a/xfa/fxbarcode/cbc_pdf417i.h +++ b/xfa/fxbarcode/cbc_pdf417i.h @@ -9,7 +9,7 @@ #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" #include "xfa/fxbarcode/cbc_codebase.h" class CBC_PDF417I : public CBC_CodeBase { diff --git a/xfa/fxbarcode/cbc_qrcode.h b/xfa/fxbarcode/cbc_qrcode.h index e8c9ced56e..e3b554b109 100644 --- a/xfa/fxbarcode/cbc_qrcode.h +++ b/xfa/fxbarcode/cbc_qrcode.h @@ -9,7 +9,7 @@ #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" #include "xfa/fxbarcode/cbc_codebase.h" class CBC_QRCode : public CBC_CodeBase { diff --git a/xfa/fxbarcode/cbc_upca.h b/xfa/fxbarcode/cbc_upca.h index 7e869b6ace..11769f361e 100644 --- a/xfa/fxbarcode/cbc_upca.h +++ b/xfa/fxbarcode/cbc_upca.h @@ -9,7 +9,7 @@ #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" #include "xfa/fxbarcode/cbc_onecode.h" class CBC_UPCA : public CBC_OneCode { diff --git a/xfa/fxbarcode/oned/BC_OneDimWriter.cpp b/xfa/fxbarcode/oned/BC_OneDimWriter.cpp index 80f76fba9f..72c956ac11 100644 --- a/xfa/fxbarcode/oned/BC_OneDimWriter.cpp +++ b/xfa/fxbarcode/oned/BC_OneDimWriter.cpp @@ -25,12 +25,12 @@ #include <algorithm> #include <memory> -#include "core/fxge/include/cfx_fxgedevice.h" -#include "core/fxge/include/cfx_gemodule.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/include/cfx_unicodeencodingex.h" +#include "core/fxge/cfx_fxgedevice.h" +#include "core/fxge/cfx_gemodule.h" +#include "core/fxge/cfx_graphstatedata.h" +#include "core/fxge/cfx_pathdata.h" +#include "core/fxge/cfx_renderdevice.h" +#include "core/fxge/cfx_unicodeencodingex.h" #include "xfa/fxbarcode/BC_Writer.h" #include "xfa/fxbarcode/common/BC_CommonBitMatrix.h" diff --git a/xfa/fxbarcode/oned/BC_OneDimWriter.h b/xfa/fxbarcode/oned/BC_OneDimWriter.h index 91763a90a8..910b2068c8 100644 --- a/xfa/fxbarcode/oned/BC_OneDimWriter.h +++ b/xfa/fxbarcode/oned/BC_OneDimWriter.h @@ -9,7 +9,7 @@ #include <memory> -#include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/cfx_renderdevice.h" #include "xfa/fxbarcode/BC_Writer.h" #include "xfa/fxbarcode/include/BC_Library.h" diff --git a/xfa/fxbarcode/oned/BC_OnedEAN13Writer.cpp b/xfa/fxbarcode/oned/BC_OnedEAN13Writer.cpp index 632738779a..51f77b5082 100644 --- a/xfa/fxbarcode/oned/BC_OnedEAN13Writer.cpp +++ b/xfa/fxbarcode/oned/BC_OnedEAN13Writer.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "core/fxge/include/cfx_fxgedevice.h" -#include "core/fxge/include/cfx_gemodule.h" +#include "core/fxge/cfx_fxgedevice.h" +#include "core/fxge/cfx_gemodule.h" #include "xfa/fxbarcode/BC_Writer.h" #include "xfa/fxbarcode/oned/BC_OneDimWriter.h" #include "xfa/fxbarcode/oned/BC_OnedEAN13Writer.h" diff --git a/xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp b/xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp index fb95f264a0..2305b18a90 100644 --- a/xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp +++ b/xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "core/fxge/include/cfx_fxgedevice.h" -#include "core/fxge/include/cfx_gemodule.h" +#include "core/fxge/cfx_fxgedevice.h" +#include "core/fxge/cfx_gemodule.h" #include "xfa/fxbarcode/BC_Writer.h" #include "xfa/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/fxbarcode/oned/BC_OneDimWriter.h" diff --git a/xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp b/xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp index 12acb5280b..e594bc7ee6 100644 --- a/xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp +++ b/xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "core/fxge/include/cfx_fxgedevice.h" -#include "core/fxge/include/cfx_gemodule.h" +#include "core/fxge/cfx_fxgedevice.h" +#include "core/fxge/cfx_gemodule.h" #include "xfa/fxbarcode/BC_Writer.h" #include "xfa/fxbarcode/oned/BC_OneDimWriter.h" #include "xfa/fxbarcode/oned/BC_OnedEAN13Writer.h" diff --git a/xfa/fxfa/app/xfa_ffwidget.cpp b/xfa/fxfa/app/xfa_ffwidget.cpp index 31cbf25928..10b587004d 100644 --- a/xfa/fxfa/app/xfa_ffwidget.cpp +++ b/xfa/fxfa/app/xfa_ffwidget.cpp @@ -12,9 +12,9 @@ #include "core/fpdfapi/fpdf_page/cpdf_pageobjectholder.h" #include "core/fxcodec/codec/ccodec_progressivedecoder.h" #include "core/fxcodec/fx_codec.h" -#include "core/fxge/include/cfx_gemodule.h" -#include "core/fxge/include/cfx_pathdata.h" -#include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/cfx_gemodule.h" +#include "core/fxge/cfx_pathdata.h" +#include "core/fxge/cfx_renderdevice.h" #include "xfa/fxfa/app/xfa_textlayout.h" #include "xfa/fxfa/include/cxfa_eventparam.h" #include "xfa/fxfa/include/fxfa_widget.h" diff --git a/xfa/fxfa/include/fxfa_widget.h b/xfa/fxfa/include/fxfa_widget.h index 9bab36f806..07b25ef5ab 100644 --- a/xfa/fxfa/include/fxfa_widget.h +++ b/xfa/fxfa/include/fxfa_widget.h @@ -8,7 +8,7 @@ #define XFA_FXFA_INCLUDE_FXFA_WIDGET_H_ #include "core/fxcrt/fx_coordinates.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fxfa/parser/cxfa_box.h" #include "xfa/fxfa/parser/cxfa_event.h" #include "xfa/fxfa/parser/cxfa_image.h" diff --git a/xfa/fxfa/include/xfa_ffwidget.h b/xfa/fxfa/include/xfa_ffwidget.h index 7b6130f09b..a44dd783b5 100644 --- a/xfa/fxfa/include/xfa_ffwidget.h +++ b/xfa/fxfa/include/xfa_ffwidget.h @@ -10,7 +10,7 @@ #include <vector> #include "core/fxcodec/fx_codec_def.h" -#include "core/fxge/include/cfx_graphstatedata.h" +#include "core/fxge/cfx_graphstatedata.h" #include "xfa/fxfa/include/fxfa.h" #include "xfa/fxfa/parser/cxfa_contentlayoutitem.h" diff --git a/xfa/fxfa/parser/cxfa_data.h b/xfa/fxfa/parser/cxfa_data.h index 8432cf4a29..e3c6390d80 100644 --- a/xfa/fxfa/parser/cxfa_data.h +++ b/xfa/fxfa/parser/cxfa_data.h @@ -8,7 +8,7 @@ #define XFA_FXFA_PARSER_CXFA_DATA_H_ #include "core/fxcrt/fx_system.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fxfa/include/fxfa_basic.h" class CXFA_Node; diff --git a/xfa/fxfa/parser/cxfa_fill.h b/xfa/fxfa/parser/cxfa_fill.h index 70b0886c85..2a5f673aa0 100644 --- a/xfa/fxfa/parser/cxfa_fill.h +++ b/xfa/fxfa/parser/cxfa_fill.h @@ -8,7 +8,7 @@ #define XFA_FXFA_PARSER_CXFA_FILL_H_ #include "core/fxcrt/fx_system.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fxfa/parser/cxfa_data.h" class CXFA_Node; diff --git a/xfa/fxfa/parser/cxfa_font.cpp b/xfa/fxfa/parser/cxfa_font.cpp index 52d12bb024..2dcb405141 100644 --- a/xfa/fxfa/parser/cxfa_font.cpp +++ b/xfa/fxfa/parser/cxfa_font.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/cxfa_font.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fxfa/parser/cxfa_fill.h" #include "xfa/fxfa/parser/cxfa_measurement.h" #include "xfa/fxfa/parser/xfa_object.h" diff --git a/xfa/fxfa/parser/cxfa_font.h b/xfa/fxfa/parser/cxfa_font.h index e2e1809aa3..0151dfbe5f 100644 --- a/xfa/fxfa/parser/cxfa_font.h +++ b/xfa/fxfa/parser/cxfa_font.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_CXFA_FONT_H_ #define XFA_FXFA_PARSER_CXFA_FONT_H_ -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fxfa/parser/cxfa_data.h" class CXFA_Node; diff --git a/xfa/fxfa/parser/cxfa_stroke.h b/xfa/fxfa/parser/cxfa_stroke.h index 7d817e0fea..8db1b29959 100644 --- a/xfa/fxfa/parser/cxfa_stroke.h +++ b/xfa/fxfa/parser/cxfa_stroke.h @@ -8,7 +8,7 @@ #define XFA_FXFA_PARSER_CXFA_STROKE_H_ #include "core/fxcrt/fx_system.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fxfa/include/fxfa_basic.h" #include "xfa/fxfa/parser/cxfa_data.h" diff --git a/xfa/fxfa/parser/xfa_localemgr.cpp b/xfa/fxfa/parser/xfa_localemgr.cpp index 0bcfe0b5e0..b7f0fbea59 100644 --- a/xfa/fxfa/parser/xfa_localemgr.cpp +++ b/xfa/fxfa/parser/xfa_localemgr.cpp @@ -11,7 +11,7 @@ #include "core/fxcodec/fx_codec.h" #include "core/fxcrt/fx_xml.h" -#include "core/fxge/include/cfx_gemodule.h" +#include "core/fxge/cfx_gemodule.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/xfa_locale.h" #include "xfa/fxfa/parser/xfa_object.h" diff --git a/xfa/fxgraphics/cagg_graphics.h b/xfa/fxgraphics/cagg_graphics.h index 5f53c73695..30117e86c7 100644 --- a/xfa/fxgraphics/cagg_graphics.h +++ b/xfa/fxgraphics/cagg_graphics.h @@ -7,7 +7,7 @@ #ifndef XFA_FXGRAPHICS_CAGG_GRAPHICS_H_ #define XFA_FXGRAPHICS_CAGG_GRAPHICS_H_ -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fxgraphics/include/cfx_graphics.h" class CFX_Graphics; diff --git a/xfa/fxgraphics/cfx_color.h b/xfa/fxgraphics/cfx_color.h index 0f321764f9..6af1f37d70 100644 --- a/xfa/fxgraphics/cfx_color.h +++ b/xfa/fxgraphics/cfx_color.h @@ -7,7 +7,7 @@ #ifndef XFA_FXGRAPHICS_CFX_COLOR_H_ #define XFA_FXGRAPHICS_CFX_COLOR_H_ -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #include "xfa/fxgraphics/include/cfx_graphics.h" class CFX_Pattern; diff --git a/xfa/fxgraphics/cfx_graphics.cpp b/xfa/fxgraphics/cfx_graphics.cpp index b9f8287ae4..85a9f439d8 100644 --- a/xfa/fxgraphics/cfx_graphics.cpp +++ b/xfa/fxgraphics/cfx_graphics.cpp @@ -8,10 +8,10 @@ #include <memory> -#include "core/fxge/include/cfx_fxgedevice.h" -#include "core/fxge/include/cfx_gemodule.h" -#include "core/fxge/include/cfx_renderdevice.h" -#include "core/fxge/include/cfx_unicodeencoding.h" +#include "core/fxge/cfx_fxgedevice.h" +#include "core/fxge/cfx_gemodule.h" +#include "core/fxge/cfx_renderdevice.h" +#include "core/fxge/cfx_unicodeencoding.h" #include "xfa/fxgraphics/cagg_graphics.h" #include "xfa/fxgraphics/cfx_color.h" #include "xfa/fxgraphics/cfx_path.h" diff --git a/xfa/fxgraphics/cfx_path.cpp b/xfa/fxgraphics/cfx_path.cpp index 5adeded977..e4fb727092 100644 --- a/xfa/fxgraphics/cfx_path.cpp +++ b/xfa/fxgraphics/cfx_path.cpp @@ -6,7 +6,7 @@ #include "xfa/fxgraphics/cfx_path.h" -#include "core/fxge/include/cfx_pathdata.h" +#include "core/fxge/cfx_pathdata.h" #include "xfa/fxgraphics/cfx_path_generator.h" CFX_Path::CFX_Path() {} diff --git a/xfa/fxgraphics/cfx_path_generator.cpp b/xfa/fxgraphics/cfx_path_generator.cpp index 2af39c49d7..b5843ed998 100644 --- a/xfa/fxgraphics/cfx_path_generator.cpp +++ b/xfa/fxgraphics/cfx_path_generator.cpp @@ -6,8 +6,8 @@ #include "xfa/fxgraphics/cfx_path_generator.h" -#include "core/fxge/include/cfx_pathdata.h" -#include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/cfx_pathdata.h" +#include "core/fxge/cfx_renderdevice.h" CFX_PathGenerator::CFX_PathGenerator() : m_pPathData(new CFX_PathData) {} diff --git a/xfa/fxgraphics/cfx_path_generator.h b/xfa/fxgraphics/cfx_path_generator.h index aa17a7e323..75e3a57633 100644 --- a/xfa/fxgraphics/cfx_path_generator.h +++ b/xfa/fxgraphics/cfx_path_generator.h @@ -9,7 +9,7 @@ #include <memory> -#include "core/fxge/include/cfx_pathdata.h" +#include "core/fxge/cfx_pathdata.h" class CFX_PathGenerator { public: diff --git a/xfa/fxgraphics/cfx_shading.h b/xfa/fxgraphics/cfx_shading.h index eb01112bc5..2cc37cf0f6 100644 --- a/xfa/fxgraphics/cfx_shading.h +++ b/xfa/fxgraphics/cfx_shading.h @@ -9,7 +9,7 @@ #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_system.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" #define FX_SHADING_Steps 256 diff --git a/xfa/fxgraphics/include/cfx_graphics.h b/xfa/fxgraphics/include/cfx_graphics.h index 3d818d7952..584a5cbac3 100644 --- a/xfa/fxgraphics/include/cfx_graphics.h +++ b/xfa/fxgraphics/include/cfx_graphics.h @@ -10,11 +10,11 @@ #include <memory> #include "core/fxcrt/fx_system.h" -#include "core/fxge/include/cfx_fxgedevice.h" -#include "core/fxge/include/cfx_graphstatedata.h" -#include "core/fxge/include/cfx_renderdevice.h" -#include "core/fxge/include/fx_dib.h" -#include "core/fxge/include/fx_font.h" +#include "core/fxge/cfx_fxgedevice.h" +#include "core/fxge/cfx_graphstatedata.h" +#include "core/fxge/cfx_renderdevice.h" +#include "core/fxge/fx_dib.h" +#include "core/fxge/fx_font.h" #include "xfa/fwl/core/fwl_error.h" class CFX_Color; |