diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2016-02-18 15:02:55 -0500 |
---|---|---|
committer | Dan Sinclair <dsinclair@chromium.org> | 2016-02-18 15:02:55 -0500 |
commit | c7cd809fccd7c5f90c8a2db7ddec7289f9630f53 (patch) | |
tree | 8ed5c89990a552395ac3943330eb6776dc1f41e5 /xfa/src/fdp/include | |
parent | c5ac0202004cd38071a9f6f0d7f3e5d8669ccfbb (diff) | |
download | pdfium-c7cd809fccd7c5f90c8a2db7ddec7289f9630f53.tar.xz |
Fixup incorrect include guards.
This CL updates include guards throughout the code base to be in the
chromium style.
BUG=pdfium:65
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1707893004 .
Diffstat (limited to 'xfa/src/fdp/include')
-rw-r--r-- | xfa/src/fdp/include/fde.h | 8 | ||||
-rw-r--r-- | xfa/src/fdp/include/fde_brs.h | 8 | ||||
-rw-r--r-- | xfa/src/fdp/include/fde_css.h | 8 | ||||
-rw-r--r-- | xfa/src/fdp/include/fde_img.h | 8 | ||||
-rw-r--r-- | xfa/src/fdp/include/fde_mem.h | 6 | ||||
-rw-r--r-- | xfa/src/fdp/include/fde_pen.h | 8 | ||||
-rw-r--r-- | xfa/src/fdp/include/fde_psr.h | 8 | ||||
-rw-r--r-- | xfa/src/fdp/include/fde_pth.h | 8 | ||||
-rw-r--r-- | xfa/src/fdp/include/fde_rdr.h | 8 | ||||
-rw-r--r-- | xfa/src/fdp/include/fde_rdv.h | 8 | ||||
-rw-r--r-- | xfa/src/fdp/include/fde_tto.h | 8 | ||||
-rw-r--r-- | xfa/src/fdp/include/fde_xml.h | 6 |
12 files changed, 56 insertions, 36 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_ |