Commit b58a17f0 authored by Sean McBride's avatar Sean McBride Committed by Kitware Robot

Merge topic 'cppcheck1.84'

c0d6d943 Added missing overrides found by cppcheck 1.84
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ken Martin's avatarKen Martin <ken.martin@kitware.com>
Merge-request: !4459
parents fb7a8ffd c0d6d943
......@@ -44,7 +44,7 @@ public:
//{{AFX_VIRTUAL(CSampleDoc)
public:
virtual BOOL OnNewDocument();
virtual void Serialize(CArchive& ar);
void Serialize(CArchive& ar) override;
virtual BOOL OnOpenDocument(LPCTSTR lpszPathName);
//}}AFX_VIRTUAL
......
......@@ -46,28 +46,28 @@ public:
virtual void OnInitialUpdate();
virtual LRESULT WindowProc(UINT message, WPARAM wParam, LPARAM lParam);
void Render() {this->RenderWindow->Render();};
vtkWindow *GetVTKWindow() {return this->RenderWindow;};
virtual void SetupMemoryRendering(int x, int y, HDC prn) {
vtkWindow *GetVTKWindow() override {return this->RenderWindow;};
void SetupMemoryRendering(int x, int y, HDC prn) override {
this->RenderWindow->SetupMemoryRendering(x,y,prn);};
virtual void ResumeScreenRendering() {
void ResumeScreenRendering() override {
this->RenderWindow->ResumeScreenRendering();};
virtual unsigned char *GetMemoryData() {
unsigned char *GetMemoryData() override {
return this->RenderWindow->GetMemoryData();};
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(vtkMFCRenderView)
protected:
virtual void OnDraw(CDC* pDC); // overridden to draw this view
virtual BOOL OnPreparePrinting(CPrintInfo* pInfo);
void OnDraw(CDC* pDC) override; // overridden to draw this view
BOOL OnPreparePrinting(CPrintInfo* pInfo) override;
//}}AFX_VIRTUAL
// Implementation
protected:
virtual ~vtkMFCRenderView();
#ifdef _DEBUG
virtual void AssertValid() const;
virtual void Dump(CDumpContext& dc) const;
void AssertValid() const override;
void Dump(CDumpContext& dc) const override;
#endif
// Generated message map functions
......
......@@ -156,7 +156,7 @@ struct Writer::WriterImpl
{ }
virtual ~ScalarValueT() { }
virtual uint64_t GetInt() { return static_cast<uint64_t>(this->ValueT); }
uint64_t GetInt() override { return static_cast<uint64_t>(this->ValueT); }
const T ValueT;
};
......
......@@ -28,7 +28,7 @@ class Functor0Args : public BaseFunctor
{
public:
virtual ~Functor0Args() { }
virtual void ExecVoid()
void ExecVoid() override
{
(*this)();
}
......@@ -47,7 +47,7 @@ public:
virtual ~MemberFunction0Args() { }
virtual TReturn operator() ()
TReturn operator() () override
{ return (this->Instance->*this->FunctionPtr)(); }
private:
......@@ -66,7 +66,7 @@ public:
virtual ~MemberFunction1Arg() { }
virtual TReturn operator() ()
TReturn operator() () override
{ return (this->Instance->*this->FunctionPtr)(this->Arg1); }
private:
......@@ -87,7 +87,7 @@ public:
virtual ~MemberFunction2Args() { }
virtual TReturn operator() ()
TReturn operator() () override
{ return (this->Instance->*this->FunctionPtr)(this->Arg1, this->Arg2); }
private:
......
......@@ -76,32 +76,32 @@ public:
/**
* Standard VCR functionality: Record incoming video.
*/
void Record();
void Record() override;
/**
* Standard VCR functionality: Play recorded video.
*/
void Play();
void Play() override;
/**
* Standard VCR functionality: Stop recording or playing.
*/
void Stop();
void Stop() override;
/**
* Grab a single video frame.
*/
void Grab();
void Grab() override;
/**
* Request a particular frame size (set the third value to 1).
*/
void SetFrameSize(int x, int y, int z);
void SetFrameSize(int x, int y, int z) override;
/**
* Request a particular output format (default: VTK_RGB).
*/
void SetOutputFormat(int format);
void SetOutputFormat(int format) override;
//@{
/**
......@@ -240,13 +240,13 @@ public:
* Initialize the driver (this is called automatically when the
* first grab is done).
*/
void Initialize();
void Initialize() override;
/**
* Free the driver (this is called automatically inside the
* destructor).
*/
void ReleaseSystemResources();
void ReleaseSystemResources() override;
//@{
/**
......@@ -256,7 +256,7 @@ public:
void *OldUserDataPtr;
int FrameCounter;
int ForceGrab;
void InternalGrab();
void InternalGrab() override;
//@}
protected:
......
......@@ -57,9 +57,9 @@ public:
/**
* Satisfy the superclass' API.
*/
virtual void BuildRepresentation();
virtual void WidgetInteraction(double eventPos[2]);
virtual void GetSize(double size[2])
void BuildRepresentation() override;
void WidgetInteraction(double eventPos[2]) override;
void GetSize(double size[2]) override
{size[0]=2.0; size[1]=2.0;}
//@}
......
......@@ -65,7 +65,7 @@ public:
* should be possible to call them multiple times, even changing WindowId
* in-between. This is what WindowRemap does.
*/
virtual void Initialize(void);
void Initialize(void) override;
/**
* "Deinitialize" the rendering window. This will shutdown all system-specific
......@@ -203,7 +203,7 @@ public:
* because point sprites don't work correctly (gl_PointCoord is undefined) unless
* glEnable(GL_POINT_SPRITE)
*/
virtual bool IsPointSpriteBugPresent();
bool IsPointSpriteBugPresent() override;
protected:
vtkEGLRenderWindow();
......@@ -216,8 +216,8 @@ protected:
class vtkInternals;
vtkInternals* Internals;
void CreateAWindow();
void DestroyWindow();
void CreateAWindow() override;
void DestroyWindow() override;
void ResizeWindow(int width, int height);
/**
......
......@@ -63,7 +63,7 @@ public:
* should be possible to call them multiple times, even changing WindowId
* in-between. This is what WindowRemap does.
*/
virtual void Initialize(void);
void Initialize(void) override;
/**
* "Deinitialize" the rendering window. This will shutdown all system-specific
......@@ -235,8 +235,8 @@ protected:
int CursorHidden;
int ForceMakeCurrent;
void CreateAWindow();
void DestroyWindow();
void CreateAWindow() override;
void DestroyWindow() override;
void CreateOffScreenWindow(int width, int height);
void DestroyOffScreenWindow();
void ResizeOffScreenWindow(int width, int height);
......
......@@ -34,13 +34,13 @@ public:
/**
* Render the overlay, we set some opf the spots based on current settings
*/
virtual void Render();
void Render() override;
protected:
vtkOpenVRDefaultOverlay();
~vtkOpenVRDefaultOverlay();
virtual void SetupSpots();
void SetupSpots() override;
private:
vtkOpenVRDefaultOverlay(const vtkOpenVRDefaultOverlay&) = delete;
......
......@@ -42,7 +42,7 @@ public:
/**
* Make OptiX calls for rendering.
*/
virtual void Render(bool prepass);
void Render(bool prepass) override;
protected:
vtkOptiXCompositePolyDataMapper2Node();
......
......@@ -71,7 +71,7 @@ public:
{
}
virtual vtkIdType Build(vtkRenderer *renderer, const vtkVector2i &res)
vtkIdType Build(vtkRenderer *renderer, const vtkVector2i &res) override
{
//vtkVector2i res(20, 50);
vtkNew<vtkParametricBoy> parametricShape;
......
......@@ -55,12 +55,12 @@ class surfaceTest : public vtkRTTest
this->WithNormals = withNormals;
}
const char *GetSummaryResultName() { return "Mtris/sec"; }
const char *GetSummaryResultName() override { return "Mtris/sec"; }
const char *GetSecondSummaryResultName() { return "Mtris"; }
const char *GetSecondSummaryResultName() override { return "Mtris"; }
virtual vtkRTTestResult Run(vtkRTTestSequence *ats,
int /*argc*/, char * /* argv */[])
vtkRTTestResult Run(vtkRTTestSequence *ats,
int /*argc*/, char * /* argv */[]) override
{
int ures, vres;
ats->GetSequenceNumbers(ures,vres);
......@@ -159,12 +159,12 @@ class glyphTest : public vtkRTTest
{
}
const char *GetSummaryResultName() { return "Mtris/sec"; }
const char *GetSummaryResultName() override { return "Mtris/sec"; }
const char *GetSecondSummaryResultName() { return "triangles"; }
const char *GetSecondSummaryResultName() override { return "triangles"; }
virtual vtkRTTestResult Run(vtkRTTestSequence *ats,
int /*argc*/, char * /* argv */[])
vtkRTTestResult Run(vtkRTTestSequence *ats,
int /*argc*/, char * /* argv */[]) override
{
int res1, res2, res3, res4;
ats->GetSequenceNumbers(res1, res2, res3, res4);
......@@ -267,14 +267,14 @@ class moleculeTest : public vtkRTTest
this->AtomsOnly = atomsOnly;
}
const char *GetSummaryResultName() {
const char *GetSummaryResultName() override {
return this->AtomsOnly ? "Atoms/sec" : "Atoms+Bonds/sec"; }
const char *GetSecondSummaryResultName() {
const char *GetSecondSummaryResultName() override {
return this->AtomsOnly ? "Atoms" : "Atoms+Bonds"; }
virtual vtkRTTestResult Run(vtkRTTestSequence *ats,
int /*argc*/, char * /* argv */[])
vtkRTTestResult Run(vtkRTTestSequence *ats,
int /*argc*/, char * /* argv */[]) override
{
int res1;
ats->GetSequenceNumbers(res1);
......@@ -406,18 +406,18 @@ class volumeTest : public vtkRTTest
this->WithShading = withShading;
}
const char *GetSummaryResultName()
const char *GetSummaryResultName() override
{
return "Mvoxels/sec" ;
}
const char *GetSecondSummaryResultName()
const char *GetSecondSummaryResultName() override
{
return "Mvoxels";
}
virtual vtkRTTestResult Run(vtkRTTestSequence *ats,
int /*argc*/, char * /* argv */[])
vtkRTTestResult Run(vtkRTTestSequence *ats,
int /*argc*/, char * /* argv */[]) override
{
int res1, res2, res3;
ats->GetSequenceNumbers(res1,res2,res3);
......@@ -529,12 +529,12 @@ class depthPeelingTest : public vtkRTTest
{
}
const char *GetSummaryResultName() { return "subsequent frame time"; }
const char *GetSummaryResultName() override { return "subsequent frame time"; }
const char *GetSecondSummaryResultName() { return "first frame time"; }
const char *GetSecondSummaryResultName() override { return "first frame time"; }
virtual vtkRTTestResult Run(vtkRTTestSequence *ats,
int /*argc*/, char * /* argv */[])
vtkRTTestResult Run(vtkRTTestSequence *ats,
int /*argc*/, char * /* argv */[]) override
{
int ures, vres;
ats->GetSequenceNumbers(ures,vres);
......@@ -655,12 +655,12 @@ class manyActorTest : public vtkRTTest
{
}
const char *GetSummaryResultName() { return "actors"; }
const char *GetSummaryResultName() override { return "actors"; }
const char *GetSecondSummaryResultName() { return "frames/sec"; }
const char *GetSecondSummaryResultName() override { return "frames/sec"; }
virtual vtkRTTestResult Run(vtkRTTestSequence *ats,
int /*argc*/, char * /* argv */[])
vtkRTTestResult Run(vtkRTTestSequence *ats,
int /*argc*/, char * /* argv */[]) override
{
int ures, vres;
ats->GetSequenceNumbers(ures,vres);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment