From 19922bbc0d62b81e0fdd6a01da39e9b875c53c68 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
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/javascript/Consts.h          |  7 +++----
 fpdfsdk/include/javascript/Document.h        |  7 +++----
 fpdfsdk/include/javascript/Field.h           |  7 +++----
 fpdfsdk/include/javascript/IJavaScript.h     |  7 +++----
 fpdfsdk/include/javascript/Icon.h            |  7 +++----
 fpdfsdk/include/javascript/JS_Context.h      | 14 +++-----------
 fpdfsdk/include/javascript/JS_Define.h       |  7 +++----
 fpdfsdk/include/javascript/JS_EventHandler.h |  7 +++----
 fpdfsdk/include/javascript/JS_GlobalData.h   |  6 +++---
 fpdfsdk/include/javascript/JS_Object.h       |  7 ++++---
 fpdfsdk/include/javascript/JS_Runtime.h      |  7 +++----
 fpdfsdk/include/javascript/JS_Value.h        |  9 ++++-----
 fpdfsdk/include/javascript/JavaScript.h      |  6 +++---
 fpdfsdk/include/javascript/PublicMethods.h   |  6 +++---
 fpdfsdk/include/javascript/app.h             |  6 +++---
 fpdfsdk/include/javascript/color.h           |  7 +++----
 fpdfsdk/include/javascript/console.h         |  7 +++----
 fpdfsdk/include/javascript/event.h           |  6 +++---
 fpdfsdk/include/javascript/global.h          |  6 +++---
 fpdfsdk/include/javascript/report.h          |  7 +++----
 fpdfsdk/include/javascript/util.h            |  7 ++++---
 21 files changed, 66 insertions(+), 84 deletions(-)

(limited to 'fpdfsdk/include/javascript')

diff --git a/fpdfsdk/include/javascript/Consts.h b/fpdfsdk/include/javascript/Consts.h
index 5d1906428c..f7ddc5215b 100644
--- a/fpdfsdk/include/javascript/Consts.h
+++ b/fpdfsdk/include/javascript/Consts.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _CONSTS_H_
-#define _CONSTS_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_CONSTS_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_CONSTS_H_
 
 #include "JS_Define.h"
 
@@ -124,5 +124,4 @@ public:
 	static int				Init(IJS_Runtime* pRuntime);
 };
 
-#endif //_CONSTS_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_CONSTS_H_
diff --git a/fpdfsdk/include/javascript/Document.h b/fpdfsdk/include/javascript/Document.h
index 0824185aa3..ab1ddb8633 100644
--- a/fpdfsdk/include/javascript/Document.h
+++ b/fpdfsdk/include/javascript/Document.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _DOCUMENT_H_
-#define _DOCUMENT_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_DOCUMENT_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_DOCUMENT_H_
 
 #include "JS_Define.h"
 
@@ -272,5 +272,4 @@ public:
 	JS_STATIC_METHOD(mailDoc, Document);
 };
 
-#endif//_DOCUMENT_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_DOCUMENT_H_
diff --git a/fpdfsdk/include/javascript/Field.h b/fpdfsdk/include/javascript/Field.h
index f9e5e49f9e..0da08b6e95 100644
--- a/fpdfsdk/include/javascript/Field.h
+++ b/fpdfsdk/include/javascript/Field.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FIELD_H_
-#define _FIELD_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_FIELD_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_FIELD_H_
 
 #include <string>  // For std::wstring.
 
@@ -356,5 +356,4 @@ public:
 	JS_STATIC_METHOD(signatureValidate, Field);
 };
 
-#endif //_FIELD_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_FIELD_H_
diff --git a/fpdfsdk/include/javascript/IJavaScript.h b/fpdfsdk/include/javascript/IJavaScript.h
index b0e21c915a..eea2e6a7ca 100644
--- a/fpdfsdk/include/javascript/IJavaScript.h
+++ b/fpdfsdk/include/javascript/IJavaScript.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _IJAVASCRIPT_H_
-#define _IJAVASCRIPT_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_IJAVASCRIPT_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_IJAVASCRIPT_H_
 
 #include "../../../core/include/fxcrt/fx_basic.h"
 #include "../../../xfa/include/fxjse/fxjse.h"
