diff options
Diffstat (limited to 'xfa/src/fdp')
23 files changed, 37 insertions, 37 deletions
diff --git a/xfa/src/fdp/include/fde_css.h b/xfa/src/fdp/include/fde_css.h index cc5ec2dbb1..b139855613 100644 --- a/xfa/src/fdp/include/fde_css.h +++ b/xfa/src/fdp/include/fde_css.h @@ -8,9 +8,9 @@ #define XFA_SRC_FDP_INCLUDE_FDE_CSS_H_ #include "core/include/fxge/fx_dib.h" -#include "xfa/src/fgas/include/fx_fnt.h" -#include "xfa/src/fgas/include/fx_stm.h" -#include "xfa/src/fgas/include/fx_utl.h" +#include "xfa/src/fgas/font/fgas_font.h" +#include "xfa/src/fgas/crt/fgas_stream.h" +#include "xfa/src/fgas/crt/fgas_utils.h" class IFDE_CSSValue; class IFDE_CSSValueList; diff --git a/xfa/src/fdp/include/fde_img.h b/xfa/src/fdp/include/fde_img.h index ea501259ed..fb7cd23fe6 100644 --- a/xfa/src/fdp/include/fde_img.h +++ b/xfa/src/fdp/include/fde_img.h @@ -7,9 +7,9 @@ #ifndef XFA_SRC_FDP_INCLUDE_FDE_IMG_H_ #define XFA_SRC_FDP_INCLUDE_FDE_IMG_H_ -#include "xfa/src/fgas/include/fx_mem.h" -#include "xfa/src/fgas/include/fx_stm.h" -#include "xfa/src/fgas/include/fx_utl.h" +#include "xfa/src/fgas/crt/fgas_memory.h" +#include "xfa/src/fgas/crt/fgas_stream.h" +#include "xfa/src/fgas/crt/fgas_utils.h" #define FDE_IMAGEFORMAT_Unknown -1 #define FDE_IMAGEFORMAT_BMP 0 diff --git a/xfa/src/fdp/include/fde_psr.h b/xfa/src/fdp/include/fde_psr.h index 72ff91fa87..84140419b8 100644 --- a/xfa/src/fdp/include/fde_psr.h +++ b/xfa/src/fdp/include/fde_psr.h @@ -15,7 +15,7 @@ #include "xfa/src/fdp/include/fde_img.h" #include "xfa/src/fdp/include/fde_pen.h" #include "xfa/src/fdp/include/fde_pth.h" -#include "xfa/src/fgas/include/fx_fnt.h" +#include "xfa/src/fgas/font/fgas_font.h" enum FDE_VISUALOBJTYPE { FDE_VISUALOBJ_Canvas = 0x00, diff --git a/xfa/src/fdp/include/fde_rdv.h b/xfa/src/fdp/include/fde_rdv.h index ee11923011..d475a87ef0 100644 --- a/xfa/src/fdp/include/fde_rdv.h +++ b/xfa/src/fdp/include/fde_rdv.h @@ -11,7 +11,7 @@ #include "core/include/fxge/fx_font.h" #include "core/include/fxge/fx_ge.h" #include "xfa/src/fdp/include/fde_pth.h" -#include "xfa/src/fgas/include/fx_fnt.h" +#include "xfa/src/fgas/font/fgas_font.h" class IFDE_Pen; class IFDE_Brush; diff --git a/xfa/src/fdp/include/fde_tto.h b/xfa/src/fdp/include/fde_tto.h index dbfa64775c..78ac4d0c85 100644 --- a/xfa/src/fdp/include/fde_tto.h +++ b/xfa/src/fdp/include/fde_tto.h @@ -9,7 +9,7 @@ #include "core/include/fxge/fx_dib.h" #include "core/include/fxge/fx_ge.h" -#include "xfa/src/fgas/include/fx_fnt.h" +#include "xfa/src/fgas/font/fgas_font.h" #define FDE_TTOSTYLE_Underline 0x0001 #define FDE_TTOSTYLE_Strikeout 0x0002 diff --git a/xfa/src/fdp/include/fde_xml.h b/xfa/src/fdp/include/fde_xml.h index 625914dd6e..f9eff3d251 100644 --- a/xfa/src/fdp/include/fde_xml.h +++ b/xfa/src/fdp/include/fde_xml.h @@ -7,8 +7,8 @@ #ifndef XFA_SRC_FDP_INCLUDE_FDE_XML_H_ #define XFA_SRC_FDP_INCLUDE_FDE_XML_H_ -#include "xfa/src/fgas/include/fx_stm.h" -#include "xfa/src/fgas/include/fx_utl.h" +#include "xfa/src/fgas/crt/fgas_stream.h" +#include "xfa/src/fgas/crt/fgas_utils.h" class IFDE_XMLNode; class IFDE_XMLInstruction; diff --git a/xfa/src/fdp/src/css/fde_csscache.h b/xfa/src/fdp/src/css/fde_csscache.h index dad87e96f7..f7e7eb3aa7 100644 --- a/xfa/src/fdp/src/css/fde_csscache.h +++ b/xfa/src/fdp/src/css/fde_csscache.h @@ -10,7 +10,7 @@ #include <map> #include "xfa/src/fdp/include/fde_css.h" -#include "xfa/src/fgas/include/fx_mem.h" +#include "xfa/src/fgas/crt/fgas_memory.h" struct FDE_CSSCACHEITEM : public CFX_Target { FDE_CSSCACHEITEM(IFDE_CSSStyleSheet* p); diff --git a/xfa/src/fdp/src/css/fde_cssdatatable.cpp b/xfa/src/fdp/src/css/fde_cssdatatable.cpp index 5b80d3ef6a..6f074c09b4 100644 --- a/xfa/src/fdp/src/css/fde_cssdatatable.cpp +++ b/xfa/src/fdp/src/css/fde_cssdatatable.cpp @@ -7,9 +7,9 @@ #include "xfa/src/fdp/src/css/fde_cssdatatable.h" #include "core/include/fxcrt/fx_ext.h" -#include "xfa/src/fgas/include/fx_alg.h" -#include "xfa/src/fgas/include/fx_cpg.h" -#include "xfa/src/fgas/include/fx_sys.h" +#include "xfa/src/fgas/crt/fgas_algorithm.h" +#include "xfa/src/fgas/crt/fgas_codepage.h" +#include "xfa/src/fgas/crt/fgas_system.h" FX_BOOL FDE_CSSLengthToFloat(const FDE_CSSLENGTH& len, FX_FLOAT fPercentBase, diff --git a/xfa/src/fdp/src/css/fde_cssdatatable.h b/xfa/src/fdp/src/css/fde_cssdatatable.h index 2502ed7fe5..512d94f3ee 100644 --- a/xfa/src/fdp/src/css/fde_cssdatatable.h +++ b/xfa/src/fdp/src/css/fde_cssdatatable.h @@ -9,7 +9,7 @@ #include "core/include/fxcrt/fx_system.h" #include "xfa/src/fdp/include/fde_css.h" -#include "xfa/src/fgas/include/fx_mem.h" +#include "xfa/src/fgas/crt/fgas_memory.h" class CFDE_CSSFunction : public CFX_Target { public: diff --git a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp b/xfa/src/fdp/src/css/fde_cssdeclaration.cpp index 73d0921b15..f63a1bef95 100644 --- a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp +++ b/xfa/src/fdp/src/css/fde_cssdeclaration.cpp @@ -7,7 +7,7 @@ #include "xfa/src/fdp/src/css/fde_cssdeclaration.h" #include "core/include/fxcrt/fx_ext.h" -#include "xfa/src/fgas/include/fx_sys.h" +#include "xfa/src/fgas/crt/fgas_system.h" IFDE_CSSValue* CFDE_CSSDeclaration::GetProperty(FDE_CSSPROPERTY eProperty, FX_BOOL& bImportant) const { diff --git a/xfa/src/fdp/src/css/fde_cssstyleselector.h b/xfa/src/fdp/src/css/fde_cssstyleselector.h index 15a45c1d8a..23e6616792 100644 --- a/xfa/src/fdp/src/css/fde_cssstyleselector.h +++ b/xfa/src/fdp/src/css/fde_cssstyleselector.h @@ -13,8 +13,8 @@ #include "xfa/src/fdp/include/fde_css.h" #include "xfa/src/fdp/src/css/fde_csscache.h" #include "xfa/src/fdp/src/css/fde_cssdeclaration.h" -#include "xfa/src/fgas/include/fx_mem.h" -#include "xfa/src/fgas/include/fx_sys.h" +#include "xfa/src/fgas/crt/fgas_memory.h" +#include "xfa/src/fgas/crt/fgas_system.h" #define FDE_CSSUNIVERSALHASH ('*') diff --git a/xfa/src/fdp/src/css/fde_cssstylesheet.cpp b/xfa/src/fdp/src/css/fde_cssstylesheet.cpp index 59fd83b7fe..8afdc1c9a9 100644 --- a/xfa/src/fdp/src/css/fde_cssstylesheet.cpp +++ b/xfa/src/fdp/src/css/fde_cssstylesheet.cpp @@ -8,7 +8,7 @@ #include "xfa/src/fdp/src/css/fde_cssdatatable.h" #include "xfa/src/fdp/src/css/fde_csssyntax.h" -#include "xfa/src/fgas/include/fx_cpg.h" +#include "xfa/src/fgas/crt/fgas_codepage.h" IFDE_CSSStyleSheet* IFDE_CSSStyleSheet::LoadHTMLStandardStyleSheet() { static const FX_WCHAR* s_pStyle = diff --git a/xfa/src/fdp/src/css/fde_csssyntax.cpp b/xfa/src/fdp/src/css/fde_csssyntax.cpp index 0ba7234633..30705d4960 100644 --- a/xfa/src/fdp/src/css/fde_csssyntax.cpp +++ b/xfa/src/fdp/src/css/fde_csssyntax.cpp @@ -7,7 +7,7 @@ #include "xfa/src/fdp/src/css/fde_csssyntax.h" #include "xfa/src/fdp/src/css/fde_cssdatatable.h" -#include "xfa/src/fgas/include/fx_cpg.h" +#include "xfa/src/fgas/crt/fgas_codepage.h" #ifdef _cplusplus extern "C" { diff --git a/xfa/src/fdp/src/css/fde_csssyntax.h b/xfa/src/fdp/src/css/fde_csssyntax.h index 1c7ba514b4..28e3ea366f 100644 --- a/xfa/src/fdp/src/css/fde_csssyntax.h +++ b/xfa/src/fdp/src/css/fde_csssyntax.h @@ -8,8 +8,8 @@ #define XFA_SRC_FDP_SRC_CSS_FDE_CSSSYNTAX_H_ #include "xfa/src/fdp/include/fde_css.h" -#include "xfa/src/fgas/include/fx_mem.h" -#include "xfa/src/fgas/include/fx_stm.h" +#include "xfa/src/fgas/crt/fgas_memory.h" +#include "xfa/src/fgas/crt/fgas_stream.h" class CFDE_CSSTextBuf : public CFX_Target { public: diff --git a/xfa/src/fdp/src/fde/fde_gedevice.h b/xfa/src/fdp/src/fde/fde_gedevice.h index 765ed954f8..56f0a0a379 100644 --- a/xfa/src/fdp/src/fde/fde_gedevice.h +++ b/xfa/src/fdp/src/fde/fde_gedevice.h @@ -8,7 +8,7 @@ #define XFA_SRC_FDP_SRC_FDE_FDE_GEDEVICE_H_ #include "xfa/src/fdp/include/fde_rdv.h" -#include "xfa/src/fgas/include/fx_mem.h" +#include "xfa/src/fgas/crt/fgas_memory.h" class CFDE_FxgeDevice : public IFDE_RenderDevice, public CFX_Target { public: diff --git a/xfa/src/fdp/src/fde/fde_geobject.h b/xfa/src/fdp/src/fde/fde_geobject.h index aa5847cf8e..a2d5fd4bad 100644 --- a/xfa/src/fdp/src/fde/fde_geobject.h +++ b/xfa/src/fdp/src/fde/fde_geobject.h @@ -9,7 +9,7 @@ #include "core/include/fxge/fx_ge.h" #include "xfa/src/fdp/include/fde_pth.h" -#include "xfa/src/fgas/include/fx_mem.h" +#include "xfa/src/fgas/crt/fgas_memory.h" class CFDE_Path : public IFDE_Path, public CFX_Target { public: diff --git a/xfa/src/fdp/src/fde/fde_iterator.cpp b/xfa/src/fdp/src/fde/fde_iterator.cpp index f79a41a001..4a286ec721 100644 --- a/xfa/src/fdp/src/fde/fde_iterator.cpp +++ b/xfa/src/fdp/src/fde/fde_iterator.cpp @@ -6,7 +6,7 @@ #include "xfa/src/fdp/src/fde/fde_iterator.h" -#include "xfa/src/fgas/include/fx_utl.h" +#include "xfa/src/fgas/crt/fgas_utils.h" IFDE_VisualSetIterator* IFDE_VisualSetIterator::Create() { return new CFDE_VisualSetIterator; diff --git a/xfa/src/fdp/src/fde/fde_iterator.h b/xfa/src/fdp/src/fde/fde_iterator.h index 52bfdbad6a..a8594af696 100644 --- a/xfa/src/fdp/src/fde/fde_iterator.h +++ b/xfa/src/fdp/src/fde/fde_iterator.h @@ -8,7 +8,7 @@ #define XFA_SRC_FDP_SRC_FDE_FDE_ITERATOR_H_ #include "xfa/src/fdp/include/fde_psr.h" -#include "xfa/src/fgas/include/fx_mem.h" +#include "xfa/src/fgas/crt/fgas_memory.h" struct FDE_CANVASITEM : public CFX_Target { IFDE_CanvasSet* pCanvas; diff --git a/xfa/src/fdp/src/fde/fde_object.h b/xfa/src/fdp/src/fde/fde_object.h index 4e90ed2aa6..22c1fe30ca 100644 --- a/xfa/src/fdp/src/fde/fde_object.h +++ b/xfa/src/fdp/src/fde/fde_object.h @@ -12,7 +12,7 @@ #include "core/include/fxge/fx_dib.h" #include "xfa/src/fdp/include/fde_brs.h" #include "xfa/src/fdp/include/fde_pen.h" -#include "xfa/src/fgas/include/fx_mem.h" +#include "xfa/src/fgas/crt/fgas_memory.h" class CFDE_Pen : public IFDE_Pen, public CFX_Target { public: diff --git a/xfa/src/fdp/src/fde/fde_render.h b/xfa/src/fdp/src/fde/fde_render.h index ce405a21fb..389c00e63b 100644 --- a/xfa/src/fdp/src/fde/fde_render.h +++ b/xfa/src/fdp/src/fde/fde_render.h @@ -10,7 +10,7 @@ #include "xfa/src/fdp/include/fde_psr.h" #include "xfa/src/fdp/include/fde_rdr.h" #include "xfa/src/fdp/include/fde_rdv.h" -#include "xfa/src/fgas/include/fx_mem.h" +#include "xfa/src/fgas/crt/fgas_memory.h" class CFDE_RenderContext : public IFDE_RenderContext, public CFX_Target { diff --git a/xfa/src/fdp/src/tto/fde_textout.h b/xfa/src/fdp/src/tto/fde_textout.h index afe62a613b..29c326fc1c 100644 --- a/xfa/src/fdp/src/tto/fde_textout.h +++ b/xfa/src/fdp/src/tto/fde_textout.h @@ -14,10 +14,10 @@ #include "xfa/src/fdp/include/fde_pen.h" #include "xfa/src/fdp/include/fde_rdv.h" #include "xfa/src/fdp/include/fde_tto.h" -#include "xfa/src/fgas/include/fx_fnt.h" -#include "xfa/src/fgas/include/fx_mem.h" -#include "xfa/src/fgas/include/fx_tbk.h" -#include "xfa/src/fgas/include/fx_utl.h" +#include "xfa/src/fgas/font/fgas_font.h" +#include "xfa/src/fgas/crt/fgas_memory.h" +#include "xfa/src/fgas/crt/fgas_utils.h" +#include "xfa/src/fgas/layout/fgas_textbreak.h" struct FDE_TTOPIECE { public: diff --git a/xfa/src/fdp/src/xml/fde_xml_imp.cpp b/xfa/src/fdp/src/xml/fde_xml_imp.cpp index 91486eb29b..0071b78135 100644 --- a/xfa/src/fdp/src/xml/fde_xml_imp.cpp +++ b/xfa/src/fdp/src/xml/fde_xml_imp.cpp @@ -8,8 +8,8 @@ #include <algorithm> -#include "xfa/src/fgas/include/fx_cpg.h" -#include "xfa/src/fgas/include/fx_sys.h" +#include "xfa/src/fgas/crt/fgas_system.h" +#include "xfa/src/fgas/crt/fgas_codepage.h" #define FDE_XMLVALIDCHARRANGENUM 5 diff --git a/xfa/src/fdp/src/xml/fde_xml_imp.h b/xfa/src/fdp/src/xml/fde_xml_imp.h index 31711df9a5..32c3de5c21 100644 --- a/xfa/src/fdp/src/xml/fde_xml_imp.h +++ b/xfa/src/fdp/src/xml/fde_xml_imp.h @@ -9,8 +9,8 @@ #include "core/include/fxcrt/fx_system.h" #include "xfa/src/fdp/include/fde_xml.h" -#include "xfa/src/fgas/include/fx_mem.h" -#include "xfa/src/fgas/include/fx_stm.h" +#include "xfa/src/fgas/crt/fgas_memory.h" +#include "xfa/src/fgas/crt/fgas_stream.h" class CFDE_BlockBuffer; class CFDE_XMLInstruction; |