diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-05-28 13:09:35 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-05-28 13:09:35 -0700 |
commit | 6b776fed401f97ce2589a847465280de704b9d7f (patch) | |
tree | 39f484bd9b3282cbd7e5dbd48c784534e29b59c3 /core/include/fxge | |
parent | 14f57a153dcbc4c5fedeffe12a3b4f915cc5d558 (diff) | |
download | pdfium-6b776fed401f97ce2589a847465280de704b9d7f.tar.xz |
Fix ALL the include guards.
Get rid of leading _CAPITAL identifiers.
A large number of these didn't actually match the filename.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1160443004
Diffstat (limited to 'core/include/fxge')
-rw-r--r-- | core/include/fxge/fpf.h | 8 | ||||
-rw-r--r-- | core/include/fxge/fx_dib.h | 11 | ||||
-rw-r--r-- | core/include/fxge/fx_font.h | 6 | ||||
-rw-r--r-- | core/include/fxge/fx_freetype.h | 5 | ||||
-rw-r--r-- | core/include/fxge/fx_ge.h | 14 | ||||
-rw-r--r-- | core/include/fxge/fx_ge_apple.h | 8 | ||||
-rw-r--r-- | core/include/fxge/fx_ge_win32.h | 8 |
7 files changed, 36 insertions, 24 deletions
diff --git a/core/include/fxge/fpf.h b/core/include/fxge/fpf.h index 9fb38f8043..440c329439 100644 --- a/core/include/fxge/fpf.h +++ b/core/include/fxge/fpf.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_PALTFORM_DEVICE_H_ -#define _FX_PALTFORM_DEVICE_H_ +#ifndef CORE_INCLUDE_FXGE_FPF_H_ +#define CORE_INCLUDE_FXGE_FPF_H_ + class IFPF_DeviceModule; class IFPF_FontMgr; class IFPF_Font; @@ -59,4 +60,5 @@ public: virtual IFPF_Font* CreateFont(FX_BSTR bsFamilyname, FX_BYTE charset, FX_DWORD dwStyle, FX_DWORD dwMatch = 0) = 0; }; -#endif + +#endif // CORE_INCLUDE_FXGE_FPF_H_ diff --git a/core/include/fxge/fx_dib.h b/core/include/fxge/fx_dib.h index d6e99b7f73..74738d0d0f 100644 --- a/core/include/fxge/fx_dib.h +++ b/core/include/fxge/fx_dib.h @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FPDF_DIB_H_ -#define _FPDF_DIB_H_ -#ifndef _FXCRT_EXTENSION_ +#ifndef CORE_INCLUDE_FXGE_FX_DIB_H_ +#define CORE_INCLUDE_FXGE_FX_DIB_H_ + #include "../fxcrt/fx_ext.h" -#endif + enum FXDIB_Format { FXDIB_Invalid = 0, FXDIB_1bppMask = 0x101, @@ -602,4 +602,5 @@ protected: FX_BOOL m_bRgbByteOrder; int m_BlendType; }; -#endif + +#endif // CORE_INCLUDE_FXGE_FX_DIB_H_ diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h index 7ae3c6d39d..aa985820c8 100644 --- a/core/include/fxge/fx_font.h +++ b/core/include/fxge/fx_font.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FX_FONT_H_ -#define FX_FONT_H_ +#ifndef CORE_INCLUDE_FXGE_FX_FONT_H_ +#define CORE_INCLUDE_FXGE_FX_FONT_H_ #include "../fxcrt/fx_ext.h" #include "fx_dib.h" @@ -432,4 +432,4 @@ protected: }; IFX_GSUBTable* FXGE_CreateGSUBTable(CFX_Font* pFont); -#endif // FX_FONT_H_ +#endif // CORE_INCLUDE_FXGE_FX_FONT_H_ diff --git a/core/include/fxge/fx_freetype.h b/core/include/fxge/fx_freetype.h index 4b49d5f6ea..6975ead298 100644 --- a/core/include/fxge/fx_freetype.h +++ b/core/include/fxge/fx_freetype.h @@ -4,6 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#ifndef CORE_INCLUDE_FXGE_FX_FREETYPE_H_ +#define CORE_INCLUDE_FXGE_FX_FREETYPE_H_ + #include <ft2build.h> #include <freetype.h> #include <ftglyph.h> @@ -141,3 +144,5 @@ void FXFT_adobe_name_from_unicode(char* name, wchar_t unicode); #ifdef __cplusplus }; #endif + +#endif // CORE_INCLUDE_FXGE_FX_FREETYPE_H_ diff --git a/core/include/fxge/fx_ge.h b/core/include/fxge/fx_ge.h index 147e24ce1f..60374eff45 100644 --- a/core/include/fxge/fx_ge.h +++ b/core/include/fxge/fx_ge.h @@ -4,14 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_GE_H_ -#define _FX_GE_H_ -#ifndef _FX_DIB_H_ +#ifndef CORE_INCLUDE_FXGE_FX_GE_H_ +#define CORE_INCLUDE_FXGE_FX_GE_H_ + #include "fx_dib.h" -#endif -#ifndef _FX_FONT_H_ #include "fx_font.h" -#endif + class CFX_ClipRgn; class CFX_PathData; class CFX_GraphStateData; @@ -23,6 +21,7 @@ class CFX_RenderDevice; class IFX_RenderDeviceDriver; class CCodec_ModuleMgr; class IFXG_PaintModuleMgr; + class CFX_GEModule { public: @@ -729,4 +728,5 @@ private: void WritePSBinary(FX_LPCBYTE data, int len); }; -#endif + +#endif // CORE_INCLUDE_FXGE_FX_GE_H_ diff --git a/core/include/fxge/fx_ge_apple.h b/core/include/fxge/fx_ge_apple.h index 44bf2a028a..90cd03455b 100644 --- a/core/include/fxge/fx_ge_apple.h +++ b/core/include/fxge/fx_ge_apple.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_GE_APPLE_H_ -#define _FX_GE_APPLE_H_ +#ifndef CORE_INCLUDE_FXGE_FX_GE_APPLE_H_ +#define CORE_INCLUDE_FXGE_FX_GE_APPLE_H_ + #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ class CFX_QuartzDevice : public CFX_RenderDevice { @@ -23,4 +24,5 @@ protected: FX_BOOL m_bOwnedBitmap; }; #endif -#endif + +#endif // CORE_INCLUDE_FXGE_FX_GE_APPLE_H_ diff --git a/core/include/fxge/fx_ge_win32.h b/core/include/fxge/fx_ge_win32.h index d39a8071e3..c9cb2a35a9 100644 --- a/core/include/fxge/fx_ge_win32.h +++ b/core/include/fxge/fx_ge_win32.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_GE_WIN32_H_ -#define _FX_GE_WIN32_H_ +#ifndef CORE_INCLUDE_FXGE_FX_GE_WIN32_H_ +#define CORE_INCLUDE_FXGE_FX_GE_WIN32_H_ + #ifdef _WIN32 #ifndef _WINDOWS_ #include <windows.h> @@ -102,4 +103,5 @@ protected: HDC m_hDC; }; #endif -#endif + +#endif // CORE_INCLUDE_FXGE_FX_GE_WIN32_H_ |