@@ -114,5 +114,4 @@ private:
 	FX_INT32						m_nGlobalDataCount;
 };
 
-#endif //_IJAVASCRIPT_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_IJAVASCRIPT_H_
diff --git a/fpdfsdk/include/javascript/Icon.h b/fpdfsdk/include/javascript/Icon.h
index 097917a5e5..20a3bb8f68 100644
--- a/fpdfsdk/include/javascript/Icon.h
+++ b/fpdfsdk/include/javascript/Icon.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _ICON_H_
-#define _ICON_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_ICON_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_ICON_H_
 
 #include "JS_Define.h"
 
@@ -37,5 +37,4 @@ public:
 	JS_STATIC_PROP(name, Icon);
 };
 
-#endif //_ICON_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_ICON_H_
diff --git a/fpdfsdk/include/javascript/JS_Context.h b/fpdfsdk/include/javascript/JS_Context.h
index b35ba3b4b2..7d9dc2c9f1 100644
--- a/fpdfsdk/include/javascript/JS_Context.h
+++ b/fpdfsdk/include/javascript/JS_Context.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JS_CONTEXT_H_
-#define _JS_CONTEXT_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_JS_CONTEXT_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_JS_CONTEXT_H_
 
 #include "../../../core/include/fxcrt/fx_system.h"
 #include "../../../core/include/fxcrt/fx_string.h"
@@ -94,12 +94,4 @@ private:
 	FX_BOOL						m_bMsgBoxEnable;
 };
 
-// static CFX_WideString JSGetStringFromID(CJS_Context* pContext, UINT ID)
-// {
-// 	ASSERT(pContext != NULL);
-// 
-// 	return JS_LoadString(pContext->GetReaderApp(), ID);
-// }
-
-#endif //_JS_CONTEXT_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_JS_CONTEXT_H_
diff --git a/fpdfsdk/include/javascript/JS_Define.h b/fpdfsdk/include/javascript/JS_Define.h
index 8310ae25fb..fc68e58755 100644
--- a/fpdfsdk/include/javascript/JS_Define.h
+++ b/fpdfsdk/include/javascript/JS_Define.h
@@ -4,12 +4,11 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JS_DEFINE_H_
-#define _JS_DEFINE_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_JS_DEFINE_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_JS_DEFINE_H_
 
 #include "../jsapi/fxjs_v8.h"
 #include "resource.h"
-
 #include "JS_Object.h"
 #include "JS_Value.h"
 
@@ -447,4 +446,4 @@ if (JS_DefineGlobalConst(pRuntime, (const wchar_t*)ArrayName, prop.ToV8Value())
 
 FXJSVALUETYPE GET_VALUE_TYPE(v8::Local<v8::Value> p);
 
-#endif //_JS_DEFINE_H_
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_JS_DEFINE_H_
diff --git a/fpdfsdk/include/javascript/JS_EventHandler.h b/fpdfsdk/include/javascript/JS_EventHandler.h
index a6736d319b..d6cdbe81bc 100644
--- a/fpdfsdk/include/javascript/JS_EventHandler.h
+++ b/fpdfsdk/include/javascript/JS_EventHandler.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JS_EVENTHANDLER_H_
-#define _JS_EVENTHANDLER_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_JS_EVENTHANDLER_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_JS_EVENTHANDLER_H_
 
 #include "../../../core/include/fxcrt/fx_string.h"
 #include "../../../core/include/fxcrt/fx_system.h"
@@ -170,5 +170,4 @@ public:
 	CPDFSDK_Annot*			m_pTargetAnnot;
 };
 
-#endif //_JS_EVENTHANDLER_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_JS_EVENTHANDLER_H_
diff --git a/fpdfsdk/include/javascript/JS_GlobalData.h b/fpdfsdk/include/javascript/JS_GlobalData.h
index b21a360820..4f09d87531 100644
--- a/fpdfsdk/include/javascript/JS_GlobalData.h
+++ b/fpdfsdk/include/javascript/JS_GlobalData.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JS_GLOBALDATA_H_
-#define _JS_GLOBALDATA_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_JS_GLOBALDATA_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_JS_GLOBALDATA_H_
 
 #include "../../../core/include/fxcrt/fx_basic.h"
 
