12 files changed, 56 insertions, 36 deletions
diff --git a/xfa/include/fwl/core/fwl_app.h b/xfa/include/fwl/core/fwl_app.h
index 1c33d47908..9bfb519d88 100644
--- a/xfa/include/fwl/core/fwl_app.h
+++ b/xfa/include/fwl/core/fwl_app.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_APP_H
-#define _FWL_APP_H
+#ifndef XFA_INCLUDE_FWL_CORE_FWL_APP_H_
+#define XFA_INCLUDE_FWL_CORE_FWL_APP_H_
+
 class IFWL_NoteThread;
 class IFWL_AdapterNative;
 class IFWL_Widget;
@@ -37,4 +38,5 @@ extern FWL_ERR FWL_Execute(const CFX_WideStringC& wsExecutable,
                            const CFX_WideStringC& wsParameters);
 FWL_ERR FWL_SetFullScreen(IFWL_Widget* pWidget, FX_BOOL bFullScreen);
 FX_BOOL FWL_AppIsActived();
-#endif
+
+#endif  // XFA_INCLUDE_FWL_CORE_FWL_APP_H_
diff --git a/xfa/include/fwl/core/fwl_content.h b/xfa/include/fwl/core/fwl_content.h
index 3050f8724d..c665469aec 100644
--- a/xfa/include/fwl/core/fwl_content.h
+++ b/xfa/include/fwl/core/fwl_content.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_CONTENT_H
-#define _FWL_CONTENT_H
+#ifndef XFA_INCLUDE_FWL_CORE_FWL_CONTENT_H_
+#define XFA_INCLUDE_FWL_CORE_FWL_CONTENT_H_
+
 class IFWL_Widget;
 class IFWL_Content;
 class IFWL_Content : public IFWL_Widget {
@@ -22,4 +23,5 @@ class IFWL_Content : public IFWL_Widget {
  protected:
   IFWL_Content();
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_CORE_FWL_CONTENT_H_
diff --git a/xfa/include/fwl/core/fwl_form.h b/xfa/include/fwl/core/fwl_form.h
index 23a6cdd6ce..e79d88da5a 100644
--- a/xfa/include/fwl/core/fwl_form.h
+++ b/xfa/include/fwl/core/fwl_form.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_FORM_H
-#define _FWL_FORM_H
+#ifndef XFA_INCLUDE_FWL_CORE_FWL_FORM_H_
+#define XFA_INCLUDE_FWL_CORE_FWL_FORM_H_
+
 class IFWL_Widget;
 class IFWL_Panel;
 class IFWL_Form;
@@ -80,4 +81,5 @@ class IFWL_Form : public IFWL_Panel {
  protected:
   IFWL_Form();
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_CORE_FWL_FORM_H_
diff --git a/xfa/include/fwl/core/fwl_grid.h b/xfa/include/fwl/core/fwl_grid.h
index 64142cdb6a..e7071af7b3 100644
--- a/xfa/include/fwl/core/fwl_grid.h
+++ b/xfa/include/fwl/core/fwl_grid.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_GRID_H
-#define _FWL_GRID_H
+#ifndef XFA_INCLUDE_FWL_CORE_FWL_GRID_H_
+#define XFA_INCLUDE_FWL_CORE_FWL_GRID_H_
+
 class IFWL_Widget;
 class IFWL_Content;
 #define FWL_CLASS_Grid L"FWL_GRID"
@@ -80,4 +81,5 @@ class IFWL_Grid : public IFWL_Content {
  protected:
   IFWL_Grid();
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_CORE_FWL_GRID_H_
diff --git a/xfa/include/fwl/core/fwl_note.h b/xfa/include/fwl/core/fwl_note.h
index ef86927263..5277af3f11 100644
--- a/xfa/include/fwl/core/fwl_note.h
+++ b/xfa/include/fwl/core/fwl_note.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_NOTE_H
-#define _FWL_NOTE_H
+#ifndef XFA_INCLUDE_FWL_CORE_FWL_NOTE_H_
+#define XFA_INCLUDE_FWL_CORE_FWL_NOTE_H_
+
 class IFWL_Target;
 class IFWL_Widget;
 class IFWL_NoteThread;
@@ -373,4 +374,5 @@ typedef FX_BOOL (*FWLMessageHookCallback)(CFWL_Message* msg, void* info);
 FWL_ERR FWL_SetHook(IFWL_NoteDriver* driver,
                     FWLMessageHookCallback callback,
                     void* info);
-#endif
+
+#endif  // XFA_INCLUDE_FWL_CORE_FWL_NOTE_H_
diff --git a/xfa/include/fwl/core/fwl_panel.h b/xfa/include/fwl/core/fwl_panel.h
index b528ff52f2..94e01bca60 100644
--- a/xfa/include/fwl/core/fwl_panel.h
+++ b/xfa/include/fwl/core/fwl_panel.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_PANEL_H
-#define _FWL_PANEL_H
+#ifndef XFA_INCLUDE_FWL_CORE_FWL_PANEL_H_
+#define XFA_INCLUDE_FWL_CORE_FWL_PANEL_H_
+
 class IFWL_Widget;
 class IFWL_Content;
 class IFWL_Panel;
@@ -37,4 +38,5 @@ class IFWL_CustomPanel : public IFWL_Widget {
  protected:
   IFWL_CustomPanel();
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_CORE_FWL_PANEL_H_
diff --git a/xfa/include/fwl/core/fwl_target.h b/xfa/include/fwl/core/fwl_target.h
index 141b296b4c..7eaf0b25f3 100644
--- a/xfa/include/fwl/core/fwl_target.h
+++ b/xfa/include/fwl/core/fwl_target.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FWL_TARGET_H_
-#define FWL_TARGET_H_
+#ifndef XFA_INCLUDE_FWL_CORE_FWL_TARGET_H_
+#define XFA_INCLUDE_FWL_CORE_FWL_TARGET_H_
 
 #include "core/include/fxcrt/fx_basic.h"
 
@@ -48,4 +48,4 @@ class IFWL_Target {
   CFWL_TargetImp* m_pImpl;
 };
 
-#endif  // FWL_TARGET_H_
+#endif  // XFA_INCLUDE_FWL_CORE_FWL_TARGET_H_
diff --git a/xfa/include/fwl/core/fwl_theme.h b/xfa/include/fwl/core/fwl_theme.h
index aba5f7892e..2700e3bd55 100644
--- a/xfa/include/fwl/core/fwl_theme.h
+++ b/xfa/include/fwl/core/fwl_theme.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_THEME_H
-#define _FWL_THEME_H
+#ifndef XFA_INCLUDE_FWL_CORE_FWL_THEME_H_
+#define XFA_INCLUDE_FWL_CORE_FWL_THEME_H_
+
 class IFWL_Widget;
 class CFWL_ThemePart;
 class CFWL_ThemeBackground;
@@ -79,4 +80,5 @@ class IFWL_ThemeProvider {
                            FX_FLOAT fy) = 0;
   virtual FX_BOOL CalcTextRect(CFWL_ThemeText* pParams, CFX_RectF& rect) = 0;
 };
-#endif
+
+#endif  // XFA_INCLUDE_FWL_CORE_FWL_THEME_H_
diff --git a/xfa/include/fwl/core/fwl_thread.h b/xfa/include/fwl/core/fwl_thread.h
index 0db473c062..c10f72900c 100644
--- a/xfa/include/fwl/core/fwl_thread.h
+++ b/xfa/include/fwl/core/fwl_thread.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FWL_THREAD_H_
-#define FWL_THREAD_H_
+#ifndef XFA_INCLUDE_FWL_CORE_FWL_THREAD_H_
+#define XFA_INCLUDE_FWL_CORE_FWL_THREAD_H_
 
 // The FWL thread/app code contains three parallel inheritance hierarchies,
 // which reference each other via pointers as follows:
@@ -48,4 +48,4 @@ class IFWL_NoteThread : public IFWL_Thread {
   IFWL_NoteDriver* GetNoteDriver();
 };
 
-#endif  // FWL_THREAD_H_
+#endif  // XFA_INCLUDE_FWL_CORE_FWL_THREAD_H_
diff --git a/xfa/include/fwl/core/fwl_widget.h b/xfa/include/fwl/core/fwl_widget.h
index 9eb8994763..2cec462535 100644
--- a/xfa/include/fwl/core/fwl_widget.h
+++ b/xfa/include/fwl/core/fwl_widget.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_WIDGET_H
-#define _FWL_WIDGET_H
+#ifndef XFA_INCLUDE_FWL_CORE_FWL_WIDGET_H_
+#define XFA_INCLUDE_FWL_CORE_FWL_WIDGET_H_
+
 class IFWL_Target;
 class IFWL_ThemeProvider;
 class CFWL_WidgetImpProperties;
@@ -120,4 +121,5 @@ FWL_ERR FWL_Accelerator_SetThread(CFX_MapAccelerators* pMapAccel);
 FWL_ERR FWL_Accelerator_SetForm(IFWL_Form* pFrom,
                                 CFX_MapAccelerators* pMapAccel);
 FWL_ERR FWL_EnabelWidget(IFWL_Widget* widget, FX_BOOL bEnable);
-#endif
+
+#endif  // XFA_INCLUDE_FWL_CORE_FWL_WIDGET_H_
diff --git a/xfa/include/fwl/core/fwl_widgetdef.h b/xfa/include/fwl/core/fwl_widgetdef.h
index 9b1eefb0fa..548fe92019 100644
--- a/xfa/include/fwl/core/fwl_widgetdef.h
+++ b/xfa/include/fwl/core/fwl_widgetdef.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_WIDGETDEF_H
-#define _FWL_WIDGETDEF_H
+#ifndef XFA_INCLUDE_FWL_CORE_FWL_WIDGETDEF_H_
+#define XFA_INCLUDE_FWL_CORE_FWL_WIDGETDEF_H_
+
 #define FWL_WGTSTYLE_OverLapper (0L << 0)
 #define FWL_WGTSTYLE_Popup (1L << 0)
 #define FWL_WGTSTYLE_Child (2L << 0)
@@ -244,4 +245,5 @@
 #define FWL_VKEY_Unknown 0
 #define FWL_VKEYSTATE_Toggled 0x0001
 #define FWL_VKEYSTATE_Down 0x0100
-#endif
+
+#endif  // XFA_INCLUDE_FWL_CORE_FWL_WIDGETDEF_H_
diff --git a/xfa/include/fwl/core/fwl_widgetmgr.h b/xfa/include/fwl/core/fwl_widgetmgr.h
index c2dfefa36a..2420f6927f 100644
--- a/xfa/include/fwl/core/fwl_widgetmgr.h
+++ b/xfa/include/fwl/core/fwl_widgetmgr.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_WIDGETMGR_H
-#define _FWL_WIDGETMGR_H
+#ifndef XFA_INCLUDE_FWL_CORE_FWL_WIDGETMGR_H_
+#define XFA_INCLUDE_FWL_CORE_FWL_WIDGETMGR_H_
+
 class IFWL_Widget;
 class IFWL_WidgetMgr;
 class IFWL_WidgetMgrDelegate;
@@ -51,4 +52,5 @@ class IFWL_WidgetMgrDelegate {
 FWL_ERR FWL_WidgetMgrSnapshot(IFWL_Widget* pWidget,
                               const CFX_WideString* saveFile,
                               const CFX_Matrix* pMatrix = NULL);
-#endif
+
+#endif  // XFA_INCLUDE_FWL_CORE_FWL_WIDGETMGR_H_