summaryrefslogtreecommitdiff
path: root/xfa/src/fgas/include
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2016-02-18 15:02:55 -0500
committerDan Sinclair <dsinclair@chromium.org>2016-02-18 15:02:55 -0500
commitc7cd809fccd7c5f90c8a2db7ddec7289f9630f53 (patch)
tree8ed5c89990a552395ac3943330eb6776dc1f41e5 /xfa/src/fgas/include
parentc5ac0202004cd38071a9f6f0d7f3e5d8669ccfbb (diff)
downloadpdfium-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/fgas/include')
-rw-r--r--xfa/src/fgas/include/fgas.h8
-rw-r--r--xfa/src/fgas/include/fx_alg.h8
-rw-r--r--xfa/src/fgas/include/fx_cpg.h8
-rw-r--r--xfa/src/fgas/include/fx_datetime.h8
-rw-r--r--xfa/src/fgas/include/fx_fnt.h8
-rw-r--r--xfa/src/fgas/include/fx_lbk.h7
-rw-r--r--xfa/src/fgas/include/fx_lgg.h8
-rw-r--r--xfa/src/fgas/include/fx_locale.h8
-rw-r--r--xfa/src/fgas/include/fx_mem.h7
-rw-r--r--xfa/src/fgas/include/fx_rbk.h8
-rw-r--r--xfa/src/fgas/include/fx_sax.h8
-rw-r--r--xfa/src/fgas/include/fx_stm.h8
-rw-r--r--xfa/src/fgas/include/fx_sys.h8
-rw-r--r--xfa/src/fgas/include/fx_tbk.h7
-rw-r--r--xfa/src/fgas/include/fx_ucd.h8
-rw-r--r--xfa/src/fgas/include/fx_utl.h7
16 files changed, 76 insertions, 48 deletions
diff --git a/xfa/src/fgas/include/fgas.h b/xfa/src/fgas/include/fgas.h
index adc4d2bd95..ba72ff3e25 100644
--- a/xfa/src/fgas/include/fgas.h
+++ b/xfa/src/fgas/include/fgas.h
@@ -6,8 +6,9 @@
// TODO(thestig): Remove this file and do IWYU.
-#ifndef _FGAS_
-#define _FGAS_
+#ifndef XFA_SRC_FGAS_INCLUDE_FGAS_H_
+#define XFA_SRC_FGAS_INCLUDE_FGAS_H_
+
#include "fx_sys.h"
#include "fx_mem.h"
#include "fx_lgg.h"
@@ -23,4 +24,5 @@
#include "fx_lbk.h"
#include "fx_tbk.h"
#include "fx_rbk.h"
-#endif
+
+#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 11ccdc63a7..dd593202da 100644
--- a/xfa/src/fgas/include/fx_alg.h
+++ b/xfa/src/fgas/include/fx_alg.h
@@ -4,8 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FX_ALGORITHM
-#define _FX_ALGORITHM
+#ifndef XFA_SRC_FGAS_INCLUDE_FX_ALG_H_
+#define XFA_SRC_FGAS_INCLUDE_FX_ALG_H_
+
#define FX_IsOdd(a) ((a)&1)
#ifdef __cplusplus
extern "C" {
@@ -44,4 +45,5 @@ class CFX_DSPATemplate {
return -1;
}
};
-#endif
+
+#endif // XFA_SRC_FGAS_INCLUDE_FX_ALG_H_
diff --git a/xfa/src/fgas/include/fx_cpg.h b/xfa/src/fgas/include/fx_cpg.h
index 357ffd820a..84914766e6 100644
--- a/xfa/src/fgas/include/fx_cpg.h
+++ b/xfa/src/fgas/include/fx_cpg.h
@@ -4,8 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FX_CODEPAGE
-#define _FX_CODEPAGE
+#ifndef XFA_SRC_FGAS_INCLUDE_FX_CPG_H_
+#define XFA_SRC_FGAS_INCLUDE_FX_CPG_H_
+
class IFX_CodePage;
#define FX_CODEPAGE_DefANSI 0
#define FX_CODEPAGE_DefOEM 1
@@ -245,4 +246,5 @@ class IFX_CodePage {
virtual FX_BOOL IsValidUnicode(FX_WCHAR wUnicode) const = 0;
virtual FX_WORD GetCharcode(FX_WCHAR wUnicode) const = 0;
};
-#endif
+
+#endif // XFA_SRC_FGAS_INCLUDE_FX_CPG_H_
diff --git a/xfa/src/fgas/include/fx_datetime.h b/xfa/src/fgas/include/fx_datetime.h
index 773acbd2fb..f5bbee7f81 100644
--- a/xfa/src/fgas/include/fx_datetime.h
+++ b/xfa/src/fgas/include/fx_datetime.h
@@ -4,8 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FX_DATETIME_H_
-#define _FX_DATETIME_H_
+#ifndef XFA_SRC_FGAS_INCLUDE_FX_DATETIME_H_
+#define XFA_SRC_FGAS_INCLUDE_FX_DATETIME_H_
+
class CFX_Unitime;
class CFX_DateTime;
typedef int64_t FX_UNITIME;
@@ -389,4 +390,5 @@ class CFX_DateTime {
private:
FX_DATETIME m_DateTime;
};
-#endif
+
+#endif // XFA_SRC_FGAS_INCLUDE_FX_DATETIME_H_
diff --git a/xfa/src/fgas/include/fx_fnt.h b/xfa/src/fgas/include/fx_fnt.h
index 894ad183f5..34abab8846 100644
--- a/xfa/src/fgas/include/fx_fnt.h
+++ b/xfa/src/fgas/include/fx_fnt.h
@@ -4,8 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FX_FONT
-#define _FX_FONT
+#ifndef XFA_SRC_FGAS_INCLUDE_FX_FNT_H_
+#define XFA_SRC_FGAS_INCLUDE_FX_FNT_H_
+
class IFX_Font;
class IFX_FontMgr;
#define FX_FONTSTYLE_Normal 0x00
@@ -261,4 +262,5 @@ class IFX_FontMgr {
virtual void RemoveFont(IFX_Font* pFont) = 0;
};
#endif
-#endif
+
+#endif // XFA_SRC_FGAS_INCLUDE_FX_FNT_H_
diff --git a/xfa/src/fgas/include/fx_lbk.h b/xfa/src/fgas/include/fx_lbk.h
index 2f0a300cd4..12a0fc1cad 100644
--- a/xfa/src/fgas/include/fx_lbk.h
+++ b/xfa/src/fgas/include/fx_lbk.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FX_LINEBREAK
-#define _FX_LINEBREAK
+#ifndef XFA_SRC_FGAS_INCLUDE_FX_LBK_H_
+#define XFA_SRC_FGAS_INCLUDE_FX_LBK_H_
#include "core/include/fxcrt/fx_system.h"
#include "xfa/src/fgas/include/fx_utl.h"
@@ -36,4 +36,5 @@ void FX_GetLineBreakPositions(const FX_WCHAR* pwsText,
void FX_GetLineBreakPositions(const FX_WCHAR* pwsText,
int32_t iLength,
CFX_Int32MassArray& bp);
-#endif
+
+#endif // XFA_SRC_FGAS_INCLUDE_FX_LBK_H_
diff --git a/xfa/src/fgas/include/fx_lgg.h b/xfa/src/fgas/include/fx_lgg.h
index ff30c53bc7..68e7ebd3ba 100644
--- a/xfa/src/fgas/include/fx_lgg.h
+++ b/xfa/src/fgas/include/fx_lgg.h
@@ -4,8 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FX_LANGUAGE
-#define _FX_LANGUAGE
+#ifndef XFA_SRC_FGAS_INCLUDE_FX_LGG_H_
+#define XFA_SRC_FGAS_INCLUDE_FX_LGG_H_
+
#define FX_LANG_Neutral 0x0000
#define FX_LANG_Invariant 0x007f
#define FX_LANG_UserDefault 0x0400
@@ -264,4 +265,5 @@
#define FX_LANG_YiPRC 0x0478
#define FX_LANG_Yiddish 0x043d
#define FX_LANG_Yoruba_Nigeria 0x046a
-#endif
+
+#endif // XFA_SRC_FGAS_INCLUDE_FX_LGG_H_
diff --git a/xfa/src/fgas/include/fx_locale.h b/xfa/src/fgas/include/fx_locale.h
index 7ead311c53..36d19b5e14 100644
--- a/xfa/src/fgas/include/fx_locale.h
+++ b/xfa/src/fgas/include/fx_locale.h
@@ -4,8 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FX_LOCALE_H_
-#define _FX_LOCALE_H_
+#ifndef XFA_SRC_FGAS_INCLUDE_FX_LOCALE_H_
+#define XFA_SRC_FGAS_INCLUDE_FX_LOCALE_H_
+
class CFX_Unitime;
class IFX_Locale;
class IFX_FormatString;
@@ -200,4 +201,5 @@ class CFX_Decimal {
uint32_t m_uLo;
uint32_t m_uMid;
};
-#endif
+
+#endif // XFA_SRC_FGAS_INCLUDE_FX_LOCALE_H_
diff --git a/xfa/src/fgas/include/fx_mem.h b/xfa/src/fgas/include/fx_mem.h
index 5d933dc06c..d59d391d44 100644
--- a/xfa/src/fgas/include/fx_mem.h
+++ b/xfa/src/fgas/include/fx_mem.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FX_MEMORY
-#define _FX_MEMORY
+#ifndef XFA_SRC_FGAS_INCLUDE_FX_MEM_H_
+#define XFA_SRC_FGAS_INCLUDE_FX_MEM_H_
#include "core/include/fxcrt/fx_memory.h" // For FX_Alloc().
@@ -53,4 +53,5 @@ class CFX_Target {
(pointer)->~__class__(); \
(pointer)->operator delete((pointer), (__allocator__)); \
}
-#endif
+
+#endif // XFA_SRC_FGAS_INCLUDE_FX_MEM_H_
diff --git a/xfa/src/fgas/include/fx_rbk.h b/xfa/src/fgas/include/fx_rbk.h
index e344959830..e3e0595f59 100644
--- a/xfa/src/fgas/include/fx_rbk.h
+++ b/xfa/src/fgas/include/fx_rbk.h
@@ -4,8 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FX_RTFBREAK
-#define _FX_RTFBREAK
+#ifndef XFA_SRC_FGAS_INCLUDE_FX_RBK_H_
+#define XFA_SRC_FGAS_INCLUDE_FX_RBK_H_
+
class IFX_Unknown;
class IFX_Font;
class CFX_Char;
@@ -225,4 +226,5 @@ class IFX_RTFBreak {
CFX_RectFArray& rtArray,
FX_BOOL bCharBBox = FALSE) const = 0;
};
-#endif
+
+#endif // XFA_SRC_FGAS_INCLUDE_FX_RBK_H_
diff --git a/xfa/src/fgas/include/fx_sax.h b/xfa/src/fgas/include/fx_sax.h
index 70978a017b..02468d31d2 100644
--- a/xfa/src/fgas/include/fx_sax.h
+++ b/xfa/src/fgas/include/fx_sax.h
@@ -4,8 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FX_SAX_
-#define _FX_SAX_
+#ifndef XFA_SRC_FGAS_INCLUDE_FX_SAX_H_
+#define XFA_SRC_FGAS_INCLUDE_FX_SAX_H_
+
class IFX_SAXReaderHandler;
class IFX_SAXReader;
#define FX_SAXPARSEMODE_NotConvert_amp 0x0001
@@ -60,4 +61,5 @@ class IFX_SAXReader {
virtual void SetHandler(IFX_SAXReaderHandler* pHandler) = 0;
};
IFX_SAXReader* FX_SAXReader_Create();
-#endif
+
+#endif // XFA_SRC_FGAS_INCLUDE_FX_SAX_H_
diff --git a/xfa/src/fgas/include/fx_stm.h b/xfa/src/fgas/include/fx_stm.h
index 43a2c8de08..0f0385b5ec 100644
--- a/xfa/src/fgas/include/fx_stm.h
+++ b/xfa/src/fgas/include/fx_stm.h
@@ -4,8 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FX_STREAM
-#define _FX_STREAM
+#ifndef XFA_SRC_FGAS_INCLUDE_FX_STM_H_
+#define XFA_SRC_FGAS_INCLUDE_FX_STM_H_
+
class IFX_Stream;
IFX_FileRead* FX_CreateFileRead(IFX_Stream* pBaseStream,
FX_BOOL bReleaseStream = FALSE);
@@ -69,4 +70,5 @@ class IFX_Stream {
int32_t iOffset,
int32_t iLength) = 0;
};
-#endif
+
+#endif // XFA_SRC_FGAS_INCLUDE_FX_STM_H_
diff --git a/xfa/src/fgas/include/fx_sys.h b/xfa/src/fgas/include/fx_sys.h
index f2fe2157c6..b4732d7728 100644
--- a/xfa/src/fgas/include/fx_sys.h
+++ b/xfa/src/fgas/include/fx_sys.h
@@ -4,8 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FX_SYSTEM
-#define _FX_SYSTEM
+#ifndef XFA_SRC_FGAS_INCLUDE_FX_SYS_H_
+#define XFA_SRC_FGAS_INCLUDE_FX_SYS_H_
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -62,4 +63,5 @@ typedef FX_VERSION const* FX_LPCVERSION;
#ifdef __cplusplus
};
#endif
-#endif
+
+#endif // XFA_SRC_FGAS_INCLUDE_FX_SYS_H_
diff --git a/xfa/src/fgas/include/fx_tbk.h b/xfa/src/fgas/include/fx_tbk.h
index d9fef51f65..6ebfd4ce04 100644
--- a/xfa/src/fgas/include/fx_tbk.h
+++ b/xfa/src/fgas/include/fx_tbk.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FX_TEXTBREAK
-#define _FX_TEXTBREAK
+#ifndef XFA_SRC_FGAS_INCLUDE_FX_TBK_H_
+#define XFA_SRC_FGAS_INCLUDE_FX_TBK_H_
#include "core/include/fxcrt/fx_ucd.h"
@@ -211,4 +211,5 @@ class IFX_TxtBreak {
CFX_RectFArray& rtArray,
FX_BOOL bCharBBox = FALSE) const = 0;
};
-#endif
+
+#endif // XFA_SRC_FGAS_INCLUDE_FX_TBK_H_
diff --git a/xfa/src/fgas/include/fx_ucd.h b/xfa/src/fgas/include/fx_ucd.h
index 6aa11ce8b4..51a0a1f2fc 100644
--- a/xfa/src/fgas/include/fx_ucd.h
+++ b/xfa/src/fgas/include/fx_ucd.h
@@ -4,8 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FGAS_UNICODE_
-#define _FGAS_UNICODE_
+#ifndef XFA_SRC_FGAS_INCLUDE_FX_UCD_H_
+#define XFA_SRC_FGAS_INCLUDE_FX_UCD_H_
+
#define FX_JAPCHARPROPERTYEX_Left 0x01
#define FX_JAPCHARPROPERTYEX_Center 0x02
#define FX_JAPCHARPROPERTYEX_Right 0x03
@@ -30,4 +31,5 @@ FX_BOOL FX_AdjustJapCharDisplayPos(FX_WCHAR wch,
FX_FLOAT fFontSize,
FX_BOOL bVertical,
CFX_PointF& ptOffset);
-#endif
+
+#endif // XFA_SRC_FGAS_INCLUDE_FX_UCD_H_
diff --git a/xfa/src/fgas/include/fx_utl.h b/xfa/src/fgas/include/fx_utl.h
index 0e4a35a651..cd7f2a7ef2 100644
--- a/xfa/src/fgas/include/fx_utl.h
+++ b/xfa/src/fgas/include/fx_utl.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FX_UTILS
-#define _FX_UTILS
+#ifndef XFA_SRC_FGAS_INCLUDE_FX_UTL_H_
+#define XFA_SRC_FGAS_INCLUDE_FX_UTL_H_
#include "fx_mem.h"
#include "core/include/fxcrt/fx_coordinates.h" // For CFX_Rect.
@@ -721,4 +721,5 @@ class CFX_CPLTree {
protected:
CPLTreeNode m_Root;
};
-#endif
+
+#endif // XFA_SRC_FGAS_INCLUDE_FX_UTL_H_