diff options
Diffstat (limited to 'xfa/src')
310 files changed, 1128 insertions, 891 deletions
diff --git a/xfa/src/fdp/include/fde.h b/xfa/src/fdp/include/fde.h index 2ec103fe25..9a6a663d10 100644 --- a/xfa/src/fdp/include/fde.h +++ b/xfa/src/fdp/include/fde.h @@ -9,16 +9,16 @@ #ifndef XFA_SRC_FDP_INCLUDE_FDE_H_ #define XFA_SRC_FDP_INCLUDE_FDE_H_ -#include "xfa/src/fdp/include/fde_mem.h" -#include "xfa/src/fdp/include/fde_xml.h" -#include "xfa/src/fdp/include/fde_img.h" #include "xfa/src/fdp/include/fde_brs.h" +#include "xfa/src/fdp/include/fde_css.h" +#include "xfa/src/fdp/include/fde_img.h" +#include "xfa/src/fdp/include/fde_mem.h" #include "xfa/src/fdp/include/fde_pen.h" -#include "xfa/src/fdp/include/fde_pth.h" -#include "xfa/src/fdp/include/fde_tto.h" #include "xfa/src/fdp/include/fde_psr.h" -#include "xfa/src/fdp/include/fde_css.h" -#include "xfa/src/fdp/include/fde_rdv.h" +#include "xfa/src/fdp/include/fde_pth.h" #include "xfa/src/fdp/include/fde_rdr.h" +#include "xfa/src/fdp/include/fde_rdv.h" +#include "xfa/src/fdp/include/fde_tto.h" +#include "xfa/src/fdp/include/fde_xml.h" #endif // XFA_SRC_FDP_INCLUDE_FDE_H_ diff --git a/xfa/src/fdp/include/fde_css.h b/xfa/src/fdp/include/fde_css.h index 5e4da8fe35..825a2a65f7 100644 --- a/xfa/src/fdp/include/fde_css.h +++ b/xfa/src/fdp/include/fde_css.h @@ -7,6 +7,11 @@ #ifndef XFA_SRC_FDP_INCLUDE_FDE_CSS_H_ #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" + class IFDE_HTMNotify; class IFDE_CSSValue; class IFDE_CSSPrimitiveValue; @@ -41,6 +46,7 @@ class IFDE_CSSQuoteContext; class IFDE_CSSContentContext; class IFDE_CSSMultiColumnContext; class IFDE_CSSFloatContext; + enum FDE_CSSVALUETYPE { FDE_CSSVALUETYPE_Primitive = 1, FDE_CSSVALUETYPE_List = 2, diff --git a/xfa/src/fdp/include/fde_img.h b/xfa/src/fdp/include/fde_img.h index 4388bbfae5..b1612cb91f 100644 --- a/xfa/src/fdp/include/fde_img.h +++ b/xfa/src/fdp/include/fde_img.h @@ -7,7 +7,10 @@ #ifndef XFA_SRC_FDP_INCLUDE_FDE_IMG_H_ #define XFA_SRC_FDP_INCLUDE_FDE_IMG_H_ -class IFDE_Image; +#include "xfa/src/fgas/include/fx_mem.h" +#include "xfa/src/fgas/include/fx_stm.h" +#include "xfa/src/fgas/include/fx_utl.h" + #define FDE_IMAGEFORMAT_Unknown -1 #define FDE_IMAGEFORMAT_BMP 0 #define FDE_IMAGEFORMAT_GIF 1 @@ -16,6 +19,7 @@ class IFDE_Image; #define FDE_IMAGEFORMAT_TIFF 4 #define FDE_IMAGEFORMAT_JPEG2000 5 #define FDE_IMAGEFORMAT_JBig2 6 + class IFDE_Image { public: static IFDE_Image* Create(IFX_Stream* pStream, diff --git a/xfa/src/fdp/include/fde_psr.h b/xfa/src/fdp/include/fde_psr.h index 5f3e93d93c..253eb8d903 100644 --- a/xfa/src/fdp/include/fde_psr.h +++ b/xfa/src/fdp/include/fde_psr.h @@ -7,6 +7,16 @@ #ifndef XFA_SRC_FDP_INCLUDE_FDE_PSR_H_ #define XFA_SRC_FDP_INCLUDE_FDE_PSR_H_ +#include "core/include/fxcrt/fx_coordinates.h" +#include "core/include/fxcrt/fx_system.h" +#include "core/include/fxge/fx_dib.h" +#include "core/include/fxge/fx_ge.h" +#include "xfa/src/fdp/include/fde_brs.h" +#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" + enum FDE_VISUALOBJTYPE { FDE_VISUALOBJ_Canvas = 0x00, FDE_VISUALOBJ_Text = 0x01, @@ -14,7 +24,9 @@ enum FDE_VISUALOBJTYPE { FDE_VISUALOBJ_Path = 0x04, FDE_VISUALOBJ_Widget = 0x08, }; + typedef struct _FDE_HVISUALOBJ { void* pData; } const* FDE_HVISUALOBJ; + class IFDE_VisualSet { public: virtual ~IFDE_VisualSet() {} @@ -24,6 +36,7 @@ class IFDE_VisualSet { virtual FX_BOOL GetRect(FDE_HVISUALOBJ hVisualObj, CFX_RectF& rt) = 0; virtual FX_BOOL GetClip(FDE_HVISUALOBJ hVisualObj, CFX_RectF& rt) = 0; }; + class IFDE_CanvasSet : public IFDE_VisualSet { public: virtual FX_POSITION GetFirstPosition(FDE_HVISUALOBJ hCanvas) = 0; diff --git a/xfa/src/fdp/include/fde_rdr.h b/xfa/src/fdp/include/fde_rdr.h index 8aca67361b..085a78e4c1 100644 --- a/xfa/src/fdp/include/fde_rdr.h +++ b/xfa/src/fdp/include/fde_rdr.h @@ -7,6 +7,9 @@ #ifndef XFA_SRC_FDP_INCLUDE_FDE_RDR_H_ #define XFA_SRC_FDP_INCLUDE_FDE_RDR_H_ +#include "core/include/fxcrt/fx_coordinates.h" +#include "xfa/src/fdp/include/fde_psr.h" + class IFDE_Page; class IFDE_RenderDevice; diff --git a/xfa/src/fdp/include/fde_rdv.h b/xfa/src/fdp/include/fde_rdv.h index 2d9e3800ef..88e7dd4507 100644 --- a/xfa/src/fdp/include/fde_rdv.h +++ b/xfa/src/fdp/include/fde_rdv.h @@ -7,6 +7,12 @@ #ifndef XFA_SRC_FDP_INCLUDE_FDE_RDV_H_ #define XFA_SRC_FDP_INCLUDE_FDE_RDV_H_ +#include "core/include/fxcrt/fx_coordinates.h" +#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" + class IFDE_Pen; class IFDE_Brush; class IFDE_Image; diff --git a/xfa/src/fdp/include/fde_tto.h b/xfa/src/fdp/include/fde_tto.h index 3e7fcf9f38..dbfa64775c 100644 --- a/xfa/src/fdp/include/fde_tto.h +++ b/xfa/src/fdp/include/fde_tto.h @@ -7,7 +7,10 @@ #ifndef XFA_SRC_FDP_INCLUDE_FDE_TTO_H_ #define XFA_SRC_FDP_INCLUDE_FDE_TTO_H_ -class IFDE_TextOut; +#include "core/include/fxge/fx_dib.h" +#include "core/include/fxge/fx_ge.h" +#include "xfa/src/fgas/include/fx_fnt.h" + #define FDE_TTOSTYLE_Underline 0x0001 #define FDE_TTOSTYLE_Strikeout 0x0002 #define FDE_TTOSTYLE_VerticalLayout 0x0004 diff --git a/xfa/src/fdp/include/fde_xml.h b/xfa/src/fdp/include/fde_xml.h index 40b0480e8c..a83e27e66c 100644 --- a/xfa/src/fdp/include/fde_xml.h +++ b/xfa/src/fdp/include/fde_xml.h @@ -7,6 +7,9 @@ #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" + class IFDE_XMLNode; class IFDE_XMLInstruction; class IFDE_XMLDeclaration; @@ -22,6 +25,7 @@ class IFDE_XMLText; class IFDE_XMLDoc; class IFDE_XMLParser; class IFDE_XMLSyntaxParser; + #ifdef __cplusplus extern "C" { #endif diff --git a/xfa/src/fdp/src/css/fde_csscache.cpp b/xfa/src/fdp/src/css/fde_csscache.cpp index 5909524dae..90fb50f121 100644 --- a/xfa/src/fdp/src/css/fde_csscache.cpp +++ b/xfa/src/fdp/src/css/fde_csscache.cpp @@ -6,8 +6,8 @@ #include <algorithm> -#include "xfa/src/foxitlib.h" #include "xfa/src/fdp/src/css/fde_csscache.h" +#include "xfa/src/foxitlib.h" _FDE_CSSCACHEITEM::_FDE_CSSCACHEITEM(IFDE_CSSStyleSheet* p) : pStylesheet(p), dwActivity(0) { FXSYS_assert(pStylesheet); diff --git a/xfa/src/fdp/src/css/fde_csscache.h b/xfa/src/fdp/src/css/fde_csscache.h index d42821b969..29ef417412 100644 --- a/xfa/src/fdp/src/css/fde_csscache.h +++ b/xfa/src/fdp/src/css/fde_csscache.h @@ -7,6 +7,9 @@ #ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSCACHE_H_ #define XFA_SRC_FDP_SRC_CSS_FDE_CSSCACHE_H_ +#include "xfa/src/fdp/include/fde_css.h" +#include "xfa/src/fgas/include/fx_mem.h" + typedef struct _FDE_CSSCACHEITEM : public CFX_Target { _FDE_CSSCACHEITEM(IFDE_CSSStyleSheet* p); ~_FDE_CSSCACHEITEM(); diff --git a/xfa/src/fdp/src/css/fde_cssdatatable.cpp b/xfa/src/fdp/src/css/fde_cssdatatable.cpp index cda1fe4638..28b925dda2 100644 --- a/xfa/src/fdp/src/css/fde_cssdatatable.cpp +++ b/xfa/src/fdp/src/css/fde_cssdatatable.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" #include "xfa/src/fdp/src/css/fde_cssdatatable.h" +#include "xfa/src/foxitlib.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 d4e4be5094..df396228fc 100644 --- a/xfa/src/fdp/src/css/fde_cssdatatable.h +++ b/xfa/src/fdp/src/css/fde_cssdatatable.h @@ -7,6 +7,10 @@ #ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSDATATABLE_H_ #define XFA_SRC_FDP_SRC_CSS_FDE_CSSDATATABLE_H_ +#include "core/include/fxcrt/fx_system.h" +#include "xfa/src/fdp/include/fde_css.h" +#include "xfa/src/fgas/include/fx_mem.h" + class CFDE_CSSFunction : public CFX_Target { public: CFDE_CSSFunction(const FX_WCHAR* pszFuncName, IFDE_CSSValueList* pArgList) diff --git a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp b/xfa/src/fdp/src/css/fde_cssdeclaration.cpp index 08ea0ee7da..6d5081317c 100644 --- a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp +++ b/xfa/src/fdp/src/css/fde_cssdeclaration.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" #include "xfa/src/fdp/src/css/fde_cssdeclaration.h" +#include "xfa/src/foxitlib.h" IFDE_CSSValue* CFDE_CSSDeclaration::GetProperty(FDE_CSSPROPERTY eProperty, FX_BOOL& bImportant) const { for (FDE_LPCSSPROPERTYHOLDER pHolder = m_pFirstProperty; pHolder; diff --git a/xfa/src/fdp/src/css/fde_cssstyleselector.cpp b/xfa/src/fdp/src/css/fde_cssstyleselector.cpp index 1bb0133e99..6cf011ac77 100644 --- a/xfa/src/fdp/src/css/fde_cssstyleselector.cpp +++ b/xfa/src/fdp/src/css/fde_cssstyleselector.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" #include "xfa/src/fdp/src/css/fde_csscache.h" #include "xfa/src/fdp/src/css/fde_cssdeclaration.h" #include "xfa/src/fdp/src/css/fde_cssstyleselector.h" +#include "xfa/src/foxitlib.h" int32_t CFDE_CSSCounterStyle::FindIndex(const FX_WCHAR* pszIdentifier) { int32_t iCount = m_arrCounterData.GetSize(); for (int32_t i = 0; i < iCount; i++) { diff --git a/xfa/src/fdp/src/css/fde_cssstyleselector.h b/xfa/src/fdp/src/css/fde_cssstyleselector.h index 92e58f5ba1..aac9b1fad8 100644 --- a/xfa/src/fdp/src/css/fde_cssstyleselector.h +++ b/xfa/src/fdp/src/css/fde_cssstyleselector.h @@ -7,6 +7,9 @@ #ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSSTYLESELECTOR_H_ #define XFA_SRC_FDP_SRC_CSS_FDE_CSSSTYLESELECTOR_H_ +#include "xfa/src/fdp/include/fde_mem.h" +#include "xfa/src/fgas/include/fx_sys.h" + #define FDE_CSSUNIVERSALHASH ('*') typedef struct _FDE_CSSRULEDATA : public CFX_Target { public: diff --git a/xfa/src/fdp/src/css/fde_cssstylesheet.cpp b/xfa/src/fdp/src/css/fde_cssstylesheet.cpp index 4aa9bf77b2..b8046280f2 100644 --- a/xfa/src/fdp/src/css/fde_cssstylesheet.cpp +++ b/xfa/src/fdp/src/css/fde_cssstylesheet.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" -#include "xfa/src/fdp/src/css/fde_csssyntax.h" #include "xfa/src/fdp/src/css/fde_cssdatatable.h" #include "xfa/src/fdp/src/css/fde_cssstylesheet.h" +#include "xfa/src/fdp/src/css/fde_csssyntax.h" +#include "xfa/src/foxitlib.h" IFDE_CSSStyleSheet* IFDE_CSSStyleSheet::LoadHTMLStandardStyleSheet() { static const FX_WCHAR* s_pStyle = L"html,address,blockquote,body,dd,div,dl,dt,fieldset,form,frame,frameset," diff --git a/xfa/src/fdp/src/css/fde_cssstylesheet.h b/xfa/src/fdp/src/css/fde_cssstylesheet.h index 789e55f667..e8b6146e92 100644 --- a/xfa/src/fdp/src/css/fde_cssstylesheet.h +++ b/xfa/src/fdp/src/css/fde_cssstylesheet.h @@ -7,6 +7,7 @@ #ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSSTYLESHEET_H_ #define XFA_SRC_FDP_SRC_CSS_FDE_CSSSTYLESHEET_H_ +#include "core/include/fxcrt/fx_ext.h" #include "xfa/src/fdp/src/css/fde_cssdeclaration.h" class CFDE_CSSSelector : public IFDE_CSSSelector, public CFX_Target { diff --git a/xfa/src/fdp/src/css/fde_csssyntax.cpp b/xfa/src/fdp/src/css/fde_csssyntax.cpp index 15b8dbb23a..35bb32217d 100644 --- a/xfa/src/fdp/src/css/fde_csssyntax.cpp +++ b/xfa/src/fdp/src/css/fde_csssyntax.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" -#include "xfa/src/fdp/src/css/fde_csssyntax.h" #include "xfa/src/fdp/src/css/fde_cssdatatable.h" +#include "xfa/src/fdp/src/css/fde_csssyntax.h" +#include "xfa/src/foxitlib.h" #ifdef _cplusplus extern "C" { #endif diff --git a/xfa/src/fdp/src/fde/fde_devbasic.cpp b/xfa/src/fdp/src/fde/fde_devbasic.cpp index bcc441806c..6b0e13971e 100644 --- a/xfa/src/fdp/src/fde/fde_devbasic.cpp +++ b/xfa/src/fdp/src/fde/fde_devbasic.cpp @@ -4,8 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" +#include <cstdint> + #include "xfa/src/fdp/src/fde/fde_devbasic.h" +#include "xfa/src/foxitlib.h" + static const FDE_HATCHDATA gs_HatchBitmapData[FDE_HATCHSTYLE_Total] = { {16, 16, diff --git a/xfa/src/fdp/src/fde/fde_devbasic.h b/xfa/src/fdp/src/fde/fde_devbasic.h index e5c27be2e0..62846ca8b7 100644 --- a/xfa/src/fdp/src/fde/fde_devbasic.h +++ b/xfa/src/fdp/src/fde/fde_devbasic.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FDP_SRC_FDE_FDE_DEVBASIC_H_ #define XFA_SRC_FDP_SRC_FDE_FDE_DEVBASIC_H_ +#include <cstdint> + struct FDE_HATCHDATA { int32_t iWidth; int32_t iHeight; diff --git a/xfa/src/fdp/src/fde/fde_gedevice.cpp b/xfa/src/fdp/src/fde/fde_gedevice.cpp index 841882f419..fb124e3b4d 100644 --- a/xfa/src/fdp/src/fde/fde_gedevice.cpp +++ b/xfa/src/fdp/src/fde/fde_gedevice.cpp @@ -6,10 +6,10 @@ #include <algorithm> -#include "xfa/src/foxitlib.h" +#include "xfa/src/fdp/src/fde/fde_devbasic.h" #include "xfa/src/fdp/src/fde/fde_gedevice.h" #include "xfa/src/fdp/src/fde/fde_geobject.h" -#include "xfa/src/fdp/src/fde/fde_devbasic.h" +#include "xfa/src/foxitlib.h" #ifndef _FDEPLUS #ifdef _cplusplus exten "C" { diff --git a/xfa/src/fdp/src/fde/fde_gedevice.h b/xfa/src/fdp/src/fde/fde_gedevice.h index dc22f7b0d4..1f39895568 100644 --- a/xfa/src/fdp/src/fde/fde_gedevice.h +++ b/xfa/src/fdp/src/fde/fde_gedevice.h @@ -7,6 +7,9 @@ #ifndef XFA_SRC_FDP_SRC_FDE_FDE_GEDEVICE_H_ #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" + #ifndef _FDEPLUS class CFDE_FxgeDevice : public IFDE_RenderDevice, public CFX_Target { public: diff --git a/xfa/src/fdp/src/fde/fde_geobject.cpp b/xfa/src/fdp/src/fde/fde_geobject.cpp index 92ec6ea4da..ed122abbb0 100644 --- a/xfa/src/fdp/src/fde/fde_geobject.cpp +++ b/xfa/src/fdp/src/fde/fde_geobject.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" -#include "xfa/src/fdp/src/fde/fde_object.h" #include "xfa/src/fdp/src/fde/fde_geobject.h" +#include "xfa/src/fdp/src/fde/fde_object.h" +#include "xfa/src/foxitlib.h" #ifndef _FDEPLUS IFDE_Path* IFDE_Path::Create() { return new CFDE_Path; diff --git a/xfa/src/fdp/src/fde/fde_iterator.cpp b/xfa/src/fdp/src/fde/fde_iterator.cpp index 5d6c415a8e..932fa58ec5 100644 --- a/xfa/src/fdp/src/fde/fde_iterator.cpp +++ b/xfa/src/fdp/src/fde/fde_iterator.cpp @@ -4,8 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" #include "xfa/src/fdp/src/fde/fde_iterator.h" +#include "xfa/src/fgas/include/fx_utl.h" +#include "xfa/src/foxitlib.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 c9fb8e423d..736bac0bee 100644 --- a/xfa/src/fdp/src/fde/fde_iterator.h +++ b/xfa/src/fdp/src/fde/fde_iterator.h @@ -7,6 +7,9 @@ #ifndef XFA_SRC_FDP_SRC_FDE_FDE_ITERATOR_H_ #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" + typedef struct _FDE_CANVASITEM : public CFX_Target { IFDE_CanvasSet* pCanvas; FDE_HVISUALOBJ hCanvas; diff --git a/xfa/src/fdp/src/fde/fde_object.cpp b/xfa/src/fdp/src/fde/fde_object.cpp index 47a1bb5efe..ba058b8179 100644 --- a/xfa/src/fdp/src/fde/fde_object.cpp +++ b/xfa/src/fdp/src/fde/fde_object.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" #include "xfa/src/fdp/src/fde/fde_object.h" +#include "xfa/src/foxitlib.h" IFDE_Pen* IFDE_Pen::Create() { return new CFDE_Pen(); } diff --git a/xfa/src/fdp/src/fde/fde_object.h b/xfa/src/fdp/src/fde/fde_object.h index 91162edeb4..222968c357 100644 --- a/xfa/src/fdp/src/fde/fde_object.h +++ b/xfa/src/fdp/src/fde/fde_object.h @@ -7,6 +7,13 @@ #ifndef XFA_SRC_FDP_SRC_FDE_FDE_OBJECT_H_ #define XFA_SRC_FDP_SRC_FDE_FDE_OBJECT_H_ +#include <cstdint> + +#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" + class CFDE_Pen : public IFDE_Pen, public CFX_Target { public: CFDE_Pen() diff --git a/xfa/src/fdp/src/fde/fde_render.cpp b/xfa/src/fdp/src/fde/fde_render.cpp index a3f00acd9e..10ad622637 100644 --- a/xfa/src/fdp/src/fde/fde_render.cpp +++ b/xfa/src/fdp/src/fde/fde_render.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" #include "xfa/src/fdp/src/fde/fde_render.h" +#include "xfa/src/foxitlib.h" void FDE_GetPageMatrix(CFX_Matrix& pageMatrix, const CFX_RectF& docPageRect, const CFX_Rect& devicePageRect, diff --git a/xfa/src/fdp/src/fde/fde_render.h b/xfa/src/fdp/src/fde/fde_render.h index 4d9ae42db6..ce405a21fb 100644 --- a/xfa/src/fdp/src/fde/fde_render.h +++ b/xfa/src/fdp/src/fde/fde_render.h @@ -7,6 +7,11 @@ #ifndef XFA_SRC_FDP_SRC_FDE_FDE_RENDER_H_ #define XFA_SRC_FDP_SRC_FDE_FDE_RENDER_H_ +#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" + class CFDE_RenderContext : public IFDE_RenderContext, public CFX_Target { public: diff --git a/xfa/src/fdp/src/tto/fde_textout.cpp b/xfa/src/fdp/src/tto/fde_textout.cpp index 7150173dbb..b10a6ecbd7 100644 --- a/xfa/src/fdp/src/tto/fde_textout.cpp +++ b/xfa/src/fdp/src/tto/fde_textout.cpp @@ -6,8 +6,8 @@ #include <algorithm> -#include "xfa/src/foxitlib.h" #include "xfa/src/fdp/src/tto/fde_textout.h" +#include "xfa/src/foxitlib.h" IFDE_TextOut* IFDE_TextOut::Create() { return new CFDE_TextOut; } diff --git a/xfa/src/fdp/src/tto/fde_textout.h b/xfa/src/fdp/src/tto/fde_textout.h index ac9d88381a..afe62a613b 100644 --- a/xfa/src/fdp/src/tto/fde_textout.h +++ b/xfa/src/fdp/src/tto/fde_textout.h @@ -7,6 +7,18 @@ #ifndef XFA_SRC_FDP_SRC_TTO_FDE_TEXTOUT_H_ #define XFA_SRC_FDP_SRC_TTO_FDE_TEXTOUT_H_ +#include "core/include/fxcrt/fx_coordinates.h" +#include "core/include/fxcrt/fx_system.h" +#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/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" + struct FDE_TTOPIECE { public: int32_t iStartChar; diff --git a/xfa/src/fdp/src/xml/fde_xml_imp.cpp b/xfa/src/fdp/src/xml/fde_xml_imp.cpp index 626e2388b4..fb9207ddf0 100644 --- a/xfa/src/fdp/src/xml/fde_xml_imp.cpp +++ b/xfa/src/fdp/src/xml/fde_xml_imp.cpp @@ -6,8 +6,8 @@ #include <algorithm> -#include "xfa/src/foxitlib.h" #include "xfa/src/fdp/src/xml/fde_xml_imp.h" +#include "xfa/src/foxitlib.h" #ifdef __cplusplus extern "C" { #endif diff --git a/xfa/src/fdp/src/xml/fde_xml_imp.h b/xfa/src/fdp/src/xml/fde_xml_imp.h index 2fed05c0fb..7054eaa292 100644 --- a/xfa/src/fdp/src/xml/fde_xml_imp.h +++ b/xfa/src/fdp/src/xml/fde_xml_imp.h @@ -7,11 +7,16 @@ #ifndef XFA_SRC_FDP_SRC_XML_FDE_XML_IMP_H_ #define XFA_SRC_FDP_SRC_XML_FDE_XML_IMP_H_ +#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" + #define _FDE_BLOCK_BUFFER #ifdef _FDE_BLOCK_BUFFER class CFDE_BlockBuffer; -#endif -class CFDE_XMLNode; +#endif // _FDE_BLOCK_BUFFER + class CFDE_XMLInstruction; class CFDE_XMLElement; class CFDE_XMLText; @@ -20,6 +25,7 @@ class IFDE_XMLParser; class CFDE_XMLDOMParser; class CFDE_XMLSAXParser; class CFDE_XMLSyntaxParser; + class CFDE_XMLNode : public CFX_Target { public: CFDE_XMLNode(); diff --git a/xfa/src/fee/include/fx_wordbreak.h b/xfa/src/fee/include/fx_wordbreak.h index 0146df26b0..f545f487cd 100644 --- a/xfa/src/fee/include/fx_wordbreak.h +++ b/xfa/src/fee/include/fx_wordbreak.h @@ -7,6 +7,9 @@ #ifndef XFA_SRC_FEE_INCLUDE_FX_WORDBREAK_H_ #define XFA_SRC_FEE_INCLUDE_FX_WORDBREAK_H_ +#include "core/include/fxcrt/fx_string.h" +#include "core/include/fxcrt/fx_system.h" + class IFX_CharIter; class IFX_WordBreak { diff --git a/xfa/src/fee/include/ifde_txtedtbuf.h b/xfa/src/fee/include/ifde_txtedtbuf.h index f4a9c119b9..f7c9550fe8 100644 --- a/xfa/src/fee/include/ifde_txtedtbuf.h +++ b/xfa/src/fee/include/ifde_txtedtbuf.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTBUF_H_ #define XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTBUF_H_ +#include "core/include/fxcrt/fx_basic.h" + #define FDE_DEFCHUNKLENGTH (1024) class IFDE_TxtEdtBuf { diff --git a/xfa/src/fee/include/ifde_txtedtengine.h b/xfa/src/fee/include/ifde_txtedtengine.h index 8af71d6de0..290d110ad6 100644 --- a/xfa/src/fee/include/ifde_txtedtengine.h +++ b/xfa/src/fee/include/ifde_txtedtengine.h @@ -7,11 +7,15 @@ #ifndef XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTENGINE_H_ #define XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTENGINE_H_ +#include "core/include/fxge/fx_dib.h" +#include "xfa/src/fgas/include/fx_fnt.h" + class IFDE_TxtEdtBuf; class IFDE_TxtEdtPage; class IFDE_TxtEdtEngine; class IFDE_TxtEdtEventSink; class IFDE_TxtEdtParag; + #define FDE_TXTEDT_FIND_FLAGS_Prev (0L << 0) #define FDE_TXTEDT_FIND_FLAGS_Next (1L << 0) #define FDE_TXTEDT_FIND_FLAGS_WholeWord (1L << 1) diff --git a/xfa/src/fee/include/ifde_txtedtpage.h b/xfa/src/fee/include/ifde_txtedtpage.h index 63b488f17f..c16e94febf 100644 --- a/xfa/src/fee/include/ifde_txtedtpage.h +++ b/xfa/src/fee/include/ifde_txtedtpage.h @@ -7,8 +7,11 @@ #ifndef XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTPAGE_H_ #define XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTPAGE_H_ +#include "core/include/fxge/fx_ge.h" +#include "xfa/src/fdp/include/fde_psr.h" +#include "xfa/src/fgas/include/fx_tbk.h" + class IFDE_TxtEdtEngine; -class IFDE_TxtEdtPage; class IFDE_TxtEdtPage : public IFDE_CanvasSet, public IFX_TxtAccess { public: static IFDE_TxtEdtPage* Create(IFDE_TxtEdtEngine* pEngine, int32_t nIndex); diff --git a/xfa/src/fee/src/fee/fde_txtedtblock.cpp b/xfa/src/fee/src/fee/fde_txtedtblock.cpp index 6a3a8abb89..99b23753cc 100644 --- a/xfa/src/fee/src/fee/fde_txtedtblock.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtblock.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" #include "xfa/src/fee/src/fee/fde_txtedtblock.h" +#include "xfa/src/foxitlib.h" #ifdef FDE_USEFORMATBLOCK #define FDE_TXTEDT_FORMATBLOCK_BGN 0xFFF9 #define FDE_TXTEDT_FORMATBLOCK_END 0xFFFB diff --git a/xfa/src/fee/src/fee/fde_txtedtbuf.cpp b/xfa/src/fee/src/fee/fde_txtedtbuf.cpp index bd8eaea155..7b71f47bdc 100644 --- a/xfa/src/fee/src/fee/fde_txtedtbuf.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtbuf.cpp @@ -6,10 +6,10 @@ #include <algorithm> -#include "xfa/src/foxitlib.h" #include "xfa/src/fee/include/ifde_txtedtbuf.h" #include "xfa/src/fee/include/ifde_txtedtengine.h" #include "xfa/src/fee/src/fee/fde_txtedtbuf.h" +#include "xfa/src/foxitlib.h" #define FDE_DEFCHUNKCOUNT 2 #define FDE_TXTEDT_FORMATBLOCK_BGN 0xFFF9 #define FDE_TXTEDT_FORMATBLOCK_END 0xFFFB diff --git a/xfa/src/fee/src/fee/fde_txtedtbuf.h b/xfa/src/fee/src/fee/fde_txtedtbuf.h index fd551aa9cc..be4e942d9b 100644 --- a/xfa/src/fee/src/fee/fde_txtedtbuf.h +++ b/xfa/src/fee/src/fee/fde_txtedtbuf.h @@ -7,9 +7,11 @@ #ifndef XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTBUF_H_ #define XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTBUF_H_ +#include "xfa/src/fgas/include/fx_mem.h" + class IFX_CharIter; -class CFDE_TxtEdtBufIter; class CFDE_TxtEdtBuf; + class CFDE_TxtEdtBufIter : public IFX_CharIter { public: #ifdef FDE_USEFORMATBLOCK diff --git a/xfa/src/fee/src/fee/fde_txtedtengine.cpp b/xfa/src/fee/src/fee/fde_txtedtengine.cpp index 7610302ca2..dd2a9f9a34 100644 --- a/xfa/src/fee/src/fee/fde_txtedtengine.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtengine.cpp @@ -6,13 +6,13 @@ #include <algorithm> -#include "xfa/src/foxitlib.h" -#include "xfa/src/fee/include/ifde_txtedtengine.h" #include "xfa/src/fee/include/ifde_txtedtbuf.h" +#include "xfa/src/fee/include/ifde_txtedtengine.h" #include "xfa/src/fee/include/ifde_txtedtpage.h" +#include "xfa/src/fee/src/fee/fde_txtedtbuf.h" #include "xfa/src/fee/src/fee/fde_txtedtengine.h" #include "xfa/src/fee/src/fee/fde_txtedtparag.h" -#include "xfa/src/fee/src/fee/fde_txtedtbuf.h" +#include "xfa/src/foxitlib.h" #ifdef FDE_USEFORMATBLOCK #include "xfa/src/fee/src/fee/fde_txtedtblock.h" #endif diff --git a/xfa/src/fee/src/fee/fde_txtedtpage.cpp b/xfa/src/fee/src/fee/fde_txtedtpage.cpp index 879c400328..78fb1b7e37 100644 --- a/xfa/src/fee/src/fee/fde_txtedtpage.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtpage.cpp @@ -6,15 +6,15 @@ #include <algorithm> -#include "xfa/src/foxitlib.h" +#include "xfa/src/fee/include/fx_wordbreak.h" #include "xfa/src/fee/include/ifde_txtedtbuf.h" #include "xfa/src/fee/include/ifde_txtedtengine.h" #include "xfa/src/fee/include/ifde_txtedtpage.h" -#include "xfa/src/fee/include/fx_wordbreak.h" -#include "xfa/src/fee/src/fee/fde_txtedtpage.h" +#include "xfa/src/fee/src/fee/fde_txtedtbuf.h" #include "xfa/src/fee/src/fee/fde_txtedtengine.h" +#include "xfa/src/fee/src/fee/fde_txtedtpage.h" #include "xfa/src/fee/src/fee/fde_txtedtparag.h" -#include "xfa/src/fee/src/fee/fde_txtedtbuf.h" +#include "xfa/src/foxitlib.h" #define FDE_TXTEDT_TOLERANCE 0.1f IFDE_TxtEdtPage* IFDE_TxtEdtPage::Create(IFDE_TxtEdtEngine* pEngine, int32_t nIndex) { diff --git a/xfa/src/fee/src/fee/fde_txtedtparag.cpp b/xfa/src/fee/src/fee/fde_txtedtparag.cpp index 3e7e1ef0c0..af102969b7 100644 --- a/xfa/src/fee/src/fee/fde_txtedtparag.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtparag.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" +#include "xfa/src/fee/include/fx_wordbreak.h" #include "xfa/src/fee/include/ifde_txtedtbuf.h" #include "xfa/src/fee/include/ifde_txtedtengine.h" -#include "xfa/src/fee/include/fx_wordbreak.h" -#include "xfa/src/fee/src/fee/fde_txtedtparag.h" -#include "xfa/src/fee/src/fee/fde_txtedtengine.h" #include "xfa/src/fee/src/fee/fde_txtedtbuf.h" +#include "xfa/src/fee/src/fee/fde_txtedtengine.h" +#include "xfa/src/fee/src/fee/fde_txtedtparag.h" +#include "xfa/src/foxitlib.h" CFDE_TxtEdtParag::CFDE_TxtEdtParag(CFDE_TxtEdtEngine* pEngine) : m_nCharStart(0), m_nCharCount(0), diff --git a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp b/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp index b1f3a4cb62..421e1a4610 100644 --- a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp +++ b/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp @@ -4,9 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" #include "xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h" +#include "xfa/src/foxitlib.h" + #define FX_IsOdd(a) ((a)&1) + FX_WordBreakProp FX_GetWordBreakProperty(FX_WCHAR wcCodePoint) { FX_DWORD dwProperty = (FX_DWORD)gs_FX_WordBreak_CodePointProperties[wcCodePoint >> 1]; diff --git a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h b/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h index 6fe76bdfdd..616690bcea 100644 --- a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h +++ b/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h @@ -7,6 +7,14 @@ #ifndef XFA_SRC_FEE_SRC_FX_WORDBREAK_FX_WORDBREAK_IMPL_H_ #define XFA_SRC_FEE_SRC_FX_WORDBREAK_FX_WORDBREAK_IMPL_H_ +#include <cstdint> + +#include "core/include/fxcrt/fx_string.h" +#include "core/include/fxcrt/fx_system.h" +#include "xfa/src/fee/include/fx_wordbreak.h" +#include "xfa/src/fee/include/ifde_txtedtengine.h" +#include "xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h" + extern const FX_WORD gs_FX_WordBreak_Table[16]; extern const uint8_t gs_FX_WordBreak_CodePointProperties[(0xFFFF - 1) / 2 + 1]; enum FX_WordBreakProp { diff --git a/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp b/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp index 114b843e4c..c1342b8981 100644 --- a/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp +++ b/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" #include "xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h" +#include "xfa/src/foxitlib.h" extern const FX_WORD gs_FX_WordBreak_Table[16] = { 0xFFFF, 0xFFF9, 0xFFFB, 0xFFFB, 0xFFFB, 0xFFFB, 0xEFBB, 0xE77B, 0xFFFB, 0xFFFB, 0xFFFB, 0xE77B, 0xE73B, 0xFFFB, 0xFFFB, 0xFFFB, diff --git a/xfa/src/fgas/include/fgas.h b/xfa/src/fgas/include/fgas.h index 8031269f1e..903d7d47c5 100644 --- a/xfa/src/fgas/include/fgas.h +++ b/xfa/src/fgas/include/fgas.h @@ -9,20 +9,20 @@ #ifndef XFA_SRC_FGAS_INCLUDE_FGAS_H_ #define XFA_SRC_FGAS_INCLUDE_FGAS_H_ -#include "xfa/src/fgas/include/fx_sys.h" -#include "xfa/src/fgas/include/fx_mem.h" -#include "xfa/src/fgas/include/fx_lgg.h" -#include "xfa/src/fgas/include/fx_utl.h" #include "xfa/src/fgas/include/fx_alg.h" #include "xfa/src/fgas/include/fx_cpg.h" -#include "xfa/src/fgas/include/fx_stm.h" #include "xfa/src/fgas/include/fx_datetime.h" -#include "xfa/src/fgas/include/fx_locale.h" -#include "xfa/src/fgas/include/fx_sax.h" #include "xfa/src/fgas/include/fx_fnt.h" -#include "xfa/src/fgas/include/fx_ucd.h" #include "xfa/src/fgas/include/fx_lbk.h" -#include "xfa/src/fgas/include/fx_tbk.h" +#include "xfa/src/fgas/include/fx_lgg.h" +#include "xfa/src/fgas/include/fx_locale.h" +#include "xfa/src/fgas/include/fx_mem.h" #include "xfa/src/fgas/include/fx_rbk.h" +#include "xfa/src/fgas/include/fx_sax.h" +#include "xfa/src/fgas/include/fx_stm.h" +#include "xfa/src/fgas/include/fx_sys.h" +#include "xfa/src/fgas/include/fx_tbk.h" +#include "xfa/src/fgas/include/fx_ucd.h" +#include "xfa/src/fgas/include/fx_utl.h" #endif // XFA_SRC_FGAS_INCLUDE_FGAS_H_ diff --git a/xfa/src/fgas/include/fx_alg.h b/xfa/src/fgas/include/fx_alg.h index dd593202da..e2682729a3 100644 --- a/xfa/src/fgas/include/fx_alg.h +++ b/xfa/src/fgas/include/fx_alg.h @@ -7,10 +7,16 @@ #ifndef XFA_SRC_FGAS_INCLUDE_FX_ALG_H_ #define XFA_SRC_FGAS_INCLUDE_FX_ALG_H_ +#include <cstdint> + +#include "core/include/fxcrt/fx_basic.h" + #define FX_IsOdd(a) ((a)&1) + #ifdef __cplusplus extern "C" { #endif + int32_t FX_Base64EncodeA(const uint8_t* pSrc, int32_t iSrcLen, FX_CHAR* pDst); int32_t FX_Base64DecodeA(const FX_CHAR* pSrc, int32_t iSrcLen, uint8_t* pDst); int32_t FX_Base64DecodeW(const FX_WCHAR* pSrc, int32_t iSrcLen, uint8_t* pDst); @@ -22,6 +28,7 @@ int32_t FX_SeparateStringW(const FX_WCHAR* pStr, #ifdef __cplusplus }; #endif + template <class baseType> class CFX_DSPATemplate { public: diff --git a/xfa/src/fgas/include/fx_cpg.h b/xfa/src/fgas/include/fx_cpg.h index 84914766e6..970066156a 100644 --- a/xfa/src/fgas/include/fx_cpg.h +++ b/xfa/src/fgas/include/fx_cpg.h @@ -7,7 +7,8 @@ #ifndef XFA_SRC_FGAS_INCLUDE_FX_CPG_H_ #define XFA_SRC_FGAS_INCLUDE_FX_CPG_H_ -class IFX_CodePage; +#include "core/include/fxcrt/fx_basic.h" + #define FX_CODEPAGE_DefANSI 0 #define FX_CODEPAGE_DefOEM 1 #define FX_CODEPAGE_DefMAC 2 diff --git a/xfa/src/fgas/include/fx_fnt.h b/xfa/src/fgas/include/fx_fnt.h index 34abab8846..78c9b5ee13 100644 --- a/xfa/src/fgas/include/fx_fnt.h +++ b/xfa/src/fgas/include/fx_fnt.h @@ -7,8 +7,17 @@ #ifndef XFA_SRC_FGAS_INCLUDE_FX_FNT_H_ #define XFA_SRC_FGAS_INCLUDE_FX_FNT_H_ +#include "core/include/fxge/fx_font.h" +#include "xfa/src/fgas/include/fx_stm.h" + +#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ +#include "xfa/src/fgas/include/fx_mem.h" +#include "xfa/src/fgas/include/fx_utl.h" +#endif // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ + class IFX_Font; class IFX_FontMgr; + #define FX_FONTSTYLE_Normal 0x00 #define FX_FONTSTYLE_FixedPitch 0x01 #define FX_FONTSTYLE_Serif 0x02 diff --git a/xfa/src/fgas/include/fx_locale.h b/xfa/src/fgas/include/fx_locale.h index 36d19b5e14..5637913a97 100644 --- a/xfa/src/fgas/include/fx_locale.h +++ b/xfa/src/fgas/include/fx_locale.h @@ -7,10 +7,13 @@ #ifndef XFA_SRC_FGAS_INCLUDE_FX_LOCALE_H_ #define XFA_SRC_FGAS_INCLUDE_FX_LOCALE_H_ +#include "core/include/fxcrt/fx_xml.h" + class CFX_Unitime; class IFX_Locale; class IFX_FormatString; class IFX_LocaleMgr; + enum FX_LOCALENUMSYMBOL { FX_LOCALENUMSYMBOL_Decimal, FX_LOCALENUMSYMBOL_Grouping, diff --git a/xfa/src/fgas/include/fx_mem.h b/xfa/src/fgas/include/fx_mem.h index d59d391d44..e768c454ac 100644 --- a/xfa/src/fgas/include/fx_mem.h +++ b/xfa/src/fgas/include/fx_mem.h @@ -47,6 +47,7 @@ class CFX_Target { void* operator new(size_t size, void* place) { return place; } void operator delete(void* p, void* place) {} }; + #define FXTARGET_NewWith(__allocator__) new (__allocator__) #define FXTARGET_DeleteWith(__class__, __allocator__, pointer) \ { \ diff --git a/xfa/src/fgas/include/fx_rbk.h b/xfa/src/fgas/include/fx_rbk.h index e3e0595f59..a56040de67 100644 --- a/xfa/src/fgas/include/fx_rbk.h +++ b/xfa/src/fgas/include/fx_rbk.h @@ -7,12 +7,16 @@ #ifndef XFA_SRC_FGAS_INCLUDE_FX_RBK_H_ #define XFA_SRC_FGAS_INCLUDE_FX_RBK_H_ +#include "core/include/fxcrt/fx_ucd.h" +#include "core/include/fxge/fx_ge.h" +#include "xfa/src/fgas/include/fx_ucd.h" + class IFX_Unknown; class IFX_Font; class CFX_Char; -class CFX_RTFChar; class CFX_RTFBreakPiece; class IFX_RTFBreak; + #define FX_RTFBREAKPOLICY_None 0x00 #define FX_RTFBREAKPOLICY_SpaceBreak 0x01 #define FX_RTFBREAKPOLICY_NumberBreak 0x02 diff --git a/xfa/src/fgas/include/fx_stm.h b/xfa/src/fgas/include/fx_stm.h index cfd863d08c..199a03f677 100644 --- a/xfa/src/fgas/include/fx_stm.h +++ b/xfa/src/fgas/include/fx_stm.h @@ -7,7 +7,10 @@ #ifndef XFA_SRC_FGAS_INCLUDE_FX_STM_H_ #define XFA_SRC_FGAS_INCLUDE_FX_STM_H_ +#include "core/include/fxcrt/fx_stream.h" + class IFX_Stream; + IFX_FileRead* FX_CreateFileRead(IFX_Stream* pBaseStream, FX_BOOL bReleaseStream = FALSE); IFX_FileRead* FX_CreateFileRead(IFX_BufferRead* pBufferRead, diff --git a/xfa/src/fgas/include/fx_tbk.h b/xfa/src/fgas/include/fx_tbk.h index 6ebfd4ce04..5063aec142 100644 --- a/xfa/src/fgas/include/fx_tbk.h +++ b/xfa/src/fgas/include/fx_tbk.h @@ -8,6 +8,9 @@ #define XFA_SRC_FGAS_INCLUDE_FX_TBK_H_ #include "core/include/fxcrt/fx_ucd.h" +#include "core/include/fxge/fx_ge.h" +#include "xfa/src/fgas/include/fx_ucd.h" +#include "xfa/src/fgas/include/fx_utl.h" class IFX_Font; class CFX_Char; @@ -15,6 +18,7 @@ class IFX_TxtAccess; class CFX_TxtChar; class CFX_TxtPiece; class IFX_TxtBreak; + #define FX_TXTBREAKPOLICY_None 0x00 #define FX_TXTBREAKPOLICY_Pagination 0x01 #define FX_TXTBREAKPOLICY_SpaceBreak 0x02 diff --git a/xfa/src/fgas/include/fx_utl.h b/xfa/src/fgas/include/fx_utl.h index f6c7c09f13..e95d82005a 100644 --- a/xfa/src/fgas/include/fx_utl.h +++ b/xfa/src/fgas/include/fx_utl.h @@ -7,8 +7,8 @@ #ifndef XFA_SRC_FGAS_INCLUDE_FX_UTL_H_ #define XFA_SRC_FGAS_INCLUDE_FX_UTL_H_ -#include "xfa/src/fgas/include/fx_mem.h" #include "core/include/fxcrt/fx_coordinates.h" // For CFX_Rect. +#include "xfa/src/fgas/include/fx_mem.h" class CFX_BaseArray; template <class baseType> diff --git a/xfa/src/fgas/src/crt/fx_memory.cpp b/xfa/src/fgas/src/crt/fx_memory.cpp index 6c0f98c382..68a76bf184 100644 --- a/xfa/src/fgas/src/crt/fx_memory.cpp +++ b/xfa/src/fgas/src/crt/fx_memory.cpp @@ -6,8 +6,8 @@ #include <algorithm> -#include "xfa/src/fgas/src/fgas_base.h" #include "xfa/src/fgas/src/crt/fx_memory.h" +#include "xfa/src/fgas/src/fgas_base.h" #define FX_4BYTEALIGN(size) (((size) + 3) / 4 * 4) IFX_MEMAllocator* FX_CreateAllocator(FX_ALLOCTYPE eType, size_t chunkSize, diff --git a/xfa/src/fgas/src/crt/fx_memory.h b/xfa/src/fgas/src/crt/fx_memory.h index 931bfbf334..75f4327c0c 100644 --- a/xfa/src/fgas/src/crt/fx_memory.h +++ b/xfa/src/fgas/src/crt/fx_memory.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FGAS_SRC_CRT_FX_MEMORY_H_ #define XFA_SRC_FGAS_SRC_CRT_FX_MEMORY_H_ +#include "xfa/src/fgas/include/fx_mem.h" + class CFX_DefStore; class CFX_StaticStore; class CFX_FixedStore; diff --git a/xfa/src/fgas/src/crt/fx_stream.cpp b/xfa/src/fgas/src/crt/fx_stream.cpp index 79a0e4c78b..d6630045e4 100644 --- a/xfa/src/fgas/src/crt/fx_stream.cpp +++ b/xfa/src/fgas/src/crt/fx_stream.cpp @@ -6,8 +6,8 @@ #include <algorithm> -#include "xfa/src/fgas/src/fgas_base.h" #include "xfa/src/fgas/src/crt/fx_stream.h" +#include "xfa/src/fgas/src/fgas_base.h" IFX_Stream* IFX_Stream::CreateStream(IFX_BufferRead* pBufferRead, FX_DWORD dwAccess, int32_t iFileSize, diff --git a/xfa/src/fgas/src/crt/fx_stream.h b/xfa/src/fgas/src/crt/fx_stream.h index d58b52c1ac..6fd8ff9af8 100644 --- a/xfa/src/fgas/src/crt/fx_stream.h +++ b/xfa/src/fgas/src/crt/fx_stream.h @@ -7,7 +7,9 @@ #ifndef XFA_SRC_FGAS_SRC_CRT_FX_STREAM_H_ #define XFA_SRC_FGAS_SRC_CRT_FX_STREAM_H_ -class CFX_StreamImp; +#include "core/include/fxcrt/fx_system.h" +#include "xfa/src/fgas/include/fx_stm.h" + class CFX_FileStreamImp; class CFX_BufferStreamImp; class CFX_FileReadStreamImp; @@ -18,6 +20,7 @@ class CFX_TextStream; class CFX_FileRead; class CFX_FileWrite; class CFX_BufferAccImp; + class CFX_StreamImp { public: virtual void Release() { delete this; } diff --git a/xfa/src/fgas/src/crt/fx_utils.cpp b/xfa/src/fgas/src/crt/fx_utils.cpp index 8f43d4474b..fda9637467 100644 --- a/xfa/src/fgas/src/crt/fx_utils.cpp +++ b/xfa/src/fgas/src/crt/fx_utils.cpp @@ -7,8 +7,8 @@ #include <algorithm> #include "xfa/src/fgas/include/fx_utl.h" -#include "xfa/src/fgas/src/fgas_base.h" #include "xfa/src/fgas/src/crt/fx_utils.h" +#include "xfa/src/fgas/src/fgas_base.h" class FX_BASEARRAYDATA : public CFX_Target { public: diff --git a/xfa/src/fgas/src/fgas_base.h b/xfa/src/fgas/src/fgas_base.h index 32ef9aff1f..055f059a49 100644 --- a/xfa/src/fgas/src/fgas_base.h +++ b/xfa/src/fgas/src/fgas_base.h @@ -9,8 +9,8 @@ #ifndef XFA_SRC_FGAS_SRC_FGAS_BASE_H_ #define XFA_SRC_FGAS_SRC_FGAS_BASE_H_ -#include "xfa/src/foxitlib.h" #include "core/include/fxge/fx_freetype.h" #include "xfa/src/fgas/include/fgas.h" +#include "xfa/src/foxitlib.h" #endif // XFA_SRC_FGAS_SRC_FGAS_BASE_H_ diff --git a/xfa/src/fgas/src/font/fx_gefont.cpp b/xfa/src/fgas/src/font/fx_gefont.cpp index 079814f5b3..a81a2a4a99 100644 --- a/xfa/src/fgas/src/font/fx_gefont.cpp +++ b/xfa/src/fgas/src/font/fx_gefont.cpp @@ -5,8 +5,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/fgas/src/fgas_base.h" -#include "xfa/src/fgas/src/font/fx_gefont.h" #include "xfa/src/fgas/src/font/fx_fontutils.h" +#include "xfa/src/fgas/src/font/fx_gefont.h" #ifndef _FXPLUS IFX_Font* IFX_Font::LoadFont(const FX_WCHAR* pszFontFamily, FX_DWORD dwFontStyles, diff --git a/xfa/src/fgas/src/layout/fx_rtfbreak.cpp b/xfa/src/fgas/src/layout/fx_rtfbreak.cpp index 8b28395119..7f566979ed 100644 --- a/xfa/src/fgas/src/layout/fx_rtfbreak.cpp +++ b/xfa/src/fgas/src/layout/fx_rtfbreak.cpp @@ -8,8 +8,8 @@ #include "xfa/src/fgas/include/fx_lbk.h" #include "xfa/src/fgas/src/fgas_base.h" -#include "xfa/src/fgas/src/layout/fx_unicode.h" #include "xfa/src/fgas/src/layout/fx_rtfbreak.h" +#include "xfa/src/fgas/src/layout/fx_unicode.h" IFX_RTFBreak* IFX_RTFBreak::Create(FX_DWORD dwPolicies) { return new CFX_RTFBreak(dwPolicies); diff --git a/xfa/src/fgas/src/layout/fx_rtfbreak.h b/xfa/src/fgas/src/layout/fx_rtfbreak.h index 895661149d..673eb628b5 100644 --- a/xfa/src/fgas/src/layout/fx_rtfbreak.h +++ b/xfa/src/fgas/src/layout/fx_rtfbreak.h @@ -8,6 +8,7 @@ #define XFA_SRC_FGAS_SRC_LAYOUT_FX_RTFBREAK_H_ #include "core/include/fxcrt/fx_arb.h" +#include "xfa/src/fgas/src/layout/fx_unicode.h" class CFX_RTFLine; class CFX_RTFBreak; diff --git a/xfa/src/fgas/src/layout/fx_textbreak.cpp b/xfa/src/fgas/src/layout/fx_textbreak.cpp index d36b477f3c..20089c966f 100644 --- a/xfa/src/fgas/src/layout/fx_textbreak.cpp +++ b/xfa/src/fgas/src/layout/fx_textbreak.cpp @@ -9,8 +9,8 @@ #include "core/include/fxcrt/fx_arb.h" #include "xfa/src/fgas/include/fx_lbk.h" #include "xfa/src/fgas/src/fgas_base.h" -#include "xfa/src/fgas/src/layout/fx_unicode.h" #include "xfa/src/fgas/src/layout/fx_textbreak.h" +#include "xfa/src/fgas/src/layout/fx_unicode.h" extern const FX_LINEBREAKTYPE gs_FX_LineBreak_PairTable[64][32]; IFX_TxtBreak* IFX_TxtBreak::Create(FX_DWORD dwPolicies) { diff --git a/xfa/src/fgas/src/layout/fx_textbreak.h b/xfa/src/fgas/src/layout/fx_textbreak.h index e9164fdade..9e32f8da2e 100644 --- a/xfa/src/fgas/src/layout/fx_textbreak.h +++ b/xfa/src/fgas/src/layout/fx_textbreak.h @@ -8,6 +8,7 @@ #define XFA_SRC_FGAS_SRC_LAYOUT_FX_TEXTBREAK_H_ #include "core/include/fxcrt/fx_memory.h" +#include "xfa/src/fgas/src/layout/fx_unicode.h" class IFX_ArabicChar; class CFX_Txtbreak; diff --git a/xfa/src/fgas/src/localization/fx_datetime.cpp b/xfa/src/fgas/src/localization/fx_datetime.cpp index 76b7eb14d6..1d4a73672c 100644 --- a/xfa/src/fgas/src/localization/fx_datetime.cpp +++ b/xfa/src/fgas/src/localization/fx_datetime.cpp @@ -4,7 +4,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#if _FX_OS_ == _FX_LINUX_DESKTOP_ || _FX_OS_ == _FX_ANDROID_ || \ + _FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_IOS_ +#include <sys/time.h> +#include <time.h> +#endif + #include "xfa/src/fgas/src/fgas_base.h" + const uint8_t g_FXDaysPerMonth[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; const uint8_t g_FXDaysPerLeapMonth[12] = {31, 29, 31, 30, 31, 30, @@ -122,11 +129,7 @@ static void FX_DaysToDate(int64_t iDays, } iDay += (uint8_t)iDays; } -#if _FX_OS_ == _FX_LINUX_DESKTOP_ || _FX_OS_ == _FX_ANDROID_ || \ - _FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_IOS_ -#include <time.h> -#include <sys/time.h> -#endif + typedef struct _FXUT_SYSTEMTIME { FX_WORD wYear; FX_WORD wMonth; diff --git a/xfa/src/foxitlib.h b/xfa/src/foxitlib.h index 285aa0ee6b..d45bdd6aea 100644 --- a/xfa/src/foxitlib.h +++ b/xfa/src/foxitlib.h @@ -10,10 +10,10 @@ #define XFA_SRC_FOXITLIB_H_ #include "xfa/include/foxitxfa.h" -#include "xfa/src/fgas/include/fgas.h" #include "xfa/src/fdp/include/fde.h" +#include "xfa/src/fee/include/fx_wordbreak.h" #include "xfa/src/fee/include/ifde_txtedtengine.h" #include "xfa/src/fee/include/ifde_txtedtpage.h" -#include "xfa/src/fee/include/fx_wordbreak.h" +#include "xfa/src/fgas/include/fgas.h" #endif // XFA_SRC_FOXITLIB_H_ diff --git a/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp b/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp index 5ea624f649..d07dd300ab 100644 --- a/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp @@ -5,11 +5,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_barcodeimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" -#include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h" -#include "xfa/src/fwl/src/basewidget/include/fwl_barcodeimp.h" // static IFWL_Barcode* IFWL_Barcode::Create(const CFWL_WidgetImpProperties& properties) { diff --git a/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp b/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp index 55fa52ad6d..ddd3db38cf 100644 --- a/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp @@ -5,10 +5,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_caretimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" -#include "xfa/src/fwl/src/basewidget/include/fwl_caretimp.h" // static IFWL_Caret* IFWL_Caret::Create(const CFWL_WidgetImpProperties& properties, diff --git a/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp index 53ed483b23..f6793df118 100644 --- a/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp @@ -7,11 +7,11 @@ #include <algorithm> #include "xfa/src/foxitlib.h" -#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_checkboximp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" -#include "xfa/src/fwl/src/basewidget/include/fwl_checkboximp.h" #define FWL_CKB_CaptionMargin 5 // static diff --git a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp index 2aa072ed2d..8161acd4c3 100644 --- a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp @@ -5,19 +5,19 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fwl/src/core/include/fwl_threadimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_listboximp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h" #include "xfa/src/fwl/src/core/include/fwl_appimp.h" -#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_formimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" -#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" #include "xfa/src/fwl/src/core/include/fwl_panelimp.h" -#include "xfa/src/fwl/src/core/include/fwl_formimp.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" -#include "xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h" -#include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h" -#include "xfa/src/fwl/src/basewidget/include/fwl_listboximp.h" -#include "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h" -#include "xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h" // static IFWL_ComboBox* IFWL_ComboBox::Create( diff --git a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp b/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp index 77130abc60..b42b43f9e9 100644 --- a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp @@ -5,16 +5,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h" +#include "xfa/src/fwl/src/core/include/fwl_formimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" -#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" #include "xfa/src/fwl/src/core/include/fwl_panelimp.h" -#include "xfa/src/fwl/src/core/include/fwl_formimp.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" -#include "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h" -#include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h" -#include "xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h" -#include "xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h" #define FWL_DTP_WIDTH 100 #define FWL_DTP_HEIGHT 20 diff --git a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp index 263968652b..ff3300b23b 100644 --- a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp @@ -7,16 +7,16 @@ #include <algorithm> #include "xfa/src/foxitlib.h" -#include "xfa/src/fwl/src/core/include/fwl_threadimp.h" -#include "xfa/src/fwl/src/core/include/fwl_appimp.h" -#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" -#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" -#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" -#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" #include "xfa/src/fwl/src/basewidget/include/fwl_caretimp.h" #include "xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h" #include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h" #include "xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h" +#include "xfa/src/fwl/src/core/include/fwl_appimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" // static IFWL_Edit* IFWL_Edit::Create(const CFWL_WidgetImpProperties& properties, diff --git a/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp b/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp index cd2da08fed..d70fd98f62 100644 --- a/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_formproxyimp.cpp @@ -5,12 +5,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h" +#include "xfa/src/fwl/src/core/include/fwl_formimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" -#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" #include "xfa/src/fwl/src/core/include/fwl_panelimp.h" -#include "xfa/src/fwl/src/core/include/fwl_formimp.h" -#include "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" CFWL_FormProxyImp::CFWL_FormProxyImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter) diff --git a/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp index 2631e045e0..71319ca06f 100644 --- a/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp @@ -5,12 +5,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_listboximp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" -#include "xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h" -#include "xfa/src/fwl/src/basewidget/include/fwl_listboximp.h" -#include "xfa/src/fwl/src/basewidget/include/fwl_comboboximp.h" #define FWL_LISTBOX_ItemTextMargin 2 diff --git a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp index 58fcd03da1..04ac358026 100644 --- a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp @@ -5,10 +5,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" -#include "xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h" #define MONTHCAL_HSEP_HEIGHT 1 #define MONTHCAL_VSEP_WIDTH 1 #define MONTHCAL_HMARGIN 3 diff --git a/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp index 583b293078..f19a5c3736 100644 --- a/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp @@ -5,10 +5,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_pictureboximp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" -#include "xfa/src/fwl/src/basewidget/include/fwl_pictureboximp.h" // static IFWL_PictureBox* IFWL_PictureBox::Create( diff --git a/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp b/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp index 806fec2e39..85f22ef2b0 100644 --- a/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp @@ -5,10 +5,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_pushbuttonimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" -#include "xfa/src/fwl/src/basewidget/include/fwl_pushbuttonimp.h" // static IFWL_PushButton* IFWL_PushButton::Create( diff --git a/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp b/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp index 2243152112..b8d70a417a 100644 --- a/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp @@ -5,10 +5,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" -#include "xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h" #define FWL_SCROLLBAR_Elapse 500 #define FWL_SCROLLBAR_MinThumb 5 diff --git a/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp b/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp index a543905d06..ac6f0c9c1d 100644 --- a/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp @@ -5,10 +5,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_spinbuttonimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" -#include "xfa/src/fwl/src/basewidget/include/fwl_spinbuttonimp.h" #define FWL_SPN_MinWidth 18 #define FWL_SPN_MinHeight 32 #define FWL_SPIN_Elapse 200 diff --git a/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp b/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp index 4d3d88e03a..6d268879a6 100644 --- a/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp @@ -5,12 +5,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h" +#include "xfa/src/fwl/src/core/include/fwl_formimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" -#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" #include "xfa/src/fwl/src/core/include/fwl_panelimp.h" -#include "xfa/src/fwl/src/core/include/fwl_formimp.h" -#include "xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" // static IFWL_ToolTip* IFWL_ToolTip::Create(const CFWL_WidgetImpProperties& properties, diff --git a/xfa/src/fwl/src/basewidget/include/fwl_barcodeimp.h b/xfa/src/fwl/src/basewidget/include/fwl_barcodeimp.h index 53749f4653..64165be256 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_barcodeimp.h +++ b/xfa/src/fwl/src/basewidget/include/fwl_barcodeimp.h @@ -7,18 +7,19 @@ #ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_BARCODEIMP_H_ #define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_BARCODEIMP_H_ +#include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h" + class CFWL_WidgetImp; class CFWL_WidgetImpProperties; class CFWL_WidgetImpDelegate; -class CFWL_EditImp; -class CFWL_EditImpDelegate; class IFWL_Widget; class CFWL_BarcodeEdit; class CFWL_BarcodeEditDelegate; -class CFWL_BarcodeImp; class CFWL_BarcodeImpDelegate; + #define XFA_BCS_NeedUpdate 0x0001 #define XFA_BCS_EncodeSuccess 0x0002 + class CFWL_BarcodeImp : public CFWL_EditImp { public: CFWL_BarcodeImp(const CFWL_WidgetImpProperties& properties, diff --git a/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h b/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h index d56c2217d8..49a1e02613 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h +++ b/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h @@ -8,13 +8,12 @@ #define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_CARETIMP_H_ #include "xfa/include/fwl/core/fwl_timer.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" -class CFWL_WidgetImp; class CFWL_WidgetImpProperties; -class CFWL_WidgetImpDelegate; class IFWL_Widget; -class CFWL_CaretImp; class CFWL_CaretImpDelegate; + class CFWL_CaretImp : public CFWL_WidgetImp { public: CFWL_CaretImp(const CFWL_WidgetImpProperties& properties, diff --git a/xfa/src/fwl/src/basewidget/include/fwl_checkboximp.h b/xfa/src/fwl/src/basewidget/include/fwl_checkboximp.h index eb32380fba..3167f9466e 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_checkboximp.h +++ b/xfa/src/fwl/src/basewidget/include/fwl_checkboximp.h @@ -7,12 +7,12 @@ #ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_CHECKBOXIMP_H_ #define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_CHECKBOXIMP_H_ -class CFWL_WidgetImp; +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" + class CFWL_WidgetImpProperties; -class CFWL_WidgetImpDelegate; class IFWL_Widget; -class CFWL_CheckBoxImp; class CFWL_CheckBoxImpDelegate; + class CFWL_CheckBoxImp : public CFWL_WidgetImp { public: CFWL_CheckBoxImp(const CFWL_WidgetImpProperties& properties, diff --git a/xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h b/xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h index 148b48a25d..1041672624 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h +++ b/xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h @@ -9,13 +9,12 @@ #include <memory> +#include "xfa/src/fwl/src/basewidget/include/fwl_editimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h" + class CFWL_WidgetImp; class CFWL_WidgetImpProperties; class CFWL_WidgetImpDelegate; -class CFWL_EditImp; -class CFWL_EditImpDelegate; -class CFWL_MonthCalendarImp; -class CFWL_MonthCalendarImpDelegate; class CFWL_FormProxyImp; class CFWL_DateTimeEdit; class CFWL_DateTimeEditImpDelegate; diff --git a/xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h b/xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h index b5b345f2df..c26d65a227 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h +++ b/xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h @@ -7,12 +7,12 @@ #ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_FORMPROXYIMP_H_ #define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_FORMPROXYIMP_H_ -class CFWL_WidgetImp; +#include "xfa/src/fwl/src/core/include/fwl_formimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" + class CFWL_WidgetImpProperties; -class CFWL_WidgetImpDelegate; -class CFWL_FormImp; -class CFWL_FormProxyImp; class CFWL_FormProxyImpDelegate; + class CFWL_FormProxyImp : public CFWL_FormImp { public: CFWL_FormProxyImp(const CFWL_WidgetImpProperties& properties, diff --git a/xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h b/xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h index ed3f40ef11..aba3355e25 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h +++ b/xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h @@ -7,15 +7,15 @@ #ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_MONTHCALENDARIMP_H_ #define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_MONTHCALENDARIMP_H_ -class CFWL_WidgetImp; +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" + class CFWL_WidgetImpProperties; -class CFWL_WidgetImpDelegate; class IFWL_Widget; class IFDE_DateTime; class CFDE_DateTime; extern uint8_t FX_DaysInMonth(int32_t iYear, uint8_t iMonth); -class CFWL_MonthCalendarImp; class CFWL_MonthCalendarImpDelegate; + class CFWL_MonthCalendarImp : public CFWL_WidgetImp { public: CFWL_MonthCalendarImp(const CFWL_WidgetImpProperties& properties, diff --git a/xfa/src/fwl/src/basewidget/include/fwl_pictureboximp.h b/xfa/src/fwl/src/basewidget/include/fwl_pictureboximp.h index bf4f512b13..a77f73dc98 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_pictureboximp.h +++ b/xfa/src/fwl/src/basewidget/include/fwl_pictureboximp.h @@ -7,12 +7,12 @@ #ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_PICTUREBOXIMP_H_ #define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_PICTUREBOXIMP_H_ -class CFWL_WidgetImp; +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" + class CFWL_WidgetImpProperties; -class CFWL_WidgetImpDelegate; class IFWL_Widget; -class CFWL_PictureBoxImp; class CFWL_PictureBoxImpDelegate; + class CFWL_PictureBoxImp : public CFWL_WidgetImp { public: CFWL_PictureBoxImp(const CFWL_WidgetImpProperties& properties, diff --git a/xfa/src/fwl/src/basewidget/include/fwl_pushbuttonimp.h b/xfa/src/fwl/src/basewidget/include/fwl_pushbuttonimp.h index 115758feae..73ee0fe899 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_pushbuttonimp.h +++ b/xfa/src/fwl/src/basewidget/include/fwl_pushbuttonimp.h @@ -7,12 +7,12 @@ #ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_PUSHBUTTONIMP_H_ #define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_PUSHBUTTONIMP_H_ -class CFWL_WidgetImp; +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" + class CFWL_WidgetImpProperties; -class CFWL_WidgetImpDelegate; class IFWL_Widget; -class CFWL_PushButtonImp; class CFWL_PushButtonImpDelegate; + class CFWL_PushButtonImp : public CFWL_WidgetImp { public: CFWL_PushButtonImp(const CFWL_WidgetImpProperties& properties, diff --git a/xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h b/xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h index 0861b76313..1b3e4f06cf 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h +++ b/xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h @@ -7,14 +7,13 @@ #ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_SCROLLBARIMP_H_ #define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_SCROLLBARIMP_H_ -class CFWL_WidgetImp; +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" + class CFWL_WidgetImpProperties; -class CFWL_WidgetImpDelegate; class IFWL_Widget; -class IFWL_Timer; class IFWL_TimerDelegate; -class CFWL_ScrollBarImp; class CFWL_ScrollBarImpDelegate; + class CFWL_ScrollBarImp : public CFWL_WidgetImp, public IFWL_Timer { public: CFWL_ScrollBarImp(const CFWL_WidgetImpProperties& properties, diff --git a/xfa/src/fwl/src/basewidget/include/fwl_spinbuttonimp.h b/xfa/src/fwl/src/basewidget/include/fwl_spinbuttonimp.h index 6ab937f782..22d782baf3 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_spinbuttonimp.h +++ b/xfa/src/fwl/src/basewidget/include/fwl_spinbuttonimp.h @@ -7,9 +7,9 @@ #ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_SPINBUTTONIMP_H_ #define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_SPINBUTTONIMP_H_ -class CFWL_WidgetImp; +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" + class CFWL_WidgetImpProperties; -class CFWL_WidgetImpDelegate; class IFWL_Widget; class IFWL_Timer; class CFWL_SpinButtonImp; diff --git a/xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h b/xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h index ae8f461270..c383fbf005 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h +++ b/xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h @@ -7,13 +7,14 @@ #ifndef XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_TOOLTIPCTRLIMP_H_ #define XFA_SRC_FWL_SRC_BASEWIDGET_INCLUDE_FWL_TOOLTIPCTRLIMP_H_ -class CFWL_WidgetImp; +#include "xfa/src/fwl/src/core/include/fwl_formimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" + class CFWL_WidgetImpProperties; -class CFWL_WidgetImpDelegate; class IFWL_Widget; class IFWL_Timer; -class CFWL_ToolTipImp; class CFWL_ToolTipImpDelegate; + class CFWL_ToolTipImp : public CFWL_FormImp { public: CFWL_ToolTipImp(const CFWL_WidgetImpProperties& properties, diff --git a/xfa/src/fwl/src/core/fwl_appimp.cpp b/xfa/src/fwl/src/core/fwl_appimp.cpp index aced5e66c6..6d71825d5f 100644 --- a/xfa/src/fwl/src/core/fwl_appimp.cpp +++ b/xfa/src/fwl/src/core/fwl_appimp.cpp @@ -5,11 +5,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_appimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_threadimp.h" -#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" -#include "xfa/src/fwl/src/core/include/fwl_appimp.h" IFWL_App* IFWL_App::Create(IFWL_AdapterNative* pAdapter) { IFWL_App* pApp = new IFWL_App; diff --git a/xfa/src/fwl/src/core/fwl_contentimp.cpp b/xfa/src/fwl/src/core/fwl_contentimp.cpp index b86b7649cf..2d3eeed8c8 100644 --- a/xfa/src/fwl/src/core/fwl_contentimp.cpp +++ b/xfa/src/fwl/src/core/fwl_contentimp.cpp @@ -5,11 +5,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_contentimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_threadimp.h" -#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" -#include "xfa/src/fwl/src/core/include/fwl_contentimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" FWL_ERR IFWL_Content::InsertWidget(IFWL_Widget* pChild, int32_t nIndex) { return static_cast<CFWL_ContentImp*>(GetImpl())->InsertWidget(pChild, nIndex); diff --git a/xfa/src/fwl/src/core/fwl_formimp.cpp b/xfa/src/fwl/src/core/fwl_formimp.cpp index dbb56f56f5..de254c774d 100644 --- a/xfa/src/fwl/src/core/fwl_formimp.cpp +++ b/xfa/src/fwl/src/core/fwl_formimp.cpp @@ -5,15 +5,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h" +#include "xfa/src/fwl/src/core/include/fwl_appimp.h" +#include "xfa/src/fwl/src/core/include/fwl_formimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_panelimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_threadimp.h" -#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" -#include "xfa/src/fwl/src/core/include/fwl_panelimp.h" -#include "xfa/src/fwl/src/core/include/fwl_formimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" -#include "xfa/src/fwl/src/core/include/fwl_appimp.h" -#include "xfa/src/fwl/src/basewidget/include/fwl_formproxyimp.h" #define FWL_SYSBTNSIZE 21 #define FWL_SYSBTNMARGIN 5 diff --git a/xfa/src/fwl/src/core/fwl_gridimp.cpp b/xfa/src/fwl/src/core/fwl_gridimp.cpp index e153f708fd..e9dd74e296 100644 --- a/xfa/src/fwl/src/core/fwl_gridimp.cpp +++ b/xfa/src/fwl/src/core/fwl_gridimp.cpp @@ -5,12 +5,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_contentimp.h" +#include "xfa/src/fwl/src/core/include/fwl_gridimp.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_threadimp.h" -#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" -#include "xfa/src/fwl/src/core/include/fwl_contentimp.h" -#include "xfa/src/fwl/src/core/include/fwl_gridimp.h" // static IFWL_Grid* IFWL_Grid::Create(const CFWL_WidgetImpProperties& properties) { diff --git a/xfa/src/fwl/src/core/fwl_noteimp.cpp b/xfa/src/fwl/src/core/fwl_noteimp.cpp index ffb3243c41..2dd90a7a3d 100644 --- a/xfa/src/fwl/src/core/fwl_noteimp.cpp +++ b/xfa/src/fwl/src/core/fwl_noteimp.cpp @@ -5,15 +5,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" -#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" -#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" -#include "xfa/src/fwl/src/core/include/fwl_panelimp.h" +#include "xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h" +#include "xfa/src/fwl/src/core/include/fwl_appimp.h" #include "xfa/src/fwl/src/core/include/fwl_formimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_panelimp.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_threadimp.h" -#include "xfa/src/fwl/src/core/include/fwl_appimp.h" -#include "xfa/src/fwl/src/basewidget/include/fwl_tooltipctrlimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" CFWL_NoteLoop::CFWL_NoteLoop(CFWL_WidgetImp* pForm) : m_pForm(pForm), m_bContinueModal(TRUE) {} FX_BOOL CFWL_NoteLoop::PreProcessMessage(CFWL_Message* pMessage) { diff --git a/xfa/src/fwl/src/core/fwl_panelimp.cpp b/xfa/src/fwl/src/core/fwl_panelimp.cpp index f252ccb36f..dadff4c1ba 100644 --- a/xfa/src/fwl/src/core/fwl_panelimp.cpp +++ b/xfa/src/fwl/src/core/fwl_panelimp.cpp @@ -5,10 +5,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" -#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" #include "xfa/src/fwl/src/core/include/fwl_panelimp.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" // static IFWL_Panel* IFWL_Panel::Create(CFWL_WidgetImpProperties& properties, diff --git a/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp b/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp index 6b323465be..9a1d07b464 100644 --- a/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp +++ b/xfa/src/fwl/src/core/fwl_sdadapterimp.cpp @@ -5,9 +5,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_threadimp.h" -#include "xfa/src/fwl/src/core/include/fwl_noteimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" CFWL_SDAdapterWidgetMgr::CFWL_SDAdapterWidgetMgr() {} CFWL_SDAdapterWidgetMgr::~CFWL_SDAdapterWidgetMgr() {} diff --git a/xfa/src/fwl/src/core/fwl_threadimp.cpp b/xfa/src/fwl/src/core/fwl_threadimp.cpp index d62a6d0dee..b63a3a4a33 100644 --- a/xfa/src/fwl/src/core/fwl_threadimp.cpp +++ b/xfa/src/fwl/src/core/fwl_threadimp.cpp @@ -5,10 +5,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_appimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_threadimp.h" -#include "xfa/src/fwl/src/core/include/fwl_appimp.h" void IFWL_Thread::Release() { delete m_pImpl; diff --git a/xfa/src/fwl/src/core/fwl_timerimp.cpp b/xfa/src/fwl/src/core/fwl_timerimp.cpp index a013f0a1e7..945a7e39cb 100644 --- a/xfa/src/fwl/src/core/fwl_timerimp.cpp +++ b/xfa/src/fwl/src/core/fwl_timerimp.cpp @@ -5,9 +5,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" +#include "xfa/src/fwl/src/core/include/fwl_appimp.h" #include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_threadimp.h" -#include "xfa/src/fwl/src/core/include/fwl_appimp.h" FWL_HTIMER FWL_StartTimer(IFWL_Timer* pTimer, FX_DWORD dwElapse, FX_BOOL bImmediately) { diff --git a/xfa/src/fwl/src/core/fwl_widgetimp.cpp b/xfa/src/fwl/src/core/fwl_widgetimp.cpp index beae23db08..e53b6a43a4 100644 --- a/xfa/src/fwl/src/core/fwl_widgetimp.cpp +++ b/xfa/src/fwl/src/core/fwl_widgetimp.cpp @@ -7,12 +7,12 @@ #include <algorithm> #include "xfa/src/foxitlib.h" -#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_appimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_threadimp.h" -#include "xfa/src/fwl/src/core/include/fwl_appimp.h" -#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" FWL_ERR IFWL_Widget::GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize) { return static_cast<CFWL_WidgetImp*>(GetImpl()) ->GetWidgetRect(rect, bAutoSize); diff --git a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp b/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp index 577ff07909..866d6a6a08 100644 --- a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp +++ b/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp @@ -5,11 +5,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_appimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" -#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_threadimp.h" -#include "xfa/src/fwl/src/core/include/fwl_appimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" FX_BOOL FWL_UseOffscreen(IFWL_Widget* pWidget) { #if (_FX_OS_ == _FX_MACOSX_) diff --git a/xfa/src/fwl/src/core/include/fwl_contentimp.h b/xfa/src/fwl/src/core/include/fwl_contentimp.h index 8839f37d30..a67d18da0a 100644 --- a/xfa/src/fwl/src/core/include/fwl_contentimp.h +++ b/xfa/src/fwl/src/core/include/fwl_contentimp.h @@ -7,9 +7,10 @@ #ifndef XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_CONTENTIMP_H_ #define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_CONTENTIMP_H_ -class CFWL_WidgetImp; +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" + class IFWL_Widget; -class CFWL_ContentImp; + class CFWL_ContentImp : public CFWL_WidgetImp { public: CFWL_ContentImp(const CFWL_WidgetImpProperties& properties, diff --git a/xfa/src/fwl/src/core/include/fwl_formimp.h b/xfa/src/fwl/src/core/include/fwl_formimp.h index c85bd6cf48..0326603b8a 100644 --- a/xfa/src/fwl/src/core/include/fwl_formimp.h +++ b/xfa/src/fwl/src/core/include/fwl_formimp.h @@ -7,16 +7,18 @@ #ifndef XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_FORMIMP_H_ #define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_FORMIMP_H_ +#include "xfa/src/fwl/src/core/include/fwl_panelimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" + class CFWL_NoteLoop; -class CFWL_PanelImp; class CFWL_WidgetImpProperties; -class CFWL_WidgetImpDelegate; class CFWL_MsgMouse; class IFWL_Widget; class IFWL_ThemeProvider; class CFWL_SysBtn; class CFWL_FormImp; class CFWL_FormImpDelegate; + #define FWL_SYSBUTTONSTATE_Hover 0x0001 #define FWL_SYSBUTTONSTATE_Pressed 0x0002 #define FWL_SYSBUTTONSTATE_Disabled 0x0010 diff --git a/xfa/src/fwl/src/core/include/fwl_panelimp.h b/xfa/src/fwl/src/core/include/fwl_panelimp.h index 7904148257..86a6a0f211 100644 --- a/xfa/src/fwl/src/core/include/fwl_panelimp.h +++ b/xfa/src/fwl/src/core/include/fwl_panelimp.h @@ -7,11 +7,12 @@ #ifndef XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_PANELIMP_H_ #define XFA_SRC_FWL_SRC_CORE_INCLUDE_FWL_PANELIMP_H_ -class CFWL_WidgetImp; +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" + class CFWL_WidgetImpProperties; class IFWL_Widget; class IFWL_Content; -class CFWL_PanelImp; + class CFWL_PanelImp : public CFWL_WidgetImp { public: CFWL_PanelImp(const CFWL_WidgetImpProperties& properties, diff --git a/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp b/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp index 3d9db381df..21a5497f98 100644 --- a/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp +++ b/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp @@ -7,12 +7,12 @@ #include <memory> #include "xfa/src/foxitlib.h" -#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" +#include "xfa/src/fwl/src/core/include/fwl_formimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" -#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" #include "xfa/src/fwl/src/core/include/fwl_panelimp.h" -#include "xfa/src/fwl/src/core/include/fwl_formimp.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_threadimp.h" +#include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" CFWL_ToolTip* CFWL_ToolTip::Create() { return new CFWL_ToolTip; diff --git a/xfa/src/fwl/src/lightwidget/widget.cpp b/xfa/src/fwl/src/lightwidget/widget.cpp index e911937157..412ff07d5a 100644 --- a/xfa/src/fwl/src/lightwidget/widget.cpp +++ b/xfa/src/fwl/src/lightwidget/widget.cpp @@ -6,8 +6,8 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" -#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_noteimp.h" +#include "xfa/src/fwl/src/core/include/fwl_targetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetimp.h" #include "xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h" diff --git a/xfa/src/fxbarcode/BC_BarCode.cpp b/xfa/src/fxbarcode/BC_BarCode.cpp index 94ee1aff0f..5fbbee65c1 100644 --- a/xfa/src/fxbarcode/BC_BarCode.cpp +++ b/xfa/src/fxbarcode/BC_BarCode.cpp @@ -20,64 +20,64 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/BC_Reader.h" -#include "xfa/src/fxbarcode/BC_Writer.h" -#include "xfa/src/fxbarcode/BC_DecoderResult.h" -#include "xfa/src/fxbarcode/BC_LuminanceSource.h" -#include "xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h" #include "xfa/src/fxbarcode/BC_Binarizer.h" #include "xfa/src/fxbarcode/BC_BinaryBitmap.h" -#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" -#include "xfa/src/fxbarcode/BC_ResultPoint.h" #include "xfa/src/fxbarcode/BC_BinaryBitmap.h" +#include "xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h" +#include "xfa/src/fxbarcode/BC_DecoderResult.h" +#include "xfa/src/fxbarcode/BC_LuminanceSource.h" +#include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/BC_ResultPoint.h" #include "xfa/src/fxbarcode/BC_TwoDimWriter.h" -#include "xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h" -#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" +#include "xfa/src/fxbarcode/BC_Writer.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" +#include "xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h" #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.h" #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.h" #include "xfa/src/fxbarcode/oned/BC_OneDReader.h" #include "xfa/src/fxbarcode/oned/BC_OneDimReader.h" #include "xfa/src/fxbarcode/oned/BC_OneDimWriter.h" -#include "xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h" -#include "xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h" #include "xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h" #include "xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.h" #include "xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h" #include "xfa/src/fxbarcode/oned/BC_OnedCode128Writer.h" -#include "xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.h" -#include "xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.h" +#include "xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h" #include "xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.h" #include "xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.h" +#include "xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.h" #include "xfa/src/fxbarcode/oned/BC_OnedUPCAReader.h" #include "xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417Writer.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417Reader.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Reader.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Writer.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h" CBC_CodeBase::CBC_CodeBase() {} diff --git a/xfa/src/fxbarcode/BC_Binarizer.cpp b/xfa/src/fxbarcode/BC_Binarizer.cpp index dadb126123..d61eeae601 100644 --- a/xfa/src/fxbarcode/BC_Binarizer.cpp +++ b/xfa/src/fxbarcode/BC_Binarizer.cpp @@ -20,11 +20,11 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/BC_LuminanceSource.h" #include "xfa/src/fxbarcode/BC_Binarizer.h" -#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/BC_LuminanceSource.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" CBC_Binarizer::CBC_Binarizer(CBC_LuminanceSource* source) { m_source = source; } diff --git a/xfa/src/fxbarcode/BC_Binarizer.h b/xfa/src/fxbarcode/BC_Binarizer.h index 131e39df7b..281f4ae5d4 100644 --- a/xfa/src/fxbarcode/BC_Binarizer.h +++ b/xfa/src/fxbarcode/BC_Binarizer.h @@ -7,10 +7,13 @@ #ifndef XFA_SRC_FXBARCODE_BC_BINARIZER_H_ #define XFA_SRC_FXBARCODE_BC_BINARIZER_H_ +#include <cstdint> + class CBC_LuminanceSource; class CBC_CommonBitMatrix; class CBC_CommonBitArray; class CBC_BinaryBitmap; + class CBC_Binarizer { public: CBC_Binarizer(CBC_LuminanceSource* source); diff --git a/xfa/src/fxbarcode/BC_BinaryBitmap.cpp b/xfa/src/fxbarcode/BC_BinaryBitmap.cpp index 745b3c1e04..23789cc8a2 100644 --- a/xfa/src/fxbarcode/BC_BinaryBitmap.cpp +++ b/xfa/src/fxbarcode/BC_BinaryBitmap.cpp @@ -20,12 +20,12 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Binarizer.h" -#include "xfa/src/fxbarcode/BC_LuminanceSource.h" #include "xfa/src/fxbarcode/BC_BinaryBitmap.h" -#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/BC_LuminanceSource.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" CBC_BinaryBitmap::CBC_BinaryBitmap(CBC_Binarizer* binarizer) : m_binarizer(binarizer), m_matrix(NULL) {} CBC_BinaryBitmap::~CBC_BinaryBitmap() { diff --git a/xfa/src/fxbarcode/BC_BinaryBitmap.h b/xfa/src/fxbarcode/BC_BinaryBitmap.h index 0554dfaba4..5d34c546ff 100644 --- a/xfa/src/fxbarcode/BC_BinaryBitmap.h +++ b/xfa/src/fxbarcode/BC_BinaryBitmap.h @@ -7,10 +7,12 @@ #ifndef XFA_SRC_FXBARCODE_BC_BINARYBITMAP_H_ #define XFA_SRC_FXBARCODE_BC_BINARYBITMAP_H_ +#include <cstdint> + class CBC_Binarizer; class CBC_CommonBitMatrix; class CBC_CommonBitArray; -class CBC_BinaryBitmap; + class CBC_BinaryBitmap { public: CBC_BinaryBitmap(CBC_Binarizer* binarizer); diff --git a/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.cpp b/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.cpp index e11b1c1c82..1b73618ac6 100644 --- a/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.cpp +++ b/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/BC_LuminanceSource.h" #include "xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h" +#include "xfa/src/fxbarcode/BC_LuminanceSource.h" +#include "xfa/src/fxbarcode/barcode.h" class CBC_Pause : public IFX_Pause { public: virtual FX_BOOL NeedToPauseNow() { return TRUE; } diff --git a/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h b/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h index f4c5f2f3ea..5696d5b554 100644 --- a/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h +++ b/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h @@ -7,8 +7,11 @@ #ifndef XFA_SRC_FXBARCODE_BC_BUFFEREDIMAGELUMINANCESOURCE_H_ #define XFA_SRC_FXBARCODE_BC_BUFFEREDIMAGELUMINANCESOURCE_H_ -class CBC_LuminanceSource; -class CBC_BufferedImageLuminanceSource; +#include "core/include/fxcrt/fx_basic.h" +#include "core/include/fxcrt/fx_string.h" +#include "core/include/fxge/fx_dib.h" +#include "xfa/src/fxbarcode/BC_LuminanceSource.h" + class CBC_BufferedImageLuminanceSource : public CBC_LuminanceSource { public: explicit CBC_BufferedImageLuminanceSource(const CFX_WideString& filename); diff --git a/xfa/src/fxbarcode/BC_DecoderResult.h b/xfa/src/fxbarcode/BC_DecoderResult.h index 21d2cc0e4f..fce22a741b 100644 --- a/xfa/src/fxbarcode/BC_DecoderResult.h +++ b/xfa/src/fxbarcode/BC_DecoderResult.h @@ -7,7 +7,8 @@ #ifndef XFA_SRC_FXBARCODE_BC_DECODERRESULT_H_ #define XFA_SRC_FXBARCODE_BC_DECODERRESULT_H_ -class CBC_DecoderResult; +#include "core/include/fxcrt/fx_basic.h" + class CBC_DecoderResult { public: CBC_DecoderResult(CFX_ByteArray* rawBytes, diff --git a/xfa/src/fxbarcode/BC_Dimension.cpp b/xfa/src/fxbarcode/BC_Dimension.cpp index bc4433e328..35671b3a9e 100644 --- a/xfa/src/fxbarcode/BC_Dimension.cpp +++ b/xfa/src/fxbarcode/BC_Dimension.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Dimension.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" CBC_Dimension::CBC_Dimension() {} CBC_Dimension::CBC_Dimension(int32_t width, int32_t height, int32_t& e) { diff --git a/xfa/src/fxbarcode/BC_Dimension.h b/xfa/src/fxbarcode/BC_Dimension.h index 5a16b8f855..d6780f0fed 100644 --- a/xfa/src/fxbarcode/BC_Dimension.h +++ b/xfa/src/fxbarcode/BC_Dimension.h @@ -7,7 +7,10 @@ #ifndef XFA_SRC_FXBARCODE_BC_DIMENSION_H_ #define XFA_SRC_FXBARCODE_BC_DIMENSION_H_ -class CBC_Dimension; +#include <cstdint> + +#include "core/include/fxcrt/fx_string.h" + class CBC_Dimension { public: CBC_Dimension(); diff --git a/xfa/src/fxbarcode/BC_Library.cpp b/xfa/src/fxbarcode/BC_Library.cpp index 35ba3dc78b..3a47c162e5 100644 --- a/xfa/src/fxbarcode/BC_Library.cpp +++ b/xfa/src/fxbarcode/BC_Library.cpp @@ -4,81 +4,81 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/BC_Reader.h" -#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" +#include "xfa/src/fxbarcode/BC_Binarizer.h" +#include "xfa/src/fxbarcode/BC_BinaryBitmap.h" #include "xfa/src/fxbarcode/BC_BinaryBitmap.h" -#include "xfa/src/fxbarcode/BC_LuminanceSource.h" #include "xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h" -#include "xfa/src/fxbarcode/BC_Binarizer.h" -#include "xfa/src/fxbarcode/BC_Writer.h" +#include "xfa/src/fxbarcode/BC_DecoderResult.h" #include "xfa/src/fxbarcode/BC_Dimension.h" -#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" +#include "xfa/src/fxbarcode/BC_LuminanceSource.h" +#include "xfa/src/fxbarcode/BC_Reader.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" -#include "xfa/src/fxbarcode/BC_BinaryBitmap.h" -#include "xfa/src/fxbarcode/BC_DecoderResult.h" #include "xfa/src/fxbarcode/BC_TwoDimWriter.h" -#include "xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h" +#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" +#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" +#include "xfa/src/fxbarcode/BC_Writer.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" -#include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h" #include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" -#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h" +#include "xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" +#include "xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h" #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.h" -#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h" -#include "xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h" +#include "xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" #include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h" -#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h" +#include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" #include "xfa/src/fxbarcode/datamatrix/BC_TextEncoder.h" #include "xfa/src/fxbarcode/datamatrix/BC_X12Encoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.h" #include "xfa/src/fxbarcode/oned/BC_OneDReader.h" -#include "xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h" -#include "xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h" #include "xfa/src/fxbarcode/oned/BC_OneDimReader.h" -#include "xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.h" -#include "xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.h" -#include "xfa/src/fxbarcode/oned/BC_OnedUPCAReader.h" -#include "xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h" #include "xfa/src/fxbarcode/oned/BC_OneDimWriter.h" +#include "xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h" #include "xfa/src/fxbarcode/oned/BC_OnedCode128Writer.h" +#include "xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h" #include "xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h" +#include "xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.h" #include "xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.h" +#include "xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.h" #include "xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.h" +#include "xfa/src/fxbarcode/oned/BC_OnedUPCAReader.h" #include "xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417Reader.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" diff --git a/xfa/src/fxbarcode/BC_LuminanceSource.cpp b/xfa/src/fxbarcode/BC_LuminanceSource.cpp index 046bdcc4fc..9bf3f984a6 100644 --- a/xfa/src/fxbarcode/BC_LuminanceSource.cpp +++ b/xfa/src/fxbarcode/BC_LuminanceSource.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_LuminanceSource.h" +#include "xfa/src/fxbarcode/barcode.h" CBC_LuminanceSource::CBC_LuminanceSource(int32_t width, int32_t height) : m_width(width), m_height(height) {} CBC_LuminanceSource::~CBC_LuminanceSource() {} diff --git a/xfa/src/fxbarcode/BC_LuminanceSource.h b/xfa/src/fxbarcode/BC_LuminanceSource.h index e78f9ba889..862fa2475f 100644 --- a/xfa/src/fxbarcode/BC_LuminanceSource.h +++ b/xfa/src/fxbarcode/BC_LuminanceSource.h @@ -7,7 +7,8 @@ #ifndef XFA_SRC_FXBARCODE_BC_LUMINANCESOURCE_H_ #define XFA_SRC_FXBARCODE_BC_LUMINANCESOURCE_H_ -class CBC_LuminanceSource; +#include "core/include/fxcrt/fx_basic.h" + class CBC_LuminanceSource { public: CBC_LuminanceSource(int32_t width, int32_t height); diff --git a/xfa/src/fxbarcode/BC_Reader.cpp b/xfa/src/fxbarcode/BC_Reader.cpp index 0f56137b42..5af914ebc3 100644 --- a/xfa/src/fxbarcode/BC_Reader.cpp +++ b/xfa/src/fxbarcode/BC_Reader.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/barcode.h" CBC_Reader::CBC_Reader() {} CBC_Reader::~CBC_Reader() {} diff --git a/xfa/src/fxbarcode/BC_Reader.h b/xfa/src/fxbarcode/BC_Reader.h index 1f19a2f278..062268a6e7 100644 --- a/xfa/src/fxbarcode/BC_Reader.h +++ b/xfa/src/fxbarcode/BC_Reader.h @@ -7,8 +7,10 @@ #ifndef XFA_SRC_FXBARCODE_BC_READER_H_ #define XFA_SRC_FXBARCODE_BC_READER_H_ +#include "core/include/fxcrt/fx_string.h" + class CBC_BinaryBitmap; -class CBC_Reader; + class CBC_Reader { public: CBC_Reader(); diff --git a/xfa/src/fxbarcode/BC_ResultPoint.cpp b/xfa/src/fxbarcode/BC_ResultPoint.cpp index 47eb8aeb33..d499235a3a 100644 --- a/xfa/src/fxbarcode/BC_ResultPoint.cpp +++ b/xfa/src/fxbarcode/BC_ResultPoint.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" +#include "xfa/src/fxbarcode/barcode.h" CBC_ResultPoint::CBC_ResultPoint(FX_FLOAT x, FX_FLOAT y) : m_x(x), m_y(y) {} FX_FLOAT CBC_ResultPoint::GetX() { return m_x; diff --git a/xfa/src/fxbarcode/BC_ResultPoint.h b/xfa/src/fxbarcode/BC_ResultPoint.h index e2c92a6aa6..6e00a26c79 100644 --- a/xfa/src/fxbarcode/BC_ResultPoint.h +++ b/xfa/src/fxbarcode/BC_ResultPoint.h @@ -7,7 +7,8 @@ #ifndef XFA_SRC_FXBARCODE_BC_RESULTPOINT_H_ #define XFA_SRC_FXBARCODE_BC_RESULTPOINT_H_ -class CBC_ResultPoint; +#include "core/include/fxcrt/fx_system.h" + class CBC_ResultPoint { public: CBC_ResultPoint(); diff --git a/xfa/src/fxbarcode/BC_TwoDimWriter.cpp b/xfa/src/fxbarcode/BC_TwoDimWriter.cpp index 8066614f0a..a97ae2069b 100644 --- a/xfa/src/fxbarcode/BC_TwoDimWriter.cpp +++ b/xfa/src/fxbarcode/BC_TwoDimWriter.cpp @@ -7,10 +7,10 @@ #include <algorithm> #include "third_party/base/numerics/safe_math.h" +#include "xfa/src/fxbarcode/BC_TwoDimWriter.h" +#include "xfa/src/fxbarcode/BC_Writer.h" #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "xfa/src/fxbarcode/BC_Writer.h" -#include "xfa/src/fxbarcode/BC_TwoDimWriter.h" CBC_TwoDimWriter::CBC_TwoDimWriter() { m_iCorrectLevel = 1; diff --git a/xfa/src/fxbarcode/BC_TwoDimWriter.h b/xfa/src/fxbarcode/BC_TwoDimWriter.h index 5660e95d7c..4e04c016fe 100644 --- a/xfa/src/fxbarcode/BC_TwoDimWriter.h +++ b/xfa/src/fxbarcode/BC_TwoDimWriter.h @@ -7,6 +7,7 @@ #ifndef XFA_SRC_FXBARCODE_BC_TWODIMWRITER_H_ #define XFA_SRC_FXBARCODE_BC_TWODIMWRITER_H_ +#include "core/include/fxge/fx_ge.h" #include "xfa/src/fxbarcode/BC_Writer.h" class CBC_CommonBitMatrix; diff --git a/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp b/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp index 3dc08adbbf..3ca466ca20 100644 --- a/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp +++ b/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" +#include "xfa/src/fxbarcode/barcode.h" CBC_UtilCodingConvert::CBC_UtilCodingConvert() {} diff --git a/xfa/src/fxbarcode/BC_UtilCodingConvert.h b/xfa/src/fxbarcode/BC_UtilCodingConvert.h index c46840ac4d..2cfd81a176 100644 --- a/xfa/src/fxbarcode/BC_UtilCodingConvert.h +++ b/xfa/src/fxbarcode/BC_UtilCodingConvert.h @@ -7,7 +7,8 @@ #ifndef XFA_SRC_FXBARCODE_BC_UTILCODINGCONVERT_H_ #define XFA_SRC_FXBARCODE_BC_UTILCODINGCONVERT_H_ -class CBC_UtilCodingConvert; +#include "core/include/fxcrt/fx_basic.h" + class CBC_UtilCodingConvert { public: CBC_UtilCodingConvert(); diff --git a/xfa/src/fxbarcode/BC_UtilRSS.cpp b/xfa/src/fxbarcode/BC_UtilRSS.cpp index d263074cc0..e2f4d752fd 100644 --- a/xfa/src/fxbarcode/BC_UtilRSS.cpp +++ b/xfa/src/fxbarcode/BC_UtilRSS.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_UtilRSS.h" +#include "xfa/src/fxbarcode/barcode.h" CBC_UtilRSS::CBC_UtilRSS() {} CBC_UtilRSS::~CBC_UtilRSS() {} CFX_Int32Array* CBC_UtilRSS::GetRssWidths(int32_t val, diff --git a/xfa/src/fxbarcode/BC_UtilRSS.h b/xfa/src/fxbarcode/BC_UtilRSS.h index 7f87bbb138..cbcad946c7 100644 --- a/xfa/src/fxbarcode/BC_UtilRSS.h +++ b/xfa/src/fxbarcode/BC_UtilRSS.h @@ -7,6 +7,10 @@ #ifndef XFA_SRC_FXBARCODE_BC_UTILRSS_H_ #define XFA_SRC_FXBARCODE_BC_UTILRSS_H_ +#include <cstdint> + +#include "core/include/fxcrt/fx_basic.h" + class CBC_RssPair; class CBC_UtilRSS { public: diff --git a/xfa/src/fxbarcode/BC_Writer.cpp b/xfa/src/fxbarcode/BC_Writer.cpp index 7a279fa05c..224fe50a91 100644 --- a/xfa/src/fxbarcode/BC_Writer.cpp +++ b/xfa/src/fxbarcode/BC_Writer.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Writer.h" +#include "xfa/src/fxbarcode/barcode.h" CBC_Writer::CBC_Writer() { m_CharEncoding = 0; m_ModuleHeight = 1; diff --git a/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp b/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp index af9b0bcb70..787324deee 100644 --- a/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/common/BC_CommonECI.h" #include "xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h" +#include "xfa/src/fxbarcode/common/BC_CommonECI.h" void CBC_CommonCharacterSetECI::initialize() {} CBC_CommonCharacterSetECI::CBC_CommonCharacterSetECI( int32_t value, diff --git a/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h b/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h index 9ca6548533..5575147fbe 100644 --- a/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h +++ b/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h @@ -7,8 +7,8 @@ #ifndef XFA_SRC_FXBARCODE_COMMON_BC_COMMONCHARACTERSETECI_H_ #define XFA_SRC_FXBARCODE_COMMON_BC_COMMONCHARACTERSETECI_H_ -class CBC_CommonECI; -class CBC_CommonCharacterSetECI; +#include "xfa/src/fxbarcode/common/BC_CommonECI.h" + class CBC_CommonCharacterSetECI : public CBC_CommonECI { public: CBC_CommonCharacterSetECI(int32_t value, CFX_ByteString encodingName); diff --git a/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp index 4210cb8513..9df2c31c21 100644 --- a/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp @@ -21,9 +21,9 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h" #include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" CBC_CommonDecoderResult::CBC_CommonDecoderResult() {} void CBC_CommonDecoderResult::Init(const CFX_ByteArray& rawBytes, const CFX_ByteString& text, diff --git a/xfa/src/fxbarcode/common/BC_CommonECI.cpp b/xfa/src/fxbarcode/common/BC_CommonECI.cpp index efb9e94657..b6be150eb4 100644 --- a/xfa/src/fxbarcode/common/BC_CommonECI.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonECI.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/common/BC_CommonECI.h" #include "xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h" +#include "xfa/src/fxbarcode/common/BC_CommonECI.h" CBC_CommonECI::CBC_CommonECI(int32_t value) { m_value = value; } diff --git a/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp index 9f0d99a99d..567b357545 100644 --- a/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp +++ b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp @@ -20,11 +20,11 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Binarizer.h" #include "xfa/src/fxbarcode/BC_LuminanceSource.h" -#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h" const int32_t LUMINANCE_BITS = 5; const int32_t LUMINANCE_SHIFT = 8 - LUMINANCE_BITS; diff --git a/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h index 86ac2eabe2..a74187e767 100644 --- a/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h +++ b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h @@ -7,11 +7,13 @@ #ifndef XFA_SRC_FXBARCODE_COMMON_BC_GLOBALHISTOGRAMBINARIZER_H_ #define XFA_SRC_FXBARCODE_COMMON_BC_GLOBALHISTOGRAMBINARIZER_H_ +#include "core/include/fxcrt/fx_basic.h" + class CBC_CommonBinarizer; class CBC_CommonBitArray; class CBC_CommonBitMatrix; class CBC_LuminanceSource; -class CBC_GlobalHistogramBinarizer; + class CBC_GlobalHistogramBinarizer : public CBC_Binarizer { public: CBC_GlobalHistogramBinarizer(CBC_LuminanceSource* source); diff --git a/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp index a2d6c55067..13b852c1f7 100644 --- a/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp +++ b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp @@ -20,10 +20,10 @@ * limitations under the License. */ +#include "xfa/src/fxbarcode/BC_ResultPoint.h" #include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "xfa/src/fxbarcode/BC_ResultPoint.h" +#include "xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h" const int32_t CBC_WhiteRectangleDetector::INIT_SIZE = 30; const int32_t CBC_WhiteRectangleDetector::CORR = 1; CBC_WhiteRectangleDetector::CBC_WhiteRectangleDetector( diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp index f74b5ff331..26bc9e4c7b 100644 --- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp +++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp @@ -21,9 +21,9 @@ */ #include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h" #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h" -#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h" CBC_ReedSolomonEncoder::CBC_ReedSolomonEncoder(CBC_ReedSolomonGF256* field) { m_field = field; } diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp index 5bb30912d4..22819c9342 100644 --- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp +++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp @@ -21,9 +21,9 @@ */ #include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h" #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h" -#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h" CBC_ReedSolomonDecoder::CBC_ReedSolomonDecoder(CBC_ReedSolomonGF256* field) { m_field = field; } diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp index 6c7bbf7dea..2e059acf37 100644 --- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp +++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h" #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h" CBC_ReedSolomonGF256* CBC_ReedSolomonGF256::QRCodeFild = NULL; CBC_ReedSolomonGF256* CBC_ReedSolomonGF256::DataMatrixField = NULL; void CBC_ReedSolomonGF256::Initialize() { diff --git a/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp index d2ae5f955f..91f5b8ee26 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp @@ -20,14 +20,14 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Dimension.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h" #include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" #include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h" #include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" CBC_ASCIIEncoder::CBC_ASCIIEncoder() {} CBC_ASCIIEncoder::~CBC_ASCIIEncoder() {} int32_t CBC_ASCIIEncoder::getEncodingMode() { diff --git a/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h b/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h index c01c4ce035..932b353ad4 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h +++ b/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h @@ -7,9 +7,10 @@ #ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_ASCIIENCODER_H_ #define XFA_SRC_FXBARCODE_DATAMATRIX_BC_ASCIIENCODER_H_ -class CBC_Encoder; +#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" + class CBC_EncoderContext; -class CBC_ASCIIEncoder; + class CBC_ASCIIEncoder : public CBC_Encoder { public: CBC_ASCIIEncoder(); diff --git a/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp index 08d174d229..4fced54c5f 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp @@ -20,14 +20,14 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Dimension.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h" #include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" #include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h" #include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" CBC_Base256Encoder::CBC_Base256Encoder() {} CBC_Base256Encoder::~CBC_Base256Encoder() {} int32_t CBC_Base256Encoder::getEncodingMode() { diff --git a/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h b/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h index 9cdef1996e..c7aa18c2c8 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h +++ b/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h @@ -7,8 +7,8 @@ #ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_BASE256ENCODER_H_ #define XFA_SRC_FXBARCODE_DATAMATRIX_BC_BASE256ENCODER_H_ -class CBC_Encoder; -class CBC_Base256Encoder; +#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" + class CBC_Base256Encoder : public CBC_Encoder { public: CBC_Base256Encoder(); diff --git a/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp index 93851376d3..48bce2bd50 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp @@ -20,15 +20,15 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Dimension.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h" #include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" #include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h" #include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" CBC_C40Encoder::CBC_C40Encoder() {} CBC_C40Encoder::~CBC_C40Encoder() {} int32_t CBC_C40Encoder::getEncodingMode() { diff --git a/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h b/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h index e082e81487..ebc67efb17 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h +++ b/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h @@ -7,7 +7,8 @@ #ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_C40ENCODER_H_ #define XFA_SRC_FXBARCODE_DATAMATRIX_BC_C40ENCODER_H_ -class CBC_C40Encoder; +#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" + class CBC_C40Encoder : public CBC_Encoder { public: CBC_C40Encoder(); diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp index 0b5b430679..6b9191bd56 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp @@ -22,8 +22,8 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h" #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h" CBC_DataMatrixBitMatrixParser::CBC_DataMatrixBitMatrixParser() { m_mappingBitMatrix = NULL; m_version = NULL; diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp index e5c39fb929..c3eae91d34 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h" #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h" CBC_DataMatrixDataBlock::~CBC_DataMatrixDataBlock() {} CBC_DataMatrixDataBlock::CBC_DataMatrixDataBlock(int32_t numDataCodewords, CFX_ByteArray* codewords) { diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp index 1838a03f1e..697d617ae5 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" #include "xfa/src/fxbarcode/common/BC_CommonBitSource.h" +#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h" const FX_CHAR CBC_DataMatrixDecodedBitStreamParser::C40_BASIC_SET_CHARS[] = { '*', '*', '*', ' ', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp index b797e2f9f3..d260c396af 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp @@ -24,11 +24,11 @@ #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h" #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" -#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h" #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h" -#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h" #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h" #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h" CBC_DataMatrixDecoder::CBC_DataMatrixDecoder() { m_rsDecoder = NULL; } diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp index f5adb06df4..930480f7b9 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp @@ -22,14 +22,14 @@ #include <algorithm> -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" -#include "xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h" +#include "xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h" #include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h" #include "xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h" -#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h" const int32_t CBC_DataMatrixDetector::INTEGERS[5] = {0, 1, 2, 3, 4}; CBC_DataMatrixDetector::CBC_DataMatrixDetector(CBC_CommonBitMatrix* image) : m_image(image), m_rectangleDetector(NULL) {} diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp index 75498f6bec..fb2e51c21f 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp @@ -20,14 +20,14 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_BinaryBitmap.h" #include "xfa/src/fxbarcode/BC_Reader.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h" #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h" #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h" CBC_DataMatrixReader::CBC_DataMatrixReader() { m_decoder = NULL; } diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp index 7348680be4..89483fe28c 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp @@ -21,10 +21,10 @@ */ #include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h" #include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" #include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" -#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" CBC_DataMatrixSymbolInfo144::CBC_DataMatrixSymbolInfo144() : CBC_SymbolInfo(FALSE, 1558, 620, 22, 22, 36) { m_rsBlockData = -1; diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h index ce16004817..607e8937cd 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h @@ -7,8 +7,8 @@ #ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXSYMBOLINFO144_H_ #define XFA_SRC_FXBARCODE_DATAMATRIX_BC_DATAMATRIXSYMBOLINFO144_H_ -class CBC_SymbolInfo; -class CBC_DataMatrixSymbolInfo144; +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" + class CBC_DataMatrixSymbolInfo144 : public CBC_SymbolInfo { public: CBC_DataMatrixSymbolInfo144(); diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp index 4b11a07742..ab488d9a5b 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp @@ -20,29 +20,29 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/BC_Writer.h" -#include "xfa/src/fxbarcode/BC_TwoDimWriter.h" -#include "xfa/src/fxbarcode/BC_Dimension.h" #include "xfa/src/fxbarcode/BC_BinaryBitmap.h" +#include "xfa/src/fxbarcode/BC_Dimension.h" +#include "xfa/src/fxbarcode/BC_TwoDimWriter.h" #include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" +#include "xfa/src/fxbarcode/BC_Writer.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h" -#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" +#include "xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h" #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h" -#include "xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h" +#include "xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" #include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h" -#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h" +#include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" #include "xfa/src/fxbarcode/datamatrix/BC_TextEncoder.h" #include "xfa/src/fxbarcode/datamatrix/BC_X12Encoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.h" CBC_DataMatrixWriter::CBC_DataMatrixWriter() {} CBC_DataMatrixWriter::~CBC_DataMatrixWriter() {} FX_BOOL CBC_DataMatrixWriter::SetErrorCorrectionLevel(int32_t level) { diff --git a/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp b/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp index 55437de91d..d87ac7472c 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" #include "xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h" +#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" CBC_DefaultPlacement::CBC_DefaultPlacement(CFX_WideString codewords, int32_t numcols, int32_t numrows) { diff --git a/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp index 1d0fc4ce50..81822335f9 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp @@ -20,15 +20,15 @@ * limitations under the License. */ +#include "xfa/src/fxbarcode/BC_Dimension.h" #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "xfa/src/fxbarcode/BC_Dimension.h" +#include "xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h" #include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" #include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h" #include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" CBC_EdifactEncoder::CBC_EdifactEncoder() {} CBC_EdifactEncoder::~CBC_EdifactEncoder() {} int32_t CBC_EdifactEncoder::getEncodingMode() { diff --git a/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h index 26324ed9d6..4d905edb63 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h +++ b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h @@ -7,8 +7,8 @@ #ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_EDIFACTENCODER_H_ #define XFA_SRC_FXBARCODE_DATAMATRIX_BC_EDIFACTENCODER_H_ -class CBC_EncoderContext; -class CBC_EdifactEncoder; +#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" + class CBC_EdifactEncoder : public CBC_Encoder { public: CBC_EdifactEncoder(); diff --git a/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp b/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp index 6743e4387d..51d4583668 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp @@ -20,14 +20,14 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Dimension.h" #include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" #include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" CBC_EncoderContext::CBC_EncoderContext(const CFX_WideString msg, CFX_WideString ecLevel, int32_t& e) { diff --git a/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h b/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h index 9b78f86661..076581c7aa 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h +++ b/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h @@ -7,10 +7,11 @@ #ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_ENCODERCONTEXT_H_ #define XFA_SRC_FXBARCODE_DATAMATRIX_BC_ENCODERCONTEXT_H_ -class CBC_SymbolShapeHint; +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" + class CBC_SymbolInfo; class CBC_Dimension; -class CBC_EncoderContext; + class CBC_EncoderContext : public CBC_SymbolShapeHint { public: CBC_EncoderContext(const CFX_WideString msg, diff --git a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp index 7a83a2ac39..64dd8e23f7 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp @@ -22,9 +22,9 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" #include "xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" int32_t CBC_ErrorCorrection::FACTOR_SETS[] = {5, 7, 10, 11, 12, 14, 18, 20, 24, 28, 36, 42, 48, 56, 62, 68}; int32_t CBC_ErrorCorrection::FACTORS[][100] = { diff --git a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp index 7e1c2edc68..a09fa39e72 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp @@ -20,21 +20,21 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Dimension.h" #include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h" #include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" #include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h" -#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" #include "xfa/src/fxbarcode/datamatrix/BC_TextEncoder.h" #include "xfa/src/fxbarcode/datamatrix/BC_X12Encoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h" #define Integer_MAX_VALUE 2147483647 FX_WCHAR CBC_HighLevelEncoder::LATCH_TO_C40 = 230; FX_WCHAR CBC_HighLevelEncoder::LATCH_TO_BASE256 = 231; diff --git a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h index 658bc4eb68..2ac64695eb 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h +++ b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h @@ -7,14 +7,15 @@ #ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_HIGHLEVELENCODER_H_ #define XFA_SRC_FXBARCODE_DATAMATRIX_BC_HIGHLEVELENCODER_H_ -class CBC_SymbolShapeHint; -class CBC_HighLevelEncoder; +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" + #define ASCII_ENCODATION 0 #define C40_ENCODATION 1 #define TEXT_ENCODATION 2 #define X12_ENCODATION 3 #define EDIFACT_ENCODATION 4 #define BASE256_ENCODATION 5 + class CBC_HighLevelEncoder : public CBC_SymbolShapeHint { public: CBC_HighLevelEncoder(); diff --git a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp index 8845225553..d73953744e 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp @@ -20,13 +20,13 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Dimension.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h" #include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" #include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" -#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" #define SYMBOLS_COUNT 30 CBC_SymbolInfo* CBC_SymbolInfo::m_PROD_SYMBOLS[30] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, diff --git a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h index b00e804fa0..c857c25840 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h +++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h @@ -7,9 +7,10 @@ #ifndef XFA_SRC_FXBARCODE_DATAMATRIX_BC_SYMBOLINFO_H_ #define XFA_SRC_FXBARCODE_DATAMATRIX_BC_SYMBOLINFO_H_ -class CBC_SymbolShapeHint; +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" + class CBC_Dimension; -class CBC_SymbolInfo; + class CBC_SymbolInfo : public CBC_SymbolShapeHint { public: CBC_SymbolInfo(FX_BOOL rectangular, diff --git a/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp index 1ed260d10b..5de3846600 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp @@ -20,15 +20,15 @@ * limitations under the License. */ +#include "xfa/src/fxbarcode/BC_Dimension.h" #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "xfa/src/fxbarcode/BC_Dimension.h" +#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h" #include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" #include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h" #include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" #include "xfa/src/fxbarcode/datamatrix/BC_TextEncoder.h" CBC_TextEncoder::CBC_TextEncoder() {} CBC_TextEncoder::~CBC_TextEncoder() {} diff --git a/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp index 91b917facf..f7dfe800a6 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp @@ -20,15 +20,15 @@ * limitations under the License. */ +#include "xfa/src/fxbarcode/BC_Dimension.h" #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "xfa/src/fxbarcode/BC_Dimension.h" +#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h" #include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" -#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" #include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h" #include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h" -#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" #include "xfa/src/fxbarcode/datamatrix/BC_X12Encoder.h" CBC_X12Encoder::CBC_X12Encoder() {} CBC_X12Encoder::~CBC_X12Encoder() {} diff --git a/xfa/src/fxbarcode/oned/BC_OneDReader.cpp b/xfa/src/fxbarcode/oned/BC_OneDReader.cpp index 047506d337..7e872d565a 100644 --- a/xfa/src/fxbarcode/oned/BC_OneDReader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OneDReader.cpp @@ -22,9 +22,9 @@ #include <algorithm> -#include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/BC_Reader.h" #include "xfa/src/fxbarcode/BC_BinaryBitmap.h" +#include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" #include "xfa/src/fxbarcode/oned/BC_OneDReader.h" const int32_t CBC_OneDReader::INTEGER_MATH_SHIFT = 8; diff --git a/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp b/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp index b11711a0ea..8de79c12c4 100644 --- a/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" #include "xfa/src/fxbarcode/oned/BC_OneDReader.h" #include "xfa/src/fxbarcode/oned/BC_OneDimReader.h" diff --git a/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp index 456d50a3cf..0c395712cb 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp @@ -22,12 +22,12 @@ #include <algorithm> -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" #include "xfa/src/fxbarcode/oned/BC_OneDReader.h" -#include "xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h" #include "xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h" const FX_CHAR* CBC_OnedCodaBarReader::ALPHABET_STRING = "0123456789-$:/.+ABCDTN"; const int32_t CBC_OnedCodaBarReader::CHARACTER_ENCODINGS[22] = { diff --git a/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp b/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp index 187a9e8ab8..a70415fb3a 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp @@ -20,11 +20,11 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/BC_Writer.h" #include "xfa/src/fxbarcode/BC_Reader.h" -#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/BC_Writer.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/src/fxbarcode/oned/BC_OneDReader.h" #include "xfa/src/fxbarcode/oned/BC_OneDimWriter.h" #include "xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h" diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp index db2702968b..b2e978c650 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp @@ -22,8 +22,8 @@ #include <algorithm> -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" #include "xfa/src/fxbarcode/oned/BC_OneDReader.h" #include "xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h" diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.cpp index cc923e6735..045dacb6ea 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/BC_Writer.h" #include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/BC_Writer.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/oned/BC_OneDReader.h" #include "xfa/src/fxbarcode/oned/BC_OneDimWriter.h" #include "xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h" diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp index d171019f62..3b13b671ca 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp @@ -22,8 +22,8 @@ #include <algorithm> -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" #include "xfa/src/fxbarcode/oned/BC_OneDReader.h" #include "xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h" diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp index 10c2529337..02de5f224f 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/BC_Writer.h" #include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/BC_Writer.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/src/fxbarcode/oned/BC_OneDReader.h" #include "xfa/src/fxbarcode/oned/BC_OneDimWriter.h" diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.cpp index 0c94fb2b34..d5ac09ed39 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" #include "xfa/src/fxbarcode/oned/BC_OneDReader.h" #include "xfa/src/fxbarcode/oned/BC_OneDimReader.h" diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp index 62ffd7bc8e..a291b1ac24 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/BC_Writer.h" #include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/BC_Writer.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/oned/BC_OneDReader.h" #include "xfa/src/fxbarcode/oned/BC_OneDimReader.h" #include "xfa/src/fxbarcode/oned/BC_OneDimWriter.h" diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.cpp index 5dc1357f3a..21a6fb30e3 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" #include "xfa/src/fxbarcode/oned/BC_OneDReader.h" #include "xfa/src/fxbarcode/oned/BC_OneDimReader.h" diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp index d0aab2704d..ae557866ec 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp @@ -20,13 +20,13 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/BC_Writer.h" #include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/BC_Writer.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/src/fxbarcode/oned/BC_OneDReader.h" -#include "xfa/src/fxbarcode/oned/BC_OneDimWriter.h" #include "xfa/src/fxbarcode/oned/BC_OneDimReader.h" +#include "xfa/src/fxbarcode/oned/BC_OneDimWriter.h" #include "xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.h" CBC_OnedEAN8Writer::CBC_OnedEAN8Writer() { m_iDataLenth = 8; diff --git a/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp b/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp index ac85853898..3f524cd210 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/oned/BC_OneDReader.h" #include "xfa/src/fxbarcode/oned/BC_OneDimReader.h" #include "xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.h" diff --git a/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp index bd18a95e7e..be626c6a1e 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Writer.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/oned/BC_OneDimWriter.h" #include "xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.h" #include "xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.h" diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp index c4e9463420..9ad72849bf 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp @@ -21,12 +21,12 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417.h" int32_t CBC_PDF417::START_PATTERN = 0x1fea8; int32_t CBC_PDF417::STOP_PATTERN = 0x3fa29; int32_t CBC_PDF417::CODEWORD_TABLE[][1000] = { diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417.h b/xfa/src/fxbarcode/pdf417/BC_PDF417.h index 6da9cb934d..684b290e67 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417.h +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417.h @@ -7,9 +7,12 @@ #ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417_H_ #define XFA_SRC_FXBARCODE_PDF417_BC_PDF417_H_ +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h" + class CBC_Compaction; class CBC_BarcodeRow; class CBC_BarcodeMatrix; + class CBC_PDF417 { public: CBC_PDF417(); diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp index 76e8e18504..cd9de0c4c5 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h" CBC_BarcodeMatrix::CBC_BarcodeMatrix(int32_t height, int32_t width) { m_matrix.SetSize(height + 2); for (int32_t i = 0, matrixLength = m_matrix.GetSize(); i < matrixLength; diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp index 4d9ea60a18..0f310f6f1f 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" CBC_BarcodeValue::CBC_BarcodeValue() {} CBC_BarcodeValue::~CBC_BarcodeValue() {} void CBC_BarcodeValue::setValue(int32_t value) { diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp index 1a999bbae4..c14e0de133 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h" CBC_BoundingBox::CBC_BoundingBox(CBC_CommonBitMatrix* image, diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp index d8adabbf58..171f658325 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" #define SYMBOL_TABLE_Length 2787 #define Float_MAX_VALUE 2147483647 FX_FLOAT CBC_PDF417CodewordDecoder::RATIOS_TABLE[2787][8] = {{0}}; diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h index 78a26e9306..41612c1a71 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h @@ -7,9 +7,6 @@ #ifndef XFA_SRC_FXBARCODE_PDF417_BC_PDF417CODEWORDDECODER_H_ #define XFA_SRC_FXBARCODE_PDF417_BC_PDF417CODEWORDDECODER_H_ -class CBC_PDF417CodewordDecoder; -#define column 8 -class CBC_PDF417Common; class CBC_PDF417CodewordDecoder { public: CBC_PDF417CodewordDecoder(); diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp index 27d483be85..79d195aee4 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp @@ -24,11 +24,11 @@ #include <stdlib.h> +#include "third_party/bigint/BigIntegerLibrary.hh" #include "xfa/src/fxbarcode/BC_DecoderResult.h" #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h" -#include "third_party/bigint/BigIntegerLibrary.hh" #define TEXT_COMPACTION_MODE_LATCH 900 #define BYTE_COMPACTION_MODE_LATCH 901 diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp index bd92a06007..107ab39c51 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp @@ -21,13 +21,13 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h" int32_t CBC_DetectionResult::ADJUST_ROW_NUMBER_SKIP = 2; CBC_DetectionResult::CBC_DetectionResult(CBC_BarcodeMetadata* barcodeMetadata, CBC_BoundingBox* boundingBox) { diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp index b03ef7d39e..39dea3ab53 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h" int32_t CBC_DetectionResultColumn::MAX_NEARBY_DISTANCE = 5; CBC_DetectionResultColumn::CBC_DetectionResultColumn( diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp index ad3bd8e216..14a87d60a2 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp @@ -20,12 +20,12 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h" diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp index 40f00b42ee..ca845ff04a 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp @@ -20,13 +20,13 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/BC_ResultPoint.h" #include "xfa/src/fxbarcode/BC_BinaryBitmap.h" -#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/BC_ResultPoint.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h" #define INTERGER_MAX 2147483647 int32_t CBC_Detector::INDEXES_START_PATTERN[] = {0, 4, 1, 5}; int32_t CBC_Detector::INDEXES_STOP_PATTERN[] = {6, 2, 7, 3}; diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h index 604bc3084a..e18a2b5151 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h @@ -11,6 +11,7 @@ class CBC_PDF417DetectorResult; class CBC_BinaryBitmap; class CBC_CommonBitMatrix; class CBC_CommonBitArray; + class CBC_Detector { public: CBC_Detector(); diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp index 7b1329e5ac..8a46c44877 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ +#include "xfa/src/fxbarcode/BC_ResultPoint.h" #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "xfa/src/fxbarcode/BC_ResultPoint.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h" CBC_PDF417DetectorResult::CBC_PDF417DetectorResult(CBC_CommonBitMatrix* bits, CFX_PtrArray* points) { diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp index b814f32dca..844a0ca255 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp @@ -22,9 +22,9 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h" CBC_PDF417ECModulusGF* CBC_PDF417ECErrorCorrection::m_field = NULL; void CBC_PDF417ECErrorCorrection::Initialize(int32_t& e) { m_field = diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp index b0b3cb69e8..b8de25da76 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp @@ -22,8 +22,8 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h" CBC_PDF417ECModulusGF* CBC_PDF417ECModulusGF::PDF417_GF = NULL; void CBC_PDF417ECModulusGF::Initialize(int32_t& e) { PDF417_GF = diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp index 52b1f8a84c..9610498565 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp @@ -22,10 +22,10 @@ #include "xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h" +#include "third_party/bigint/BigIntegerLibrary.hh" #include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h" -#include "third_party/bigint/BigIntegerLibrary.hh" #define SUBMODE_ALPHA 0 #define SUBMODE_LOWER 1 diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp index 57a12e222d..b0f717e5bc 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "testing/gtest/include/gtest/gtest.h" #include "core/include/fxcrt/fx_basic.h" #include "testing/fx_string_testhelpers.h" +#include "testing/gtest/include/gtest/gtest.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h" TEST(PDF417HighLevelEncoder, EncodeHighLevel) { diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp index 556e6e1db8..a8167816c4 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp @@ -20,36 +20,36 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/BC_Reader.h" #include "xfa/src/fxbarcode/BC_BinaryBitmap.h" -#include "xfa/src/fxbarcode/BC_ResultPoint.h" #include "xfa/src/fxbarcode/BC_BinaryBitmap.h" #include "xfa/src/fxbarcode/BC_DecoderResult.h" -#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/BC_ResultPoint.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" -#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417Reader.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h" #define Integer_MAX_VALUE 2147483647 CBC_PDF417Reader::CBC_PDF417Reader() {} CBC_PDF417Reader::~CBC_PDF417Reader() {} diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp index 9ef37e6a14..df36e30926 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp @@ -20,25 +20,25 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_DecoderResult.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h" int32_t CBC_PDF417ScanningDecoder::CODEWORD_SKEW_SIZE = 2; int32_t CBC_PDF417ScanningDecoder::MAX_ERRORS = 3; diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp index b832c8a7c2..7b4a200978 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp @@ -20,13 +20,13 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_TwoDimWriter.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417Writer.h" CBC_PDF417Writer::CBC_PDF417Writer() { m_bFixedSize = FALSE; diff --git a/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp b/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp index 680806eafb..c3aa28c593 100644 --- a/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp @@ -20,10 +20,10 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.h" CBC_QRFinderPatternInfo::CBC_QRFinderPatternInfo(CFX_PtrArray* patternCenters) { m_bottomLeft = (CBC_QRFinderPattern*)(*patternCenters)[0]; m_topLeft = (CBC_QRFinderPattern*)(*patternCenters)[1]; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp index 47e3197f76..3eb70f9cc7 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.h" CBC_QRAlignmentPattern::CBC_QRAlignmentPattern(FX_FLOAT posX, FX_FLOAT posY, diff --git a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp index 4e88215a58..bb04debe46 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.h" #include "xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h" diff --git a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp index db4f243fee..4bd502665f 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp @@ -22,10 +22,10 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" #include "xfa/src/fxbarcode/qrcode/BC_QRDataMask.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h" CBC_QRBitMatrixParser::CBC_QRBitMatrixParser() {} void CBC_QRBitMatrixParser::Init(CBC_CommonBitMatrix* bitMatrix, int32_t& e) { m_dimension = bitMatrix->GetDimension(e); diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp index d5effa0b66..e74f8e7f3a 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp @@ -20,26 +20,26 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/BC_Reader.h" -#include "xfa/src/fxbarcode/BC_LuminanceSource.h" -#include "xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h" #include "xfa/src/fxbarcode/BC_Binarizer.h" #include "xfa/src/fxbarcode/BC_BinaryBitmap.h" +#include "xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h" +#include "xfa/src/fxbarcode/BC_LuminanceSource.h" +#include "xfa/src/fxbarcode/BC_Reader.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" -#include "xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" +#include "xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h" #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRDetector.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRDataMask.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDataMask.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDetector.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h" CBC_QRCodeReader::CBC_QRCodeReader() : m_decoder(NULL) {} void CBC_QRCodeReader::Init() { m_decoder = new CBC_QRCoderDecoder; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp index 0506b4fb97..ebb55aea34 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp @@ -20,14 +20,14 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/BC_TwoDimWriter.h" #include "xfa/src/fxbarcode/BC_Reader.h" +#include "xfa/src/fxbarcode/BC_TwoDimWriter.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCoder.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" CBC_QRCodeWriter::CBC_QRCodeWriter() { m_bFixedSize = TRUE; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp index fdc7a4e064..9b0effcd30 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp @@ -22,9 +22,9 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoder.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRCoder.h" CBC_QRCoder::CBC_QRCoder() { m_mode = NULL; m_ecLevel = NULL; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp index 676f7e4971..4a337b12cd 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp @@ -26,11 +26,11 @@ #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h" #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" #include "xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" #include "xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h" #include "xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h" CBC_QRCoderDecoder::CBC_QRCoderDecoder() { m_rsDecoder = NULL; } diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp index 74ce5316a1..1ebd35203a 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp @@ -22,22 +22,22 @@ #include <algorithm> -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonByteArray.h" #include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h" #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h" #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCoder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" const int32_t CBC_QRCoderEncoder::m_alphaNumbericTable[] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp index de2d428596..2c707ea306 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp @@ -22,8 +22,8 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCoder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h" CBC_QRCoderMaskUtil::CBC_QRCoderMaskUtil() {} CBC_QRCoderMaskUtil::~CBC_QRCoderMaskUtil() {} diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp index 5bf02b9573..44cfe8d91f 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp @@ -22,11 +22,11 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCoder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h" const int32_t CBC_QRCoderMatrixUtil::POSITION_DETECTION_PATTERN[7][7] = { {1, 1, 1, 1, 1, 1, 1}, {1, 0, 0, 0, 0, 0, 1}, diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp index 3e24c72cd1..405cf5489d 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" CBC_QRCoderMode* CBC_QRCoderMode::sBYTE = NULL; CBC_QRCoderMode* CBC_QRCoderMode::sNUMERIC = NULL; CBC_QRCoderMode* CBC_QRCoderMode::sALPHANUMERIC = NULL; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp index 06686a918b..9fae0ef0c6 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp @@ -21,14 +21,14 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/utils.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" +#include "xfa/src/fxbarcode/utils.h" const int32_t CBC_QRCoderVersion::VERSION_DECODE_INFO[] = { 0x07C94, 0x085BC, 0x09A99, 0x0A4D3, 0x0BBF6, 0x0C762, 0x0D847, 0x0E60D, 0x0F928, 0x10B78, 0x1145D, 0x12A17, 0x13532, 0x149A6, diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp index 4fca780590..c8cf58a6dc 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp @@ -21,10 +21,10 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h" CBC_QRDataBlock::CBC_QRDataBlock(int32_t numDataCodewords, CFX_ByteArray* codewords) : m_numDataCodewords(numDataCodewords), m_codewords(codewords) {} diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp index 4297253ccd..d967892eb1 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp @@ -20,12 +20,12 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitSource.h" -#include "xfa/src/fxbarcode/common/BC_CommonECI.h" #include "xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h" #include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" +#include "xfa/src/fxbarcode/common/BC_CommonECI.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h" #include "xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h" const FX_CHAR* CBC_QRDecodedBitStreamParser::UTF_8 = "utf8"; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp index 96c156a892..ac1e4b5298 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp @@ -22,17 +22,17 @@ #include <algorithm> +#include "xfa/src/fxbarcode/BC_ResultPoint.h" #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "xfa/src/fxbarcode/BC_ResultPoint.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" #include "xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h" #include "xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" #include "xfa/src/fxbarcode/qrcode/BC_QRDetector.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h" CBC_QRDetector::CBC_QRDetector(CBC_CommonBitMatrix* image) : m_image(image) {} CBC_QRDetector::~CBC_QRDetector() {} CBC_QRDetectorResult* CBC_QRDetector::Detect(int32_t hints, int32_t& e) { diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp index 0d0ae9f034..10eb839e74 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h" CBC_QRDetectorResult::CBC_QRDetectorResult(CBC_CommonBitMatrix* bits, diff --git a/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp b/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp index 205abe348a..c368f5742a 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.h" CBC_QRFinderPattern::CBC_QRFinderPattern(FX_FLOAT x, FX_FLOAT posY, diff --git a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp index 5242f2c1e0..58ac1c0df4 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp @@ -20,12 +20,12 @@ * limitations under the License. */ -#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" +#include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h" #include "xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h" #include "xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h" const int32_t CBC_QRFinderPatternFinder::CENTER_QUORUM = 2; const int32_t CBC_QRFinderPatternFinder::MIN_SKIP = 3; const int32_t CBC_QRFinderPatternFinder::MAX_MODULES = 57; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp b/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp index 088b3cbd7c..f78c543476 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h" #include "xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h" CBC_QRGridSampler CBC_QRGridSampler::m_gridSampler; CBC_QRGridSampler::CBC_QRGridSampler() {} diff --git a/xfa/src/fxfa/src/app/xfa_checksum.cpp b/xfa/src/fxfa/src/app/xfa_checksum.cpp index 9ec9223986..4a4168f40b 100644 --- a/xfa/src/fxfa/src/app/xfa_checksum.cpp +++ b/xfa/src/fxfa/src/app/xfa_checksum.cpp @@ -5,8 +5,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa/src/fxfa/src/app/xfa_checksum.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" CXFA_SAXReaderHandler::CXFA_SAXReaderHandler(CXFA_ChecksumContext* pContext) : m_pContext(pContext) { FXSYS_assert(m_pContext); diff --git a/xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp b/xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp index 1b10c3ab63..7bbcb02abb 100644 --- a/xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp @@ -5,8 +5,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa/src/fxfa/src/app/xfa_ffConfigAcc.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" CXFA_FFConfigAcc::CXFA_FFConfigAcc(CXFA_Node* pNode) : m_pNode(pNode), m_pPsMapNode(NULL) {} CXFA_FFConfigAcc::~CXFA_FFConfigAcc() {} diff --git a/xfa/src/fxfa/src/app/xfa_ffapp.cpp b/xfa/src/fxfa/src/app/xfa_ffapp.cpp index e487c5d9cf..be3a38be52 100644 --- a/xfa/src/fxfa/src/app/xfa_ffapp.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffapp.cpp @@ -7,14 +7,14 @@ #include <algorithm> #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" #include "xfa/src/fxfa/src/app/xfa_ffdochandler.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h" +#include "xfa/src/fxfa/src/app/xfa_fontmgr.h" #include "xfa/src/fxfa/src/app/xfa_fwladapter.h" -#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" -#include "xfa/src/fxfa/src/app/xfa_ffapp.h" #include "xfa/src/fxfa/src/app/xfa_fwltheme.h" -#include "xfa/src/fxfa/src/app/xfa_fontmgr.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" CXFA_FileRead::CXFA_FileRead(const CFX_ArrayTemplate<CPDF_Stream*>& streams) { int32_t iCount = streams.GetSize(); diff --git a/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp b/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp index 4abb20d6d0..72a9e6dfa5 100644 --- a/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp @@ -5,13 +5,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffbarcode.h" #include "xfa/src/fxfa/src/app/xfa_fffield.h" #include "xfa/src/fxfa/src/app/xfa_ffpageview.h" #include "xfa/src/fxfa/src/app/xfa_fftextedit.h" -#include "xfa/src/fxfa/src/app/xfa_ffbarcode.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" static XFA_LPCBARCODETYPEENUMINFO XFA_GetBarcodeTypeByName( const CFX_WideStringC& wsName); CXFA_FFBarcode::CXFA_FFBarcode(CXFA_FFPageView* pPageView, diff --git a/xfa/src/fxfa/src/app/xfa_ffbarcode.h b/xfa/src/fxfa/src/app/xfa_ffbarcode.h index 58826869b5..5fac3e232d 100644 --- a/xfa/src/fxfa/src/app/xfa_ffbarcode.h +++ b/xfa/src/fxfa/src/app/xfa_ffbarcode.h @@ -7,7 +7,9 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFBARCODE_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_FFBARCODE_H_ -class CXFA_FFTextEdit; +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_fftextedit.h" + class CXFA_FFBarcode : public CXFA_FFTextEdit { public: CXFA_FFBarcode(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc); @@ -21,6 +23,7 @@ class CXFA_FFBarcode : public CXFA_FFTextEdit { virtual FX_BOOL OnLButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy); virtual FX_BOOL OnRButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy); }; + enum XFA_BARCODETYPEENUM { XFA_BARCODETYPE_aztec, XFA_BARCODETYPE_codabar, diff --git a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp index 2824086f8a..b3d18efa33 100644 --- a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp @@ -5,15 +5,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" -#include "xfa/src/fxfa/src/app/xfa_fffield.h" -#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" -#include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h" -#include "xfa/src/fxfa/src/app/xfa_ffexclgroup.h" -#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" #include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h" #include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" +#include "xfa/src/fxfa/src/app/xfa_ffexclgroup.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" CXFA_FFCheckButton::CXFA_FFCheckButton(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFField(pPageView, pDataAcc), m_pOldDelegate(NULL) { diff --git a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.h b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.h index 38b0184384..3a41d3ae06 100644 --- a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.h +++ b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.h @@ -7,6 +7,9 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFCHECKBUTTON_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_FFCHECKBUTTON_H_ +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" + class CXFA_FFExclGroup; class CXFA_FFCheckButton : public CXFA_FFField { public: diff --git a/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp b/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp index 49c262af1a..9954adde9e 100644 --- a/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp @@ -5,14 +5,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" -#include "xfa/src/fxfa/src/app/xfa_fffield.h" -#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" -#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" #include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h" #include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" CXFA_FFListBox::CXFA_FFListBox(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFField(pPageView, pDataAcc), m_pOldDelegate(NULL) {} diff --git a/xfa/src/fxfa/src/app/xfa_ffchoicelist.h b/xfa/src/fxfa/src/app/xfa_ffchoicelist.h index 3646dc826f..ef2de65ab4 100644 --- a/xfa/src/fxfa/src/app/xfa_ffchoicelist.h +++ b/xfa/src/fxfa/src/app/xfa_ffchoicelist.h @@ -7,6 +7,9 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFCHOICELIST_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_FFCHOICELIST_H_ +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" + class CXFA_FFListBox : public CXFA_FFField { public: CXFA_FFListBox(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc); diff --git a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp index 9611a945e6..3e3549d8f9 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp @@ -5,13 +5,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa/src/fxfa/src/app/xfa_ffapp.h" #include "xfa/src/fxfa/src/app/xfa_ffdoc.h" #include "xfa/src/fxfa/src/app/xfa_ffdocview.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" #include "xfa/src/fxfa/src/app/xfa_ffnotify.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" #include "xfa/src/fxfa/src/app/xfa_fontmgr.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" CXFA_FFDoc::CXFA_FFDoc(CXFA_FFApp* pApp, IXFA_DocProvider* pDocProvider) : m_pDocProvider(pDocProvider), m_pDocument(nullptr), diff --git a/xfa/src/fxfa/src/app/xfa_ffdoc.h b/xfa/src/fxfa/src/app/xfa_ffdoc.h index e2e5bec9ef..5d83efbd80 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdoc.h +++ b/xfa/src/fxfa/src/app/xfa_ffdoc.h @@ -8,6 +8,7 @@ #define XFA_SRC_FXFA_SRC_APP_XFA_FFDOC_H_ #include "xfa/include/fxfa/fxfa.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" class CXFA_FFApp; class CXFA_FFNotify; diff --git a/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp b/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp index db2e840f0a..35fc20bc02 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp @@ -5,9 +5,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_ffdochandler.h" #include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffdochandler.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" CXFA_FFDocHandler::CXFA_FFDocHandler() {} CXFA_FFDocHandler::~CXFA_FFDocHandler() {} void CXFA_FFDocHandler::ReleaseDoc(IXFA_Doc* hDoc) { diff --git a/xfa/src/fxfa/src/app/xfa_ffdocview.cpp b/xfa/src/fxfa/src/app/xfa_ffdocview.cpp index bf382c156a..2ad07dbcac 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdocview.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdocview.cpp @@ -5,30 +5,30 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" -#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" -#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h" -#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" -#include "xfa/src/fxfa/src/app/xfa_fffield.h" -#include "xfa/src/fxfa/src/app/xfa_ffpushbutton.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffbarcode.h" #include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h" #include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h" -#include "xfa/src/fxfa/src/app/xfa_ffimageedit.h" -#include "xfa/src/fxfa/src/app/xfa_fftextedit.h" -#include "xfa/src/fxfa/src/app/xfa_ffbarcode.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" #include "xfa/src/fxfa/src/app/xfa_ffdraw.h" -#include "xfa/src/fxfa/src/app/xfa_fftext.h" -#include "xfa/src/fxfa/src/app/xfa_ffpath.h" -#include "xfa/src/fxfa/src/app/xfa_ffimage.h" #include "xfa/src/fxfa/src/app/xfa_ffexclgroup.h" -#include "xfa/src/fxfa/src/app/xfa_ffsubform.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffimage.h" +#include "xfa/src/fxfa/src/app/xfa_ffimageedit.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffpath.h" +#include "xfa/src/fxfa/src/app/xfa_ffpushbutton.h" #include "xfa/src/fxfa/src/app/xfa_ffsignature.h" -#include "xfa/src/fxfa/src/app/xfa_ffapp.h" -#include "xfa/src/fxfa/src/app/xfa_textlayout.h" +#include "xfa/src/fxfa/src/app/xfa_ffsubform.h" +#include "xfa/src/fxfa/src/app/xfa_fftext.h" +#include "xfa/src/fxfa/src/app/xfa_fftextedit.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" #include "xfa/src/fxfa/src/app/xfa_ffwidgetacc.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/app/xfa_textlayout.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" extern const XFA_ATTRIBUTEENUM gs_EventActivity[] = { XFA_ATTRIBUTEENUM_Click, XFA_ATTRIBUTEENUM_Change, XFA_ATTRIBUTEENUM_DocClose, XFA_ATTRIBUTEENUM_DocReady, diff --git a/xfa/src/fxfa/src/app/xfa_ffdraw.cpp b/xfa/src/fxfa/src/app/xfa_ffdraw.cpp index 3de0dd8656..1989ff9761 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdraw.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdraw.cpp @@ -5,12 +5,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" -#include "xfa/src/fxfa/src/app/xfa_ffdraw.h" -#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" #include "xfa/src/fxfa/src/app/xfa_ffapp.h" #include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffdraw.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" CXFA_FFDraw::CXFA_FFDraw(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFWidget(pPageView, pDataAcc) {} CXFA_FFDraw::~CXFA_FFDraw() {} diff --git a/xfa/src/fxfa/src/app/xfa_ffdraw.h b/xfa/src/fxfa/src/app/xfa_ffdraw.h index fba7d4ed8a..24862e5180 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdraw.h +++ b/xfa/src/fxfa/src/app/xfa_ffdraw.h @@ -7,12 +7,13 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFDRAW_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_FFDRAW_H_ +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" + class CXFA_FFDraw : public CXFA_FFWidget { public: CXFA_FFDraw(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc); virtual ~CXFA_FFDraw(); - - protected: }; #endif // XFA_SRC_FXFA_SRC_APP_XFA_FFDRAW_H_ diff --git a/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp b/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp index b634a69b5e..8176ddd38e 100644 --- a/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp @@ -5,12 +5,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" -#include "xfa/src/fxfa/src/app/xfa_ffexclgroup.h" -#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" #include "xfa/src/fxfa/src/app/xfa_ffapp.h" #include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffexclgroup.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" CXFA_FFExclGroup::CXFA_FFExclGroup(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFWidget(pPageView, pDataAcc) {} diff --git a/xfa/src/fxfa/src/app/xfa_ffexclgroup.h b/xfa/src/fxfa/src/app/xfa_ffexclgroup.h index 2b6d39216e..b67b355ffc 100644 --- a/xfa/src/fxfa/src/app/xfa_ffexclgroup.h +++ b/xfa/src/fxfa/src/app/xfa_ffexclgroup.h @@ -7,6 +7,9 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFEXCLGROUP_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_FFEXCLGROUP_H_ +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" + class CXFA_FFExclGroup : public CXFA_FFWidget { public: CXFA_FFExclGroup(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc); @@ -16,8 +19,6 @@ class CXFA_FFExclGroup : public CXFA_FFWidget { CFX_Matrix* pMatrix = NULL, FX_DWORD dwStatus = 0, int32_t iRotate = 0); - - protected: }; #endif // XFA_SRC_FXFA_SRC_APP_XFA_FFEXCLGROUP_H_ diff --git a/xfa/src/fxfa/src/app/xfa_fffield.cpp b/xfa/src/fxfa/src/app/xfa_fffield.cpp index c3331f2870..47140a0c6d 100644 --- a/xfa/src/fxfa/src/app/xfa_fffield.cpp +++ b/xfa/src/fxfa/src/app/xfa_fffield.cpp @@ -5,15 +5,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" -#include "xfa/src/fxfa/src/app/xfa_fffield.h" -#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" #include "xfa/src/fxfa/src/app/xfa_ffapp.h" #include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" #include "xfa/src/fxfa/src/app/xfa_fwltheme.h" #include "xfa/src/fxfa/src/app/xfa_textlayout.h" -#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" CXFA_FFField::CXFA_FFField(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFWidget(pPageView, pDataAcc), m_pNormalWidget(NULL) { m_rtUI.Set(0, 0, 0, 0); diff --git a/xfa/src/fxfa/src/app/xfa_fffield.h b/xfa/src/fxfa/src/app/xfa_fffield.h index eb4bd0348c..e168b147ce 100644 --- a/xfa/src/fxfa/src/app/xfa_fffield.h +++ b/xfa/src/fxfa/src/app/xfa_fffield.h @@ -7,8 +7,12 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFFIELD_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_FFFIELD_H_ +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" + #define XFA_MINUI_HEIGHT 4.32f #define XFA_DEFAULTUI_HEIGHT 2.0f + class CXFA_TextLayout; class CXFA_FFField : public CXFA_FFWidget, public IFWL_WidgetDelegate { public: diff --git a/xfa/src/fxfa/src/app/xfa_ffimage.cpp b/xfa/src/fxfa/src/app/xfa_ffimage.cpp index 1a79b32b06..947bad6881 100644 --- a/xfa/src/fxfa/src/app/xfa_ffimage.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffimage.cpp @@ -5,13 +5,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" #include "xfa/src/fxfa/src/app/xfa_ffdraw.h" #include "xfa/src/fxfa/src/app/xfa_ffimage.h" #include "xfa/src/fxfa/src/app/xfa_ffpageview.h" -#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" -#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" CXFA_FFImage::CXFA_FFImage(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFDraw(pPageView, pDataAcc) {} CXFA_FFImage::~CXFA_FFImage() { diff --git a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp index 8cc99a5ca4..59a84820c2 100644 --- a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp @@ -5,13 +5,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" #include "xfa/src/fxfa/src/app/xfa_fffield.h" -#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" #include "xfa/src/fxfa/src/app/xfa_ffimageedit.h" -#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" -#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" CXFA_FFImageEdit::CXFA_FFImageEdit(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFField(pPageView, pDataAcc), m_pOldDelegate(NULL) {} diff --git a/xfa/src/fxfa/src/app/xfa_ffnotify.cpp b/xfa/src/fxfa/src/app/xfa_ffnotify.cpp index 03ab097276..fa85760651 100644 --- a/xfa/src/fxfa/src/app/xfa_ffnotify.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffnotify.cpp @@ -5,31 +5,31 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" -#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" -#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h" -#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" -#include "xfa/src/fxfa/src/app/xfa_fffield.h" -#include "xfa/src/fxfa/src/app/xfa_ffpushbutton.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffbarcode.h" #include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h" #include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h" -#include "xfa/src/fxfa/src/app/xfa_ffimageedit.h" -#include "xfa/src/fxfa/src/app/xfa_fftextedit.h" -#include "xfa/src/fxfa/src/app/xfa_ffbarcode.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" #include "xfa/src/fxfa/src/app/xfa_ffdraw.h" -#include "xfa/src/fxfa/src/app/xfa_fftext.h" -#include "xfa/src/fxfa/src/app/xfa_ffpath.h" -#include "xfa/src/fxfa/src/app/xfa_ffimage.h" #include "xfa/src/fxfa/src/app/xfa_ffexclgroup.h" -#include "xfa/src/fxfa/src/app/xfa_ffsubform.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffimage.h" +#include "xfa/src/fxfa/src/app/xfa_ffimageedit.h" +#include "xfa/src/fxfa/src/app/xfa_ffnotify.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffpath.h" +#include "xfa/src/fxfa/src/app/xfa_ffpushbutton.h" #include "xfa/src/fxfa/src/app/xfa_ffsignature.h" -#include "xfa/src/fxfa/src/app/xfa_ffapp.h" -#include "xfa/src/fxfa/src/app/xfa_textlayout.h" +#include "xfa/src/fxfa/src/app/xfa_ffsubform.h" +#include "xfa/src/fxfa/src/app/xfa_fftext.h" +#include "xfa/src/fxfa/src/app/xfa_fftextedit.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" #include "xfa/src/fxfa/src/app/xfa_ffwidgetacc.h" -#include "xfa/src/fxfa/src/app/xfa_ffnotify.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/app/xfa_textlayout.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" static void XFA_FFDeleteWidgetAcc(void* pData) { delete static_cast<CXFA_WidgetAcc*>(pData); diff --git a/xfa/src/fxfa/src/app/xfa_ffpageview.cpp b/xfa/src/fxfa/src/app/xfa_ffpageview.cpp index 2fa2b3f4ec..2601ffa004 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpageview.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffpageview.cpp @@ -5,18 +5,18 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" -#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h" +#include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h" #include "xfa/src/fxfa/src/app/xfa_ffdoc.h" #include "xfa/src/fxfa/src/app/xfa_ffdocview.h" #include "xfa/src/fxfa/src/app/xfa_fffield.h" -#include "xfa/src/fxfa/src/app/xfa_ffpushbutton.h" -#include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h" -#include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h" #include "xfa/src/fxfa/src/app/xfa_ffimageedit.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffpushbutton.h" #include "xfa/src/fxfa/src/app/xfa_fftextedit.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" CXFA_FFPageView::CXFA_FFPageView(CXFA_FFDocView* pDocView, CXFA_Node* pPageArea) : CXFA_ContainerLayoutItem(pPageArea), m_pDocView(pDocView), diff --git a/xfa/src/fxfa/src/app/xfa_ffpageview.h b/xfa/src/fxfa/src/app/xfa_ffpageview.h index 6d1926ea12..6ee2e140fb 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpageview.h +++ b/xfa/src/fxfa/src/app/xfa_ffpageview.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFPAGEVIEW_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_FFPAGEVIEW_H_ +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" + class CXFA_FFWidget; class CXFA_FFDocView; class CXFA_FFPageView : public CXFA_ContainerLayoutItem, public IXFA_PageView { diff --git a/xfa/src/fxfa/src/app/xfa_ffpath.cpp b/xfa/src/fxfa/src/app/xfa_ffpath.cpp index fd6947a8b0..c1fb273431 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpath.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffpath.cpp @@ -5,13 +5,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" #include "xfa/src/fxfa/src/app/xfa_ffdraw.h" -#include "xfa/src/fxfa/src/app/xfa_ffpath.h" #include "xfa/src/fxfa/src/app/xfa_ffpageview.h" -#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" -#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffpath.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" CXFA_FFLine::CXFA_FFLine(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFDraw(pPageView, pDataAcc) {} CXFA_FFLine::~CXFA_FFLine() {} diff --git a/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp b/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp index 12c1a2a30d..bd5656f5f3 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp @@ -5,14 +5,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidgetacc.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" #include "xfa/src/fxfa/src/app/xfa_fffield.h" #include "xfa/src/fxfa/src/app/xfa_ffpageview.h" #include "xfa/src/fxfa/src/app/xfa_ffpushbutton.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidgetacc.h" #include "xfa/src/fxfa/src/app/xfa_textlayout.h" -#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" CXFA_FFPushButton::CXFA_FFPushButton(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFField(pPageView, pDataAcc), diff --git a/xfa/src/fxfa/src/app/xfa_ffsignature.cpp b/xfa/src/fxfa/src/app/xfa_ffsignature.cpp index 138036c01c..905906296b 100644 --- a/xfa/src/fxfa/src/app/xfa_ffsignature.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffsignature.cpp @@ -5,12 +5,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" #include "xfa/src/fxfa/src/app/xfa_fffield.h" #include "xfa/src/fxfa/src/app/xfa_ffpageview.h" #include "xfa/src/fxfa/src/app/xfa_ffsignature.h" -#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" CXFA_FFSignature::CXFA_FFSignature(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFField(pPageView, pDataAcc) {} diff --git a/xfa/src/fxfa/src/app/xfa_ffsubform.cpp b/xfa/src/fxfa/src/app/xfa_ffsubform.cpp index 97b37c32c7..9e826f241b 100644 --- a/xfa/src/fxfa/src/app/xfa_ffsubform.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffsubform.cpp @@ -5,12 +5,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" -#include "xfa/src/fxfa/src/app/xfa_ffsubform.h" -#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" #include "xfa/src/fxfa/src/app/xfa_ffapp.h" #include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffsubform.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" CXFA_FFSubForm::CXFA_FFSubForm(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFWidget(pPageView, pDataAcc) {} diff --git a/xfa/src/fxfa/src/app/xfa_ffsubform.h b/xfa/src/fxfa/src/app/xfa_ffsubform.h index ae548cca7d..11c1123b08 100644 --- a/xfa/src/fxfa/src/app/xfa_ffsubform.h +++ b/xfa/src/fxfa/src/app/xfa_ffsubform.h @@ -7,6 +7,9 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFSUBFORM_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_FFSUBFORM_H_ +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" + class CXFA_FFSubForm : public CXFA_FFWidget { public: CXFA_FFSubForm(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc); diff --git a/xfa/src/fxfa/src/app/xfa_fftext.cpp b/xfa/src/fxfa/src/app/xfa_fftext.cpp index a7630aca2d..126d47d64b 100644 --- a/xfa/src/fxfa/src/app/xfa_fftext.cpp +++ b/xfa/src/fxfa/src/app/xfa_fftext.cpp @@ -5,14 +5,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" #include "xfa/src/fxfa/src/app/xfa_ffdraw.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" #include "xfa/src/fxfa/src/app/xfa_fftext.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" #include "xfa/src/fxfa/src/app/xfa_textlayout.h" -#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" -#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" -#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" CXFA_FFText::CXFA_FFText(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFDraw(pPageView, pDataAcc) {} CXFA_FFText::~CXFA_FFText() {} diff --git a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp b/xfa/src/fxfa/src/app/xfa_fftextedit.cpp index cab1c0d782..2e84c39e6a 100644 --- a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp +++ b/xfa/src/fxfa/src/app/xfa_fftextedit.cpp @@ -5,16 +5,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" #include "xfa/src/fxfa/src/app/xfa_fffield.h" #include "xfa/src/fxfa/src/app/xfa_ffpageview.h" #include "xfa/src/fxfa/src/app/xfa_fftextedit.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" #include "xfa/src/fxfa/src/app/xfa_textlayout.h" -#include "xfa/src/fxfa/src/app/xfa_ffapp.h" -#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" -#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" CXFA_FFTextEdit::CXFA_FFTextEdit(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFField(pPageView, pDataAcc), m_pOldDelegate(NULL) {} diff --git a/xfa/src/fxfa/src/app/xfa_fftextedit.h b/xfa/src/fxfa/src/app/xfa_fftextedit.h index e6c11ca610..638d506ae3 100644 --- a/xfa/src/fxfa/src/app/xfa_fftextedit.h +++ b/xfa/src/fxfa/src/app/xfa_fftextedit.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFTEXTEDIT_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_FFTEXTEDIT_H_ +#include "xfa/src/fxfa/src/app/xfa_fffield.h" + class CXFA_FFTextEdit : public CXFA_FFField { public: CXFA_FFTextEdit(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc); diff --git a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp b/xfa/src/fxfa/src/app/xfa_ffwidget.cpp index 4e31a27ca5..c93e945071 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffwidget.cpp @@ -7,13 +7,13 @@ #include <algorithm> #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" #include "xfa/src/fxfa/src/app/xfa_ffapp.h" #include "xfa/src/fxfa/src/app/xfa_ffdoc.h" #include "xfa/src/fxfa/src/app/xfa_ffdocview.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" #include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" #include "xfa/src/fxfa/src/app/xfa_textlayout.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" CXFA_FFWidget::CXFA_FFWidget(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_ContentLayoutItem(pDataAcc->GetNode()), diff --git a/xfa/src/fxfa/src/app/xfa_ffwidget.h b/xfa/src/fxfa/src/app/xfa_ffwidget.h index 7b373b25e4..2928adfb16 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidget.h +++ b/xfa/src/fxfa/src/app/xfa_ffwidget.h @@ -10,6 +10,7 @@ #include <vector> #include "xfa/include/fxfa/fxfa.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" class CXFA_FFPageView; class CXFA_FFDocView; diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp index f3c8e15c1f..8a6aab2692 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp @@ -7,19 +7,19 @@ #include <algorithm> #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h" +#include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h" #include "xfa/src/fxfa/src/app/xfa_ffdoc.h" #include "xfa/src/fxfa/src/app/xfa_ffdocview.h" -#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" -#include "xfa/src/fxfa/src/app/xfa_ffapp.h" -#include "xfa/src/fxfa/src/app/xfa_textlayout.h" -#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" #include "xfa/src/fxfa/src/app/xfa_fffield.h" -#include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h" -#include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" #include "xfa/src/fxfa/src/app/xfa_ffwidgetacc.h" #include "xfa/src/fxfa/src/app/xfa_fontmgr.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/app/xfa_textlayout.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" static void XFA_FFDeleteCalcData(void* pData) { if (pData) { delete ((CXFA_CalcData*)pData); diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp index 6b718526a9..21d3476392 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp @@ -5,14 +5,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" -#include "xfa/src/fxfa/src/app/xfa_fffield.h" #include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h" #include "xfa/src/fxfa/src/app/xfa_ffdoc.h" #include "xfa/src/fxfa/src/app/xfa_ffdocview.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" CXFA_FFWidgetHandler::CXFA_FFWidgetHandler(CXFA_FFDocView* pDocView) : m_pDocView(pDocView) {} CXFA_FFWidgetHandler::~CXFA_FFWidgetHandler() {} diff --git a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp index 7bc8029f46..f42eca6d94 100644 --- a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp +++ b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp @@ -7,11 +7,11 @@ #include <algorithm> #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_fontmgr.h" -#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" #include "xfa/src/fxfa/src/app/xfa_ffConfigAcc.h" #include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_fontmgr.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ static const XFA_FONTINFO g_XFAFontsMap[] = { {0x01d5d33e, L"SimSun", L"Arial", 0, 936}, diff --git a/xfa/src/fxfa/src/app/xfa_fwladapter.cpp b/xfa/src/fxfa/src/app/xfa_fwladapter.cpp index 2ef612516f..f176434554 100644 --- a/xfa/src/fxfa/src/app/xfa_fwladapter.cpp +++ b/xfa/src/fxfa/src/app/xfa_fwladapter.cpp @@ -5,11 +5,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" -#include "xfa/src/fxfa/src/app/xfa_fffield.h" #include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" void FWL_PostMessageToMainRoop(CFWL_Message* pMessage) {} FX_BOOL FWL_ShowCaret(IFWL_Widget* pWidget, diff --git a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp b/xfa/src/fxfa/src/app/xfa_fwltheme.cpp index 1d061567d5..fa9b92e808 100644 --- a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp +++ b/xfa/src/fxfa/src/app/xfa_fwltheme.cpp @@ -5,10 +5,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_fwltheme.h" -#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" #include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fwltheme.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" CXFA_FFWidget* XFA_ThemeGetOuterWidget(IFWL_Widget* pWidget) { IFWL_Widget* pOuter = pWidget; while (pOuter->GetOuter()) { diff --git a/xfa/src/fxfa/src/app/xfa_rendercontext.cpp b/xfa/src/fxfa/src/app/xfa_rendercontext.cpp index d658e8dd36..88713f9b4b 100644 --- a/xfa/src/fxfa/src/app/xfa_rendercontext.cpp +++ b/xfa/src/fxfa/src/app/xfa_rendercontext.cpp @@ -5,9 +5,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_rendercontext.h" #include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_rendercontext.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" #define XFA_RENDERCONTEXT_MaxCount 30 IXFA_RenderContext* XFA_RenderContext_Create() { return new CXFA_RenderContext; diff --git a/xfa/src/fxfa/src/app/xfa_textlayout.cpp b/xfa/src/fxfa/src/app/xfa_textlayout.cpp index b6eb986f4c..629b7f15a6 100644 --- a/xfa/src/fxfa/src/app/xfa_textlayout.cpp +++ b/xfa/src/fxfa/src/app/xfa_textlayout.cpp @@ -7,11 +7,11 @@ #include <algorithm> #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa/src/fxfa/src/app/xfa_textlayout.h" #include "xfa/src/fxfa/src/app/xfa_ffapp.h" #include "xfa/src/fxfa/src/app/xfa_ffdoc.h" #include "xfa/src/fxfa/src/app/xfa_fontmgr.h" +#include "xfa/src/fxfa/src/app/xfa_textlayout.h" +#include "xfa/src/fxfa/src/common/xfa_common.h" CXFA_CSSTagProvider::~CXFA_CSSTagProvider() { FX_POSITION pos = m_Attributes.GetStartPosition(); while (pos) { diff --git a/xfa/src/fxfa/src/common/xfa_common.h b/xfa/src/fxfa/src/common/xfa_common.h index ce7f4d211c..17948d193b 100644 --- a/xfa/src/fxfa/src/common/xfa_common.h +++ b/xfa/src/fxfa/src/common/xfa_common.h @@ -9,14 +9,14 @@ #ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_COMMON_H_ #define XFA_SRC_FXFA_SRC_COMMON_XFA_COMMON_H_ -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" #endif // XFA_SRC_FXFA_SRC_COMMON_XFA_COMMON_H_ diff --git a/xfa/src/fxfa/src/common/xfa_docdata.h b/xfa/src/fxfa/src/common/xfa_docdata.h index b1b78eba6f..2c23d96b70 100644 --- a/xfa/src/fxfa/src/common/xfa_docdata.h +++ b/xfa/src/fxfa/src/common/xfa_docdata.h @@ -7,9 +7,12 @@ #ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_DOCDATA_H_ #define XFA_SRC_FXFA_SRC_COMMON_XFA_DOCDATA_H_ +#include "xfa/src/fxfa/src/common/xfa_document.h" + enum XFA_DATAFORMAT { XFA_DATAFORMAT_XDP, }; + class IXFA_PacketExport { public: static IXFA_PacketExport* Create(CXFA_Document* pDocument, diff --git a/xfa/src/fxfa/src/common/xfa_doclayout.h b/xfa/src/fxfa/src/common/xfa_doclayout.h index 5ac4cb945f..7460b7ba13 100644 --- a/xfa/src/fxfa/src/common/xfa_doclayout.h +++ b/xfa/src/fxfa/src/common/xfa_doclayout.h @@ -7,10 +7,13 @@ #ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_DOCLAYOUT_H_ #define XFA_SRC_FXFA_SRC_COMMON_XFA_DOCLAYOUT_H_ +#include "xfa/src/fxfa/src/common/xfa_document.h" + #define _XFA_LAYOUTITEM_ProcessCACHE_ class CXFA_ContainerLayoutItem; class CXFA_ContentLayoutItem; +class IXFA_DocLayout; class IXFA_LayoutPage { public: diff --git a/xfa/src/fxfa/src/common/xfa_document.h b/xfa/src/fxfa/src/common/xfa_document.h index 5498b1f831..1978a619b2 100644 --- a/xfa/src/fxfa/src/common/xfa_document.h +++ b/xfa/src/fxfa/src/common/xfa_document.h @@ -7,6 +7,9 @@ #ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_DOCUMENT_H_ #define XFA_SRC_FXFA_SRC_COMMON_XFA_DOCUMENT_H_ +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" + class CXFA_Document; class CXFA_LayoutItem; class CXFA_LayoutProcessor; @@ -64,6 +67,7 @@ enum XFA_LAYOUTRESULT { }; #define XFA_LAYOUTNOTIFY_StrictHeight 0x0001 #define XFA_LAYOUTNOTIFY_NoParentBreak 0x0002 + class IXFA_Notify { public: virtual ~IXFA_Notify() {} diff --git a/xfa/src/fxfa/src/common/xfa_object.h b/xfa/src/fxfa/src/common/xfa_object.h index a565922157..54b77c013a 100644 --- a/xfa/src/fxfa/src/common/xfa_object.h +++ b/xfa/src/fxfa/src/common/xfa_object.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_OBJECT_H_ #define XFA_SRC_FXFA_SRC_COMMON_XFA_OBJECT_H_ +#include "xfa/src/fxfa/src/common/xfa_utils.h" + class CXFA_ArrayNodeList; class CXFA_AttachNodeList; class CXFA_Document; diff --git a/xfa/src/fxfa/src/fm2js/xfa_expression.h b/xfa/src/fxfa/src/fm2js/xfa_expression.h index a3464a2d13..f70ee60e5f 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_expression.h +++ b/xfa/src/fxfa/src/fm2js/xfa_expression.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FXFA_SRC_FM2JS_XFA_EXPRESSION_H_ #define XFA_SRC_FXFA_SRC_FM2JS_XFA_EXPRESSION_H_ +#include "xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h" + enum XFA_FM_EXPTYPE { XFA_FM_EXPTYPE_UNKNOWN, XFA_FM_EXPTYPE_FUNC, diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2js.h b/xfa/src/fxfa/src/fm2js/xfa_fm2js.h index 998a5627e0..e0356d119a 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_fm2js.h +++ b/xfa/src/fxfa/src/fm2js/xfa_fm2js.h @@ -8,26 +8,26 @@ #define XFA_SRC_FXFA_SRC_FM2JS_XFA_FM2JS_H_ #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" -#define RUNTIMEFUNCTIONRETURNVALUE \ - (FX_WSTRC(L"foxit_xfa_formcalc_runtime_func_return_value")) -#define EXCLAMATION_IN_IDENTIFIER \ - (FX_WSTRC(L"foxit_xfa_formcalc__exclamation__")) -typedef CFX_ArrayTemplate<CFX_WideStringC> CFX_WideStringCArray; +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" #include "xfa/src/fxfa/src/fm2js/xfa_error.h" -#include "xfa/src/fxfa/src/fm2js/xfa_lexer.h" -#include "xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h" #include "xfa/src/fxfa/src/fm2js/xfa_expression.h" +#include "xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h" #include "xfa/src/fxfa/src/fm2js/xfa_fmparse.h" +#include "xfa/src/fxfa/src/fm2js/xfa_lexer.h" #include "xfa/src/fxfa/src/fm2js/xfa_program.h" -#include "xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h" +#include "xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h" + +#define RUNTIMEFUNCTIONRETURNVALUE \ + (FX_WSTRC(L"foxit_xfa_formcalc_runtime_func_return_value")) +#define EXCLAMATION_IN_IDENTIFIER \ + (FX_WSTRC(L"foxit_xfa_formcalc__exclamation__")) #endif // XFA_SRC_FXFA_SRC_FM2JS_XFA_FM2JS_H_ diff --git a/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h b/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h index 4412cbd248..f474004300 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h +++ b/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FXFA_SRC_FM2JS_XFA_SIMPLEEXPRESSION_H_ #define XFA_SRC_FXFA_SRC_FM2JS_XFA_SIMPLEEXPRESSION_H_ +#include "xfa/src/fxfa/src/fm2js/xfa_lexer.h" + enum XFA_FM_SimpleExpressionType { ASSIGN, LOGICALOR, diff --git a/xfa/src/fxfa/src/parser/xfa_basic_data.cpp b/xfa/src/fxfa/src/parser/xfa_basic_data.cpp index 6ee9259ceb..cfae869f3d 100644 --- a/xfa/src/fxfa/src/parser/xfa_basic_data.cpp +++ b/xfa/src/fxfa/src/parser/xfa_basic_data.cpp @@ -5,21 +5,21 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" #include "xfa/src/fxfa/src/parser/xfa_basic_imp.h" #include "xfa/src/fxfa/src/parser/xfa_script_datawindow.h" #include "xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h" #include "xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h" -#include "xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h" #include "xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h" +#include "xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h" #include "xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h" extern const XFA_ATTRIBUTEENUMINFO g_XFAEnumData[] = { {0x2a, L"*", XFA_ATTRIBUTEENUM_Asterisk}, diff --git a/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp b/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp index 83449b9f1f..3c32811bbd 100644 --- a/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp @@ -5,15 +5,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" #include "xfa/src/fxfa/src/parser/xfa_basic_imp.h" extern const XFA_PACKETINFO g_XFAPacketData[]; extern const int32_t g_iXFAPacketCount; diff --git a/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp index 5c3682ef1b..2a6146ba21 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.cpp @@ -5,15 +5,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" #define XFA_HASHCODE_Group 0xf7f75fcd class CXFA_TraverseStrategy_DDGroup { public: diff --git a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp index 37b5cc070a..a9c12522a5 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp @@ -5,15 +5,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" #include "xfa/src/fxfa/src/parser/xfa_basic_imp.h" #include "xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.h" #include "xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h" diff --git a/xfa/src/fxfa/src/parser/xfa_document_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_imp.cpp index f010920685..8980ad9535 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_imp.cpp @@ -5,22 +5,22 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" #include "xfa/src/fxfa/src/parser/xfa_basic_imp.h" #include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h" #include "xfa/src/fxfa/src/parser/xfa_script_datawindow.h" #include "xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h" #include "xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h" -#include "xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h" #include "xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h" +#include "xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h" #include "xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h" CXFA_Document::CXFA_Document(IXFA_DocParser* pParser) : m_pParser(pParser), diff --git a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp index 179e85ce22..71fc72ce5a 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp @@ -5,21 +5,21 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" #include "xfa/src/fxfa/src/parser/xfa_basic_imp.h" -#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h" #include "xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h" #include "xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h" #include "xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h" -#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h" CXFA_LayoutProcessor* CXFA_Document::GetLayoutProcessor() { if (!m_pLayoutProcessor) { m_pLayoutProcessor = new CXFA_LayoutProcessor(this); diff --git a/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp b/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp index 6624bc338f..bbcf8d27c4 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp @@ -5,15 +5,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" #include "xfa/src/fxfa/src/parser/xfa_document_serialize.h" IXFA_PacketImport* IXFA_PacketImport::Create(CXFA_Document* pDocument) { return new CXFA_DataImporter(pDocument); diff --git a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp b/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp index 5b4f87a693..7653410c14 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp +++ b/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp @@ -5,19 +5,19 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" #include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h" #include "xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h" #include "xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h" -#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h" FX_DWORD XFA_GetRelevant(CXFA_Node* pFormItem, FX_DWORD dwParentRelvant) { FX_DWORD dwRelevant = XFA_LAYOUTSTATUS_Viewable | XFA_LAYOUTSTATUS_Printable; CFX_WideStringC wsRelevant; diff --git a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp index 071fe4d40f..549b116ed8 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp +++ b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp @@ -8,19 +8,19 @@ #include <memory> #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" #include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h" #include "xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h" #include "xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h" -#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h" CXFA_ItemLayoutProcessor::CXFA_ItemLayoutProcessor(CXFA_Node* pNode, CXFA_LayoutPageMgr* pPageMgr) : m_bKeepBreakFinish(FALSE), diff --git a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp index 4030326964..4dbfcbc2a9 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp +++ b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp @@ -5,20 +5,20 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" #include "xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h" #include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h" #include "xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h" #include "xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h" -#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h" CXFA_LayoutPageMgr::CXFA_LayoutPageMgr(CXFA_LayoutProcessor* pLayoutProcessor) : m_pLayoutProcessor(pLayoutProcessor), m_pTemplatePageSetRoot(nullptr), diff --git a/xfa/src/fxfa/src/parser/xfa_locale.cpp b/xfa/src/fxfa/src/parser/xfa_locale.cpp index 91e6dac2b7..f75853a418 100644 --- a/xfa/src/fxfa/src/parser/xfa_locale.cpp +++ b/xfa/src/fxfa/src/parser/xfa_locale.cpp @@ -6,15 +6,15 @@ #include "core/include/fxcrt/fx_xml.h" #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" #include "xfa/src/fxfa/src/parser/xfa_locale.h" static const FX_WCHAR* g_FX_Percent = L"z,zzz,zzz,zzz,zzz,zzz%"; diff --git a/xfa/src/fxfa/src/parser/xfa_localemgr.cpp b/xfa/src/fxfa/src/parser/xfa_localemgr.cpp index fae2753b61..a3567b802a 100644 --- a/xfa/src/fxfa/src/parser/xfa_localemgr.cpp +++ b/xfa/src/fxfa/src/parser/xfa_localemgr.cpp @@ -6,15 +6,15 @@ #include "core/include/fxcrt/fx_xml.h" #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" #include "xfa/src/fxfa/src/parser/xfa_locale.h" const uint8_t g_enUS_Locale[] = { diff --git a/xfa/src/fxfa/src/parser/xfa_localevalue.cpp b/xfa/src/fxfa/src/parser/xfa_localevalue.cpp index 1bc82b5f47..99ff2e94d0 100644 --- a/xfa/src/fxfa/src/parser/xfa_localevalue.cpp +++ b/xfa/src/fxfa/src/parser/xfa_localevalue.cpp @@ -5,15 +5,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" static const FX_DOUBLE fraction_scales[] = {0.1, 0.01, 0.001, diff --git a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp index 8c820fcb99..f3f2836ea7 100644 --- a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp @@ -5,15 +5,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" #include "xfa/src/fxfa/src/parser/xfa_basic_imp.h" #include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h" CXFA_Object::CXFA_Object(CXFA_Document* pDocument, FX_DWORD uFlags) diff --git a/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp b/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp index 9261a77ed7..449c1b84fa 100644 --- a/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_objectacc_imp.cpp @@ -5,15 +5,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" static FX_ARGB XFA_WStringToColor(const CFX_WideStringC& wsValue) { uint8_t r = 0, g = 0, b = 0; if (wsValue.GetLength() == 0) { diff --git a/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp b/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp index a2c05044a8..94a3739fb1 100644 --- a/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp @@ -5,15 +5,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" #include "xfa/src/fxfa/src/parser/xfa_basic_imp.h" #include "xfa/src/fxfa/src/parser/xfa_parser_imp.h" IXFA_Parser* IXFA_Parser::Create(IXFA_ObjFactory* pFactory, diff --git a/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp b/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp index 03fbaf8b26..26b3616a3e 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp @@ -5,15 +5,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" #include "xfa/src/fxfa/src/parser/xfa_script_datawindow.h" CScript_DataWindow::CScript_DataWindow(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_DataWindow) { diff --git a/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp index b5c5f0126d..99fe7c255e 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp @@ -5,15 +5,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" #include "xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h" CScript_EventPseudoModel::CScript_EventPseudoModel(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_EventPseudoModel) { diff --git a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp index 9f65c52d3e..b495a774bc 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp @@ -5,15 +5,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" #include "xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h" CScript_HostPseudoModel::CScript_HostPseudoModel(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_HostPseudoModel) { diff --git a/xfa/src/fxfa/src/parser/xfa_script_imp.cpp b/xfa/src/fxfa/src/parser/xfa_script_imp.cpp index 6897acf785..1c913cceae 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_imp.cpp @@ -5,18 +5,18 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" #include "xfa/src/fxfa/src/parser/xfa_script_imp.h" -#include "xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h" #include "xfa/src/fxfa/src/parser/xfa_script_nodehelper.h" +#include "xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h" CXFA_ScriptContext::CXFA_ScriptContext(CXFA_Document* pDocument) : m_pDocument(pDocument), m_hJsContext(nullptr), diff --git a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp index fdeb0de167..5cf43af336 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp @@ -5,18 +5,18 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" -#include "xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" #include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h" #include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h" +#include "xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h" CScript_LayoutPseudoModel::CScript_LayoutPseudoModel(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_LayoutPseudoModel) { m_uScriptHash = XFA_HASHCODE_Layout; diff --git a/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp index 94c0f0b3a7..be69240508 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp @@ -5,15 +5,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" #include "xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h" CScript_LogPseudoModel::CScript_LogPseudoModel(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_LogPseudoModel) { diff --git a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp index f5e5b726f7..1107091180 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp @@ -5,17 +5,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" -#include "xfa/src/fxfa/src/parser/xfa_script_nodehelper.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" #include "xfa/src/fxfa/src/parser/xfa_script_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_script_nodehelper.h" CXFA_NodeHelper::CXFA_NodeHelper(void) : m_eLastCreateType(XFA_ELEMENT_DataValue), m_pCreateParent(NULL), diff --git a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp index d54846fc29..dcdbc8b83c 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp @@ -5,18 +5,18 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" -#include "xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h" -#include "xfa/src/fxfa/src/parser/xfa_script_nodehelper.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" #include "xfa/src/fxfa/src/parser/xfa_script_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_script_nodehelper.h" +#include "xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h" CXFA_ResolveProcessor::CXFA_ResolveProcessor(void) : m_pNodeHelper(NULL), m_iCurStart(0) { m_pNodeHelper = new CXFA_NodeHelper; diff --git a/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp index 68dbc16b9b..0b22dc3b61 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp @@ -5,15 +5,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" #include "xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h" CScript_SignaturePseudoModel::CScript_SignaturePseudoModel( CXFA_Document* pDocument) diff --git a/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp b/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp index 2f20d2c22a..ec17992e9c 100644 --- a/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_utils_imp.cpp @@ -5,15 +5,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxfa/src/common/xfa_utils.h" -#include "xfa/src/fxfa/src/common/xfa_object.h" -#include "xfa/src/fxfa/src/common/xfa_document.h" -#include "xfa/src/fxfa/src/common/xfa_parser.h" -#include "xfa/src/fxfa/src/common/xfa_script.h" #include "xfa/src/fxfa/src/common/xfa_docdata.h" #include "xfa/src/fxfa/src/common/xfa_doclayout.h" -#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" CXFA_Node* XFA_CreateUIChild(CXFA_Node* pNode, XFA_ELEMENT& eWidgetType) { XFA_ELEMENT eType = pNode->GetClassID(); eWidgetType = eType; diff --git a/xfa/src/fxgraphics/src/fx_path_generator.cpp b/xfa/src/fxgraphics/src/fx_path_generator.cpp index 630059cd3e..8d5030ac5b 100644 --- a/xfa/src/fxgraphics/src/fx_path_generator.cpp +++ b/xfa/src/fxgraphics/src/fx_path_generator.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fxgraphics/src/pre.h" #include "xfa/src/fxgraphics/src/fx_path_generator.h" +#include "xfa/src/fxgraphics/src/pre.h" CFX_PathGenerator::CFX_PathGenerator() { m_pPathData = NULL; } diff --git a/xfa/src/fxjse/src/class.cpp b/xfa/src/fxjse/src/class.cpp index 6cf90efb1a..f33a87486d 100644 --- a/xfa/src/fxjse/src/class.cpp +++ b/xfa/src/fxjse/src/class.cpp @@ -5,12 +5,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxjse/src/fxv8.h" -#include "xfa/src/fxjse/src/context.h" #include "xfa/src/fxjse/src/class.h" -#include "xfa/src/fxjse/src/value.h" +#include "xfa/src/fxjse/src/context.h" +#include "xfa/src/fxjse/src/fxv8.h" #include "xfa/src/fxjse/src/scope_inline.h" #include "xfa/src/fxjse/src/util_inline.h" +#include "xfa/src/fxjse/src/value.h" static void FXJSE_V8ConstructorCallback_Wrapper( const v8::FunctionCallbackInfo<v8::Value>& info); static void FXJSE_V8FunctionCallback_Wrapper( diff --git a/xfa/src/fxjse/src/class.h b/xfa/src/fxjse/src/class.h index 763b3236ec..89c49abcf6 100644 --- a/xfa/src/fxjse/src/class.h +++ b/xfa/src/fxjse/src/class.h @@ -7,8 +7,11 @@ #ifndef XFA_SRC_FXJSE_SRC_CLASS_H_ #define XFA_SRC_FXJSE_SRC_CLASS_H_ +#include <v8.h> + class CFXJSE_Context; class CFXJSE_Value; + class CFXJSE_Class { protected: CFXJSE_Class(CFXJSE_Context* lpContext) diff --git a/xfa/src/fxjse/src/context.cpp b/xfa/src/fxjse/src/context.cpp index 6161802e08..269e817cd6 100644 --- a/xfa/src/fxjse/src/context.cpp +++ b/xfa/src/fxjse/src/context.cpp @@ -5,12 +5,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxjse/src/fxv8.h" -#include "xfa/src/fxjse/src/context.h" #include "xfa/src/fxjse/src/class.h" -#include "xfa/src/fxjse/src/value.h" +#include "xfa/src/fxjse/src/context.h" +#include "xfa/src/fxjse/src/fxv8.h" #include "xfa/src/fxjse/src/scope_inline.h" #include "xfa/src/fxjse/src/util_inline.h" +#include "xfa/src/fxjse/src/value.h" FXJSE_HCONTEXT FXJSE_Context_Create(FXJSE_HRUNTIME hRuntime, const FXJSE_CLASS* lpGlobalClass, void* lpGlobalObject) { diff --git a/xfa/src/fxjse/src/dynprop.cpp b/xfa/src/fxjse/src/dynprop.cpp index 3ae5279345..2bfb1a0822 100644 --- a/xfa/src/fxjse/src/dynprop.cpp +++ b/xfa/src/fxjse/src/dynprop.cpp @@ -5,8 +5,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "xfa/src/fxjse/src/fxv8.h" #include "xfa/src/fxjse/src/class.h" +#include "xfa/src/fxjse/src/fxv8.h" #include "xfa/src/fxjse/src/value.h" static void FXJSE_DynPropGetterAdapter_MethodCallback( const v8::FunctionCallbackInfo<v8::Value>& info) { diff --git a/xfa/src/fxjse/src/fxv8.h b/xfa/src/fxjse/src/fxv8.h index 433003c4b5..fcf1e59855 100644 --- a/xfa/src/fxjse/src/fxv8.h +++ b/xfa/src/fxjse/src/fxv8.h @@ -9,7 +9,7 @@ #ifndef XFA_SRC_FXJSE_SRC_FXV8_H_ #define XFA_SRC_FXJSE_SRC_FXV8_H_ -#include <v8.h> #include <libplatform/libplatform.h> +#include <v8.h> #endif // XFA_SRC_FXJSE_SRC_FXV8_H_ diff --git a/xfa/src/fxjse/src/scope_inline.h b/xfa/src/fxjse/src/scope_inline.h index 77ddfa369e..6a7860f93e 100644 --- a/xfa/src/fxjse/src/scope_inline.h +++ b/xfa/src/fxjse/src/scope_inline.h @@ -7,8 +7,8 @@ #ifndef XFA_SRC_FXJSE_SRC_SCOPE_INLINE_H_ #define XFA_SRC_FXJSE_SRC_SCOPE_INLINE_H_ -#include "xfa/src/fxjse/src/runtime.h" #include "xfa/src/fxjse/src/context.h" +#include "xfa/src/fxjse/src/runtime.h" class CFXJSE_ScopeUtil_IsolateHandle { protected: diff --git a/xfa/src/fxjse/src/util_inline.h b/xfa/src/fxjse/src/util_inline.h index b6d66ad4f2..21520cfbe6 100644 --- a/xfa/src/fxjse/src/util_inline.h +++ b/xfa/src/fxjse/src/util_inline.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FXJSE_SRC_UTIL_INLINE_H_ #define XFA_SRC_FXJSE_SRC_UTIL_INLINE_H_ +#include "xfa/src/fxjse/src/context.h" + static V8_INLINE v8::Local<v8::Object> FXJSE_GetGlobalObjectFromContext( const v8::Local<v8::Context>& hContext) { return hContext->Global()->GetPrototype().As<v8::Object>(); diff --git a/xfa/src/fxjse/src/value.cpp b/xfa/src/fxjse/src/value.cpp index 325996ff11..5aca40368f 100644 --- a/xfa/src/fxjse/src/value.cpp +++ b/xfa/src/fxjse/src/value.cpp @@ -7,10 +7,10 @@ #include <math.h> #include "xfa/src/foxitlib.h" -#include "xfa/src/fxjse/src/fxv8.h" -#include "xfa/src/fxjse/src/value.h" #include "xfa/src/fxjse/src/class.h" +#include "xfa/src/fxjse/src/fxv8.h" #include "xfa/src/fxjse/src/util_inline.h" +#include "xfa/src/fxjse/src/value.h" FX_BOOL FXJSE_Value_IsUndefined(FXJSE_HVALUE hValue) { CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue); |