summaryrefslogtreecommitdiff
path: root/core/include
diff options
context:
space:
mode:
Diffstat (limited to 'core/include')
-rw-r--r--core/include/fdrm/fx_crypt.h6
-rw-r--r--core/include/fpdfapi/fpdf_module.h11
-rw-r--r--core/include/fpdfapi/fpdf_objects.h11
-rw-r--r--core/include/fpdfapi/fpdf_page.h17
-rw-r--r--core/include/fpdfapi/fpdf_pageobj.h15
-rw-r--r--core/include/fpdfapi/fpdf_parser.h13
-rw-r--r--core/include/fpdfapi/fpdf_render.h15
-rw-r--r--core/include/fpdfapi/fpdf_resource.h15
-rw-r--r--core/include/fpdfapi/fpdf_serial.h13
-rw-r--r--core/include/fpdfapi/fpdfapi.h6
-rw-r--r--core/include/fpdfdoc/fpdf_ap.h7
-rw-r--r--core/include/fpdfdoc/fpdf_doc.h13
-rw-r--r--core/include/fpdfdoc/fpdf_tagged.h8
-rw-r--r--core/include/fpdfdoc/fpdf_vt.h7
-rw-r--r--core/include/fpdftext/fpdf_text.h19
-rw-r--r--core/include/fxcodec/fx_codec.h11
-rw-r--r--core/include/fxcodec/fx_codec_def.h8
-rw-r--r--core/include/fxcodec/fx_codec_provider.h8
-rw-r--r--core/include/fxcrt/fx_arb.h7
-rw-r--r--core/include/fxcrt/fx_basic.h6
-rw-r--r--core/include/fxcrt/fx_coordinates.h7
-rw-r--r--core/include/fxcrt/fx_ext.h7
-rw-r--r--core/include/fxcrt/fx_memory.h9
-rw-r--r--core/include/fxcrt/fx_stream.h7
-rw-r--r--core/include/fxcrt/fx_string.h7
-rw-r--r--core/include/fxcrt/fx_system.h6
-rw-r--r--core/include/fxcrt/fx_ucd.h7
-rw-r--r--core/include/fxcrt/fx_xml.h7
-rw-r--r--core/include/fxge/fpf.h8
-rw-r--r--core/include/fxge/fx_dib.h11
-rw-r--r--core/include/fxge/fx_font.h6
-rw-r--r--core/include/fxge/fx_freetype.h5
-rw-r--r--core/include/fxge/fx_ge.h14
-rw-r--r--core/include/fxge/fx_ge_apple.h8
-rw-r--r--core/include/fxge/fx_ge_win32.h8
-rw-r--r--core/include/reflow/fpdf_layout.h7
-rw-r--r--core/include/reflow/reflowengine.h13
37 files changed, 188 insertions, 165 deletions
diff --git a/core/include/fdrm/fx_crypt.h b/core/include/fdrm/fx_crypt.h
index adbdf8fa23..7bd69defdf 100644
--- a/core/include/fdrm/fx_crypt.h
+++ b/core/include/fdrm/fx_crypt.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef FX_CRYPT_H_
-#define FX_CRYPT_H_
+#ifndef CORE_INCLUDE_FDRM_FX_CRYPT_H_
+#define CORE_INCLUDE_FDRM_FX_CRYPT_H_
#include "../fxcrt/fx_basic.h"
@@ -46,4 +46,4 @@ void CRYPT_SetPubKeyDecryptor(FX_BOOL (*func)(FX_LPCBYTE pData, FX_DWORD size, F
};
#endif
-#endif // FX_CRYPT_H_
+#endif // CORE_INCLUDE_FDRM_FX_CRYPT_H_
diff --git a/core/include/fpdfapi/fpdf_module.h b/core/include/fpdfapi/fpdf_module.h
index 9b3a5bf7dc..6317cd0b18 100644
--- a/core/include/fpdfapi/fpdf_module.h
+++ b/core/include/fpdfapi/fpdf_module.h
@@ -4,11 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FPDF_MODULE_
-#define _FPDF_MODULE_
-#ifndef _FXCRT_EXTENSION_
+#ifndef CORE_INCLUDE_FPDFAPI_FPDF_MODULE_H_
+#define CORE_INCLUDE_FPDFAPI_FPDF_MODULE_H_
+
#include "../fxcrt/fx_ext.h"
-#endif
+
class CPDF_ModuleMgr;
class CPDF_PageModuleDef;
class CPDF_RenderModuleDef;
@@ -193,4 +193,5 @@ public:
return NULL;
}
};
-#endif
+
+#endif // CORE_INCLUDE_FPDFAPI_FPDF_MODULE_H_
diff --git a/core/include/fpdfapi/fpdf_objects.h b/core/include/fpdfapi/fpdf_objects.h
index e4a0d3701d..72beb2ceee 100644
--- a/core/include/fpdfapi/fpdf_objects.h
+++ b/core/include/fpdfapi/fpdf_objects.h
@@ -4,11 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FPDF_OBJECTS_
-#define _FPDF_OBJECTS_
-#ifndef _FXCRT_EXTENSION_
+#ifndef CORE_INCLUDE_FPDFAPI_FPDF_OBJECTS_H_
+#define CORE_INCLUDE_FPDFAPI_FPDF_OBJECTS_H_
+
#include "../fxcrt/fx_ext.h"
-#endif
+
class CPDF_Document;
class CPDF_IndirectObjects;
class CPDF_Null;
@@ -742,4 +742,5 @@ protected:
FX_DWORD m_LastObjNum;
};
-#endif
+
+#endif // CORE_INCLUDE_FPDFAPI_FPDF_OBJECTS_H_
diff --git a/core/include/fpdfapi/fpdf_page.h b/core/include/fpdfapi/fpdf_page.h
index 0bac0595c2..d549b7713a 100644
--- a/core/include/fpdfapi/fpdf_page.h
+++ b/core/include/fpdfapi/fpdf_page.h
@@ -4,17 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FPDF_PAGE_
-#define _FPDF_PAGE_
-#ifndef _FPDF_PARSER_
+#ifndef CORE_INCLUDE_FPDFAPI_FPDF_PAGE_H_
+#define CORE_INCLUDE_FPDFAPI_FPDF_PAGE_H_
+
+#include "../fxge/fx_dib.h"
#include "fpdf_parser.h"
-#endif
-#ifndef _FPDF_RESOURCE_
#include "fpdf_resource.h"
-#endif
-#ifndef _FX_DIB_H_
-#include "../fxge/fx_dib.h"
-#endif
+
class CPDF_PageObjects;
class CPDF_Page;
class CPDF_Form;
@@ -246,4 +242,5 @@ private:
CPDF_Document* m_pDocument;
CFX_PtrArray m_pageObjects;
};
-#endif
+
+#endif // CORE_INCLUDE_FPDFAPI_FPDF_PAGE_H_
diff --git a/core/include/fpdfapi/fpdf_pageobj.h b/core/include/fpdfapi/fpdf_pageobj.h
index e78c9bb8b2..1b53bdc859 100644
--- a/core/include/fpdfapi/fpdf_pageobj.h
+++ b/core/include/fpdfapi/fpdf_pageobj.h
@@ -4,14 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FPDF_PAGEOBJ_H_
-#define _FPDF_PAGEOBJ_H_
-#ifndef _FPDF_RESOURCE_
-#include "fpdf_resource.h"
-#endif
-#ifndef _FX_GE_H_
+#ifndef CORE_INCLUDE_FPDFAPI_FPDF_PAGEOBJ_H_
+#define CORE_INCLUDE_FPDFAPI_FPDF_PAGEOBJ_H_
+
#include "../fxge/fx_ge.h"
-#endif
+#include "fpdf_resource.h"
+
class CPDF_Path;
class CPDF_ClipPathData;
class CPDF_ClipPath;
@@ -717,4 +715,5 @@ protected:
virtual void Transform(const CFX_AffineMatrix& matrix) {}
virtual void CopyData(const CPDF_PageObject* pSrcObjet) {}
};
-#endif
+
+#endif // CORE_INCLUDE_FPDFAPI_FPDF_PAGEOBJ_H_
diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h
index 20766702e2..0dc9ca64a3 100644
--- a/core/include/fpdfapi/fpdf_parser.h
+++ b/core/include/fpdfapi/fpdf_parser.h
@@ -4,14 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FPDF_PARSER_
-#define _FPDF_PARSER_
-#ifndef _FX_BASIC_H_
+#ifndef CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_
+#define CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_
+
#include "../fxcrt/fx_ext.h"
-#endif
-#ifndef _FPDF_OBJECTS_
#include "fpdf_objects.h"
-#endif
+
class CPDF_Document;
class IPDF_DocParser;
class CPDF_Parser;
@@ -947,4 +945,5 @@ enum PDF_DATAAVAIL_STATUS {
PDF_DATAAVAIL_LOADALLFILE,
PDF_DATAAVAIL_TRAILER_APPEND
};
-#endif
+
+#endif // CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_
diff --git a/core/include/fpdfapi/fpdf_render.h b/core/include/fpdfapi/fpdf_render.h
index 2028550546..714fffba5c 100644
--- a/core/include/fpdfapi/fpdf_render.h
+++ b/core/include/fpdfapi/fpdf_render.h
@@ -4,14 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FPDF_RENDER_
-#define _FPDF_RENDER_
-#ifndef _FPDF_PAGE_
-#include "fpdf_page.h"
-#endif
-#ifndef _FX_GE_H_
+#ifndef CORE_INCLUDE_FPDFAPI_FPDF_RENDER_H_
+#define CORE_INCLUDE_FPDFAPI_FPDF_RENDER_H_
+
#include "../fxge/fx_ge.h"
-#endif
+#include "fpdf_page.h"
+
class CPDF_RenderContext;
class CPDF_RenderOptions;
class CPDF_ImageCache;
@@ -315,4 +313,5 @@ public:
int m_HalftoneLimit;
int m_RenderStepLimit;
};
-#endif
+
+#endif // CORE_INCLUDE_FPDFAPI_FPDF_RENDER_H_
diff --git a/core/include/fpdfapi/fpdf_resource.h b/core/include/fpdfapi/fpdf_resource.h
index 4a85096900..f1ea6b5a23 100644
--- a/core/include/fpdfapi/fpdf_resource.h
+++ b/core/include/fpdfapi/fpdf_resource.h
@@ -4,14 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FPDF_RESOURCE_
-#define _FPDF_RESOURCE_
-#ifndef _FPDF_PARSER_
-#include "fpdf_parser.h"
-#endif
-#ifndef _FX_FONT_H_
+#ifndef CORE_INCLUDE_FPDFAPI_FPDF_RESOURCE_H_
+#define CORE_INCLUDE_FPDFAPI_FPDF_RESOURCE_H_
+
#include "../fxge/fx_font.h"
-#endif
+#include "fpdf_parser.h"
+
class CPDF_Font;
class CPDF_Type1Font;
class CPDF_TrueTypeFont;
@@ -946,4 +944,5 @@ private:
CPDF_Dictionary* m_pOC;
CPDF_Dictionary* InitJPEG(FX_LPBYTE pData, FX_DWORD size);
};
-#endif
+
+#endif // CORE_INCLUDE_FPDFAPI_FPDF_RESOURCE_H_
diff --git a/core/include/fpdfapi/fpdf_serial.h b/core/include/fpdfapi/fpdf_serial.h
index 50e5fbc346..fc55fa08a9 100644
--- a/core/include/fpdfapi/fpdf_serial.h
+++ b/core/include/fpdfapi/fpdf_serial.h
@@ -4,14 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FPDF_SERIAL_
-#define _FPDF_SERIAL_
-#ifndef _FPDF_PAGE_
+#ifndef CORE_INCLUDE_FPDFAPI_FPDF_SERIAL_H_
+#define CORE_INCLUDE_FPDFAPI_FPDF_SERIAL_H_
+
#include "fpdf_page.h"
-#endif
-#ifndef _FPDF_PAGEOBJ_H_
#include "fpdf_pageobj.h"
-#endif
+
class CPDF_ObjectStream;
class CPDF_XRefStream;
CFX_ByteTextBuf& operator << (CFX_ByteTextBuf& buf, const CPDF_Object* pObj);
@@ -202,4 +200,5 @@ protected:
friend class CPDF_ObjectStream;
friend class CPDF_XRefStream;
};
-#endif
+
+#endif // CORE_INCLUDE_FPDFAPI_FPDF_SERIAL_H_
diff --git a/core/include/fpdfapi/fpdfapi.h b/core/include/fpdfapi/fpdfapi.h
index a2f715d71b..e432823c7a 100644
--- a/core/include/fpdfapi/fpdfapi.h
+++ b/core/include/fpdfapi/fpdfapi.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef FPDFAPI_H_
-#define FPDFAPI_H_
+#ifndef CORE_INCLUDE_FPDFAPI_FPDFAPI_H_
+#define CORE_INCLUDE_FPDFAPI_FPDFAPI_H_
#include "../fxcrt/fx_basic.h"
#include "../fxge/fx_ge.h"
@@ -14,4 +14,4 @@
#include "fpdf_render.h"
#include "fpdf_serial.h"
-#endif // FPDFAPI_H_
+#endif // CORE_INCLUDE_FPDFAPI_FPDFAPI_H_
diff --git a/core/include/fpdfdoc/fpdf_ap.h b/core/include/fpdfdoc/fpdf_ap.h
index 02bbf249c4..39daf028ac 100644
--- a/core/include/fpdfdoc/fpdf_ap.h
+++ b/core/include/fpdfdoc/fpdf_ap.h
@@ -4,12 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FPDF_AP_H_
-#define _FPDF_AP_H_
+#ifndef CORE_INCLUDE_FPDFDOC_FPDF_AP_H_
+#define CORE_INCLUDE_FPDFDOC_FPDF_AP_H_
#include "../fxcrt/fx_basic.h"
#include "../fpdfapi/fpdf_parser.h"
#include "fpdf_vt.h"
+
class IPVT_FontMap
{
public:
@@ -92,4 +93,4 @@ public:
static CFX_ByteString GenerateColorAP(const CPVT_Color & color, const FX_BOOL & bFillOrStroke);
};
-#endif // _FPDF_AP_H_
+#endif // CORE_INCLUDE_FPDFDOC_FPDF_AP_H_
diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h
index 254ce3b94d..801ed2a1a9 100644
--- a/core/include/fpdfdoc/fpdf_doc.h
+++ b/core/include/fpdfdoc/fpdf_doc.h
@@ -4,14 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FPDF_DOC_H_
-#define _FPDF_DOC_H_
-#ifndef _FPDF_PARSER_
+#ifndef CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_
+#define CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_
+
#include "../fpdfapi/fpdf_parser.h"
-#endif
-#ifndef _FPDF_RENDER_
#include "../fpdfapi/fpdf_render.h"
-#endif
+
class CPDF_Action;
class CPDF_Annot;
class CPDF_AnnotList;
@@ -1752,4 +1750,5 @@ protected:
CPDF_Stream* GetIcon(FX_BSTR csEntry);
friend class CPDF_FormControl;
};
-#endif
+
+#endif // CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_
diff --git a/core/include/fpdfdoc/fpdf_tagged.h b/core/include/fpdfdoc/fpdf_tagged.h
index a5862e0a8f..2c40ac176d 100644
--- a/core/include/fpdfdoc/fpdf_tagged.h
+++ b/core/include/fpdfdoc/fpdf_tagged.h
@@ -4,8 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FPDF_TAGGED_H_
-#define _FPDF_TAGGED_H_
+#ifndef CORE_INCLUDE_FPDFDOC_FPDF_TAGGED_H_
+#define CORE_INCLUDE_FPDFDOC_FPDF_TAGGED_H_
+
class CPDF_StructTree;
class CPDF_StructElement;
struct CPDF_StructKid;
@@ -97,4 +98,5 @@ public:
virtual int GetInteger(FX_BSTR owner, FX_BSTR name, int default_value, FX_BOOL bInheritable = FALSE, int subindex = -1) = 0;
};
-#endif
+
+#endif // CORE_INCLUDE_FPDFDOC_FPDF_TAGGED_H_
diff --git a/core/include/fpdfdoc/fpdf_vt.h b/core/include/fpdfdoc/fpdf_vt.h
index 18ea709bcf..87ef02576b 100644
--- a/core/include/fpdfdoc/fpdf_vt.h
+++ b/core/include/fpdfdoc/fpdf_vt.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FPDF_VT_H_
-#define _FPDF_VT_H_
+#ifndef CORE_INCLUDE_FPDFDOC_FPDF_VT_H_
+#define CORE_INCLUDE_FPDFDOC_FPDF_VT_H_
#include "../fpdfapi/fpdf_parser.h"
#include "../fxcrt/fx_basic.h"
@@ -448,4 +448,5 @@ public:
protected:
~IPDF_VariableText() { }
};
-#endif
+
+#endif // CORE_INCLUDE_FPDFDOC_FPDF_VT_H_
diff --git a/core/include/fpdftext/fpdf_text.h b/core/include/fpdftext/fpdf_text.h
index 8673c1aac1..936e0f1722 100644
--- a/core/include/fpdftext/fpdf_text.h
+++ b/core/include/fpdftext/fpdf_text.h
@@ -4,17 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FPDF_TEXT_H_
-#define _FPDF_TEXT_H_
-#ifndef _FPDF_PARSER_
-#include "../fpdfapi/fpdf_parser.h"
-#endif
-#ifndef _FPDF_PAGEOBJ_H_
-#include "../fpdfapi/fpdf_pageobj.h"
-#endif
-#ifndef _FPDF_PAGE_
+#ifndef CORE_INCLUDE_FPDFTEXT_FPDF_TEXT_H_
+#define CORE_INCLUDE_FPDFTEXT_FPDF_TEXT_H_
+
#include "../fpdfapi/fpdf_page.h"
-#endif
+#include "../fpdfapi/fpdf_pageobj.h"
+#include "../fpdfapi/fpdf_parser.h"
+
class CPDF_PageObjects;
#define PDF2TXT_AUTO_ROTATE 1
#define PDF2TXT_AUTO_WIDTH 2
@@ -170,4 +166,5 @@ public:
virtual void GetRects(int index, CFX_RectArray& rects) const = 0;
};
-#endif
+
+#endif // CORE_INCLUDE_FPDFTEXT_FPDF_TEXT_H_
diff --git a/core/include/fxcodec/fx_codec.h b/core/include/fxcodec/fx_codec.h
index 3a00fd3835..6a62c2d12c 100644
--- a/core/include/fxcodec/fx_codec.h
+++ b/core/include/fxcodec/fx_codec.h
@@ -4,13 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FX_CODEC_H_
-#define _FX_CODEC_H_
-#ifndef _FXCRT_EXTENSION_
+#ifndef CORE_INCLUDE_FXCODEC_FX_CODEC_H_
+#define CORE_INCLUDE_FXCODEC_FX_CODEC_H_
+
#include "../fxcrt/fx_ext.h"
-#endif
#include "fx_codec_def.h"
#include "fx_codec_provider.h"
+
class CFX_DIBSource;
class ICodec_ScanlineDecoder;
class ICodec_ProgressiveDecoder;
@@ -468,4 +468,5 @@ public:
virtual ~IFX_DIBAttributeExif() {};
virtual FX_BOOL GetInfo(FX_WORD tag, FX_LPVOID val) = 0;
};
-#endif
+
+#endif // CORE_INCLUDE_FXCODEC_FX_CODEC_H_
diff --git a/core/include/fxcodec/fx_codec_def.h b/core/include/fxcodec/fx_codec_def.h
index 7a18f5be09..a98c61a4c5 100644
--- a/core/include/fxcodec/fx_codec_def.h
+++ b/core/include/fxcodec/fx_codec_def.h
@@ -4,8 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FX_CODEC_DEF_H_
-#define _FX_CODEC_DEF_H_
+#ifndef CORE_INCLUDE_FXCODEC_FX_CODEC_DEF_H_
+#define CORE_INCLUDE_FXCODEC_FX_CODEC_DEF_H_
+
enum FXCODEC_IMAGE_TYPE {
FXCODEC_IMAGE_UNKNOWN = 0,
FXCODEC_IMAGE_BMP,
@@ -83,4 +84,5 @@ enum FXCODEC_RESUNIT {
#define EXIFTAG_STRING_IAMGEDESCRIPTION 270
#define EXIFTAG_STRING_DATETIME 306
#define EXIFTAG_STRING_COPYRIGHT 33432
-#endif
+
+#endif // CORE_INCLUDE_FXCODEC_FX_CODEC_DEF_H_
diff --git a/core/include/fxcodec/fx_codec_provider.h b/core/include/fxcodec/fx_codec_provider.h
index 00792ff2ad..8d2b4980ec 100644
--- a/core/include/fxcodec/fx_codec_provider.h
+++ b/core/include/fxcodec/fx_codec_provider.h
@@ -4,8 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FX_CODEC_PROVIDER_H_
-#define _FX_CODEC_PROVIDER_H_
+#ifndef CORE_INCLUDE_FXCODEC_FX_CODEC_PROVIDER_H_
+#define CORE_INCLUDE_FXCODEC_FX_CODEC_PROVIDER_H_
+
class CFX_DIBAttribute;
class IFX_JpegProvider
{
@@ -52,4 +53,5 @@ public:
protected:
~IFX_JpegProvider() { }
};
-#endif
+
+#endif // CORE_INCLUDE_FXCODEC_FX_CODEC_PROVIDER_H_
diff --git a/core/include/fxcrt/fx_arb.h b/core/include/fxcrt/fx_arb.h
index e61c0cc456..8c2a8eba42 100644
--- a/core/include/fxcrt/fx_arb.h
+++ b/core/include/fxcrt/fx_arb.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FX_ARABIC_
-#define _FX_ARABIC_
+#ifndef CORE_INCLUDE_FXCRT_FX_ARB_H_
+#define CORE_INCLUDE_FXCRT_FX_ARB_H_
#include "fx_system.h"
#include "fx_ucd.h"
@@ -72,4 +72,5 @@ public:
protected:
~IFX_BidiChar() { }
};
-#endif
+
+#endif // CORE_INCLUDE_FXCRT_FX_ARB_H_
diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h
index 7c25b237ad..111e0d3876 100644
--- a/core/include/fxcrt/fx_basic.h
+++ b/core/include/fxcrt/fx_basic.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FX_BASIC_H_
-#define _FX_BASIC_H_
+#ifndef CORE_INCLUDE_FXCRT_FX_BASIC_H_
+#define CORE_INCLUDE_FXCRT_FX_BASIC_H_
#include "fx_memory.h"
#include "fx_stream.h"
@@ -1626,4 +1626,4 @@ public:
FX_FLOAT i;
};
-#endif
+#endif // CORE_INCLUDE_FXCRT_FX_BASIC_H_
diff --git a/core/include/fxcrt/fx_coordinates.h b/core/include/fxcrt/fx_coordinates.h
index 758d33762e..076c0e6a2f 100644
--- a/core/include/fxcrt/fx_coordinates.h
+++ b/core/include/fxcrt/fx_coordinates.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FXCRT_COORDINATES_
-#define _FXCRT_COORDINATES_
+#ifndef CORE_INCLUDE_FXCRT_FX_COORDINATES_H_
+#define CORE_INCLUDE_FXCRT_FX_COORDINATES_H_
#include "fx_basic.h"
@@ -903,4 +903,5 @@ public:
FX_FLOAT f;
};
#define CFX_AffineMatrix CFX_Matrix
-#endif
+
+#endif // CORE_INCLUDE_FXCRT_FX_COORDINATES_H_
diff --git a/core/include/fxcrt/fx_ext.h b/core/include/fxcrt/fx_ext.h
index c9c4447be3..97c47df6f6 100644
--- a/core/include/fxcrt/fx_ext.h
+++ b/core/include/fxcrt/fx_ext.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FXCRT_EXTENSION_
-#define _FXCRT_EXTENSION_
+#ifndef CORE_INCLUDE_FXCRT_FX_EXT_H_
+#define CORE_INCLUDE_FXCRT_FX_EXT_H_
#include "fx_arb.h"
#include "fx_basic.h"
@@ -108,4 +108,5 @@ public:
}
}
};
-#endif
+
+#endif // CORE_INCLUDE_FXCRT_FX_EXT_H_
diff --git a/core/include/fxcrt/fx_memory.h b/core/include/fxcrt/fx_memory.h
index e4b6e98039..03df3647b0 100644
--- a/core/include/fxcrt/fx_memory.h
+++ b/core/include/fxcrt/fx_memory.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FX_MEMORY_H_
-#define _FX_MEMORY_H_
+#ifndef CORE_INCLUDE_FXCRT_FX_MEMORY_H_
+#define CORE_INCLUDE_FXCRT_FX_MEMORY_H_
#include "fx_system.h"
@@ -117,5 +117,6 @@ private:
void* m_pFirstTrunk;
};
-#endif // __cplusplust
-#endif // _FX_MEMORY_H_
+#endif // __cplusplus
+
+#endif // CORE_INCLUDE_FXCRT_FX_MEMORY_H_
diff --git a/core/include/fxcrt/fx_stream.h b/core/include/fxcrt/fx_stream.h
index dc162f064f..35c54cb3d2 100644
--- a/core/include/fxcrt/fx_stream.h
+++ b/core/include/fxcrt/fx_stream.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FX_STREAM_H_
-#define _FX_STREAM_H_
+#ifndef CORE_INCLUDE_FXCRT_FX_STREAM_H_
+#define CORE_INCLUDE_FXCRT_FX_STREAM_H_
#include "fx_memory.h"
#include "fx_string.h"
@@ -209,4 +209,5 @@ public:
virtual FX_FILESIZE GetBlockOffset() = 0;
};
-#endif
+
+#endif // CORE_INCLUDE_FXCRT_FX_STREAM_H_
diff --git a/core/include/fxcrt/fx_string.h b/core/include/fxcrt/fx_string.h
index 3614cbe0ee..efbe80accb 100644
--- a/core/include/fxcrt/fx_string.h
+++ b/core/include/fxcrt/fx_string.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FX_STRING_H_
-#define _FX_STRING_H_
+#ifndef CORE_INCLUDE_FXCRT_FX_STRING_H_
+#define CORE_INCLUDE_FXCRT_FX_STRING_H_
#include <stdint.h> // For intptr_t.
#include <algorithm>
@@ -902,4 +902,5 @@ inline CFX_ByteString FX_UTF8Encode(const CFX_WideString &wsStr)
{
return FX_UTF8Encode(wsStr.c_str(), wsStr.GetLength());
}
-#endif
+
+#endif // CORE_INCLUDE_FXCRT_FX_STRING_H_
diff --git a/core/include/fxcrt/fx_system.h b/core/include/fxcrt/fx_system.h
index 96030ca551..76c6b59a52 100644
--- a/core/include/fxcrt/fx_system.h
+++ b/core/include/fxcrt/fx_system.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FX_SYSTEM_H_
-#define _FX_SYSTEM_H_
+#ifndef CORE_INCLUDE_FXCRT_FX_SYSTEM_H_
+#define CORE_INCLUDE_FXCRT_FX_SYSTEM_H_
#define _FX_WIN32_DESKTOP_ 1
#define _FX_LINUX_DESKTOP_ 4
@@ -359,4 +359,4 @@ int FXSYS_round(FX_FLOAT f);
#define NEVER_INLINE __attribute__((__noinline__))
#endif // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
-#endif // _FX_SYSTEM_H_
+#endif // CORE_INCLUDE_FXCRT_FX_SYSTEM_H_
diff --git a/core/include/fxcrt/fx_ucd.h b/core/include/fxcrt/fx_ucd.h
index 66e980e13c..42ab623afb 100644
--- a/core/include/fxcrt/fx_ucd.h
+++ b/core/include/fxcrt/fx_ucd.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FX_UNICODE_
-#define _FX_UNICODE_
+#ifndef CORE_INCLUDE_FXCRT_FX_UCD_H_
+#define CORE_INCLUDE_FXCRT_FX_UCD_H_
#include "fx_basic.h"
@@ -197,4 +197,5 @@ public:
IFX_Unknown *m_pUserData;
};
typedef CFX_ArrayTemplate<CFX_RTFChar> CFX_RTFCharArray;
-#endif
+
+#endif // CORE_INCLUDE_FXCRT_FX_UCD_H_
diff --git a/core/include/fxcrt/fx_xml.h b/core/include/fxcrt/fx_xml.h
index 7f3dbcc205..b2fb24c6df 100644
--- a/core/include/fxcrt/fx_xml.h
+++ b/core/include/fxcrt/fx_xml.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FX_XML_H_
-#define _FX_XML_H_
+#ifndef CORE_INCLUDE_FXCRT_FX_XML_H_
+#define CORE_INCLUDE_FXCRT_FX_XML_H_
#include "fx_basic.h"
@@ -176,4 +176,5 @@ protected:
friend class CXML_Parser;
friend class CXML_Composer;
};
-#endif
+
+#endif // CORE_INCLUDE_FXCRT_FX_XML_H_
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 adf7e6251c..3d2d99cfd8 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"
@@ -473,4 +473,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_
diff --git a/core/include/reflow/fpdf_layout.h b/core/include/reflow/fpdf_layout.h
index fc01ba30c8..ebd879c764 100644
--- a/core/include/reflow/fpdf_layout.h
+++ b/core/include/reflow/fpdf_layout.h
@@ -4,8 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FPDFAPI_LAYOUT_H_
-#define _FPDFAPI_LAYOUT_H_
+#ifndef CORE_INCLUDE_REFLOW_FPDF_LAYOUT_H_
+#define CORE_INCLUDE_REFLOW_FPDF_LAYOUT_H_
+
class IPDF_LayoutElement;
class IPDF_LayoutProcessor;
class IPDF_LayoutProvider;
@@ -277,4 +278,4 @@ public:
virtual IPDF_LayoutElement* GetRoot() = 0;
};
-#endif
+#endif // CORE_INCLUDE_REFLOW_FPDF_LAYOUT_H_
diff --git a/core/include/reflow/reflowengine.h b/core/include/reflow/reflowengine.h
index e6a5265db3..af3c943e97 100644
--- a/core/include/reflow/reflowengine.h
+++ b/core/include/reflow/reflowengine.h
@@ -4,13 +4,15 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _REFLOW_ENGINE_H
-#define _REFLOW_ENGINE_H
+#ifndef CORE_INCLUDE_REFLOW_REFLOWENGINE_H_
+#define CORE_INCLUDE_REFLOW_REFLOWENGINE_H_
+
+#include "../fpdfapi/fpdf_pageobj.h"
#include "../fpdfapi/fpdf_render.h"
+#include "../fpdfdoc/fpdf_tagged.h"
#include "../fpdftext/fpdf_text.h"
#include "fpdf_layout.h"
-#include "../fpdfapi/fpdf_pageobj.h"
-#include "../fpdfdoc/fpdf_tagged.h"
+
class IPDF_ReflowedPage
{
public:
@@ -73,4 +75,5 @@ public:
IPDF_ReflowedPage* Create_ReflowPage();
IPDF_ProgressiveReflowPageParser* Create_ReflowPageParser();
IPDF_ProgressiveReflowPageRender* Create_ReflowPageRender();
-#endif
+
+#endif // CORE_INCLUDE_REFLOW_REFLOWENGINE_H_