diff options
Diffstat (limited to 'xfa/fxfa/parser')
24 files changed, 27 insertions, 27 deletions
diff --git a/xfa/fxfa/parser/cscript_eventpseudomodel.cpp b/xfa/fxfa/parser/cscript_eventpseudomodel.cpp index 73356af8bf..dd6142c47c 100644 --- a/xfa/fxfa/parser/cscript_eventpseudomodel.cpp +++ b/xfa/fxfa/parser/cscript_eventpseudomodel.cpp @@ -8,13 +8,13 @@ #include "fxjs/cfxjse_arguments.h" #include "xfa/fxfa/app/xfa_ffnotify.h" -#include "xfa/fxfa/include/cxfa_eventparam.h" -#include "xfa/fxfa/include/xfa_ffwidgethandler.h" +#include "xfa/fxfa/cxfa_eventparam.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/cxfa_scriptcontext.h" #include "xfa/fxfa/parser/xfa_localemgr.h" #include "xfa/fxfa/parser/xfa_object.h" #include "xfa/fxfa/parser/xfa_utils.h" +#include "xfa/fxfa/xfa_ffwidgethandler.h" namespace { diff --git a/xfa/fxfa/parser/cxfa_data.h b/xfa/fxfa/parser/cxfa_data.h index e3c6390d80..829c84cc9f 100644 --- a/xfa/fxfa/parser/cxfa_data.h +++ b/xfa/fxfa/parser/cxfa_data.h @@ -9,7 +9,7 @@ #include "core/fxcrt/fx_system.h" #include "core/fxge/fx_dib.h" -#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/fxfa_basic.h" class CXFA_Node; diff --git a/xfa/fxfa/parser/cxfa_dataimporter.cpp b/xfa/fxfa/parser/cxfa_dataimporter.cpp index c5bcc99cb9..92559a1239 100644 --- a/xfa/fxfa/parser/cxfa_dataimporter.cpp +++ b/xfa/fxfa/parser/cxfa_dataimporter.cpp @@ -10,8 +10,8 @@ #include "core/fxcrt/fx_stream.h" #include "xfa/fde/xml/fde_xml_imp.h" -#include "xfa/fxfa/include/fxfa.h" -#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/fxfa.h" +#include "xfa/fxfa/fxfa_basic.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/cxfa_simple_parser.h" #include "xfa/fxfa/parser/xfa_object.h" diff --git a/xfa/fxfa/parser/cxfa_document.h b/xfa/fxfa/parser/cxfa_document.h index dbcfa47b53..919be5da2d 100644 --- a/xfa/fxfa/parser/cxfa_document.h +++ b/xfa/fxfa/parser/cxfa_document.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_CXFA_DOCUMENT_H_ #define XFA_FXFA_PARSER_CXFA_DOCUMENT_H_ -#include "xfa/fxfa/include/fxfa.h" +#include "xfa/fxfa/fxfa.h" #include "xfa/fxfa/parser/xfa_localemgr.h" #include "xfa/fxfa/parser/xfa_object.h" diff --git a/xfa/fxfa/parser/cxfa_document_parser.cpp b/xfa/fxfa/parser/cxfa_document_parser.cpp index daf5221489..459edfa5ec 100644 --- a/xfa/fxfa/parser/cxfa_document_parser.cpp +++ b/xfa/fxfa/parser/cxfa_document_parser.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/cxfa_document_parser.h" -#include "xfa/fxfa/include/fxfa.h" +#include "xfa/fxfa/fxfa.h" #include "xfa/fxfa/parser/cxfa_document.h" CXFA_DocumentParser::CXFA_DocumentParser(CXFA_FFNotify* pNotify) diff --git a/xfa/fxfa/parser/cxfa_measurement.h b/xfa/fxfa/parser/cxfa_measurement.h index d1b83bda40..cf43f7625a 100644 --- a/xfa/fxfa/parser/cxfa_measurement.h +++ b/xfa/fxfa/parser/cxfa_measurement.h @@ -9,7 +9,7 @@ #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" -#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/fxfa_basic.h" class CXFA_Measurement { public: diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp index 5152436aeb..bf5b6bf964 100644 --- a/xfa/fxfa/parser/cxfa_node.cpp +++ b/xfa/fxfa/parser/cxfa_node.cpp @@ -15,7 +15,7 @@ #include "xfa/fde/xml/fde_xml_imp.h" #include "xfa/fgas/crt/fgas_codepage.h" #include "xfa/fxfa/app/xfa_ffnotify.h" -#include "xfa/fxfa/include/cxfa_eventparam.h" +#include "xfa/fxfa/cxfa_eventparam.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/cxfa_layoutprocessor.h" #include "xfa/fxfa/parser/cxfa_measurement.h" diff --git a/xfa/fxfa/parser/cxfa_scriptcontext.cpp b/xfa/fxfa/parser/cxfa_scriptcontext.cpp index 0a0e5bde5d..e7d45e3074 100644 --- a/xfa/fxfa/parser/cxfa_scriptcontext.cpp +++ b/xfa/fxfa/parser/cxfa_scriptcontext.cpp @@ -11,7 +11,7 @@ #include "fxjs/cfxjse_class.h" #include "fxjs/cfxjse_value.h" #include "xfa/fxfa/app/xfa_ffnotify.h" -#include "xfa/fxfa/include/cxfa_eventparam.h" +#include "xfa/fxfa/cxfa_eventparam.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/cxfa_nodehelper.h" #include "xfa/fxfa/parser/cxfa_resolveprocessor.h" diff --git a/xfa/fxfa/parser/cxfa_scriptcontext.h b/xfa/fxfa/parser/cxfa_scriptcontext.h index 2816d26808..656c51a8c8 100644 --- a/xfa/fxfa/parser/cxfa_scriptcontext.h +++ b/xfa/fxfa/parser/cxfa_scriptcontext.h @@ -12,8 +12,8 @@ #include <vector> #include "fxjs/cfxjse_arguments.h" +#include "xfa/fxfa/cxfa_eventparam.h" #include "xfa/fxfa/fm2js/xfa_fm2jscontext.h" -#include "xfa/fxfa/include/cxfa_eventparam.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/xfa_resolvenode_rs.h" diff --git a/xfa/fxfa/parser/cxfa_simple_parser.cpp b/xfa/fxfa/parser/cxfa_simple_parser.cpp index 3f431e08b3..b8d9fcb318 100644 --- a/xfa/fxfa/parser/cxfa_simple_parser.cpp +++ b/xfa/fxfa/parser/cxfa_simple_parser.cpp @@ -8,13 +8,13 @@ #include "core/fxcrt/fx_ext.h" #include "xfa/fgas/crt/fgas_codepage.h" -#include "xfa/fxfa/include/fxfa.h" -#include "xfa/fxfa/include/xfa_checksum.h" +#include "xfa/fxfa/fxfa.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/cxfa_widetextread.h" #include "xfa/fxfa/parser/cxfa_xml_parser.h" #include "xfa/fxfa/parser/xfa_basic_data.h" #include "xfa/fxfa/parser/xfa_utils.h" +#include "xfa/fxfa/xfa_checksum.h" namespace { diff --git a/xfa/fxfa/parser/cxfa_simple_parser.h b/xfa/fxfa/parser/cxfa_simple_parser.h index 270dcd2a30..f4d0095c1c 100644 --- a/xfa/fxfa/parser/cxfa_simple_parser.h +++ b/xfa/fxfa/parser/cxfa_simple_parser.h @@ -10,7 +10,7 @@ #include <memory> #include "xfa/fde/xml/fde_xml_imp.h" -#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/fxfa_basic.h" class CXFA_Document; class CXFA_Node; diff --git a/xfa/fxfa/parser/cxfa_stroke.h b/xfa/fxfa/parser/cxfa_stroke.h index 8db1b29959..d42ece32c8 100644 --- a/xfa/fxfa/parser/cxfa_stroke.h +++ b/xfa/fxfa/parser/cxfa_stroke.h @@ -9,7 +9,7 @@ #include "core/fxcrt/fx_system.h" #include "core/fxge/fx_dib.h" -#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/fxfa_basic.h" #include "xfa/fxfa/parser/cxfa_data.h" enum StrokeSameStyle { diff --git a/xfa/fxfa/parser/cxfa_valuearray.h b/xfa/fxfa/parser/cxfa_valuearray.h index c1af419c10..2c4ea29779 100644 --- a/xfa/fxfa/parser/cxfa_valuearray.h +++ b/xfa/fxfa/parser/cxfa_valuearray.h @@ -8,7 +8,7 @@ #define XFA_FXFA_PARSER_CXFA_VALUEARRAY_H_ #include "fxjs/cfxjse_value.h" -#include "xfa/fxfa/include/fxfa.h" +#include "xfa/fxfa/fxfa.h" class CXFA_ValueArray : public CFX_ArrayTemplate<CFXJSE_Value*> { public: diff --git a/xfa/fxfa/parser/xfa_basic_data.cpp b/xfa/fxfa/parser/xfa_basic_data.cpp index 308090e1cf..fecc942c7d 100644 --- a/xfa/fxfa/parser/xfa_basic_data.cpp +++ b/xfa/fxfa/parser/xfa_basic_data.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/xfa_basic_data.h" -#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/fxfa_basic.h" #include "xfa/fxfa/parser/xfa_object.h" const XFA_ELEMENTINFO g_XFAElementData[] = { diff --git a/xfa/fxfa/parser/xfa_basic_data.h b/xfa/fxfa/parser/xfa_basic_data.h index 119ef85e76..5b97ee2faa 100644 --- a/xfa/fxfa/parser/xfa_basic_data.h +++ b/xfa/fxfa/parser/xfa_basic_data.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_PARSER_XFA_BASIC_DATA_H_ #define XFA_FXFA_PARSER_XFA_BASIC_DATA_H_ -#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/fxfa_basic.h" extern const XFA_PACKETINFO g_XFAPacketData[]; extern const int32_t g_iXFAPacketCount; diff --git a/xfa/fxfa/parser/xfa_basic_data_attributes.cpp b/xfa/fxfa/parser/xfa_basic_data_attributes.cpp index 66d4be23cc..6ed16a0c3d 100644 --- a/xfa/fxfa/parser/xfa_basic_data_attributes.cpp +++ b/xfa/fxfa/parser/xfa_basic_data_attributes.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/xfa_basic_data.h" -#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/fxfa_basic.h" #include "xfa/fxfa/parser/cxfa_measurement.h" static const CXFA_Measurement g_XFAMeasurementData[] = { diff --git a/xfa/fxfa/parser/xfa_basic_data_element_attributes.cpp b/xfa/fxfa/parser/xfa_basic_data_element_attributes.cpp index e6d4402503..640af338e6 100644 --- a/xfa/fxfa/parser/xfa_basic_data_element_attributes.cpp +++ b/xfa/fxfa/parser/xfa_basic_data_element_attributes.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/xfa_basic_data.h" -#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/fxfa_basic.h" const XFA_ELEMENTHIERARCHY g_XFAElementAttributeIndex[] = { {0, 3}, {3, 2}, {5, 3}, {8, 10}, {18, 2}, {20, 6}, {26, 2}, diff --git a/xfa/fxfa/parser/xfa_basic_data_element_properties.cpp b/xfa/fxfa/parser/xfa_basic_data_element_properties.cpp index 268a5ea8e5..1b47b033e8 100644 --- a/xfa/fxfa/parser/xfa_basic_data_element_properties.cpp +++ b/xfa/fxfa/parser/xfa_basic_data_element_properties.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/xfa_basic_data.h" -#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/fxfa_basic.h" const XFA_ELEMENTHIERARCHY g_XFAElementPropertyIndex[] = { {0, 8}, {8, 0}, {8, 14}, {22, 0}, {22, 0}, {22, 6}, {28, 0}, diff --git a/xfa/fxfa/parser/xfa_basic_data_element_script.cpp b/xfa/fxfa/parser/xfa_basic_data_element_script.cpp index c4b3818686..675fb8a39a 100644 --- a/xfa/fxfa/parser/xfa_basic_data_element_script.cpp +++ b/xfa/fxfa/parser/xfa_basic_data_element_script.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/xfa_basic_data.h" -#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/fxfa_basic.h" #include "xfa/fxfa/parser/cscript_datawindow.h" #include "xfa/fxfa/parser/cscript_eventpseudomodel.h" #include "xfa/fxfa/parser/cscript_hostpseudomodel.h" diff --git a/xfa/fxfa/parser/xfa_basic_data_enum.cpp b/xfa/fxfa/parser/xfa_basic_data_enum.cpp index 89305da16f..06cd764e6d 100644 --- a/xfa/fxfa/parser/xfa_basic_data_enum.cpp +++ b/xfa/fxfa/parser/xfa_basic_data_enum.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/xfa_basic_data.h" -#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/fxfa_basic.h" const XFA_ATTRIBUTEENUMINFO g_XFAEnumData[] = { {0x2a, L"*", XFA_ATTRIBUTEENUM_Asterisk}, diff --git a/xfa/fxfa/parser/xfa_basic_data_packets.cpp b/xfa/fxfa/parser/xfa_basic_data_packets.cpp index bfd1d91004..39a09dabd0 100644 --- a/xfa/fxfa/parser/xfa_basic_data_packets.cpp +++ b/xfa/fxfa/parser/xfa_basic_data_packets.cpp @@ -6,7 +6,7 @@ #include "xfa/fxfa/parser/xfa_basic_data.h" -#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/fxfa_basic.h" const XFA_PACKETINFO g_XFAPacketData[] = { {0x0, nullptr, XFA_XDPPACKET_USER, nullptr, diff --git a/xfa/fxfa/parser/xfa_layout_itemlayout.h b/xfa/fxfa/parser/xfa_layout_itemlayout.h index ee9e29d8b4..6da09cb3f7 100644 --- a/xfa/fxfa/parser/xfa_layout_itemlayout.h +++ b/xfa/fxfa/parser/xfa_layout_itemlayout.h @@ -13,7 +13,7 @@ #include <map> #include "core/fxcrt/fx_basic.h" -#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/fxfa_basic.h" #define XFA_LAYOUT_INVALIDNODE ((CXFA_Node*)(intptr_t)-1) #define XFA_LAYOUT_FLOAT_PERCISION (0.0005f) diff --git a/xfa/fxfa/parser/xfa_resolvenode_rs.h b/xfa/fxfa/parser/xfa_resolvenode_rs.h index 407352e8c9..633d080876 100644 --- a/xfa/fxfa/parser/xfa_resolvenode_rs.h +++ b/xfa/fxfa/parser/xfa_resolvenode_rs.h @@ -8,7 +8,7 @@ #define XFA_FXFA_PARSER_XFA_RESOLVENODE_RS_H_ #include "fxjs/cfxjse_value.h" -#include "xfa/fxfa/include/fxfa.h" +#include "xfa/fxfa/fxfa.h" #include "xfa/fxfa/parser/cxfa_valuearray.h" #define XFA_RESOLVENODE_Children 0x0001 diff --git a/xfa/fxfa/parser/xfa_utils.h b/xfa/fxfa/parser/xfa_utils.h index a5bdc905d0..90168604eb 100644 --- a/xfa/fxfa/parser/xfa_utils.h +++ b/xfa/fxfa/parser/xfa_utils.h @@ -10,7 +10,7 @@ #include "xfa/fde/xml/fde_xml.h" #include "xfa/fgas/crt/fgas_stream.h" #include "xfa/fgas/crt/fgas_utils.h" -#include "xfa/fxfa/include/fxfa_basic.h" +#include "xfa/fxfa/fxfa_basic.h" class CFDE_XMLElement; class CFDE_XMLNode; |