Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Added missing overrides found by cppcheck 1.84
missingOverride,Examples/GUI/Win32/SampleMFC/SampleDoc.h:47
missingOverride,Examples/GUI/Win32/SampleMFC/vtkMFCRenderView.h:49
missingOverride,Examples/GUI/Win32/SampleMFC/vtkMFCRenderView.h:50
missingOverride,Examples/GUI/Win32/SampleMFC/vtkMFCRenderView.h:52
missingOverride,Examples/GUI/Win32/SampleMFC/vtkMFCRenderView.h:54
missingOverride,Examples/GUI/Win32/SampleMFC/vtkMFCRenderView.h:61
missingOverride,Examples/GUI/Win32/SampleMFC/vtkMFCRenderView.h:62
missingOverride,Examples/GUI/Win32/SampleMFC/vtkMFCRenderView.h:69
missingOverride,Examples/GUI/Win32/SampleMFC/vtkMFCRenderView.h:70
missingOverride,Interaction/Widgets/vtkXYPlotRepresentation.h:60
missingOverride,Interaction/Widgets/vtkXYPlotRepresentation.h:61
missingOverride,Interaction/Widgets/vtkXYPlotRepresentation.h:62
missingOverride,IO/ADIOS/FunctionPointers.h:114
missingOverride,IO/Video/vtkMILVideoSource.h:104
missingOverride,IO/Video/vtkMILVideoSource.h:243
missingOverride,IO/Video/vtkMILVideoSource.h:249
missingOverride,IO/Video/vtkMILVideoSource.h:259
missingOverride,IO/Video/vtkMILVideoSource.h:79
missingOverride,IO/Video/vtkMILVideoSource.h:84
missingOverride,IO/Video/vtkMILVideoSource.h:89
missingOverride,IO/Video/vtkMILVideoSource.h:94
missingOverride,IO/Video/vtkMILVideoSource.h:99
missingOverride,Rendering/OpenGL2/vtkEGLRenderWindow.h:206
missingOverride,Rendering/OpenGL2/vtkEGLRenderWindow.h:219
missingOverride,Rendering/OpenGL2/vtkEGLRenderWindow.h:220
missingOverride,Rendering/OpenGL2/vtkEGLRenderWindow.h:68
missingOverride,Rendering/OpenGL2/vtkOSOpenGLRenderWindow.h:238
missingOverride,Rendering/OpenGL2/vtkOSOpenGLRenderWindow.h:239
missingOverride,Rendering/OpenGL2/vtkOSOpenGLRenderWindow.h:66
missingOverride,Rendering/OpenVR/vtkOpenVRDefaultOverlay.h:37
missingOverride,Rendering/OpenVR/vtkOpenVRDefaultOverlay.h:43
missingOverride,Rendering/OptiX/vtkOptiXCompositePolyDataMapper2Node.h:45,style,The function 'Render' overrides a function in a base class but is not marked with a 'override' specifier.
missingOverride,Utilities/Benchmarks/GLBenchmarking.cxx:74
missingOverride,Utilities/Benchmarks/vtkRenderTimingTests.h:162
missingOverride,Utilities/Benchmarks/vtkRenderTimingTests.h:164
missingOverride,Utilities/Benchmarks/vtkRenderTimingTests.h:166
missingOverride,Utilities/Benchmarks/vtkRenderTimingTests.h:270
missingOverride,Utilities/Benchmarks/vtkRenderTimingTests.h:273
missingOverride,Utilities/Benchmarks/vtkRenderTimingTests.h:276
missingOverride,Utilities/Benchmarks/vtkRenderTimingTests.h:409
missingOverride,Utilities/Benchmarks/vtkRenderTimingTests.h:414
missingOverride,Utilities/Benchmarks/vtkRenderTimingTests.h:419
missingOverride,Utilities/Benchmarks/vtkRenderTimingTests.h:532
missingOverride,Utilities/Benchmarks/vtkRenderTimingTests.h:534
missingOverride,Utilities/Benchmarks/vtkRenderTimingTests.h:536
missingOverride,Utilities/Benchmarks/vtkRenderTimingTests.h:58
missingOverride,Utilities/Benchmarks/vtkRenderTimingTests.h:60
missingOverride,Utilities/Benchmarks/vtkRenderTimingTests.h:62
missingOverride,Utilities/Benchmarks/vtkRenderTimingTests.h:658
missingOverride,Utilities/Benchmarks/vtkRenderTimingTests.h:660
missingOverride,Utilities/Benchmarks/vtkRenderTimingTests.h:662
missingOverride,IO/ADIOS/ADIOSWriter.cxx:159,style,The function 'GetInt' overrides a function in a base class but is not marked with a 'override' specifier.
missingOverride,IO/ADIOS/FunctionPointers.h:31,style,The function 'ExecVoid' overrides a function in a base class but is not marked with a 'override' specifier.
missingOverride,IO/ADIOS/FunctionPointers.h:50,style,The function 'operator()' overrides a function in a base class but is not marked with a 'override' specifier.
missingOverride,IO/ADIOS/FunctionPointers.h:69,style,The function 'operator()' overrides a function in a base class but is not marked with a 'override' specifier.
missingOverride,IO/ADIOS/FunctionPointers.h:90,style,The function 'operator()' overrides a function in a base class but is not marked with a 'override' specifier.
  • Loading branch information
