diff options
Diffstat (limited to 'xfa/src/fdp')
27 files changed, 130 insertions, 81 deletions
diff --git a/xfa/src/fdp/include/fde.h b/xfa/src/fdp/include/fde.h index c0ad758598..1d6f360391 100644 --- a/xfa/src/fdp/include/fde.h +++ b/xfa/src/fdp/include/fde.h @@ -6,8 +6,9 @@ // TODO(thestig): Remove this file and do IWYU. -#ifndef _FDE -#define _FDE +#ifndef XFA_SRC_FDP_INCLUDE_FDE_H_ +#define XFA_SRC_FDP_INCLUDE_FDE_H_ + #include "fde_mem.h" #include "fde_xml.h" #include "fde_img.h" @@ -19,4 +20,5 @@ #include "fde_css.h" #include "fde_rdv.h" #include "fde_rdr.h" -#endif + +#endif // XFA_SRC_FDP_INCLUDE_FDE_H_ diff --git a/xfa/src/fdp/include/fde_brs.h b/xfa/src/fdp/include/fde_brs.h index 81fb9ed06b..f68da73a77 100644 --- a/xfa/src/fdp/include/fde_brs.h +++ b/xfa/src/fdp/include/fde_brs.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FDE_BRUSH -#define _FDE_BRUSH +#ifndef XFA_SRC_FDP_INCLUDE_FDE_BRS_H_ +#define XFA_SRC_FDP_INCLUDE_FDE_BRS_H_ + class IFDE_Image; class IFDE_Path; class IFDE_Brush; @@ -140,4 +141,5 @@ class IFDE_LinearGradientBrush : public IFDE_Brush { virtual int32_t GetWrapMode() const = 0; virtual void SetWrapMode(int32_t iWrapMode) = 0; }; -#endif + +#endif // XFA_SRC_FDP_INCLUDE_FDE_BRS_H_ diff --git a/xfa/src/fdp/include/fde_css.h b/xfa/src/fdp/include/fde_css.h index d4a675e82e..5e4da8fe35 100644 --- a/xfa/src/fdp/include/fde_css.h +++ b/xfa/src/fdp/include/fde_css.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FDE_CSS -#define _FDE_CSS +#ifndef XFA_SRC_FDP_INCLUDE_FDE_CSS_H_ +#define XFA_SRC_FDP_INCLUDE_FDE_CSS_H_ + class IFDE_HTMNotify; class IFDE_CSSValue; class IFDE_CSSPrimitiveValue; @@ -1082,4 +1083,5 @@ class IFDE_CSSStyleSelector { int32_t iDeclCount, IFDE_CSSComputedStyle* pDestStyle) = 0; }; -#endif + +#endif // XFA_SRC_FDP_INCLUDE_FDE_CSS_H_ diff --git a/xfa/src/fdp/include/fde_img.h b/xfa/src/fdp/include/fde_img.h index d7a5fc618f..4388bbfae5 100644 --- a/xfa/src/fdp/include/fde_img.h +++ b/xfa/src/fdp/include/fde_img.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FDE_IMAGE -#define _FDE_IMAGE +#ifndef XFA_SRC_FDP_INCLUDE_FDE_IMG_H_ +#define XFA_SRC_FDP_INCLUDE_FDE_IMG_H_ + class IFDE_Image; #define FDE_IMAGEFORMAT_Unknown -1 #define FDE_IMAGEFORMAT_BMP 0 @@ -82,4 +83,5 @@ typedef struct _FDE_CONTRASTPARAMS : public FDE_IMAGEFILTERPARAMS { int32_t iContrast; } FDE_CONTRASTPARAMS, *FDE_LPCONTRASTPARAMS; typedef FDE_CONTRASTPARAMS const* FDE_LPCCONTRASTPARAMS; -#endif + +#endif // XFA_SRC_FDP_INCLUDE_FDE_IMG_H_ diff --git a/xfa/src/fdp/include/fde_mem.h b/xfa/src/fdp/include/fde_mem.h index 739c417337..9a292bef04 100644 --- a/xfa/src/fdp/include/fde_mem.h +++ b/xfa/src/fdp/include/fde_mem.h @@ -6,12 +6,12 @@ // TODO(thestig): Remove this file and do IWYU. -#ifndef FDE_MEM_H_ -#define FDE_MEM_H_ +#ifndef XFA_SRC_FDP_INCLUDE_FDE_MEM_H_ +#define XFA_SRC_FDP_INCLUDE_FDE_MEM_H_ #include "core/include/fxcrt/fx_memory.h" #define FDE_NewWith FXTARGET_NewWith #define FDE_DeleteWith FXTARGET_DeleteWith -#endif // FDE_MEM_H_ +#endif // XFA_SRC_FDP_INCLUDE_FDE_MEM_H_ diff --git a/xfa/src/fdp/include/fde_pen.h b/xfa/src/fdp/include/fde_pen.h index 170471fa0d..a335c972ee 100644 --- a/xfa/src/fdp/include/fde_pen.h +++ b/xfa/src/fdp/include/fde_pen.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FDE_PEN -#define _FDE_PEN +#ifndef XFA_SRC_FDP_INCLUDE_FDE_PEN_H_ +#define XFA_SRC_FDP_INCLUDE_FDE_PEN_H_ + class IFDE_Pen; #define FDE_PENTYPE_Unknown FDE_BRUSHTYPE_Unknown #define FDE_PENTYPE_SolidColor FDE_BRUSHTYPE_Solid @@ -61,4 +62,5 @@ class IFDE_Pen { virtual FX_BOOL SetCompoundPatterns( const CFDE_CompoundPatterns& compoundPatterns) = 0; }; -#endif + +#endif // XFA_SRC_FDP_INCLUDE_FDE_PEN_H_ diff --git a/xfa/src/fdp/include/fde_psr.h b/xfa/src/fdp/include/fde_psr.h index 4b64393fe0..5f3e93d93c 100644 --- a/xfa/src/fdp/include/fde_psr.h +++ b/xfa/src/fdp/include/fde_psr.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FDE_PARSER -#define _FDE_PARSER +#ifndef XFA_SRC_FDP_INCLUDE_FDE_PSR_H_ +#define XFA_SRC_FDP_INCLUDE_FDE_PSR_H_ + enum FDE_VISUALOBJTYPE { FDE_VISUALOBJ_Canvas = 0x00, FDE_VISUALOBJ_Text = 0x01, @@ -102,4 +103,5 @@ class IFDE_VisualSetIterator { FDE_HVISUALOBJ* phCanvasObj = NULL, IFDE_CanvasSet** ppCanvasSet = NULL) = 0; }; -#endif + +#endif // XFA_SRC_FDP_INCLUDE_FDE_PSR_H_ diff --git a/xfa/src/fdp/include/fde_pth.h b/xfa/src/fdp/include/fde_pth.h index 6db03e251d..41cb367613 100644 --- a/xfa/src/fdp/include/fde_pth.h +++ b/xfa/src/fdp/include/fde_pth.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FDE_PATH -#define _FDE_PATH +#ifndef XFA_SRC_FDP_INCLUDE_FDE_PTH_H_ +#define XFA_SRC_FDP_INCLUDE_FDE_PTH_H_ + class IFDE_Path; class IFDE_Path { public: @@ -30,4 +31,5 @@ class IFDE_Path { FX_FLOAT fLineWidth, FX_FLOAT fMiterLimit) const = 0; }; -#endif + +#endif // XFA_SRC_FDP_INCLUDE_FDE_PTH_H_ diff --git a/xfa/src/fdp/include/fde_rdr.h b/xfa/src/fdp/include/fde_rdr.h index a69404cbb3..8aca67361b 100644 --- a/xfa/src/fdp/include/fde_rdr.h +++ b/xfa/src/fdp/include/fde_rdr.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FDE_RENDERCONTEXT -#define _FDE_RENDERCONTEXT +#ifndef XFA_SRC_FDP_INCLUDE_FDE_RDR_H_ +#define XFA_SRC_FDP_INCLUDE_FDE_RDR_H_ + class IFDE_Page; class IFDE_RenderDevice; @@ -33,4 +34,5 @@ class IFDE_RenderContext { virtual FDE_RENDERSTATUS DoRender(IFX_Pause* pPause = NULL) = 0; virtual void StopRender() = 0; }; -#endif + +#endif // XFA_SRC_FDP_INCLUDE_FDE_RDR_H_ diff --git a/xfa/src/fdp/include/fde_rdv.h b/xfa/src/fdp/include/fde_rdv.h index 5c6a2d19ba..2d9e3800ef 100644 --- a/xfa/src/fdp/include/fde_rdv.h +++ b/xfa/src/fdp/include/fde_rdv.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FDE_RENDERDEVICE -#define _FDE_RENDERDEVICE +#ifndef XFA_SRC_FDP_INCLUDE_FDE_RDV_H_ +#define XFA_SRC_FDP_INCLUDE_FDE_RDV_H_ + class IFDE_Pen; class IFDE_Brush; class IFDE_Image; @@ -100,4 +101,5 @@ class IFDE_RenderDevice { const CFX_RectF& rect, const CFX_Matrix* pMatrix = NULL) = 0; }; -#endif + +#endif // XFA_SRC_FDP_INCLUDE_FDE_RDV_H_ diff --git a/xfa/src/fdp/include/fde_tto.h b/xfa/src/fdp/include/fde_tto.h index 43eb9553bb..3e7fcf9f38 100644 --- a/xfa/src/fdp/include/fde_tto.h +++ b/xfa/src/fdp/include/fde_tto.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FDE_TEXTOUT -#define _FDE_TEXTOUT +#ifndef XFA_SRC_FDP_INCLUDE_FDE_TTO_H_ +#define XFA_SRC_FDP_INCLUDE_FDE_TTO_H_ + class IFDE_TextOut; #define FDE_TTOSTYLE_Underline 0x0001 #define FDE_TTOSTYLE_Strikeout 0x0002 @@ -94,4 +95,5 @@ class IFDE_TextOut { const CFX_RectF& rect) = 0; virtual int32_t GetTotalLines() = 0; }; -#endif + +#endif // XFA_SRC_FDP_INCLUDE_FDE_TTO_H_ diff --git a/xfa/src/fdp/include/fde_xml.h b/xfa/src/fdp/include/fde_xml.h index 5a8a33504b..40b0480e8c 100644 --- a/xfa/src/fdp/include/fde_xml.h +++ b/xfa/src/fdp/include/fde_xml.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FDE_XML_H_ -#define FDE_XML_H_ +#ifndef XFA_SRC_FDP_INCLUDE_FDE_XML_H_ +#define XFA_SRC_FDP_INCLUDE_FDE_XML_H_ class IFDE_XMLNode; class IFDE_XMLInstruction; @@ -230,4 +230,4 @@ class IFDE_XMLSyntaxParser { virtual void GetTargetData(CFX_WideString& wsData) const = 0; }; -#endif // FDE_XML_H_ +#endif // XFA_SRC_FDP_INCLUDE_FDE_XML_H_ diff --git a/xfa/src/fdp/src/css/fde_csscache.h b/xfa/src/fdp/src/css/fde_csscache.h index 674a202656..637fd11866 100644 --- a/xfa/src/fdp/src/css/fde_csscache.h +++ b/xfa/src/fdp/src/css/fde_csscache.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FDE_CSSCACHE -#define _FDE_CSSCACHE +#ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSCACHE_H_ +#define XFA_SRC_FDP_SRC_CSS_FDE_CSSCACHE_H_ + typedef struct _FDE_CSSCACHEITEM : public CFX_Target { _FDE_CSSCACHEITEM(IFDE_CSSStyleSheet* p); ~_FDE_CSSCACHEITEM(); @@ -71,4 +72,5 @@ class CFDE_CSSAccelerator : public IFDE_CSSAccelerator, public CFX_Target { protected: CFDE_CSSTagStack m_Stack; }; -#endif + +#endif // XFA_SRC_FDP_SRC_CSS_FDE_CSSCACHE_H_ diff --git a/xfa/src/fdp/src/css/fde_cssdatatable.h b/xfa/src/fdp/src/css/fde_cssdatatable.h index cd1b8ed5c2..d4e4be5094 100644 --- a/xfa/src/fdp/src/css/fde_cssdatatable.h +++ b/xfa/src/fdp/src/css/fde_cssdatatable.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FDE_CSSDATATABLE -#define _FDE_CSSDATATABLE +#ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSDATATABLE_H_ +#define XFA_SRC_FDP_SRC_CSS_FDE_CSSDATATABLE_H_ + class CFDE_CSSFunction : public CFX_Target { public: CFDE_CSSFunction(const FX_WCHAR* pszFuncName, IFDE_CSSValueList* pArgList) @@ -192,4 +193,4 @@ FX_BOOL FDE_ParseCSSURI(const FX_WCHAR* pszValue, int32_t& iOffset, int32_t& iLength); -#endif +#endif // XFA_SRC_FDP_SRC_CSS_FDE_CSSDATATABLE_H_ diff --git a/xfa/src/fdp/src/css/fde_cssdeclaration.h b/xfa/src/fdp/src/css/fde_cssdeclaration.h index 7442706d96..8670e5e169 100644 --- a/xfa/src/fdp/src/css/fde_cssdeclaration.h +++ b/xfa/src/fdp/src/css/fde_cssdeclaration.h @@ -4,9 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FDE_CSSDECLARATION -#define _FDE_CSSDECLARATION +#ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSDECLARATION_H_ +#define XFA_SRC_FDP_SRC_CSS_FDE_CSSDECLARATION_H_ + #include "fde_cssdatatable.h" + typedef struct _FDE_CSSPROPERTYHOLDER : public CFX_Target { int16_t eProperty; int16_t bImportant; @@ -148,4 +150,5 @@ class CFDE_CSSDeclaration : public IFDE_CSSDeclaration, public CFX_Target { FDE_LPCSSCUSTOMPROPERTY m_pFirstCustom; FDE_LPCSSCUSTOMPROPERTY m_pLastCustom; }; -#endif + +#endif // XFA_SRC_FDP_SRC_CSS_FDE_CSSDECLARATION_H_ diff --git a/xfa/src/fdp/src/css/fde_cssstyleselector.h b/xfa/src/fdp/src/css/fde_cssstyleselector.h index 965ece666d..4814a9c818 100644 --- a/xfa/src/fdp/src/css/fde_cssstyleselector.h +++ b/xfa/src/fdp/src/css/fde_cssstyleselector.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FDE_CSSSTYLESELECTOR -#define _FDE_CSSSTYLESELECTOR +#ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSSTYLESELECTOR_H_ +#define XFA_SRC_FDP_SRC_CSS_FDE_CSSSTYLESELECTOR_H_ + #define FDE_CSSUNIVERSALHASH ('*') typedef struct _FDE_CSSRULEDATA : public CFX_Target { public: @@ -883,4 +884,5 @@ class CFDE_CSSComputedStyle : public IFDE_CSSComputedStyle, CFDE_CSSNonInheritedData m_NonInheritedData; CFX_WideStringArray m_CustomProperties; }; -#endif + +#endif // XFA_SRC_FDP_SRC_CSS_FDE_CSSSTYLESELECTOR_H_ diff --git a/xfa/src/fdp/src/css/fde_cssstylesheet.h b/xfa/src/fdp/src/css/fde_cssstylesheet.h index 9fece7b3f2..596443bfcb 100644 --- a/xfa/src/fdp/src/css/fde_cssstylesheet.h +++ b/xfa/src/fdp/src/css/fde_cssstylesheet.h @@ -4,9 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FDE_CSSSTYLESHEET -#define _FDE_CSSSTYLESHEET +#ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSSTYLESHEET_H_ +#define XFA_SRC_FDP_SRC_CSS_FDE_CSSSTYLESHEET_H_ + #include "fde_cssdeclaration.h" + class CFDE_CSSSelector : public IFDE_CSSSelector, public CFX_Target { public: CFDE_CSSSelector(FDE_CSSSELECTORTYPE eType, @@ -134,4 +136,5 @@ class CFDE_CSSStyleSheet : public IFDE_CSSStyleSheet, public CFX_Target { CFDE_CSSSelectorArray m_Selectors; CFX_MapPtrToPtr m_StringCache; }; -#endif + +#endif // XFA_SRC_FDP_SRC_CSS_FDE_CSSSTYLESHEET_H_ diff --git a/xfa/src/fdp/src/css/fde_csssyntax.h b/xfa/src/fdp/src/css/fde_csssyntax.h index cf04c655a9..e0f03bba57 100644 --- a/xfa/src/fdp/src/css/fde_csssyntax.h +++ b/xfa/src/fdp/src/css/fde_csssyntax.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FDE_CSSSYNTAX -#define _FDE_CSSSYNTAX +#ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSSYNTAX_H_ +#define XFA_SRC_FDP_SRC_CSS_FDE_CSSSYNTAX_H_ + class CFDE_CSSTextBuf : public CFX_Target { public: CFDE_CSSTextBuf(); @@ -107,4 +108,5 @@ class CFDE_CSSSyntaxParser : public IFDE_CSSSyntaxParser, public CFX_Target { FDE_CSSSYNTAXSTATUS m_eStatus; CFX_StackTemplate<FDE_CSSSYNTAXMODE> m_ModeStack; }; -#endif + +#endif // XFA_SRC_FDP_SRC_CSS_FDE_CSSSYNTAX_H_ diff --git a/xfa/src/fdp/src/fde/fde_devbasic.h b/xfa/src/fdp/src/fde/fde_devbasic.h index 4cd4890985..e5c27be2e0 100644 --- a/xfa/src/fdp/src/fde/fde_devbasic.h +++ b/xfa/src/fdp/src/fde/fde_devbasic.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FDE_DEVICE_BASIC_IMP -#define _FDE_DEVICE_BASIC_IMP +#ifndef XFA_SRC_FDP_SRC_FDE_FDE_DEVBASIC_H_ +#define XFA_SRC_FDP_SRC_FDE_FDE_DEVBASIC_H_ + struct FDE_HATCHDATA { int32_t iWidth; int32_t iHeight; @@ -13,4 +14,5 @@ struct FDE_HATCHDATA { }; typedef FDE_HATCHDATA const* FDE_LPCHATCHDATA; FDE_LPCHATCHDATA FDE_DEVGetHatchData(int32_t iHatchStyle); -#endif + +#endif // XFA_SRC_FDP_SRC_FDE_FDE_DEVBASIC_H_ diff --git a/xfa/src/fdp/src/fde/fde_gdidevice.h b/xfa/src/fdp/src/fde/fde_gdidevice.h index f495e63cf6..c7b70f4dd7 100644 --- a/xfa/src/fdp/src/fde/fde_gdidevice.h +++ b/xfa/src/fdp/src/fde/fde_gdidevice.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FDE_GDIPLUSDEVICE_IMP -#define _FDE_GDIPLUSDEVICE_IMP +#ifndef XFA_SRC_FDP_SRC_FDE_FDE_GDIDEVICE_H_ +#define XFA_SRC_FDP_SRC_FDE_FDE_GDIDEVICE_H_ + #ifdef _FDEPLUS #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN32_MOBILE_ || \ _FX_OS_ == _FX_WIN64_ @@ -154,4 +155,5 @@ class CFDE_GdiDevice : public IFDE_RenderDevice, public CFX_Target { }; #endif #endif -#endif + +#endif // XFA_SRC_FDP_SRC_FDE_FDE_GDIDEVICE_H_ diff --git a/xfa/src/fdp/src/fde/fde_gedevice.h b/xfa/src/fdp/src/fde/fde_gedevice.h index 189bd0fa31..dc22f7b0d4 100644 --- a/xfa/src/fdp/src/fde/fde_gedevice.h +++ b/xfa/src/fdp/src/fde/fde_gedevice.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FDE_FXGEDEVICE_IMP -#define _FDE_FXGEDEVICE_IMP +#ifndef XFA_SRC_FDP_SRC_FDE_FDE_GEDEVICE_H_ +#define XFA_SRC_FDP_SRC_FDE_FDE_GEDEVICE_H_ + #ifndef _FDEPLUS class CFDE_FxgeDevice : public IFDE_RenderDevice, public CFX_Target { public: @@ -130,4 +131,5 @@ class CFDE_FxgeDevice : public IFDE_RenderDevice, public CFX_Target { int32_t m_iCharCount; }; #endif -#endif + +#endif // XFA_SRC_FDP_SRC_FDE_FDE_GEDEVICE_H_ diff --git a/xfa/src/fdp/src/fde/fde_geobject.h b/xfa/src/fdp/src/fde/fde_geobject.h index dd97e7f776..c883ebc794 100644 --- a/xfa/src/fdp/src/fde/fde_geobject.h +++ b/xfa/src/fdp/src/fde/fde_geobject.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FDE_GRAPHOBJS_IMP -#define _FDE_GRAPHOBJS_IMP +#ifndef XFA_SRC_FDP_SRC_FDE_FDE_GEOBJECT_H_ +#define XFA_SRC_FDP_SRC_FDE_FDE_GEOBJECT_H_ + #ifndef _FDEPLUS #include "xfa/src/foxitlib.h" class CFDE_GEFontMgr; @@ -52,4 +53,5 @@ class CFDE_Path : public IFDE_Path, public CFX_Target { CFX_PathData m_Path; }; #endif -#endif + +#endif // XFA_SRC_FDP_SRC_FDE_FDE_GEOBJECT_H_ diff --git a/xfa/src/fdp/src/fde/fde_iterator.h b/xfa/src/fdp/src/fde/fde_iterator.h index 2e1304bdef..c9fb8e423d 100644 --- a/xfa/src/fdp/src/fde/fde_iterator.h +++ b/xfa/src/fdp/src/fde/fde_iterator.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FDE_ITERATOR_IMP -#define _FDE_ITERATOR_IMP +#ifndef XFA_SRC_FDP_SRC_FDE_FDE_ITERATOR_H_ +#define XFA_SRC_FDP_SRC_FDE_FDE_ITERATOR_H_ + typedef struct _FDE_CANVASITEM : public CFX_Target { IFDE_CanvasSet* pCanvas; FDE_HVISUALOBJ hCanvas; @@ -30,4 +31,5 @@ class CFDE_VisualSetIterator : public IFDE_VisualSetIterator, FX_DWORD m_dwFilter; CFX_StackTemplate<FDE_CANVASITEM> m_CanvasStack; }; -#endif + +#endif // XFA_SRC_FDP_SRC_FDE_FDE_ITERATOR_H_ diff --git a/xfa/src/fdp/src/fde/fde_object.h b/xfa/src/fdp/src/fde/fde_object.h index de973b636a..91162edeb4 100644 --- a/xfa/src/fdp/src/fde/fde_object.h +++ b/xfa/src/fdp/src/fde/fde_object.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FDE_BASEOBJECT_IMP -#define _FDE_BASEOBJECT_IMP +#ifndef XFA_SRC_FDP_SRC_FDE_FDE_OBJECT_H_ +#define XFA_SRC_FDP_SRC_FDE_FDE_OBJECT_H_ + class CFDE_Pen : public IFDE_Pen, public CFX_Target { public: CFDE_Pen() @@ -234,4 +235,5 @@ class CFDE_LinearBrush : public IFDE_LinearGradientBrush, public CFX_Target { int32_t m_iWrapMode; CFX_Matrix m_Matrix; }; -#endif + +#endif // XFA_SRC_FDP_SRC_FDE_FDE_OBJECT_H_ diff --git a/xfa/src/fdp/src/fde/fde_render.h b/xfa/src/fdp/src/fde/fde_render.h index cb52224a45..50f76f394e 100644 --- a/xfa/src/fdp/src/fde/fde_render.h +++ b/xfa/src/fdp/src/fde/fde_render.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FDE_RENDER_IMP -#define _FDE_RENDER_IMP +#ifndef XFA_SRC_FDP_SRC_FDE_FDE_RENDER_H_ +#define XFA_SRC_FDP_SRC_FDE_FDE_RENDER_H_ + class CFDE_RenderContext; class CFDE_RenderContext : public IFDE_RenderContext, public CFX_ThreadLock, @@ -36,4 +37,5 @@ class CFDE_RenderContext : public IFDE_RenderContext, int32_t m_iCharPosCount; IFDE_VisualSetIterator* m_pIterator; }; -#endif + +#endif // XFA_SRC_FDP_SRC_FDE_FDE_RENDER_H_ diff --git a/xfa/src/fdp/src/tto/fde_textout.h b/xfa/src/fdp/src/tto/fde_textout.h index 97bf51756f..ac9d88381a 100644 --- a/xfa/src/fdp/src/tto/fde_textout.h +++ b/xfa/src/fdp/src/tto/fde_textout.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FDE_TEXTOUT_IMP -#define _FDE_TEXTOUT_IMP +#ifndef XFA_SRC_FDP_SRC_TTO_FDE_TEXTOUT_H_ +#define XFA_SRC_FDP_SRC_TTO_FDE_TEXTOUT_H_ + struct FDE_TTOPIECE { public: int32_t iStartChar; @@ -164,4 +165,5 @@ class CFDE_TextOut : public IFDE_TextOut, public CFX_Target { CFX_Int32Array m_hotKeys; CFX_RectFArray m_rectArray; }; -#endif + +#endif // XFA_SRC_FDP_SRC_TTO_FDE_TEXTOUT_H_ diff --git a/xfa/src/fdp/src/xml/fde_xml_imp.h b/xfa/src/fdp/src/xml/fde_xml_imp.h index cc83aa594e..2fed05c0fb 100644 --- a/xfa/src/fdp/src/xml/fde_xml_imp.h +++ b/xfa/src/fdp/src/xml/fde_xml_imp.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FDE_XML_IMP_H_ -#define FDE_XML_IMP_H_ +#ifndef XFA_SRC_FDP_SRC_XML_FDE_XML_IMP_H_ +#define XFA_SRC_FDP_SRC_XML_FDE_XML_IMP_H_ #define _FDE_BLOCK_BUFFER #ifdef _FDE_BLOCK_BUFFER @@ -372,4 +372,4 @@ class CFDE_XMLSyntaxParser : public IFDE_XMLSyntaxParser, public CFX_Target { #endif }; -#endif // FDE_XML_IMP_H_ +#endif // XFA_SRC_FDP_SRC_XML_FDE_XML_IMP_H_ |