From c7cd809fccd7c5f90c8a2db7ddec7289f9630f53 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 18 Feb 2016 15:02:55 -0500 Subject: 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 . --- xfa/src/fxfa/src/app/xfa_checksum.h | 8 +++++--- xfa/src/fxfa/src/app/xfa_ffConfigAcc.h | 8 +++++--- xfa/src/fxfa/src/app/xfa_ffapp.h | 6 +++--- xfa/src/fxfa/src/app/xfa_ffbarcode.h | 8 +++++--- xfa/src/fxfa/src/app/xfa_ffcheckbutton.h | 8 +++++--- xfa/src/fxfa/src/app/xfa_ffchoicelist.h | 8 +++++--- xfa/src/fxfa/src/app/xfa_ffdoc.h | 6 +++--- xfa/src/fxfa/src/app/xfa_ffdochandler.h | 6 +++--- xfa/src/fxfa/src/app/xfa_ffdocview.h | 6 +++--- xfa/src/fxfa/src/app/xfa_ffdraw.h | 8 +++++--- xfa/src/fxfa/src/app/xfa_ffexclgroup.h | 8 +++++--- xfa/src/fxfa/src/app/xfa_fffield.h | 8 +++++--- xfa/src/fxfa/src/app/xfa_ffimage.h | 8 +++++--- xfa/src/fxfa/src/app/xfa_ffimageedit.h | 8 +++++--- xfa/src/fxfa/src/app/xfa_ffnotify.h | 8 +++++--- xfa/src/fxfa/src/app/xfa_ffpageview.h | 8 +++++--- xfa/src/fxfa/src/app/xfa_ffpath.h | 8 +++++--- xfa/src/fxfa/src/app/xfa_ffpushbutton.h | 8 +++++--- xfa/src/fxfa/src/app/xfa_ffsignature.h | 8 +++++--- xfa/src/fxfa/src/app/xfa_ffsubform.h | 10 +++++----- xfa/src/fxfa/src/app/xfa_fftext.h | 8 +++++--- xfa/src/fxfa/src/app/xfa_fftextedit.h | 6 +++--- xfa/src/fxfa/src/app/xfa_ffwidget.h | 6 +++--- xfa/src/fxfa/src/app/xfa_ffwidgetacc.h | 9 ++++++--- xfa/src/fxfa/src/app/xfa_ffwidgethandler.h | 6 +++--- xfa/src/fxfa/src/app/xfa_fontmgr.h | 6 +++--- xfa/src/fxfa/src/app/xfa_fwladapter.h | 8 +++++--- xfa/src/fxfa/src/app/xfa_fwltheme.h | 8 +++++--- xfa/src/fxfa/src/app/xfa_rendercontext.h | 8 +++++--- xfa/src/fxfa/src/app/xfa_textlayout.h | 8 +++++--- xfa/src/fxfa/src/common/fxfa_localevalue.h | 8 +++++--- xfa/src/fxfa/src/common/xfa_common.h | 8 +++++--- xfa/src/fxfa/src/common/xfa_docdata.h | 8 +++++--- xfa/src/fxfa/src/common/xfa_doclayout.h | 8 +++++--- xfa/src/fxfa/src/common/xfa_document.h | 7 ++++--- xfa/src/fxfa/src/common/xfa_fm2jsapi.h | 11 ++++++++--- xfa/src/fxfa/src/common/xfa_localemgr.h | 8 +++++--- xfa/src/fxfa/src/common/xfa_object.h | 6 +++--- xfa/src/fxfa/src/common/xfa_parser.h | 8 +++++--- xfa/src/fxfa/src/common/xfa_script.h | 8 +++++--- xfa/src/fxfa/src/common/xfa_utils.h | 8 +++++--- xfa/src/fxfa/src/fm2js/xfa_error.h | 8 +++++--- xfa/src/fxfa/src/fm2js/xfa_expression.h | 8 +++++--- xfa/src/fxfa/src/fm2js/xfa_fm2js.h | 8 +++++--- xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h | 8 +++++--- xfa/src/fxfa/src/fm2js/xfa_fmparse.h | 6 +++--- xfa/src/fxfa/src/fm2js/xfa_lexer.h | 6 +++--- xfa/src/fxfa/src/fm2js/xfa_program.h | 8 +++++--- xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h | 8 +++++--- xfa/src/fxfa/src/parser/xfa_basic_imp.h | 9 ++++++--- xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.h | 8 +++++--- xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h | 8 +++++--- xfa/src/fxfa/src/parser/xfa_document_layout_imp.h | 8 +++++--- xfa/src/fxfa/src/parser/xfa_document_serialize.h | 8 +++++--- xfa/src/fxfa/src/parser/xfa_layout_appadapter.h | 8 +++++--- xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h | 8 +++++--- xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h | 8 +++++--- xfa/src/fxfa/src/parser/xfa_locale.h | 8 +++++--- xfa/src/fxfa/src/parser/xfa_parser_imp.h | 8 +++++--- xfa/src/fxfa/src/parser/xfa_script_datawindow.h | 8 +++++--- xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h | 8 +++++--- xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h | 8 +++++--- xfa/src/fxfa/src/parser/xfa_script_imp.h | 6 +++--- xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h | 8 +++++--- xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h | 8 +++++--- xfa/src/fxfa/src/parser/xfa_script_nodehelper.h | 8 +++++--- xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h | 8 +++++--- xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h | 8 +++++--- 68 files changed, 320 insertions(+), 206 deletions(-) (limited to 'xfa/src/fxfa') diff --git a/xfa/src/fxfa/src/app/xfa_checksum.h b/xfa/src/fxfa/src/app/xfa_checksum.h index 96c7fd222f..5927e5335f 100644 --- a/xfa/src/fxfa/src/app/xfa_checksum.h +++ b/xfa/src/fxfa/src/app/xfa_checksum.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFA_FORMFILLER_CHECKSUM_IMP_H -#define _FXFA_FORMFILLER_CHECKSUM_IMP_H +#ifndef XFA_SRC_FXFA_SRC_APP_XFA_CHECKSUM_H_ +#define XFA_SRC_FXFA_SRC_APP_XFA_CHECKSUM_H_ + class CXFA_SAXReaderHandler; class CXFA_ChecksumContext; class CXFA_SAXContext { @@ -63,4 +64,5 @@ class CXFA_ChecksumContext : public IXFA_ChecksumContext { uint8_t* m_pByteContext; CFX_ByteString m_bsChecksum; }; -#endif + +#endif // XFA_SRC_FXFA_SRC_APP_XFA_CHECKSUM_H_ diff --git a/xfa/src/fxfa/src/app/xfa_ffConfigAcc.h b/xfa/src/fxfa/src/app/xfa_ffConfigAcc.h index f41495b4e9..c26876a4e3 100644 --- a/xfa/src/fxfa/src/app/xfa_ffConfigAcc.h +++ b/xfa/src/fxfa/src/app/xfa_ffConfigAcc.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFA_FORMFILLERCONFIGACC_IMP_H -#define _FXFA_FORMFILLERCONFIGACC_IMP_H +#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFCONFIGACC_H_ +#define XFA_SRC_FXFA_SRC_APP_XFA_FFCONFIGACC_H_ + class CXFA_FFConfigAcc { public: CXFA_FFConfigAcc(CXFA_Node* pNode); @@ -22,4 +23,5 @@ class CXFA_FFConfigAcc { CXFA_Node* m_pNode; CXFA_Node* m_pPsMapNode; }; -#endif + +#endif // XFA_SRC_FXFA_SRC_APP_XFA_FFCONFIGACC_H_ diff --git a/xfa/src/fxfa/src/app/xfa_ffapp.h b/xfa/src/fxfa/src/app/xfa_ffapp.h index 515e192430..2b04782108 100644 --- a/xfa/src/fxfa/src/app/xfa_ffapp.h +++ b/xfa/src/fxfa/src/app/xfa_ffapp.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FFAPP_H_ -#define XFA_FFAPP_H_ +#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFAPP_H_ +#define XFA_SRC_FXFA_SRC_APP_XFA_FFAPP_H_ class CXFA_FileRead : public IFX_FileRead { public: @@ -69,4 +69,4 @@ class CXFA_FFApp : public IXFA_App, public IFWL_AdapterNative { CFWL_SDAdapterThreadMgr* m_pAdapterThreadMgr; }; -#endif // XFA_FFAPP_H_ +#endif // XFA_SRC_FXFA_SRC_APP_XFA_FFAPP_H_ diff --git a/xfa/src/fxfa/src/app/xfa_ffbarcode.h b/xfa/src/fxfa/src/app/xfa_ffbarcode.h index 0d52486d16..58826869b5 100644 --- a/xfa/src/fxfa/src/app/xfa_ffbarcode.h +++ b/xfa/src/fxfa/src/app/xfa_ffbarcode.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFA_FORMFILLER_BARCODE_IMP_H -#define _FXFA_FORMFILLER_BARCODE_IMP_H +#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFBARCODE_H_ +#define XFA_SRC_FXFA_SRC_APP_XFA_FFBARCODE_H_ + class CXFA_FFTextEdit; class CXFA_FFBarcode : public CXFA_FFTextEdit { public: @@ -92,4 +93,5 @@ struct XFA_BARCODETYPEENUMINFO { }; typedef XFA_BARCODETYPEENUMINFO const* XFA_LPCBARCODETYPEENUMINFO; extern const XFA_BARCODETYPEENUMINFO g_XFABarCodeTypeEnumData[]; -#endif + +#endif // XFA_SRC_FXFA_SRC_APP_XFA_FFBARCODE_H_ diff --git a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.h b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.h index fc05aefbc9..38b0184384 100644 --- a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.h +++ b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFA_FORMFILLER_CHECKBUTTON_IMP_H -#define _FXFA_FORMFILLER_CHECKBUTTON_IMP_H +#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFCHECKBUTTON_H_ +#define XFA_SRC_FXFA_SRC_APP_XFA_FFCHECKBUTTON_H_ + class CXFA_FFExclGroup; class CXFA_FFCheckButton : public CXFA_FFField { public: @@ -36,4 +37,5 @@ class CXFA_FFCheckButton : public CXFA_FFField { IFWL_WidgetDelegate* m_pOldDelegate; CFX_RectF m_rtCheckBox; }; -#endif + +#endif // XFA_SRC_FXFA_SRC_APP_XFA_FFCHECKBUTTON_H_ diff --git a/xfa/src/fxfa/src/app/xfa_ffchoicelist.h b/xfa/src/fxfa/src/app/xfa_ffchoicelist.h index b8140b33d5..3646dc826f 100644 --- a/xfa/src/fxfa/src/app/xfa_ffchoicelist.h +++ b/xfa/src/fxfa/src/app/xfa_ffchoicelist.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFA_FORMFILLER_CHOICELIST_IMP_H -#define _FXFA_FORMFILLER_CHOICELIST_IMP_H +#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFCHOICELIST_H_ +#define XFA_SRC_FXFA_SRC_APP_XFA_FFCHOICELIST_H_ + class CXFA_FFListBox : public CXFA_FFField { public: CXFA_FFListBox(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc); @@ -88,4 +89,5 @@ class CXFA_FFComboBox : public CXFA_FFField { protected: IFWL_WidgetDelegate* m_pOldDelegate; }; -#endif + +#endif // XFA_SRC_FXFA_SRC_APP_XFA_FFCHOICELIST_H_ diff --git a/xfa/src/fxfa/src/app/xfa_ffdoc.h b/xfa/src/fxfa/src/app/xfa_ffdoc.h index f5e6f95250..e2e5bec9ef 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdoc.h +++ b/xfa/src/fxfa/src/app/xfa_ffdoc.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FXFA_SRC_APP_XFA_FFDOC_H_ -#define FXFA_SRC_APP_XFA_FFDOC_H_ +#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFDOC_H_ +#define XFA_SRC_FXFA_SRC_APP_XFA_FFDOC_H_ #include "xfa/include/fxfa/fxfa.h" @@ -61,4 +61,4 @@ class CXFA_FFDoc : public IXFA_Doc { FX_BOOL m_bOwnStream; }; -#endif // FXFA_SRC_APP_XFA_FFDOC_H_ +#endif // XFA_SRC_FXFA_SRC_APP_XFA_FFDOC_H_ diff --git a/xfa/src/fxfa/src/app/xfa_ffdochandler.h b/xfa/src/fxfa/src/app/xfa_ffdochandler.h index 4fdf849bf7..36fb149cca 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdochandler.h +++ b/xfa/src/fxfa/src/app/xfa_ffdochandler.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FFDOCHANDLER_H_ -#define XFA_FFDOCHANDLER_H_ +#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFDOCHANDLER_H_ +#define XFA_SRC_FXFA_SRC_APP_XFA_FFDOCHANDLER_H_ class CXFA_FFDocHandler : public IXFA_DocHandler { public: @@ -45,4 +45,4 @@ class CXFA_FFDocHandler : public IXFA_DocHandler { protected: }; -#endif // XFA_FFDOCHANDLER_H_ +#endif // XFA_SRC_FXFA_SRC_APP_XFA_FFDOCHANDLER_H_ diff --git a/xfa/src/fxfa/src/app/xfa_ffdocview.h b/xfa/src/fxfa/src/app/xfa_ffdocview.h index df709251ca..511302119d 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdocview.h +++ b/xfa/src/fxfa/src/app/xfa_ffdocview.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FXFA_SRC_APP_XFA_FFDOCVIEW_H_ -#define FXFA_SRC_APP_XFA_FFDOCVIEW_H_ +#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFDOCVIEW_H_ +#define XFA_SRC_FXFA_SRC_APP_XFA_FFDOCVIEW_H_ #include "xfa_ffdoc.h" @@ -168,4 +168,4 @@ class CXFA_WidgetAccIterator : public IXFA_WidgetAccIterator { CXFA_WidgetAcc* m_pCurWidgetAcc; }; -#endif // FXFA_SRC_APP_XFA_FFDOCVIEW_H_ +#endif // XFA_SRC_FXFA_SRC_APP_XFA_FFDOCVIEW_H_ diff --git a/xfa/src/fxfa/src/app/xfa_ffdraw.h b/xfa/src/fxfa/src/app/xfa_ffdraw.h index 3833a845f4..fba7d4ed8a 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdraw.h +++ b/xfa/src/fxfa/src/app/xfa_ffdraw.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFA_FORMFILLER_DRAW_IMP_H -#define _FXFA_FORMFILLER_DRAW_IMP_H +#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFDRAW_H_ +#define XFA_SRC_FXFA_SRC_APP_XFA_FFDRAW_H_ + class CXFA_FFDraw : public CXFA_FFWidget { public: CXFA_FFDraw(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc); @@ -13,4 +14,5 @@ class CXFA_FFDraw : public CXFA_FFWidget { protected: }; -#endif + +#endif // XFA_SRC_FXFA_SRC_APP_XFA_FFDRAW_H_ diff --git a/xfa/src/fxfa/src/app/xfa_ffexclgroup.h b/xfa/src/fxfa/src/app/xfa_ffexclgroup.h index ba247674b5..2b6d39216e 100644 --- a/xfa/src/fxfa/src/app/xfa_ffexclgroup.h +++ b/xfa/src/fxfa/src/app/xfa_ffexclgroup.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFA_FORMFILLER_EXCLGROUP_IMP_H -#define _FXFA_FORMFILLER_EXCLGROUP_IMP_H +#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFEXCLGROUP_H_ +#define XFA_SRC_FXFA_SRC_APP_XFA_FFEXCLGROUP_H_ + class CXFA_FFExclGroup : public CXFA_FFWidget { public: CXFA_FFExclGroup(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc); @@ -18,4 +19,5 @@ class CXFA_FFExclGroup : public CXFA_FFWidget { protected: }; -#endif + +#endif // XFA_SRC_FXFA_SRC_APP_XFA_FFEXCLGROUP_H_ diff --git a/xfa/src/fxfa/src/app/xfa_fffield.h b/xfa/src/fxfa/src/app/xfa_fffield.h index 7b7d6a738d..eb4bd0348c 100644 --- a/xfa/src/fxfa/src/app/xfa_fffield.h +++ b/xfa/src/fxfa/src/app/xfa_fffield.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFA_FORMFILLER_FIELD_IMP_H -#define _FXFA_FORMFILLER_FIELD_IMP_H +#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFFIELD_H_ +#define XFA_SRC_FXFA_SRC_APP_XFA_FFFIELD_H_ + #define XFA_MINUI_HEIGHT 4.32f #define XFA_DEFAULTUI_HEIGHT 2.0f class CXFA_TextLayout; @@ -89,4 +90,5 @@ class CXFA_FFField : public CXFA_FFWidget, public IFWL_WidgetDelegate { CFX_RectF m_rtUI; CFX_RectF m_rtCaption; }; -#endif + +#endif // XFA_SRC_FXFA_SRC_APP_XFA_FFFIELD_H_ diff --git a/xfa/src/fxfa/src/app/xfa_ffimage.h b/xfa/src/fxfa/src/app/xfa_ffimage.h index 1cc47b5973..8bece23818 100644 --- a/xfa/src/fxfa/src/app/xfa_ffimage.h +++ b/xfa/src/fxfa/src/app/xfa_ffimage.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _XFA_DRAW_IMAGE_IMP_H -#define _XFA_DRAW_IMAGE_IMP_H +#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFIMAGE_H_ +#define XFA_SRC_FXFA_SRC_APP_XFA_FFIMAGE_H_ + class CXFA_FFImage : public CXFA_FFDraw { public: CXFA_FFImage(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc); @@ -18,4 +19,5 @@ class CXFA_FFImage : public CXFA_FFDraw { virtual FX_BOOL LoadWidget(); virtual void UnloadWidget(); }; -#endif + +#endif // XFA_SRC_FXFA_SRC_APP_XFA_FFIMAGE_H_ diff --git a/xfa/src/fxfa/src/app/xfa_ffimageedit.h b/xfa/src/fxfa/src/app/xfa_ffimageedit.h index 388585fe0a..09fc2e9c68 100644 --- a/xfa/src/fxfa/src/app/xfa_ffimageedit.h +++ b/xfa/src/fxfa/src/app/xfa_ffimageedit.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFA_FORMFILLER_IMAGEEDIT_IMP_H -#define _FXFA_FORMFILLER_IMAGEEDIT_IMP_H +#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFIMAGEEDIT_H_ +#define XFA_SRC_FXFA_SRC_APP_XFA_FFIMAGEEDIT_H_ + class CXFA_FFImageEdit : public CXFA_FFField { public: CXFA_FFImageEdit(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc); @@ -29,4 +30,5 @@ class CXFA_FFImageEdit : public CXFA_FFField { virtual FX_BOOL CommitData(); IFWL_WidgetDelegate* m_pOldDelegate; }; -#endif + +#endif // XFA_SRC_FXFA_SRC_APP_XFA_FFIMAGEEDIT_H_ diff --git a/xfa/src/fxfa/src/app/xfa_ffnotify.h b/xfa/src/fxfa/src/app/xfa_ffnotify.h index e49fe6579d..311d99b95d 100644 --- a/xfa/src/fxfa/src/app/xfa_ffnotify.h +++ b/xfa/src/fxfa/src/app/xfa_ffnotify.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFA_FFNOTIFY_H_ -#define _FXFA_FFNOTIFY_H_ +#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFNOTIFY_H_ +#define XFA_SRC_FXFA_SRC_APP_XFA_FFNOTIFY_H_ + class CXFA_FFNotify : public IXFA_Notify { public: CXFA_FFNotify(CXFA_FFDoc* pDoc); @@ -92,4 +93,5 @@ class CXFA_FFNotify : public IXFA_Notify { void* pParam2); CXFA_FFDoc* m_pDoc; }; -#endif + +#endif // XFA_SRC_FXFA_SRC_APP_XFA_FFNOTIFY_H_ diff --git a/xfa/src/fxfa/src/app/xfa_ffpageview.h b/xfa/src/fxfa/src/app/xfa_ffpageview.h index 457650d0ea..6d1926ea12 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpageview.h +++ b/xfa/src/fxfa/src/app/xfa_ffpageview.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFA_FORMFILLER_PAGEVIEW_IMP_H -#define _FXFA_FORMFILLER_PAGEVIEW_IMP_H +#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFPAGEVIEW_H_ +#define XFA_SRC_FXFA_SRC_APP_XFA_FFPAGEVIEW_H_ + class CXFA_FFWidget; class CXFA_FFDocView; class CXFA_FFPageView : public CXFA_ContainerLayoutItem, public IXFA_PageView { @@ -104,4 +105,5 @@ class CXFA_FFTabOrderPageWidgetIterator : public IXFA_WidgetIterator { FX_BOOL& bContentArea, FX_BOOL bMarsterPage = FALSE); }; -#endif + +#endif // XFA_SRC_FXFA_SRC_APP_XFA_FFPAGEVIEW_H_ diff --git a/xfa/src/fxfa/src/app/xfa_ffpath.h b/xfa/src/fxfa/src/app/xfa_ffpath.h index 457abe30d6..b970c989c4 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpath.h +++ b/xfa/src/fxfa/src/app/xfa_ffpath.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _XFA_DRAW_PATH_IMP_H -#define _XFA_DRAW_PATH_IMP_H +#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFPATH_H_ +#define XFA_SRC_FXFA_SRC_APP_XFA_FFPATH_H_ + class CXFA_FFLine : public CXFA_FFDraw { public: CXFA_FFLine(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc); @@ -36,4 +37,5 @@ class CXFA_FFRectangle : public CXFA_FFDraw { FX_DWORD dwStatus = 0, int32_t iRotate = 0); }; -#endif + +#endif // XFA_SRC_FXFA_SRC_APP_XFA_FFPATH_H_ diff --git a/xfa/src/fxfa/src/app/xfa_ffpushbutton.h b/xfa/src/fxfa/src/app/xfa_ffpushbutton.h index 96b71c5327..e3761d142f 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpushbutton.h +++ b/xfa/src/fxfa/src/app/xfa_ffpushbutton.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFA_FORMFILLER_PUSHBUTTON_IMP_H -#define _FXFA_FORMFILLER_PUSHBUTTON_IMP_H +#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFPUSHBUTTON_H_ +#define XFA_SRC_FXFA_SRC_APP_XFA_FFPUSHBUTTON_H_ + #define XFA_FWL_PSBSTYLEEXT_HiliteNone (0L << 0) #define XFA_FWL_PSBSTYLEEXT_HiliteInverted (1L << 0) #define XFA_FWL_PSBSTYLEEXT_HilitePush (2L << 0) @@ -40,4 +41,5 @@ class CXFA_FFPushButton : public CXFA_FFField { CXFA_TextProvider* m_pRollProvider; IFWL_WidgetDelegate* m_pOldDelegate; }; -#endif + +#endif // XFA_SRC_FXFA_SRC_APP_XFA_FFPUSHBUTTON_H_ diff --git a/xfa/src/fxfa/src/app/xfa_ffsignature.h b/xfa/src/fxfa/src/app/xfa_ffsignature.h index 36b1ddca39..79cc0ad407 100644 --- a/xfa/src/fxfa/src/app/xfa_ffsignature.h +++ b/xfa/src/fxfa/src/app/xfa_ffsignature.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFA_FORMFILLER_SIGNATURE_IMP_H -#define _FXFA_FORMFILLER_SIGNATURE_IMP_H +#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFSIGNATURE_H_ +#define XFA_SRC_FXFA_SRC_APP_XFA_FFSIGNATURE_H_ + class CXFA_FFSignature final : public CXFA_FFField { public: CXFA_FFSignature(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc); @@ -38,4 +39,5 @@ class CXFA_FFSignature final : public CXFA_FFField { protected: }; -#endif + +#endif // XFA_SRC_FXFA_SRC_APP_XFA_FFSIGNATURE_H_ diff --git a/xfa/src/fxfa/src/app/xfa_ffsubform.h b/xfa/src/fxfa/src/app/xfa_ffsubform.h index 8a6f069ca1..ae548cca7d 100644 --- a/xfa/src/fxfa/src/app/xfa_ffsubform.h +++ b/xfa/src/fxfa/src/app/xfa_ffsubform.h @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFA_FORMFILLER_SUBFORM_IMP_H -#define _FXFA_FORMFILLER_SUBFORM_IMP_H +#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFSUBFORM_H_ +#define XFA_SRC_FXFA_SRC_APP_XFA_FFSUBFORM_H_ + class CXFA_FFSubForm : public CXFA_FFWidget { public: CXFA_FFSubForm(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc); virtual ~CXFA_FFSubForm(); - - protected: }; -#endif + +#endif // XFA_SRC_FXFA_SRC_APP_XFA_FFSUBFORM_H_ diff --git a/xfa/src/fxfa/src/app/xfa_fftext.h b/xfa/src/fxfa/src/app/xfa_fftext.h index 5d8a4701a6..f4decf215e 100644 --- a/xfa/src/fxfa/src/app/xfa_fftext.h +++ b/xfa/src/fxfa/src/app/xfa_fftext.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFA_FORMFILLER_DRAWTEXT_IMP_H -#define _FXFA_FORMFILLER_DRAWTEXT_IMP_H +#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFTEXT_H_ +#define XFA_SRC_FXFA_SRC_APP_XFA_FFTEXT_H_ + class CXFA_TextLayout; class CXFA_FFText : public CXFA_FFDraw { public: @@ -26,4 +27,5 @@ class CXFA_FFText : public CXFA_FFDraw { virtual const FX_WCHAR* GetLinkURLAtPoint(FX_FLOAT fx, FX_FLOAT fy); void FWLToClient(FX_FLOAT& fx, FX_FLOAT& fy); }; -#endif + +#endif // XFA_SRC_FXFA_SRC_APP_XFA_FFTEXT_H_ diff --git a/xfa/src/fxfa/src/app/xfa_fftextedit.h b/xfa/src/fxfa/src/app/xfa_fftextedit.h index 0f99a69084..e6c11ca610 100644 --- a/xfa/src/fxfa/src/app/xfa_fftextedit.h +++ b/xfa/src/fxfa/src/app/xfa_fftextedit.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FFTEXTEDIT_H_ -#define XFA_FFTEXTEDIT_H_ +#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFTEXTEDIT_H_ +#define XFA_SRC_FXFA_SRC_APP_XFA_FFTEXTEDIT_H_ class CXFA_FFTextEdit : public CXFA_FFField { public: @@ -131,4 +131,4 @@ class CXFA_FFDateTimeEdit : public CXFA_FFTextEdit { virtual FWL_ERR OnProcessEvent(CFWL_Event* pEvent); }; -#endif // XFA_FFTEXTEDIT_H_ +#endif // XFA_SRC_FXFA_SRC_APP_XFA_FFTEXTEDIT_H_ diff --git a/xfa/src/fxfa/src/app/xfa_ffwidget.h b/xfa/src/fxfa/src/app/xfa_ffwidget.h index 8262be8c13..7b373b25e4 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidget.h +++ b/xfa/src/fxfa/src/app/xfa_ffwidget.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FFWIDGET_H_ -#define XFA_FFWIDGET_H_ +#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGET_H_ +#define XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGET_H_ #include @@ -186,4 +186,4 @@ void XFA_DrawBox(CXFA_Box box, CFX_Matrix* pMatrix, FX_DWORD dwFlags = 0); -#endif // XFA_FFWIDGET_H_ +#endif // XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGET_H_ diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.h b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.h index 4be5fadc20..7a8dd94bfe 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.h +++ b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.h @@ -4,9 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFA_FORMFILLER_WIDGETACC_IMP_H -#define _FXFA_FORMFILLER_WIDGETACC_IMP_H +#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGETACC_H_ +#define XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGETACC_H_ + #include "xfa_textlayout.h" + enum XFA_TEXTPROVIDERTYPE { XFA_TEXTPROVIDERTYPE_Text, XFA_TEXTPROVIDERTYPE_Datasets, @@ -38,4 +40,5 @@ class CXFA_TextProvider : public IXFA_TextProvider { XFA_TEXTPROVIDERTYPE m_eType; CXFA_Node* m_pTextNode; }; -#endif + +#endif // XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGETACC_H_ diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h index e6d7721b21..2f3453d84f 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h +++ b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FFWIDGETHANDLER_H_ -#define XFA_FFWIDGETHANDLER_H_ +#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGETHANDLER_H_ +#define XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGETHANDLER_H_ #include @@ -172,4 +172,4 @@ class CXFA_FFMenuHandler : public IXFA_MenuHandler { const CFX_ByteStringC& bsReplace); }; -#endif // XFA_FFWIDGETHANDLER_H_ +#endif // XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGETHANDLER_H_ diff --git a/xfa/src/fxfa/src/app/xfa_fontmgr.h b/xfa/src/fxfa/src/app/xfa_fontmgr.h index 84f59bc214..e3fb99e824 100644 --- a/xfa/src/fxfa/src/app/xfa_fontmgr.h +++ b/xfa/src/fxfa/src/app/xfa_fontmgr.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FONTMGR_H_ -#define XFA_FONTMGR_H_ +#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FONTMGR_H_ +#define XFA_SRC_FXFA_SRC_APP_XFA_FONTMGR_H_ #include @@ -90,4 +90,4 @@ class CXFA_FontMgr { std::map m_FontMap; }; -#endif // XFA_FONTMGR_H_ +#endif // XFA_SRC_FXFA_SRC_APP_XFA_FONTMGR_H_ diff --git a/xfa/src/fxfa/src/app/xfa_fwladapter.h b/xfa/src/fxfa/src/app/xfa_fwladapter.h index 2b05d1ec89..91210717c1 100644 --- a/xfa/src/fxfa/src/app/xfa_fwladapter.h +++ b/xfa/src/fxfa/src/app/xfa_fwladapter.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _XFA_FWL_ADAPTER_IMP_H -#define _XFA_FWL_ADAPTER_IMP_H +#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FWLADAPTER_H_ +#define XFA_SRC_FXFA_SRC_APP_XFA_FWLADAPTER_H_ + class CXFA_FWLAdapterWidgetMgr : public CFWL_SDAdapterWidgetMgr { public: virtual FWL_ERR RepaintWidget(IFWL_Widget* pWidget, const CFX_RectF* pRect); @@ -15,4 +16,5 @@ class CXFA_FWLAdapterWidgetMgr : public CFWL_SDAdapterWidgetMgr { const CFX_RectF& rtAnchor, CFX_RectF& rtPopup); }; -#endif + +#endif // XFA_SRC_FXFA_SRC_APP_XFA_FWLADAPTER_H_ diff --git a/xfa/src/fxfa/src/app/xfa_fwltheme.h b/xfa/src/fxfa/src/app/xfa_fwltheme.h index 8b4c9385bf..eabde0481b 100644 --- a/xfa/src/fxfa/src/app/xfa_fwltheme.h +++ b/xfa/src/fxfa/src/app/xfa_fwltheme.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _XFA_FWL_THEME_IMP_H -#define _XFA_FWL_THEME_IMP_H +#ifndef XFA_SRC_FXFA_SRC_APP_XFA_FWLTHEME_H_ +#define XFA_SRC_FXFA_SRC_APP_XFA_FWLTHEME_H_ + class CXFA_FWLTheme : public IFWL_ThemeProvider { public: CXFA_FWLTheme(CXFA_FFApp* pApp); @@ -89,4 +90,5 @@ class CXFA_FWLEditTP : public CFWL_EditTP { public: virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams); }; -#endif + +#endif // XFA_SRC_FXFA_SRC_APP_XFA_FWLTHEME_H_ diff --git a/xfa/src/fxfa/src/app/xfa_rendercontext.h b/xfa/src/fxfa/src/app/xfa_rendercontext.h index cdb2bea4f7..9f91d23e56 100644 --- a/xfa/src/fxfa/src/app/xfa_rendercontext.h +++ b/xfa/src/fxfa/src/app/xfa_rendercontext.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFA_FORMFILLER_RENDERCONTEXT_IMP_H -#define _FXFA_FORMFILLER_RENDERCONTEXT_IMP_H +#ifndef XFA_SRC_FXFA_SRC_APP_XFA_RENDERCONTEXT_H_ +#define XFA_SRC_FXFA_SRC_APP_XFA_RENDERCONTEXT_H_ + class CXFA_RenderContext : public IXFA_RenderContext { public: CXFA_RenderContext(); @@ -28,4 +29,5 @@ class CXFA_RenderContext : public IXFA_RenderContext { FX_DWORD m_dwStatus; CFX_RectF m_rtClipRect; }; -#endif + +#endif // XFA_SRC_FXFA_SRC_APP_XFA_RENDERCONTEXT_H_ diff --git a/xfa/src/fxfa/src/app/xfa_textlayout.h b/xfa/src/fxfa/src/app/xfa_textlayout.h index 0078ec74bb..44a27ad46c 100644 --- a/xfa/src/fxfa/src/app/xfa_textlayout.h +++ b/xfa/src/fxfa/src/app/xfa_textlayout.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFA_TEXTLAYOUT_H -#define _FXFA_TEXTLAYOUT_H +#ifndef XFA_SRC_FXFA_SRC_APP_XFA_TEXTLAYOUT_H_ +#define XFA_SRC_FXFA_SRC_APP_XFA_TEXTLAYOUT_H_ + #define XFA_LOADERCNTXTFLG_FILTERSPACE 0x001 class CXFA_TextTabstopsContext; class IXFA_TextProvider { @@ -403,4 +404,5 @@ class CXFA_TextLayout { CXFA_TextTabstopsContext* m_pTabstopContext; FX_BOOL m_bBlockContinue; }; -#endif + +#endif // XFA_SRC_FXFA_SRC_APP_XFA_TEXTLAYOUT_H_ diff --git a/xfa/src/fxfa/src/common/fxfa_localevalue.h b/xfa/src/fxfa/src/common/fxfa_localevalue.h index d29e70f501..1157e9970d 100644 --- a/xfa/src/fxfa/src/common/fxfa_localevalue.h +++ b/xfa/src/fxfa/src/common/fxfa_localevalue.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFA_WIDGETVALUE_H -#define _FXFA_WIDGETVALUE_H +#ifndef XFA_SRC_FXFA_SRC_COMMON_FXFA_LOCALVALUE_H_ +#define XFA_SRC_FXFA_SRC_COMMON_FXFA_LOCALVALUE_H_ + class IFX_Locale; class CFX_Unitime; class CXFA_LocaleMgr; @@ -103,4 +104,5 @@ class CXFA_LocaleValue { FX_DWORD m_dwType; FX_BOOL m_bValid; }; -#endif + +#endif // XFA_SRC_FXFA_SRC_COMMON_FXFA_LOCALVALUE_H_ diff --git a/xfa/src/fxfa/src/common/xfa_common.h b/xfa/src/fxfa/src/common/xfa_common.h index 26db24237b..269cab605e 100644 --- a/xfa/src/fxfa/src/common/xfa_common.h +++ b/xfa/src/fxfa/src/common/xfa_common.h @@ -6,8 +6,9 @@ // TODO(thestig): Remove this file and do IWYU. -#ifndef _XFA_COMMON_H_ -#define _XFA_COMMON_H_ +#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_COMMON_H_ +#define XFA_SRC_FXFA_SRC_COMMON_XFA_COMMON_H_ + #include "xfa_utils.h" #include "xfa_object.h" #include "xfa_document.h" @@ -17,4 +18,5 @@ #include "xfa_doclayout.h" #include "xfa_localemgr.h" #include "xfa_fm2jsapi.h" -#endif + +#endif // XFA_SRC_FXFA_SRC_COMMON_XFA_COMMON_H_ diff --git a/xfa/src/fxfa/src/common/xfa_docdata.h b/xfa/src/fxfa/src/common/xfa_docdata.h index 59084e9655..b1b78eba6f 100644 --- a/xfa/src/fxfa/src/common/xfa_docdata.h +++ b/xfa/src/fxfa/src/common/xfa_docdata.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _XFA_DOCDATA_H -#define _XFA_DOCDATA_H +#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_DOCDATA_H_ +#define XFA_SRC_FXFA_SRC_COMMON_XFA_DOCDATA_H_ + enum XFA_DATAFORMAT { XFA_DATAFORMAT_XDP, }; @@ -28,4 +29,5 @@ class IXFA_PacketImport { virtual void Release() = 0; virtual FX_BOOL ImportData(IFX_FileRead* pDataDocument) = 0; }; -#endif + +#endif // XFA_SRC_FXFA_SRC_COMMON_XFA_DOCDATA_H_ diff --git a/xfa/src/fxfa/src/common/xfa_doclayout.h b/xfa/src/fxfa/src/common/xfa_doclayout.h index d59ae89828..5ac4cb945f 100644 --- a/xfa/src/fxfa/src/common/xfa_doclayout.h +++ b/xfa/src/fxfa/src/common/xfa_doclayout.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _XFA_DOCLAYOUT_H_ -#define _XFA_DOCLAYOUT_H_ +#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_DOCLAYOUT_H_ +#define XFA_SRC_FXFA_SRC_COMMON_XFA_DOCLAYOUT_H_ + #define _XFA_LAYOUTITEM_ProcessCACHE_ class CXFA_ContainerLayoutItem; @@ -130,4 +131,5 @@ class IXFA_DocLayout { virtual IXFA_LayoutPage* GetPage(int32_t index) const = 0; virtual CXFA_LayoutItem* GetLayoutItem(CXFA_Node* pFormItem) = 0; }; -#endif + +#endif // XFA_SRC_FXFA_SRC_COMMON_XFA_DOCLAYOUT_H_ diff --git a/xfa/src/fxfa/src/common/xfa_document.h b/xfa/src/fxfa/src/common/xfa_document.h index e041514b19..5498b1f831 100644 --- a/xfa/src/fxfa/src/common/xfa_document.h +++ b/xfa/src/fxfa/src/common/xfa_document.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _XFA_DOCUMENT_H -#define _XFA_DOCUMENT_H +#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_DOCUMENT_H_ +#define XFA_SRC_FXFA_SRC_COMMON_XFA_DOCUMENT_H_ class CXFA_Document; class CXFA_LayoutItem; @@ -193,4 +193,5 @@ class CXFA_Document : public IXFA_ObjFactory { FX_DWORD m_dwDocFlags; friend class CXFA_SimpleParser; }; -#endif + +#endif // XFA_SRC_FXFA_SRC_COMMON_XFA_DOCUMENT_H_ diff --git a/xfa/src/fxfa/src/common/xfa_fm2jsapi.h b/xfa/src/fxfa/src/common/xfa_fm2jsapi.h index 6e9aa04b79..67f3b7e193 100644 --- a/xfa/src/fxfa/src/common/xfa_fm2jsapi.h +++ b/xfa/src/fxfa/src/common/xfa_fm2jsapi.h @@ -4,12 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _XFA_FM2JS_API_H -#define _XFA_FM2JS_API_H +#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_FM2JSAPI_H_ +#define XFA_SRC_FXFA_SRC_COMMON_XFA_FM2JSAPI_H_ + #define FOXIT_XFA_FM2JS_FORMCALC_RUNTIME "foxit_xfa_formcalc_runtime" + #ifdef __cplusplus extern "C" { #endif + typedef struct XFA_HFM2JSCONTEXT_ { void** pData; } * XFA_HFM2JSCONTEXT; int32_t XFA_FM2JS_Translate(const CFX_WideStringC& wsFormcalc, CFX_WideTextBuf& wsJavascript, @@ -22,7 +25,9 @@ void XFA_FM2JS_ContextInitialize(XFA_HFM2JSCONTEXT hFM2JSContext, void XFA_FM2JS_GlobalPropertyGetter(XFA_HFM2JSCONTEXT hFM2JSContext, FXJSE_HVALUE hValue); void XFA_FM2JS_ContextRelease(XFA_HFM2JSCONTEXT hFM2JSContext); + #ifdef __cplusplus } #endif -#endif + +#endif // XFA_SRC_FXFA_SRC_COMMON_XFA_FM2JSAPI_H_ diff --git a/xfa/src/fxfa/src/common/xfa_localemgr.h b/xfa/src/fxfa/src/common/xfa_localemgr.h index 432913baf2..6583ddb061 100644 --- a/xfa/src/fxfa/src/common/xfa_localemgr.h +++ b/xfa/src/fxfa/src/common/xfa_localemgr.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFA_LOCALEMGR_H -#define _FXFA_LOCALEMGR_H +#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_LOCALEMGR_H_ +#define XFA_SRC_FXFA_SRC_COMMON_XFA_LOCALEMGR_H_ + class CXFA_Node; class IFX_Locale; class IFX_LocaleMgr; @@ -67,4 +68,5 @@ class CXFA_TimeZoneProvider : public IXFA_TimeZoneProvider { private: FX_TIMEZONE m_tz; }; -#endif + +#endif // XFA_SRC_FXFA_SRC_COMMON_XFA_LOCALEMGR_H_ diff --git a/xfa/src/fxfa/src/common/xfa_object.h b/xfa/src/fxfa/src/common/xfa_object.h index b6bc340bf4..a565922157 100644 --- a/xfa/src/fxfa/src/common/xfa_object.h +++ b/xfa/src/fxfa/src/common/xfa_object.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_OBJECT_H_ -#define XFA_OBJECT_H_ +#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_OBJECT_H_ +#define XFA_SRC_FXFA_SRC_COMMON_XFA_OBJECT_H_ class CXFA_ArrayNodeList; class CXFA_AttachNodeList; @@ -798,4 +798,4 @@ inline const CXFA_NodeList* ToNodeList(const CXFA_Object* pObj) { return pObj ? pObj->AsNodeList() : nullptr; } -#endif // XFA_OBJECT_H_ +#endif // XFA_SRC_FXFA_SRC_COMMON_XFA_OBJECT_H_ diff --git a/xfa/src/fxfa/src/common/xfa_parser.h b/xfa/src/fxfa/src/common/xfa_parser.h index 5c8ea88f56..80cae0065b 100644 --- a/xfa/src/fxfa/src/common/xfa_parser.h +++ b/xfa/src/fxfa/src/common/xfa_parser.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _XFA_PARSER_H -#define _XFA_PARSER_H +#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_PARSER_H +#define XFA_SRC_FXFA_SRC_COMMON_XFA_PARSER_H + class IFX_Stream; class IXFA_Parser { public: @@ -32,4 +33,5 @@ class IXFA_DocParser : public IXFA_Parser { virtual CXFA_Document* GetDocument() const = 0; virtual IXFA_Notify* GetNotify() const = 0; }; -#endif + +#endif // XFA_SRC_FXFA_SRC_COMMON_XFA_PARSER_H diff --git a/xfa/src/fxfa/src/common/xfa_script.h b/xfa/src/fxfa/src/common/xfa_script.h index fa419c712a..68f8117041 100644 --- a/xfa/src/fxfa/src/common/xfa_script.h +++ b/xfa/src/fxfa/src/common/xfa_script.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFA_SCRIPT_H -#define _FXFA_SCRIPT_H +#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_SCRIPT_H +#define XFA_SRC_FXFA_SRC_COMMON_XFA_SCRIPT_H + #define XFA_RESOLVENODE_Children 0x0001 #define XFA_RESOLVENODE_Attributes 0x0004 #define XFA_RESOLVENODE_Properties 0x0008 @@ -106,4 +107,5 @@ class IXFA_ScriptContext { virtual FX_BOOL IsRunAtClient() = 0; }; IXFA_ScriptContext* XFA_ScriptContext_Create(CXFA_Document* pDocument); -#endif + +#endif // XFA_SRC_FXFA_SRC_COMMON_XFA_SCRIPT_H diff --git a/xfa/src/fxfa/src/common/xfa_utils.h b/xfa/src/fxfa/src/common/xfa_utils.h index 47fd9e90e2..4ebc59b4fa 100644 --- a/xfa/src/fxfa/src/common/xfa_utils.h +++ b/xfa/src/fxfa/src/common/xfa_utils.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _XFA_UTILS_H_ -#define _XFA_UTILS_H_ +#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_UTILS_H_ +#define XFA_SRC_FXFA_SRC_COMMON_XFA_UTILS_H_ + FX_BOOL XFA_FDEExtension_ResolveNamespaceQualifier( IFDE_XMLElement* pNode, const CFX_WideStringC& wsQualifier, @@ -211,4 +212,5 @@ void XFA_DataExporter_RegenerateFormFile(CXFA_Node* pNode, IFX_Stream* pStream, const FX_CHAR* pChecksum = NULL, FX_BOOL bSaveXML = FALSE); -#endif + +#endif // XFA_SRC_FXFA_SRC_COMMON_XFA_UTILS_H_ diff --git a/xfa/src/fxfa/src/fm2js/xfa_error.h b/xfa/src/fxfa/src/fm2js/xfa_error.h index 0021d3a428..87318d5491 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_error.h +++ b/xfa/src/fxfa/src/fm2js/xfa_error.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _XFA_FM_ERROR_H -#define _XFA_FM_ERROR_H +#ifndef XFA_SRC_FXFA_SRC_FM2JS_XFA_ERROR_H_ +#define XFA_SRC_FXFA_SRC_FM2JS_XFA_ERROR_H_ + enum XFA_FM_ERRMSG { FMERR_UNSUPPORTED_CHAR, FMERR_BAD_SUFFIX_NUMBER, @@ -25,4 +26,5 @@ class CXFA_FMErrorInfo { CFX_WideString message; }; const FX_WCHAR* XFA_FM_ErrorMsg(XFA_FM_ERRMSG msg); -#endif + +#endif // XFA_SRC_FXFA_SRC_FM2JS_XFA_ERROR_H_ diff --git a/xfa/src/fxfa/src/fm2js/xfa_expression.h b/xfa/src/fxfa/src/fm2js/xfa_expression.h index 8515f0204b..a3464a2d13 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_expression.h +++ b/xfa/src/fxfa/src/fm2js/xfa_expression.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _XFA_FM_EXPRESSION_H -#define _XFA_FM_EXPRESSION_H +#ifndef XFA_SRC_FXFA_SRC_FM2JS_XFA_EXPRESSION_H_ +#define XFA_SRC_FXFA_SRC_FM2JS_XFA_EXPRESSION_H_ + enum XFA_FM_EXPTYPE { XFA_FM_EXPTYPE_UNKNOWN, XFA_FM_EXPTYPE_FUNC, @@ -175,4 +176,5 @@ class CXFA_FMForeachExpression : public CXFA_FMLoopExpression { CFX_PtrArray* m_pAccessors; CXFA_FMExpression* m_pList; }; -#endif + +#endif // XFA_SRC_FXFA_SRC_FM2JS_XFA_EXPRESSION_H_ diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2js.h b/xfa/src/fxfa/src/fm2js/xfa_fm2js.h index 8ff12f724b..cb10391517 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_fm2js.h +++ b/xfa/src/fxfa/src/fm2js/xfa_fm2js.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _XFA_FM2JS_H -#define _XFA_FM2JS_H +#ifndef XFA_SRC_FXFA_SRC_FM2JS_XFA_FM2JS_H_ +#define XFA_SRC_FXFA_SRC_FM2JS_XFA_FM2JS_H_ + #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_utils.h" #include "xfa/src/fxfa/src/common/xfa_object.h" @@ -28,4 +29,5 @@ typedef CFX_ArrayTemplate CFX_WideStringCArray; #include "xfa_fmparse.h" #include "xfa_program.h" #include "xfa_fm2jscontext.h" -#endif + +#endif // XFA_SRC_FXFA_SRC_FM2JS_XFA_FM2JS_H_ diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h index e7b5aa5264..75d3b15583 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h +++ b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _XFA_FM2JS_CONTEXT_H -#define _XFA_FM2JS_CONTEXT_H +#ifndef XFA_SRC_FXFA_SRC_FM2JS_XFA_FM2JSCONTEXT_H_ +#define XFA_SRC_FXFA_SRC_FM2JS_XFA_FM2JSCONTEXT_H_ + class CXFA_FM2JSContext { public: static void Abs(FXJSE_HOBJECT hThis, @@ -446,4 +447,5 @@ class CXFA_FM2JSContext { FXJSE_HVALUE m_hValue; CXFA_Document* m_pDocument; }; -#endif + +#endif // XFA_SRC_FXFA_SRC_FM2JS_XFA_FM2JSCONTEXT_H_ diff --git a/xfa/src/fxfa/src/fm2js/xfa_fmparse.h b/xfa/src/fxfa/src/fm2js/xfa_fmparse.h index ed950c5aa4..bac6729795 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_fmparse.h +++ b/xfa/src/fxfa/src/fm2js/xfa_fmparse.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _XFA_FM_PARSE_H -#define _XFA_FM_PARSE_H +#ifndef XFA_SRC_FXFA_SRC_FM2JS_XFA_FMPARSE_H_ +#define XFA_SRC_FXFA_SRC_FM2JS_XFA_FMPARSE_H_ #include @@ -49,4 +49,4 @@ class CXFA_FMParse { CXFA_FMErrorInfo* m_pErrorInfo; }; -#endif +#endif // XFA_SRC_FXFA_SRC_FM2JS_XFA_FMPARSE_H_ diff --git a/xfa/src/fxfa/src/fm2js/xfa_lexer.h b/xfa/src/fxfa/src/fm2js/xfa_lexer.h index 14b927d6d9..5db3b093cd 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_lexer.h +++ b/xfa/src/fxfa/src/fm2js/xfa_lexer.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _XFA_FM_LEXER_H -#define _XFA_FM_LEXER_H +#ifndef XFA_SRC_FXFA_SRC_FM2JS_XFA_LEXER_H_ +#define XFA_SRC_FXFA_SRC_FM2JS_XFA_LEXER_H_ #include @@ -128,4 +128,4 @@ class CXFA_FMLexer { CXFA_FMErrorInfo* m_pErrorInfo; }; -#endif +#endif // XFA_SRC_FXFA_SRC_FM2JS_XFA_LEXER_H_ diff --git a/xfa/src/fxfa/src/fm2js/xfa_program.h b/xfa/src/fxfa/src/fm2js/xfa_program.h index 39a19e24a2..6f3a390991 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_program.h +++ b/xfa/src/fxfa/src/fm2js/xfa_program.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _XFA_FM_PROGRAM_H -#define _XFA_FM_PROGRAM_H +#ifndef XFA_SRC_FXFA_SRC_FM2JS_XFA_PROGRAM_H_ +#define XFA_SRC_FXFA_SRC_FM2JS_XFA_PROGRAM_H_ + class CXFA_FMProgram { public: CXFA_FMProgram(); @@ -20,4 +21,5 @@ class CXFA_FMProgram { CXFA_FMParse m_parse; CXFA_FMFunctionDefinition* m_globalFunction; }; -#endif + +#endif // XFA_SRC_FXFA_SRC_FM2JS_XFA_PROGRAM_H_ diff --git a/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h b/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h index 07c9f33946..4412cbd248 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h +++ b/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _XFA_FM_SIMPLEEXPRESSION_H -#define _XFA_FM_SIMPLEEXPRESSION_H +#ifndef XFA_SRC_FXFA_SRC_FM2JS_XFA_SIMPLEEXPRESSION_H_ +#define XFA_SRC_FXFA_SRC_FM2JS_XFA_SIMPLEEXPRESSION_H_ + enum XFA_FM_SimpleExpressionType { ASSIGN, LOGICALOR, @@ -266,4 +267,5 @@ class CXFA_FMMethodCallExpression : public CXFA_FMBinExpression { protected: }; -#endif + +#endif // XFA_SRC_FXFA_SRC_FM2JS_XFA_SIMPLEEXPRESSION_H_ diff --git a/xfa/src/fxfa/src/parser/xfa_basic_imp.h b/xfa/src/fxfa/src/parser/xfa_basic_imp.h index 95d4fb135c..966d27e946 100644 --- a/xfa/src/fxfa/src/parser/xfa_basic_imp.h +++ b/xfa/src/fxfa/src/parser/xfa_basic_imp.h @@ -4,14 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _XFA_BASIC_IMP -#define _XFA_BASIC_IMP +#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_BASIC_IMP_H_ +#define XFA_SRC_FXFA_SRC_PARSER_XFA_BASIC_IMP_H_ + typedef struct _XFA_NOTSUREATTRIBUTE { XFA_ELEMENT eElement; XFA_ATTRIBUTE eAttribute; XFA_ATTRIBUTETYPE eType; void* pValue; } XFA_NOTSUREATTRIBUTE, *XFA_LPNOTSUREATTRIBUTE; + typedef XFA_NOTSUREATTRIBUTE const* XFA_LPCNOTSUREATTRIBUTE; XFA_LPCNOTSUREATTRIBUTE XFA_GetNotsureAttribute( XFA_ELEMENT eElement, @@ -63,4 +65,5 @@ class CXFA_WideTextRead : public IFX_Stream { int32_t m_iPosition; int32_t m_iRefCount; }; -#endif + +#endif // XFA_SRC_FXFA_SRC_PARSER_XFA_BASIC_IMP_H_ diff --git a/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.h b/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.h index 0f385ba3c7..d890f9247d 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.h +++ b/xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _XFA_DOCUMENT_DATADESCRIPTION_IMP_H_ -#define _XFA_DOCUMENT_DATADESCRIPTION_IMP_H_ +#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_DATADESCRIPTION_IMP_H_ +#define XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_DATADESCRIPTION_IMP_H_ + void XFA_DataDescription_UpdateDataRelation(CXFA_Node* pDataNode, CXFA_Node* pDataDescriptionNode); CXFA_Node* XFA_DataDescription_MaybeCreateDataNode( @@ -13,4 +14,5 @@ CXFA_Node* XFA_DataDescription_MaybeCreateDataNode( CXFA_Node* pDataParent, XFA_ELEMENT eNodeType, const CFX_WideStringC& wsName); -#endif + +#endif // XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_DATADESCRIPTION_IMP_H_ diff --git a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h b/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h index ca755c6df0..72c40dcf63 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h +++ b/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _XFA_DOCUMENT_DATAMERGER_IMP_H_ -#define _XFA_DOCUMENT_DATAMERGER_IMP_H_ +#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_DATAMERGER_IMP_H_ +#define XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_DATAMERGER_IMP_H_ + CXFA_Node* XFA_NodeMerge_CloneOrMergeContainer( CXFA_Document* pDocument, CXFA_Node* pFormParent, @@ -17,4 +18,5 @@ CXFA_Node* XFA_DataMerge_FindFormDOMInstance(CXFA_Document* pDocument, XFA_ELEMENT eClassID, FX_DWORD dwNameHash, CXFA_Node* pFormParent); -#endif + +#endif // XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_DATAMERGER_IMP_H_ diff --git a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h index 6af69ead7d..78b364053e 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h +++ b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _XFA_DOCUMENT_LAYOUT_IMP_H_ -#define _XFA_DOCUMENT_LAYOUT_IMP_H_ +#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_LAYOUT_IMP_H_ +#define XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_LAYOUT_IMP_H_ + class CXFA_ItemLayoutProcessor; class CXFA_LayoutPageMgr; class CXFA_LayoutAppAdapter; @@ -42,4 +43,5 @@ class CXFA_LayoutProcessor : public IXFA_DocLayout { uint32_t m_nProgressCounter; FX_BOOL m_bNeeLayout; }; -#endif + +#endif // XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_LAYOUT_IMP_H_ diff --git a/xfa/src/fxfa/src/parser/xfa_document_serialize.h b/xfa/src/fxfa/src/parser/xfa_document_serialize.h index d50f0d2674..bcec733772 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_serialize.h +++ b/xfa/src/fxfa/src/parser/xfa_document_serialize.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _XFA_DOCUMENT_SERIALIZE_H_ -#define _XFA_DOCUMENT_SERIALIZE_H_ +#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_SERIALIZE_H_ +#define XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_SERIALIZE_H_ + class CXFA_DataImporter : public IXFA_PacketImport { public: CXFA_DataImporter(CXFA_Document* pDocument); @@ -32,4 +33,5 @@ class CXFA_DataExporter : public IXFA_PacketExport { const FX_CHAR* pChecksum); CXFA_Document* m_pDocument; }; -#endif + +#endif // XFA_SRC_FXFA_SRC_PARSER_XFA_DOCUMENT_SERIALIZE_H_ diff --git a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.h b/xfa/src/fxfa/src/parser/xfa_layout_appadapter.h index 123f2e4e52..6ae4706343 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.h +++ b/xfa/src/fxfa/src/parser/xfa_layout_appadapter.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _XFA_LAYOUT_APPADAPTER_H_ -#define _XFA_LAYOUT_APPADAPTER_H_ +#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_APPADAPTER_H_ +#define XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_APPADAPTER_H_ + class CXFA_TraverseStrategy_PageAreaContainerLayoutItem { public: static inline CXFA_ContainerLayoutItem* GetFirstChild( @@ -70,4 +71,5 @@ class CXFA_TraverseStrategy_ContentLayoutItem { }; FX_DWORD XFA_GetRelevant(CXFA_Node* pFormItem, FX_DWORD dwParentRelvant); void XFA_ReleaseLayoutItem(CXFA_LayoutItem* pLayoutItem); -#endif + +#endif // XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_APPADAPTER_H_ diff --git a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h index 980eaee4e7..f53b19fe26 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h +++ b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _XFA_LAYOUT_ITEMLAYOUT_H_ -#define _XFA_LAYOUT_ITEMLAYOUT_H_ +#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_ITEMLAYOUT_H_ +#define XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_ITEMLAYOUT_H_ + #define XFA_LAYOUT_INVALIDNODE ((CXFA_Node*)(intptr_t)-1) #define XFA_LAYOUT_FLOAT_PERCISION (0.0005f) #include "float.h" @@ -183,4 +184,5 @@ class CXFA_ItemLayoutProcessor { FX_BOOL m_bHasAvailHeight; }; FX_BOOL XFA_ItemLayoutProcessor_IsTakingSpace(CXFA_Node* pNode); -#endif + +#endif // XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_ITEMLAYOUT_H_ diff --git a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h index 1bbe9fa0c7..94da5a41ed 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h +++ b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _XFA_LAYOUT_PAGEMGR_H_ -#define _XFA_LAYOUT_PAGEMGR_H_ +#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_PAGEMGR_NEW_H_ +#define XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_PAGEMGR_NEW_H_ + class CXFA_ContainerRecord { public: CXFA_ContainerRecord(CXFA_ContainerLayoutItem* pPageSet = NULL, @@ -149,4 +150,5 @@ class CXFA_LayoutPageMgr { CFX_MapPtrToPtr m_NodeToContent; #endif }; -#endif + +#endif // XFA_SRC_FXFA_SRC_PARSER_XFA_LAYOUT_PAGEMGR_NEW_H_ diff --git a/xfa/src/fxfa/src/parser/xfa_locale.h b/xfa/src/fxfa/src/parser/xfa_locale.h index 7b52d08132..60336f6e88 100644 --- a/xfa/src/fxfa/src/parser/xfa_locale.h +++ b/xfa/src/fxfa/src/parser/xfa_locale.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFA_LOCALE_H -#define _FXFA_LOCALE_H +#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_LOCALE_H_ +#define XFA_SRC_FXFA_SRC_PARSER_XFA_LOCALE_H_ + class CXFA_XMLLocale : public IFX_Locale { public: CXFA_XMLLocale(CXML_Element* pLocaleData); @@ -85,4 +86,5 @@ class CXFA_NodeLocale : public IFX_Locale { CXFA_Node* m_pLocale; }; -#endif + +#endif // XFA_SRC_FXFA_SRC_PARSER_XFA_LOCALE_H_ diff --git a/xfa/src/fxfa/src/parser/xfa_parser_imp.h b/xfa/src/fxfa/src/parser/xfa_parser_imp.h index 83ff212b91..6c6593ae03 100644 --- a/xfa/src/fxfa/src/parser/xfa_parser_imp.h +++ b/xfa/src/fxfa/src/parser/xfa_parser_imp.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _XFA_PARSER_IMP -#define _XFA_PARSER_IMP +#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_PARSER_IMP_H_ +#define XFA_SRC_FXFA_SRC_PARSER_XFA_PARSER_IMP_H_ + #define _XFA_VERIFY_Checksum_ class CXFA_XMLParser; class CXFA_SimpleParser : public IXFA_Parser { @@ -131,4 +132,5 @@ class CXFA_XMLParser : public IFDE_XMLParser { CFX_WideString m_ws2; FX_DWORD m_dwStatus; }; -#endif + +#endif // XFA_SRC_FXFA_SRC_PARSER_XFA_PARSER_IMP_H_ diff --git a/xfa/src/fxfa/src/parser/xfa_script_datawindow.h b/xfa/src/fxfa/src/parser/xfa_script_datawindow.h index c5fb31e86d..8be21a762f 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_datawindow.h +++ b/xfa/src/fxfa/src/parser/xfa_script_datawindow.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _SCRIPT_DATAWINDOW_H_ -#define _SCRIPT_DATAWINDOW_H_ +#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_DATAWINDOW_H_ +#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_DATAWINDOW_H_ + class CScript_DataWindow : public CXFA_OrdinaryObject { public: CScript_DataWindow(CXFA_Document* pDocument); @@ -27,4 +28,5 @@ class CScript_DataWindow : public CXFA_OrdinaryObject { FX_BOOL bSetting, XFA_ATTRIBUTE eAttribute); }; -#endif + +#endif // XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_DATAWINDOW_H_ diff --git a/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h b/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h index 8ba8135cf3..31646cc8d6 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h +++ b/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _SCRIPT_EVENTPSEUDOMODEL_H_ -#define _SCRIPT_EVENTPSEUDOMODEL_H_ +#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_EVENTPSEUDOMODEL_H_ +#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_EVENTPSEUDOMODEL_H_ + #define XFA_EVENT_CHANGE 0 #define XFA_EVENT_COMMITKEY 1 #define XFA_EVENT_FULLTEXT 2 @@ -88,4 +89,5 @@ class CScript_EventPseudoModel : public CXFA_OrdinaryObject { FX_DWORD dwFlag, FX_BOOL bSetting); }; -#endif + +#endif // XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_EVENTPSEUDOMODEL_H_ diff --git a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h b/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h index 29e5dd59b9..f17a85dc06 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h +++ b/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _SCRIPT_HOSTPSEUDOMODEL_H_ -#define _SCRIPT_HOSTPSEUDOMODEL_H_ +#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_HOSTPSEUDOMODEL_H_ +#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_HOSTPSEUDOMODEL_H_ + class CScript_HostPseudoModel : public CXFA_OrdinaryObject { public: CScript_HostPseudoModel(CXFA_Document* pDocument); @@ -81,4 +82,5 @@ class CScript_HostPseudoModel : public CXFA_OrdinaryObject { int32_t iArgIndex, CFX_WideString& wsValue); }; -#endif + +#endif // XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_HOSTPSEUDOMODEL_H_ diff --git a/xfa/src/fxfa/src/parser/xfa_script_imp.h b/xfa/src/fxfa/src/parser/xfa_script_imp.h index 9692a8a71f..8b1b6c6914 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_imp.h +++ b/xfa/src/fxfa/src/parser/xfa_script_imp.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SCRIPT_IMP_H_ -#define XFA_SCRIPT_IMP_H_ +#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_IMP_H_ +#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_IMP_H_ #include @@ -120,4 +120,4 @@ class CXFA_ScriptContext : public IXFA_ScriptContext { XFA_ATTRIBUTEENUM m_eRunAtType; }; -#endif // XFA_SCRIPT_IMP_H_ +#endif // XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_IMP_H_ diff --git a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h b/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h index ccff992fd6..f0420e71fd 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h +++ b/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _SCRIPT_LAYOUTPSEUDOMODEL_H_ -#define _SCRIPT_LAYOUTPSEUDOMODEL_H_ +#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_LAYOUTPSEUDOMODEL_H_ +#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_LAYOUTPSEUDOMODEL_H_ + enum XFA_LAYOUTMODEL_HWXY { XFA_LAYOUTMODEL_H, XFA_LAYOUTMODEL_W, @@ -55,4 +56,5 @@ class CScript_LayoutPseudoModel : public CXFA_OrdinaryObject { void Script_LayoutPseudoModel_PageImp(CFXJSE_Arguments* pArguments, FX_BOOL bAbsPage); }; -#endif + +#endif // XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_LAYOUTPSEUDOMODEL_H_ diff --git a/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h b/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h index 118bd66bc1..60be763b47 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h +++ b/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _SCRIPT_LOGPSEUDOMODEL_H_ -#define _SCRIPT_LOGPSEUDOMODEL_H_ +#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_LOGPSEUDOMODEL_H_ +#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_LOGPSEUDOMODEL_H_ + class CScript_LogPseudoModel : public CXFA_OrdinaryObject { public: CScript_LogPseudoModel(CXFA_Document* pDocument); @@ -17,4 +18,5 @@ class CScript_LogPseudoModel : public CXFA_OrdinaryObject { void Script_LogPseudoModel_TraceDeactivate(CFXJSE_Arguments* pArguments); void Script_LogPseudoModel_Trace(CFXJSE_Arguments* pArguments); }; -#endif + +#endif // XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_LOGPSEUDOMODEL_H_ diff --git a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h index 6f9c5e468b..37a369170a 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h +++ b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _XFA_NODEHELPER_H_ -#define _XFA_NODEHELPER_H_ +#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_NODEHELPER_H_ +#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_NODEHELPER_H_ + class CXFA_ScriptContext; enum XFA_LOGIC_TYPE { XFA_LOGIC_NoTransparent, @@ -62,4 +63,5 @@ class CXFA_NodeHelper { int32_t m_iCurAllStart; CXFA_Node* m_pAllStartParent; }; -#endif + +#endif // XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_NODEHELPER_H_ diff --git a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h index eb0d999d76..445982303a 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h +++ b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _XFA_RESOLVEPROCESSOR_H_ -#define _XFA_RESOLVEPROCESSOR_H_ +#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_RESOLVEPROCESSOR_H_ +#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_RESOLVEPROCESSOR_H_ + class CXFA_NodeHelper; class CXFA_ScriptContext; class CXFA_ResolveNodesData { @@ -76,4 +77,5 @@ class CXFA_ResolveProcessor { public: int32_t m_iCurStart; }; -#endif + +#endif // XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_RESOLVEPROCESSOR_H_ diff --git a/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h b/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h index c7bcbd838e..56ef052110 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h +++ b/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _SCRIPT_SIGNATUREPSEUDOMODEL_H_ -#define _SCRIPT_SIGNATUREPSEUDOMODEL_H_ +#ifndef XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_SIGNATUREPSEUDOMODEL_H_ +#define XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_SIGNATUREPSEUDOMODEL_H_ + class CScript_SignaturePseudoModel : public CXFA_OrdinaryObject { public: CScript_SignaturePseudoModel(CXFA_Document* pDocument); @@ -15,4 +16,5 @@ class CScript_SignaturePseudoModel : public CXFA_OrdinaryObject { void Script_SignaturePseudoModel_Enumerate(CFXJSE_Arguments* pArguments); void Script_SignaturePseudoModel_Clear(CFXJSE_Arguments* pArguments); }; -#endif + +#endif // XFA_SRC_FXFA_SRC_PARSER_XFA_SCRIPT_SIGNATUREPSEUDOMODEL_H_ -- cgit v1.2.3