@@ -95,4 +95,4 @@ private:
 	CPDFDoc_Environment*						m_pApp;
 };
 
-#endif //_JS_GLOBALDATA_H_
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_JS_GLOBALDATA_H_
diff --git a/fpdfsdk/include/javascript/JS_Object.h b/fpdfsdk/include/javascript/JS_Object.h
index a9ad01835c..3b97677fa6 100644
--- a/fpdfsdk/include/javascript/JS_Object.h
+++ b/fpdfsdk/include/javascript/JS_Object.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JS_OBJECT_H_
-#define _JS_OBJECT_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_JS_OBJECT_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_JS_OBJECT_H_
 
 #include "../fsdk_define.h"  // For FX_UINT
 #include "../fsdk_mgr.h"  // For CPDFDoc_Environment
@@ -296,4 +296,5 @@ private:
 
 	CPDFDoc_Environment*			m_pApp;
 };
-#endif //_JS_OBJECT_H_
+
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_JS_OBJECT_H_
diff --git a/fpdfsdk/include/javascript/JS_Runtime.h b/fpdfsdk/include/javascript/JS_Runtime.h
index 0e824f994c..91a82da375 100644
--- a/fpdfsdk/include/javascript/JS_Runtime.h
+++ b/fpdfsdk/include/javascript/JS_Runtime.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JS_RUNTIME_H_
-#define _JS_RUNTIME_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_JS_RUNTIME_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_JS_RUNTIME_H_
 
 #include "../../../third_party/base/nonstd_unique_ptr.h"
 #include "../../../core/include/fxcrt/fx_basic.h"
@@ -76,5 +76,4 @@ protected:
 	v8::Global<v8::Context> m_context;
 };
 
-#endif //_JS_RUNTIME_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_JS_RUNTIME_H_
diff --git a/fpdfsdk/include/javascript/JS_Value.h b/fpdfsdk/include/javascript/JS_Value.h
index faa612d21e..245b736cdf 100644
--- a/fpdfsdk/include/javascript/JS_Value.h
+++ b/fpdfsdk/include/javascript/JS_Value.h
@@ -4,11 +4,11 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _JS_VALUE_H_
-#define _JS_VALUE_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_JS_VALUE_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_JS_VALUE_H_
 
-#include "../jsapi/fxjs_v8.h"
 #include "../../../core/include/fxcrt/fx_basic.h"
+#include "../jsapi/fxjs_v8.h"
 
 class CJS_Array;
 class CJS_Date;
@@ -186,5 +186,4 @@ protected:
 	v8::Isolate* m_isolate;
 };
 
-#endif //_JS_VALUE_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_JS_VALUE_H_
diff --git a/fpdfsdk/include/javascript/JavaScript.h b/fpdfsdk/include/javascript/JavaScript.h
index e43b231d30..d96c6cac42 100644
--- a/fpdfsdk/include/javascript/JavaScript.h
+++ b/fpdfsdk/include/javascript/JavaScript.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef JAVASCRIPT_H_
-#define JAVASCRIPT_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_JAVASCRIPT_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_JAVASCRIPT_H_
 
 #include <string>
 #include <vector>
@@ -24,4 +24,4 @@
 #include "../pdfwindow/IPDFWindow.h"
 #include "../fpdfxfa/fpdfxfa_app.h"
 
-#endif  // JAVASCRIPT_H_
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_JAVASCRIPT_H_
diff --git a/fpdfsdk/include/javascript/PublicMethods.h b/fpdfsdk/include/javascript/PublicMethods.h
index e7a4010016..375ae1fcfe 100644
--- a/fpdfsdk/include/javascript/PublicMethods.h
+++ b/fpdfsdk/include/javascript/PublicMethods.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _PUBLICMETHODS_H_
-#define _PUBLICMETHODS_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_PUBLICMETHODS_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_PUBLICMETHODS_H_
 
 #include "JS_Define.h"
 
@@ -100,4 +100,4 @@ public:
 	static CJS_Array		AF_MakeArrayFromList(v8::Isolate* isolate, CJS_Value val);
 };
 