seanm committed Jul 26, 2018
1 parent a01fc64 commit c0d6d94
Show file tree
Hide file tree
Showing 12 changed files with 61 additions and 61 deletions.
2 changes: 1 addition & 1 deletion Examples/GUI/Win32/SampleMFC/SampleDoc.h
Expand Up @@ -44,7 +44,7 @@ class CSampleDoc : public vtkMFCDocument
//{{AFX_VIRTUAL(CSampleDoc)
public:
virtual BOOL OnNewDocument();
virtual void Serialize(CArchive& ar);
void Serialize(CArchive& ar) override;
virtual BOOL OnOpenDocument(LPCTSTR lpszPathName);
//}}AFX_VIRTUAL

Expand Down
16 changes: 8 additions & 8 deletions Examples/GUI/Win32/SampleMFC/vtkMFCRenderView.h
Expand Up @@ -46,28 +46,28 @@ class vtkMFCRenderView : public vtkMFCView
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
Expand Down
2 changes: 1 addition & 1 deletion IO/ADIOS/ADIOSWriter.cxx
Expand Up @@ -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;
};
Expand Down
8 changes: 4 additions & 4 deletions IO/ADIOS/FunctionPointers.h
Expand Up @@ -28,7 +28,7 @@ class Functor0Args : public BaseFunctor
{
public:
virtual ~Functor0Args() { }
virtual void ExecVoid()
void ExecVoid() override
{
(*this)();
}
Expand All @@ -47,7 +47,7 @@ class MemberFunction0Args : public Functor0Args<TReturn>

virtual ~MemberFunction0Args() { }

virtual TReturn operator() ()
TReturn operator() () override
{ return (this->Instance->*this->FunctionPtr)(); }

private:
Expand All @@ -66,7 +66,7 @@ class MemberFunction1Arg : public Functor0Args<TReturn>

virtual ~MemberFunction1Arg() { }

virtual TReturn operator() ()
TReturn operator() () override
{ return (this->Instance->*this->FunctionPtr)(this->Arg1); }

private:
Expand All @@ -87,7 +87,7 @@ class MemberFunction2Args : public Functor0Args<TReturn>

virtual ~MemberFunction2Args() { }

virtual TReturn operator() ()
TReturn operator() () override
{ return (this->Instance->*this->FunctionPtr)(this->Arg1, this->Arg2); }

private:
Expand Down
18 changes: 9 additions & 9 deletions IO/Video/vtkMILVideoSource.h
Expand Up @@ -76,32 +76,32 @@ class VTKIOVIDEO_EXPORT vtkMILVideoSource : public vtkVideoSource
/**
* 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;

//@{
/**
Expand Down Expand Up @@ -240,13 +240,13 @@ class VTKIOVIDEO_EXPORT vtkMILVideoSource : public vtkVideoSource
* 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;

//@{
/**
Expand All @@ -256,7 +256,7 @@ class VTKIOVIDEO_EXPORT vtkMILVideoSource : public vtkVideoSource
void *OldUserDataPtr;
int FrameCounter;
int ForceGrab;
void InternalGrab();
void InternalGrab() override;
//@}

protected:
Expand Down
6 changes: 3 additions & 3 deletions Interaction/Widgets/vtkXYPlotRepresentation.h
Expand Up @@ -57,9 +57,9 @@ class VTKINTERACTIONWIDGETS_EXPORT vtkXYPlotRepresentation : public vtkBorderRep
/**
* 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;}
//@}

Expand Down
8 changes: 4 additions & 4 deletions Rendering/OpenGL2/vtkEGLRenderWindow.h
Expand Up @@ -65,7 +65,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkEGLRenderWindow : public vtkOpenGLRenderWind
* 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
Expand Down Expand Up @@ -203,7 +203,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkEGLRenderWindow : public vtkOpenGLRenderWind
* because point sprites don't work correctly (gl_PointCoord is undefined) unless
* glEnable(GL_POINT_SPRITE)
*/
virtual bool IsPointSpriteBugPresent();
bool IsPointSpriteBugPresent() override;

protected:
vtkEGLRenderWindow();
Expand All @@ -216,8 +216,8 @@ class VTKRENDERINGOPENGL2_EXPORT vtkEGLRenderWindow : public vtkOpenGLRenderWind
class vtkInternals;
vtkInternals* Internals;

void CreateAWindow();
void DestroyWindow();
void CreateAWindow() override;
void DestroyWindow() override;
void ResizeWindow(int width, int height);

/**
Expand Down
6 changes: 3 additions & 3 deletions Rendering/OpenGL2/vtkOSOpenGLRenderWindow.h
Expand Up @@ -63,7 +63,7 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOSOpenGLRenderWindow : public vtkOpenGLRende
* 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
Expand Down Expand Up @@ -235,8 +235,8 @@ class VTKRENDERINGOPENGL2_EXPORT vtkOSOpenGLRenderWindow : public vtkOpenGLRende
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);
Expand Down
4 changes: 2 additions & 2 deletions Rendering/OpenVR/vtkOpenVRDefaultOverlay.h
Expand Up @@ -34,13 +34,13 @@ class VTKRENDERINGOPENVR_EXPORT vtkOpenVRDefaultOverlay : public vtkOpenVROverla
/**
* 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;
Expand Down
2 changes: 1 addition & 1 deletion Rendering/OptiX/vtkOptiXCompositePolyDataMapper2Node.h
Expand Up @@ -42,7 +42,7 @@ class VTKRENDERINGOPTIX_EXPORT vtkOptiXCompositePolyDataMapper2Node :
/**
* Make OptiX calls for rendering.
*/
virtual void Render(bool prepass);
void Render(bool prepass) override;

protected:
vtkOptiXCompositePolyDataMapper2Node();
Expand Down
2 changes: 1 addition & 1 deletion Utilities/Benchmarks/GLBenchmarking.cxx
Expand Up @@ -71,7 +71,7 @@ class SurfaceTest : public BenchmarkTest
{
}

virtual vtkIdType Build(vtkRenderer *renderer, const vtkVector2i &res)
vtkIdType Build(vtkRenderer *renderer, const vtkVector2i &res) override
{
//vtkVector2i res(20, 50);
vtkNew<vtkParametricBoy> parametricShape;
Expand Down
48 changes: 24 additions & 24 deletions Utilities/Benchmarks/vtkRenderTimingTests.h
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit c0d6d94

Please sign in to comment.