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/include/fwl/basewidget/fwl_barcode.h | 9 ++++++--- xfa/include/fwl/basewidget/fwl_caret.h | 8 +++++--- xfa/include/fwl/basewidget/fwl_checkbox.h | 7 ++++--- xfa/include/fwl/basewidget/fwl_combobox.h | 8 +++++--- xfa/include/fwl/basewidget/fwl_datetimepicker.h | 8 +++++--- xfa/include/fwl/basewidget/fwl_edit.h | 6 +++--- xfa/include/fwl/basewidget/fwl_listbox.h | 8 +++++--- xfa/include/fwl/basewidget/fwl_menu.h | 8 +++++--- xfa/include/fwl/basewidget/fwl_monthcalendar.h | 8 +++++--- xfa/include/fwl/basewidget/fwl_picturebox.h | 8 +++++--- xfa/include/fwl/basewidget/fwl_pushbutton.h | 8 +++++--- xfa/include/fwl/basewidget/fwl_scrollbar.h | 8 +++++--- xfa/include/fwl/basewidget/fwl_spinbutton.h | 8 +++++--- xfa/include/fwl/basewidget/fwl_tooltipctrl.h | 8 +++++--- xfa/include/fwl/basewidget/fxmath_barcode.h | 8 +++++--- 15 files changed, 73 insertions(+), 45 deletions(-) (limited to 'xfa/include/fwl/basewidget') diff --git a/xfa/include/fwl/basewidget/fwl_barcode.h b/xfa/include/fwl/basewidget/fwl_barcode.h index 2b3654d7b2..a0a6b816fd 100644 --- a/xfa/include/fwl/basewidget/fwl_barcode.h +++ b/xfa/include/fwl/basewidget/fwl_barcode.h @@ -4,9 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FWL_BARCODE_H -#define _FWL_BARCODE_H +#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_BARCODE_H_ +#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_BARCODE_H_ + #include "fwl_edit.h" + class CFWL_WidgetImpProperties; class IFWL_Widget; class IFWL_BarcodeDP; @@ -57,4 +59,5 @@ class IFWL_Barcode : public IFWL_Edit { protected: IFWL_Barcode(); }; -#endif + +#endif // XFA_INCLUDE_FWL_BASEWIDGET_FWL_BARCODE_H_ diff --git a/xfa/include/fwl/basewidget/fwl_caret.h b/xfa/include/fwl/basewidget/fwl_caret.h index f88dee601d..7b022e7816 100644 --- a/xfa/include/fwl/basewidget/fwl_caret.h +++ b/xfa/include/fwl/basewidget/fwl_caret.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FWL_CARET_H -#define _FWL_CARET_H +#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_CARET_H_ +#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_CARET_H_ + class CFWL_WidgetImpProperties; class IFWL_Widget; class IFWL_Caret; @@ -28,4 +29,5 @@ class IFWL_Caret : public IFWL_Widget { protected: IFWL_Caret(); }; -#endif + +#endif // XFA_INCLUDE_FWL_BASEWIDGET_FWL_CARET_H_ diff --git a/xfa/include/fwl/basewidget/fwl_checkbox.h b/xfa/include/fwl/basewidget/fwl_checkbox.h index 6e6cec5e76..616fef5397 100644 --- a/xfa/include/fwl/basewidget/fwl_checkbox.h +++ b/xfa/include/fwl/basewidget/fwl_checkbox.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FWL_CHECKBOX_H -#define _FWL_CHECKBOX_H +#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_CHECKBOX_H_ +#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_CHECKBOX_H_ + class CFWL_WidgetImpProperties; class IFWL_Widget; class IFWL_CheckBoxDP; @@ -78,4 +79,4 @@ class IFWL_CheckBox : public IFWL_Widget { IFWL_CheckBox(); }; -#endif +#endif // XFA_INCLUDE_FWL_BASEWIDGET_FWL_CHECKBOX_H_ diff --git a/xfa/include/fwl/basewidget/fwl_combobox.h b/xfa/include/fwl/basewidget/fwl_combobox.h index db23d34f5c..624061f387 100644 --- a/xfa/include/fwl/basewidget/fwl_combobox.h +++ b/xfa/include/fwl/basewidget/fwl_combobox.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FWL_COMBOBOX_H -#define _FWL_COMBOBOX_H +#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_COMBOBOX_H_ +#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_COMBOBOX_H_ + class CFWL_WidgetImpProperties; class IFWL_Widget; class IFWL_ListBox; @@ -136,4 +137,5 @@ class IFWL_ComboBox : public IFWL_Widget { protected: IFWL_ComboBox(); }; -#endif + +#endif // XFA_INCLUDE_FWL_BASEWIDGET_FWL_COMBOBOX_H_ diff --git a/xfa/include/fwl/basewidget/fwl_datetimepicker.h b/xfa/include/fwl/basewidget/fwl_datetimepicker.h index 79cb5f5fcb..5932991f6f 100644 --- a/xfa/include/fwl/basewidget/fwl_datetimepicker.h +++ b/xfa/include/fwl/basewidget/fwl_datetimepicker.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FWL_DATETIMEPICKER_H -#define _FWL_DATETIMEPICKER_H +#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_DATETIMEPICKER_H_ +#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_DATETIMEPICKER_H_ + class CFWL_WidgetImpProperties; class IFWL_Widget; class IFWL_DateTimePickerDP; @@ -102,4 +103,5 @@ class IFWL_DateTimePicker : public IFWL_Widget { protected: IFWL_DateTimePicker(); }; -#endif + +#endif // XFA_INCLUDE_FWL_BASEWIDGET_FWL_DATETIMEPICKER_H_ diff --git a/xfa/include/fwl/basewidget/fwl_edit.h b/xfa/include/fwl/basewidget/fwl_edit.h index 878e5319fc..915f149c09 100644 --- a/xfa/include/fwl/basewidget/fwl_edit.h +++ b/xfa/include/fwl/basewidget/fwl_edit.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef FWL_EDIT_H_ -#define FWL_EDIT_H_ +#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_EDIT_H_ +#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_EDIT_H_ #include @@ -168,4 +168,4 @@ class IFWL_Edit : public IFWL_Widget { IFWL_Edit(); }; -#endif // FWL_EDIT_H_ +#endif // XFA_INCLUDE_FWL_BASEWIDGET_FWL_EDIT_H_ diff --git a/xfa/include/fwl/basewidget/fwl_listbox.h b/xfa/include/fwl/basewidget/fwl_listbox.h index d28b8896f7..49f291e813 100644 --- a/xfa/include/fwl/basewidget/fwl_listbox.h +++ b/xfa/include/fwl/basewidget/fwl_listbox.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FWL_LISTBOX_H -#define _FWL_LISTBOX_H +#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_LISTBOX_H_ +#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_LISTBOX_H_ + class CFWL_WidgetImpProperties; class IFWL_Widget; class IFWL_ListBoxDP; @@ -126,4 +127,5 @@ class IFWL_ListBox : public IFWL_Widget { protected: IFWL_ListBox(); }; -#endif + +#endif // XFA_INCLUDE_FWL_BASEWIDGET_FWL_LISTBOX_H_ diff --git a/xfa/include/fwl/basewidget/fwl_menu.h b/xfa/include/fwl/basewidget/fwl_menu.h index b2e7ec00ac..9b6f321d94 100644 --- a/xfa/include/fwl/basewidget/fwl_menu.h +++ b/xfa/include/fwl/basewidget/fwl_menu.h @@ -4,12 +4,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FWL_MENU_H -#define _FWL_MENU_H +#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_MENU_H_ +#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_MENU_H_ + #define FWL_CLASS_Menu L"FWL_MENU" #define FWL_CLASSHASH_Menu 3957949655 #define FWL_STYLEEXT_MNU_Horz (0L << 0) #define FWL_STYLEEXT_MNU_Vert (1L << 0) #define FWL_STYLEEXT_MNU_Dock (1L << 1) #define FWL_STYLEEXT_MNU_OwnerDraw (1L << 2) -#endif + +#endif // XFA_INCLUDE_FWL_BASEWIDGET_ diff --git a/xfa/include/fwl/basewidget/fwl_monthcalendar.h b/xfa/include/fwl/basewidget/fwl_monthcalendar.h index 9c2a7df996..3053947180 100644 --- a/xfa/include/fwl/basewidget/fwl_monthcalendar.h +++ b/xfa/include/fwl/basewidget/fwl_monthcalendar.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FWL_MONTHCALENDAR_H -#define _FWL_MONTHCALENDAR_H +#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_MONTHCALENDAR_H_ +#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_MONTHCALENDAR_H_ + class IFWL_MonthCalendarDP; class IFWL_MonthCalendar; #define FWL_CLASS_MonthCalendar L"FWL_MONTHCALENDAR" @@ -127,4 +128,5 @@ class IFWL_MonthCalendar : public IFWL_Widget { protected: IFWL_MonthCalendar(); }; -#endif + +#endif // XFA_INCLUDE_FWL_BASEWIDGET_FWL_MONTHCALENDAR_H_ diff --git a/xfa/include/fwl/basewidget/fwl_picturebox.h b/xfa/include/fwl/basewidget/fwl_picturebox.h index bb7d911f90..0b206c2d04 100644 --- a/xfa/include/fwl/basewidget/fwl_picturebox.h +++ b/xfa/include/fwl/basewidget/fwl_picturebox.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FWL_PICTUREBOX_H -#define _FWL_PICTUREBOX_H +#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_PICTUREBOX_H_ +#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_PICTUREBOX_H_ + class CFWL_WidgetImpProperties; class IFWL_Widget; class IFWL_PictureBoxDP; @@ -49,4 +50,5 @@ class IFWL_PictureBox : public IFWL_Widget { protected: IFWL_PictureBox(); }; -#endif + +#endif // XFA_INCLUDE_FWL_BASEWIDGET_FWL_PICTUREBOX_H_ diff --git a/xfa/include/fwl/basewidget/fwl_pushbutton.h b/xfa/include/fwl/basewidget/fwl_pushbutton.h index 8e459d2f78..500cc0dcc1 100644 --- a/xfa/include/fwl/basewidget/fwl_pushbutton.h +++ b/xfa/include/fwl/basewidget/fwl_pushbutton.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FWL_PUSHBUTTON_H -#define _FWL_PUSHBUTTON_H +#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_PUSHBUTTON_H_ +#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_PUSHBUTTON_H_ + class CFWL_WidgetImpProperties; class IFWL_Widget; class IFWL_PushButtonDP; @@ -51,4 +52,5 @@ class IFWL_PushButton : public IFWL_Widget { protected: IFWL_PushButton(); }; -#endif + +#endif // XFA_INCLUDE_FWL_BASEWIDGET_FWL_PUSHBUTTON_H_ diff --git a/xfa/include/fwl/basewidget/fwl_scrollbar.h b/xfa/include/fwl/basewidget/fwl_scrollbar.h index c8a0d91446..691ec8826c 100644 --- a/xfa/include/fwl/basewidget/fwl_scrollbar.h +++ b/xfa/include/fwl/basewidget/fwl_scrollbar.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FWL_SCROLLBAR_H -#define _FWL_SCROLLBAR_H +#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_SCROLLBAR_H_ +#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_SCROLLBAR_H_ + class CFWL_WidgetImpProperties; class IFWL_Widget; class IFWL_ScrollBarDP; @@ -66,4 +67,5 @@ class IFWL_ScrollBar : public IFWL_Widget { protected: IFWL_ScrollBar(); }; -#endif + +#endif // XFA_INCLUDE_FWL_BASEWIDGET_FWL_SCROLLBAR_H_ diff --git a/xfa/include/fwl/basewidget/fwl_spinbutton.h b/xfa/include/fwl/basewidget/fwl_spinbutton.h index 5e89e43b84..a501cea864 100644 --- a/xfa/include/fwl/basewidget/fwl_spinbutton.h +++ b/xfa/include/fwl/basewidget/fwl_spinbutton.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FWL_SPINBUTTON_H -#define _FWL_SPINBUTTON_H +#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_SPINBUTTON_H_ +#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_SPINBUTTON_H_ + class CFWL_WidgetImpProperties; class IFWL_Widget; class IFWL_SpinButton; @@ -39,4 +40,5 @@ class IFWL_SpinButton : public IFWL_Widget { protected: IFWL_SpinButton(); }; -#endif + +#endif // XFA_INCLUDE_FWL_BASEWIDGET_FWL_SPINBUTTON_H_ diff --git a/xfa/include/fwl/basewidget/fwl_tooltipctrl.h b/xfa/include/fwl/basewidget/fwl_tooltipctrl.h index 1d63ba8096..9fcec86ea4 100644 --- a/xfa/include/fwl/basewidget/fwl_tooltipctrl.h +++ b/xfa/include/fwl/basewidget/fwl_tooltipctrl.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FWL_TOOLTIP_H -#define _FWL_TOOLTIP_H +#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_TOOLTIPCTRL_H_ +#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_TOOLTIPCTRL_H_ + class CFWL_WidgetImpProperties; class IFWL_Form; class IFWL_ToolTipDP; @@ -41,4 +42,5 @@ class IFWL_ToolTip : public IFWL_Form { protected: IFWL_ToolTip(); }; -#endif + +#endif // XFA_INCLUDE_FWL_BASEWIDGET_FWL_TOOLTIPCTRL_H_ diff --git a/xfa/include/fwl/basewidget/fxmath_barcode.h b/xfa/include/fwl/basewidget/fxmath_barcode.h index 7fc6cd700b..2797dc8f18 100644 --- a/xfa/include/fwl/basewidget/fxmath_barcode.h +++ b/xfa/include/fwl/basewidget/fxmath_barcode.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXMATH_BARCODE_H_ -#define _FXMATH_BARCODE_H_ +#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FXMATH_BARCODE_H_ +#define XFA_INCLUDE_FWL_BASEWIDGET_FXMATH_BARCODE_H_ + class IFX_Barcode { public: virtual ~IFX_Barcode() {} @@ -45,4 +46,5 @@ class IFX_Barcode { virtual FX_BOOL SetTruncated(FX_BOOL truncated) = 0; }; IFX_Barcode* FX_Barcode_Create(BC_TYPE type); -#endif + +#endif // XFA_INCLUDE_FWL_BASEWIDGET_FXMATH_BARCODE_H_ -- cgit v1.2.3