-#endif //_PUBLICMETHODS_H_
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_PUBLICMETHODS_H_
diff --git a/fpdfsdk/include/javascript/app.h b/fpdfsdk/include/javascript/app.h
index a515df4770..7e51f73135 100644
--- a/fpdfsdk/include/javascript/app.h
+++ b/fpdfsdk/include/javascript/app.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _APP_H_
-#define _APP_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_APP_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_APP_H_
 
 #include "JS_Define.h"
 
@@ -220,4 +220,4 @@ public:
 
 };
 
-#endif //_APP_H_
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_APP_H_
diff --git a/fpdfsdk/include/javascript/color.h b/fpdfsdk/include/javascript/color.h
index 6eeb37be7e..8aab76fffe 100644
--- a/fpdfsdk/include/javascript/color.h
+++ b/fpdfsdk/include/javascript/color.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _COLOR_H_
-#define _COLOR_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_COLOR_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_COLOR_H_
 
 #include "JS_Define.h"
 // TODO(tsepez): include CPWL_Color.h once its own IWYU is fixed.
@@ -77,5 +77,4 @@ public:
 
 };
 
-#endif //_COLOR_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_COLOR_H_
diff --git a/fpdfsdk/include/javascript/console.h b/fpdfsdk/include/javascript/console.h
index 60326aaf8b..d49ea418eb 100644
--- a/fpdfsdk/include/javascript/console.h
+++ b/fpdfsdk/include/javascript/console.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _CONSOLE_H_
-#define _CONSOLE_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_CONSOLE_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_CONSOLE_H_
 
 #include "JS_Define.h"
 
@@ -36,5 +36,4 @@ public:
 	JS_STATIC_METHOD(show, console);
 };
 
-#endif //_CONSOLE_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_CONSOLE_H_
diff --git a/fpdfsdk/include/javascript/event.h b/fpdfsdk/include/javascript/event.h
index b3418c2b71..f43def973a 100644
--- a/fpdfsdk/include/javascript/event.h
+++ b/fpdfsdk/include/javascript/event.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _EVENT_H_
-#define _EVENT_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_EVENT_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_EVENT_H_
 
 #include "JS_Define.h"
 
@@ -69,4 +69,4 @@ public:
 	JS_STATIC_PROP(willCommit, event);
 };
 
-#endif //_EVENT_H_
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_EVENT_H_
diff --git a/fpdfsdk/include/javascript/global.h b/fpdfsdk/include/javascript/global.h
index 2690f6822c..fac93d8e5b 100644
--- a/fpdfsdk/include/javascript/global.h
+++ b/fpdfsdk/include/javascript/global.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _GLOBAL_H_
-#define _GLOBAL_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_GLOBAL_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_GLOBAL_H_
 
 #include "JS_Define.h"
 
@@ -86,4 +86,4 @@ public:
 
 };
 
-#endif //_GLOBAL_H_
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_GLOBAL_H_
diff --git a/fpdfsdk/include/javascript/report.h b/fpdfsdk/include/javascript/report.h
index 05e7ddd803..9705adac88 100644
--- a/fpdfsdk/include/javascript/report.h
+++ b/fpdfsdk/include/javascript/report.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _REPORT_H_
-#define _REPORT_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_REPORT_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_REPORT_H_
 
 #include "JS_Define.h"
 
@@ -33,5 +33,4 @@ public:
 	JS_STATIC_METHOD(writeText, Report);
 };
 
-#endif //_REPORT_H_
-
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_REPORT_H_
diff --git a/fpdfsdk/include/javascript/util.h b/fpdfsdk/include/javascript/util.h
index 7601f7a4e5..b621067bc3 100644
--- a/fpdfsdk/include/javascript/util.h
+++ b/fpdfsdk/include/javascript/util.h
@@ -4,8 +4,8 @@
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _UTIL_H_
-#define _UTIL_H_
+#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_UTIL_H_
+#define FPDFSDK_INCLUDE_JAVASCRIPT_UTIL_H_
 
 #include <string>  // For std::wstring.
 
@@ -46,4 +46,5 @@ public:
 };
 
 FX_INT64 FX_atoi64(const char *nptr);
-#endif //_UTIL_H_
+
+#endif  // FPDFSDK_INCLUDE_JAVASCRIPT_UTIL_H_
-- 
cgit v1.2.3