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

fpdfsdk/include/javascript/app.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef FPDFSDK_INCLUDE_JAVASCRIPT_APP_H_
 #define FPDFSDK_INCLUDE_JAVASCRIPT_APP_H_
 
 #include "JS_Define.h"
 
 class CJS_Runtime;
 
 /* ---------------------------- TimerObj ---------------------------- */
 
 class CJS_Timer;
 
 class TimerObj : public CJS_EmbedObj {
  public:
   TimerObj(CJS_Object* pJSObject);
-  virtual ~TimerObj();
+  ~TimerObj() override;
 
  public:
   void SetTimer(CJS_Timer* pTimer);
   CJS_Timer* GetTimer() const;
 
  private:
   CJS_Timer* m_pTimer;
 };
 
 class CJS_TimerObj : public CJS_Object {
  public:
   CJS_TimerObj(JSFXObject pObject) : CJS_Object(pObject) {}
-  virtual ~CJS_TimerObj() {}
+  ~CJS_TimerObj() override {}
 
   DECLARE_JS_CLASS(CJS_TimerObj);
 };
 
 class app : public CJS_EmbedObj {
  public:
   app(CJS_Object* pJSObject);
-  virtual ~app();
+  ~app() override;
 
  public:
   FX_BOOL activeDocs(IFXJS_Context* cc,
                      CJS_PropValue& vp,
                      CFX_WideString& sError);
   FX_BOOL calculate(IFXJS_Context* cc,
                     CJS_PropValue& vp,
                     CFX_WideString& sError);
   FX_BOOL formsVersion(IFXJS_Context* cc,
                        CJS_PropValue& vp,
@@ skipping 100 matching lines @@
                    CFX_WideString& sError);
   FX_BOOL setInterval(IFXJS_Context* cc,
                       const CJS_Parameters& params,
                       CJS_Value& vRet,
                       CFX_WideString& sError);
   FX_BOOL setTimeOut(IFXJS_Context* cc,
                      const CJS_Parameters& params,
                      CJS_Value& vRet,
                      CFX_WideString& sError);
 
- private:
-  void TimerProc(CJS_Timer* pTimer);
-  void RunJsScript(CJS_Runtime* pRuntime, const CFX_WideString& wsScript);
-
- public:
   static CFX_WideString SysPathToPDFPath(const CFX_WideString& sOldPath);
 
  private:
+  // CJS_EmbedObj
+  void TimerProc(CJS_Timer* pTimer) override;
+  void RunJsScript(CJS_Runtime* pRuntime, const CFX_WideString& wsScript);
+
   bool m_bCalculate;
   bool m_bRuntimeHighLight;
-
   CFX_ArrayTemplate<CJS_Timer*> m_aTimer;
 };
 
 class CJS_App : public CJS_Object {
  public:
-  CJS_App(JSFXObject pObject) : CJS_Object(pObject){};
-  virtual ~CJS_App(void){};
+  explicit CJS_App(JSFXObject pObject) : CJS_Object(pObject) {}
+  ~CJS_App() override {}
 
   DECLARE_JS_CLASS(CJS_App);
 
   JS_STATIC_PROP(activeDocs, app);
   JS_STATIC_PROP(calculate, app);
   JS_STATIC_PROP(formsVersion, app);
   JS_STATIC_PROP(fs, app);
   JS_STATIC_PROP(fullscreen, app);
   JS_STATIC_PROP(language, app);
   JS_STATIC_PROP(media, app);
@@ skipping 20 matching lines @@
   JS_STATIC_METHOD(openDoc, app);
   JS_STATIC_METHOD(openFDF, app);
   JS_STATIC_METHOD(popUpMenuEx, app);
   JS_STATIC_METHOD(popUpMenu, app);
   JS_STATIC_METHOD(response, app);
   JS_STATIC_METHOD(setInterval, app);
   JS_STATIC_METHOD(setTimeOut, app);
 };
 
 #endif  // FPDFSDK_INCLUDE_JAVASCRIPT_APP_H_