From 19922bbc0d62b81e0fdd6a01da39e9b875c53c68 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 28 May 2015 13:23:12 -0700 Subject: Merge to XFA: Fix ALL the include guards. Original Review URL: https://codereview.chromium.org/1160443004 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1162013003 --- fpdfsdk/include/pdfwindow/IPDFWindow.h | 6 +++--- fpdfsdk/include/pdfwindow/PDFWindow.h | 6 +++--- fpdfsdk/include/pdfwindow/PWL_Button.h | 6 +++--- fpdfsdk/include/pdfwindow/PWL_Caret.h | 7 +++---- fpdfsdk/include/pdfwindow/PWL_ComboBox.h | 7 +++---- fpdfsdk/include/pdfwindow/PWL_Edit.h | 7 +++---- fpdfsdk/include/pdfwindow/PWL_EditCtrl.h | 7 +++---- fpdfsdk/include/pdfwindow/PWL_FontMap.h | 6 +++--- fpdfsdk/include/pdfwindow/PWL_Icon.h | 8 +++---- fpdfsdk/include/pdfwindow/PWL_IconList.h | 8 +++---- fpdfsdk/include/pdfwindow/PWL_Label.h | 8 +++---- fpdfsdk/include/pdfwindow/PWL_ListBox.h | 8 +++---- fpdfsdk/include/pdfwindow/PWL_ListCtrl.h | 7 +++---- fpdfsdk/include/pdfwindow/PWL_Note.h | 7 +++---- fpdfsdk/include/pdfwindow/PWL_ScrollBar.h | 8 +++---- fpdfsdk/include/pdfwindow/PWL_Signature.h | 8 +++---- fpdfsdk/include/pdfwindow/PWL_SpecialButton.h | 8 +++---- fpdfsdk/include/pdfwindow/PWL_Utils.h | 8 +++---- fpdfsdk/include/pdfwindow/PWL_Wnd.h | 30 +++------------------------ 19 files changed, 57 insertions(+), 103 deletions(-) (limited to 'fpdfsdk/include/pdfwindow') diff --git a/fpdfsdk/include/pdfwindow/IPDFWindow.h b/fpdfsdk/include/pdfwindow/IPDFWindow.h index 472737a2e3..0191cac639 100644 --- a/fpdfsdk/include/pdfwindow/IPDFWindow.h +++ b/fpdfsdk/include/pdfwindow/IPDFWindow.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _IPDFWINDOW_H_ -#define _IPDFWINDOW_H_ +#ifndef FPDFSDK_INCLUDE_PDFWINDOW_IPDFWINDOW_H_ +#define FPDFSDK_INCLUDE_PDFWINDOW_IPDFWINDOW_H_ #include "PWL_Button.h" #include "PWL_Caret.h" @@ -25,4 +25,4 @@ #include "PWL_Utils.h" #include "PWL_Wnd.h" -#endif //_IPDFWINDOW_H_ +#endif // FPDFSDK_INCLUDE_PDFWINDOW_IPDFWINDOW_H_ diff --git a/fpdfsdk/include/pdfwindow/PDFWindow.h b/fpdfsdk/include/pdfwindow/PDFWindow.h index dafc7452f2..3cd1e02878 100644 --- a/fpdfsdk/include/pdfwindow/PDFWindow.h +++ b/fpdfsdk/include/pdfwindow/PDFWindow.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef PDFWINDOW_H_ -#define PDFWINDOW_H_ +#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PDFWINDOW_H_ +#define FPDFSDK_INCLUDE_PDFWINDOW_PDFWINDOW_H_ #include "../../../core/include/fpdfapi/fpdf_module.h" #include "../../../core/include/fpdfdoc/fpdf_doc.h" @@ -15,4 +15,4 @@ #include "../fx_systemhandler.h" #include "../fxedit/fx_edit.h" -#endif // PDFWINDOW_H_ +#endif // FPDFSDK_INCLUDE_PDFWINDOW_PDFWINDOW_H_ diff --git a/fpdfsdk/include/pdfwindow/PWL_Button.h b/fpdfsdk/include/pdfwindow/PWL_Button.h index 72adcf9546..9141cf047c 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Button.h +++ b/fpdfsdk/include/pdfwindow/PWL_Button.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _PWL_BUTTON_H_ -#define _PWL_BUTTON_H_ +#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_BUTTON_H_ +#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_BUTTON_H_ #include "PWL_Wnd.h" @@ -24,4 +24,4 @@ protected: FX_BOOL m_bMouseDown; }; -#endif +#endif // FPDFSDK_INCLUDE_PDFWINDOW_PWL_BUTTON_H_ diff --git a/fpdfsdk/include/pdfwindow/PWL_Caret.h b/fpdfsdk/include/pdfwindow/PWL_Caret.h index 2dfef2ae92..b827f18d3f 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Caret.h +++ b/fpdfsdk/include/pdfwindow/PWL_Caret.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _PWL_CARET_H_ -#define _PWL_CARET_H_ +#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_CARET_H_ +#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_CARET_H_ #include "PWL_Wnd.h" @@ -50,5 +50,4 @@ private: CPDF_Rect m_rcInvalid; }; -#endif - +#endif // FPDFSDK_INCLUDE_PDFWINDOW_PWL_CARET_H_ diff --git a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h b/fpdfsdk/include/pdfwindow/PWL_ComboBox.h index 0b86add467..826f4dcc3e 100644 --- a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h +++ b/fpdfsdk/include/pdfwindow/PWL_ComboBox.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _PWL_COMBOBOX_H_ -#define _PWL_COMBOBOX_H_ +#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_COMBOBOX_H_ +#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_COMBOBOX_H_ #include "PWL_Edit.h" #include "PWL_ListBox.h" @@ -115,5 +115,4 @@ private: void* m_pFormFiller; }; -#endif // !defined(AFX_PWL_COMBOBOX_H__9D6645F8_64AA_4806_94E8_95FDEDD39C17__INCLUDED_) - +#endif // FPDFSDK_INCLUDE_PDFWINDOW_PWL_COMBOBOX_H_ diff --git a/fpdfsdk/include/pdfwindow/PWL_Edit.h b/fpdfsdk/include/pdfwindow/PWL_Edit.h index 85ed5e8f91..5b0e7dd1ff 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Edit.h +++ b/fpdfsdk/include/pdfwindow/PWL_Edit.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _PWL_EDIT_H_ -#define _PWL_EDIT_H_ +#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDIT_H_ +#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDIT_H_ #include "../../../core/include/fxcrt/fx_basic.h" #include "PWL_EditCtrl.h" @@ -142,5 +142,4 @@ private: void* m_pFormFiller; }; -#endif - +#endif // FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDIT_H_ diff --git a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h index d179e69938..600c348446 100644 --- a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h +++ b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _PWL_EDITCTRL_H_ -#define _PWL_EDITCTRL_H_ +#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDITCTRL_H_ +#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDITCTRL_H_ #include "../../../core/include/fxcrt/fx_string.h" #include "../fxedit/fx_edit.h" @@ -173,5 +173,4 @@ private: FX_INT32 m_nCodePage; }; -#endif - +#endif // FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDITCTRL_H_ diff --git a/fpdfsdk/include/pdfwindow/PWL_FontMap.h b/fpdfsdk/include/pdfwindow/PWL_FontMap.h index 2ff6c0f38c..cdce862b29 100644 --- a/fpdfsdk/include/pdfwindow/PWL_FontMap.h +++ b/fpdfsdk/include/pdfwindow/PWL_FontMap.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _PWL_FONTMAP_H_ -#define _PWL_FONTMAP_H_ +#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_FONTMAP_H_ +#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_FONTMAP_H_ #include "../../../public/fpdf_sysfontinfo.h" #include "../fxedit/fx_edit.h" @@ -136,4 +136,4 @@ private: CPDF_Document* m_pAttachedDoc; }; -#endif +#endif // FPDFSDK_INCLUDE_PDFWINDOW_PWL_FONTMAP_H_ diff --git a/fpdfsdk/include/pdfwindow/PWL_Icon.h b/fpdfsdk/include/pdfwindow/PWL_Icon.h index 08f3e4fd8b..cb56a9929e 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Icon.h +++ b/fpdfsdk/include/pdfwindow/PWL_Icon.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _PWL_ICON_H_ -#define _PWL_ICON_H_ +#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICON_H_ +#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICON_H_ #include "../../../core/include/fxcrt/fx_string.h" #include "PWL_Wnd.h" @@ -57,6 +57,4 @@ private: }; -#endif // !defined(AFX_PWL_BUTTON_H__5A6080AA_33C5_4FC9_91FC_D9644C41120A__INCLUDED_) - - +#endif // FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICON_H_ diff --git a/fpdfsdk/include/pdfwindow/PWL_IconList.h b/fpdfsdk/include/pdfwindow/PWL_IconList.h index b85ba4955e..d074b76be1 100644 --- a/fpdfsdk/include/pdfwindow/PWL_IconList.h +++ b/fpdfsdk/include/pdfwindow/PWL_IconList.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _PWL_IconList_H_ -#define _PWL_IconList_H_ +#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICONLIST_H_ +#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICONLIST_H_ #include "../../../core/include/fxcrt/fx_string.h" #include "PWL_ListCtrl.h" @@ -124,7 +124,5 @@ private: CPWL_IconList_Content* m_pListContent; FX_INT32 m_nListCount; }; - -#endif //_PWL_IconList_H_ - +#endif // FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICONLIST_H_ diff --git a/fpdfsdk/include/pdfwindow/PWL_Label.h b/fpdfsdk/include/pdfwindow/PWL_Label.h index 811a3dae07..f724a0a82b 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Label.h +++ b/fpdfsdk/include/pdfwindow/PWL_Label.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _PWL_LABEL_H_ -#define _PWL_LABEL_H_ +#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_LABEL_H_ +#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_LABEL_H_ #include "PWL_Wnd.h" @@ -42,6 +42,4 @@ private: IFX_Edit* m_pEdit; }; -#endif - - +#endif // FPDFSDK_INCLUDE_PDFWINDOW_PWL_LABEL_H_ diff --git a/fpdfsdk/include/pdfwindow/PWL_ListBox.h b/fpdfsdk/include/pdfwindow/PWL_ListBox.h index a31818f274..e8e9036b8e 100644 --- a/fpdfsdk/include/pdfwindow/PWL_ListBox.h +++ b/fpdfsdk/include/pdfwindow/PWL_ListBox.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _PWL_LISTBOX_H_ -#define _PWL_LISTBOX_H_ +#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTBOX_H_ +#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTBOX_H_ #include "../fxedit/fx_edit.h" #include "PWL_Wnd.h" @@ -101,6 +101,4 @@ private: void* m_pFormFiller; }; -#endif // !defined(AFX_PWL_LISTBOX_H__F8C0DD72_CC3C_4806_86FB_E9D02B04A34B__INCLUDED_) - - +#endif // FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTBOX_H_ diff --git a/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h b/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h index 5a1f06045a..65df7aecfc 100644 --- a/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h +++ b/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _PWL_LISTCTRL_H_ -#define _PWL_LISTCTRL_H_ +#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTCTRL_H_ +#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTCTRL_H_ #include "PWL_Wnd.h" @@ -44,5 +44,4 @@ private: FX_FLOAT m_fBottomSpace; }; -#endif - +#endif // FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTCTRL_H_ diff --git a/fpdfsdk/include/pdfwindow/PWL_Note.h b/fpdfsdk/include/pdfwindow/PWL_Note.h index 25290928db..c5cdc4dd9c 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Note.h +++ b/fpdfsdk/include/pdfwindow/PWL_Note.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _PWL_NOTE_H_ -#define _PWL_NOTE_H_ +#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_NOTE_H_ +#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_NOTE_H_ #include "PWL_Button.h" #include "PWL_Edit.h" @@ -357,5 +357,4 @@ private: CFX_WideString m_sReplyString; }; -#endif - +#endif // FPDFSDK_INCLUDE_PDFWINDOW_PWL_NOTE_H_ diff --git a/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h b/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h index dc1f18fce9..2f0473f1d2 100644 --- a/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h +++ b/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _PWL_SCROLLBAR_H_ -#define _PWL_SCROLLBAR_H_ +#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_SCROLLBAR_H_ +#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_SCROLLBAR_H_ #include "PWL_Wnd.h" @@ -163,6 +163,4 @@ private: FX_FLOAT m_fOldPosButton; }; -#endif // !defined(AFX_PWL_SCROLLBAR_H__DCFEC082_2651_48A4_B8F3_63F1B3CC5E10__INCLUDED_) - - +#endif // FPDFSDK_INCLUDE_PDFWINDOW_PWL_SCROLLBAR_H_ diff --git a/fpdfsdk/include/pdfwindow/PWL_Signature.h b/fpdfsdk/include/pdfwindow/PWL_Signature.h index 6860d814c0..bdc1406a3d 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Signature.h +++ b/fpdfsdk/include/pdfwindow/PWL_Signature.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _PWL_SIGNATURE_H_ -#define _PWL_SIGNATURE_H_ +#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_SIGNATURE_H_ +#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_SIGNATURE_H_ #include "PWL_Icon.h" #include "PWL_Wnd.h" @@ -64,6 +64,4 @@ private: FX_BOOL m_bFlagExist; }; -#endif // _PWL_SIGNATURE_H_ - - +#endif // FPDFSDK_INCLUDE_PDFWINDOW_PWL_SIGNATURE_H_ diff --git a/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h b/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h index 2df3d5d369..9b4ffd2341 100644 --- a/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h +++ b/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _PWL_SPECIALBUTTON_H_ -#define _PWL_SPECIALBUTTON_H_ +#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_SPECIALBUTTON_H_ +#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_SPECIALBUTTON_H_ #include "PWL_Button.h" @@ -53,6 +53,4 @@ private: FX_BOOL m_bChecked; }; -#endif - - +#endif // FPDFSDK_INCLUDE_PDFWINDOW_PWL_SPECIALBUTTON_H_ diff --git a/fpdfsdk/include/pdfwindow/PWL_Utils.h b/fpdfsdk/include/pdfwindow/PWL_Utils.h index 3eeaa7ac81..51514f2513 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Utils.h +++ b/fpdfsdk/include/pdfwindow/PWL_Utils.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _PWL_UTILS_H_ -#define _PWL_UTILS_H_ +#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_UTILS_H_ +#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_UTILS_H_ #include "../../../core/include/fpdfapi/fpdf_parser.h" // For CPDF_Point. #include "../../../core/include/fpdfdoc/fpdf_vt.h" // For CPVT_WordRange. @@ -240,6 +240,4 @@ private: static void GetGraphics_Foxit(CFX_ByteString& sPathData, CFX_PathData& path, const CPDF_Rect& crBBox, const PWL_PATH_TYPE type); }; -#endif // !defined(AFX_PWL_UTILS_H__D32812AD_A875_4E08_9D3C_0A57020987C6__INCLUDED_) - - +#endif // FPDFSDK_INCLUDE_PDFWINDOW_PWL_UTILS_H_ diff --git a/fpdfsdk/include/pdfwindow/PWL_Wnd.h b/fpdfsdk/include/pdfwindow/PWL_Wnd.h index 8b766ec984..4fa1c7639b 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Wnd.h +++ b/fpdfsdk/include/pdfwindow/PWL_Wnd.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _PWL_WND_H_ -#define _PWL_WND_H_ +#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_WND_H_ +#define FPDFSDK_INCLUDE_PDFWINDOW_PWL_WND_H_ #include "../../../core/include/fxcrt/fx_basic.h" #include "../../../core/include/fpdfdoc/fpdf_doc.h" @@ -474,28 +474,4 @@ private: FX_BOOL m_bEnabled; }; -// #ifndef VK_END -// -// #define VK_END 0x23 -// #define VK_HOME 0x24 -// #define VK_LEFT 0x25 -// #define VK_UP 0x26 -// #define VK_RIGHT 0x27 -// #define VK_DOWN 0x28 -// #define VK_INSERT 0x2D -// #define VK_DELETE 0x2E -// -// #define VK_BACK 0x08 -// #define VK_TAB 0x09 -// -// #define VK_CLEAR 0x0C -// #define VK_RETURN 0x0D -// #define VK_ESCAPE 0x1B -// #define VK_SPACE 0x20 -// #endif -// -// #define VK_NONE 0 - -#endif // !defined(AFX_PWL_WND_H__D32812AD_A875_4E08_9D3C_0A57020987C6__INCLUDED_) - - +#endif // FPDFSDK_INCLUDE_PDFWINDOW_PWL_WND_H_ -- cgit v1.2.3