summaryrefslogtreecommitdiff
path: root/fpdfsdk/include/javascript/app.h
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-08-14 22:16:22 -0700
committerLei Zhang <thestig@chromium.org>2015-08-14 22:16:22 -0700
commit2b1a2d528469cda4e9f3e36d3c7a649e0d476480 (patch)
tree91eea8ae70b87c632a06fba52ea06c0842e30878 /fpdfsdk/include/javascript/app.h
parent62b2e912dc2a508972fbf01b25f7449c39ff1543 (diff)
downloadpdfium-2b1a2d528469cda4e9f3e36d3c7a649e0d476480.tar.xz
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 .
Diffstat (limited to 'fpdfsdk/include/javascript/app.h')
-rw-r--r--fpdfsdk/include/javascript/app.h20
1 files changed, 9 insertions, 11 deletions
diff --git a/fpdfsdk/include/javascript/app.h b/fpdfsdk/include/javascript/app.h
index b13121323b..995c2605df 100644
--- a/fpdfsdk/include/javascript/app.h
+++ b/fpdfsdk/include/javascript/app.h
@@ -18,7 +18,7 @@ class CJS_Timer;
class TimerObj : public CJS_EmbedObj {
public:
TimerObj(CJS_Object* pJSObject);
- virtual ~TimerObj();
+ ~TimerObj() override;
public:
void SetTimer(CJS_Timer* pTimer);
@@ -31,7 +31,7 @@ class TimerObj : public CJS_EmbedObj {
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);
};
@@ -39,7 +39,7 @@ class CJS_TimerObj : public CJS_Object {
class app : public CJS_EmbedObj {
public:
app(CJS_Object* pJSObject);
- virtual ~app();
+ ~app() override;
public:
FX_BOOL activeDocs(IFXJS_Context* cc,
@@ -160,24 +160,22 @@ class app : public CJS_EmbedObj {
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);