Merge to XFA: Use override in more classes in fpdfsdk/

R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1287193005 .

(cherry picked from commit 0f6b51c0fdd14f5762bf3c7412ac59c825443cc3)

Review URL: https://codereview.chromium.org/1288393004 .

7 files changed, 10 insertions, 7 deletions

diff --git a/fpdfsdk/src/javascript/JS_Context.cpp b/fpdfsdk/src/javascript/JS_Context.cpp
index 9c142e6b1e..b51b5aa265 100644
--- a/fpdfsdk/src/javascript/JS_Context.cpp
+++ b/fpdfsdk/src/javascript/JS_Context.cpp
@@ -19,7 +19,7 @@ CJS_Context::CJS_Context(CJS_Runtime* pRuntime)
   m_pEventHandler = new CJS_EventHandler(this);
 }
 
-CJS_Context::~CJS_Context(void) {
+CJS_Context::~CJS_Context() {
   delete m_pEventHandler;
 }
 
diff --git a/fpdfsdk/src/javascript/JS_Object.cpp b/fpdfsdk/src/javascript/JS_Object.cpp
index 96e1d1d564..02978982d8 100644
--- a/fpdfsdk/src/javascript/JS_Object.cpp
+++ b/fpdfsdk/src/javascript/JS_Object.cpp
@@ -89,7 +89,7 @@ CJS_Object::CJS_Object(JSFXObject pObject) : m_pEmbedObj(NULL) {
   m_pObject.Reset(m_pIsolate, pObject);
 };
 
-CJS_Object::~CJS_Object(void) {
+CJS_Object::~CJS_Object() {
   m_pObject.Reset();
 };
 
diff --git a/fpdfsdk/src/javascript/app.cpp b/fpdfsdk/src/javascript/app.cpp
index aff491a084..547446861f 100644
--- a/fpdfsdk/src/javascript/app.cpp
+++ b/fpdfsdk/src/javascript/app.cpp
@@ -112,7 +112,7 @@ IMPLEMENT_JS_CLASS(CJS_App, app)
 app::app(CJS_Object* pJSObject)
     : CJS_EmbedObj(pJSObject), m_bCalculate(true), m_bRuntimeHighLight(false) {}
 
-app::~app(void) {
+app::~app() {
   for (int i = 0, sz = m_aTimer.GetSize(); i < sz; i++)
     delete m_aTimer[i];
 
diff --git a/fpdfsdk/src/javascript/color.cpp b/fpdfsdk/src/javascript/color.cpp
index 0659ab94a4..c6d13fc284 100644
--- a/fpdfsdk/src/javascript/color.cpp
+++ b/fpdfsdk/src/javascript/color.cpp
@@ -65,7 +65,8 @@ color::color(CJS_Object* pJSObject) : CJS_EmbedObj(pJSObject) {
   m_crLTGray = CPWL_Color(COLORTYPE_GRAY, 0.75);
 }
 
-color::~color(void) {}
+color::~color() {
+}
 
 void color::ConvertPWLColorToArray(const CPWL_Color& color, CJS_Array& array) {
   switch (color.nColorType) {
diff --git a/fpdfsdk/src/javascript/event.cpp b/fpdfsdk/src/javascript/event.cpp
index 4bcdcce3a0..492f225d18 100644
--- a/fpdfsdk/src/javascript/event.cpp
+++ b/fpdfsdk/src/javascript/event.cpp
@@ -50,7 +50,8 @@ IMPLEMENT_JS_CLASS(CJS_Event, event)
 
 event::event(CJS_Object* pJsObject) : CJS_EmbedObj(pJsObject) {}
 
-event::~event(void) {}
+event::~event() {
+}
 
 FX_BOOL event::change(IFXJS_Context* cc,
                       CJS_PropValue& vp,
diff --git a/fpdfsdk/src/javascript/global.cpp b/fpdfsdk/src/javascript/global.cpp
index c3bf837727..ff915a8b38 100644
--- a/fpdfsdk/src/javascript/global.cpp
+++ b/fpdfsdk/src/javascript/global.cpp
@@ -107,7 +107,7 @@ FX_BOOL CJS_Global::InitInstance(IFXJS_Context* cc) {
 global_alternate::global_alternate(CJS_Object* pJSObject)
     : CJS_EmbedObj(pJSObject), m_pApp(NULL) {}
 
-global_alternate::~global_alternate(void) {
+global_alternate::~global_alternate() {
   DestroyGlobalPersisitentVariables();
   CPDFXFA_App::GetInstance()->GetRuntimeFactory()->ReleaseGlobalData();
 }
diff --git a/fpdfsdk/src/javascript/util.cpp b/fpdfsdk/src/javascript/util.cpp
index c735b971dc..85092dab17 100644
--- a/fpdfsdk/src/javascript/util.cpp
+++ b/fpdfsdk/src/javascript/util.cpp
@@ -48,7 +48,8 @@ IMPLEMENT_JS_CLASS(CJS_Util, util)
 
 util::util(CJS_Object* pJSObject) : CJS_EmbedObj(pJSObject) {}
 
-util::~util(void) {}
+util::~util() {
+}
 
 struct stru_TbConvert {
   const FX_WCHAR* lpszJSMark;