Commit e7d67871 authored by Todd Martin's avatar Todd Martin

Replace deprecated VTK_OVERRIDE with override

parent 68cd215c
......@@ -308,7 +308,7 @@ vtkArrayDownCast_TemplateFastCastMacro(vtkAOSDataArrayTemplate)
// declarations for these functions such that the wrapper
// can see them. The wrappers ignore vtkAOSDataArrayTemplate.
#define vtkCreateWrappedArrayInterface(T) \
int GetDataType() VTK_OVERRIDE;\
int GetDataType() override;\
void GetTypedTuple(vtkIdType i, T* tuple) \
VTK_EXPECTS(0 <= i && i < GetNumberOfTuples()); \
void SetTypedTuple(vtkIdType i, const T* tuple) \
......@@ -320,7 +320,7 @@ vtkArrayDownCast_TemplateFastCastMacro(vtkAOSDataArrayTemplate)
VTK_EXPECTS(0 <= id && id < GetNumberOfValues()); \
void SetValue(vtkIdType id, T value) \
VTK_EXPECTS(0 <= id && id < GetNumberOfValues()); \
void SetNumberOfValues(vtkIdType number) VTK_OVERRIDE;\
void SetNumberOfValues(vtkIdType number) override;\
void InsertValue(vtkIdType id, T f) \
VTK_EXPECTS(0 <= id); \
vtkIdType InsertNextValue(T f); \
......
......@@ -48,7 +48,7 @@ public:
/**
* New lines are converted to carriage return new lines.
*/
void DisplayText(const char*) VTK_OVERRIDE;
void DisplayText(const char*) override;
virtual void DisplayErrorText(const char*);
virtual void DisplayWarningText(const char*);
virtual void DisplayGenericWarningText(const char*);
......
......@@ -47,7 +47,7 @@ public:
/**
* New lines are converted to carriage return new lines.
*/
void DisplayText(const char*) VTK_OVERRIDE;
void DisplayText(const char*) override;
//@{
/**
......
......@@ -38,7 +38,7 @@ public:
/**
* Send text to the output window process.
*/
void DisplayText(const char*) VTK_OVERRIDE;
void DisplayText(const char*) override;
protected:
vtkWin32ProcessOutputWindow();
......
......@@ -65,7 +65,7 @@ class VTKFILTERSGENERAL_EXPORT vtkSplitField : public vtkDataSetAlgorithm
{
public:
vtkTypeMacro(vtkSplitField,vtkDataSetAlgorithm);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Create a new vtkSplitField.
......
......@@ -36,16 +36,16 @@ class VTKIOMOVIE_EXPORT vtkAVIWriter : public vtkGenericMovieWriter
public:
static vtkAVIWriter *New();
vtkTypeMacro(vtkAVIWriter,vtkGenericMovieWriter);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent) override;
//@{
/**
* These methods start writing an AVI file, write a frame to the file
* and then end the writing process.
*/
void Start() VTK_OVERRIDE;
void Write() VTK_OVERRIDE;
void End() VTK_OVERRIDE;
void Start() override;
void Write() override;
void End() override;
//@}
//@{
......
......@@ -41,46 +41,46 @@ class VTKIOVIDEO_EXPORT vtkWin32VideoSource : public vtkVideoSource
public:
static vtkWin32VideoSource *New();
vtkTypeMacro(vtkWin32VideoSource,vtkVideoSource);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Standard VCR functionality: Record incoming video.
*/
void Record() VTK_OVERRIDE;
void Record() override;
/**
* Standard VCR functionality: Play recorded video.
*/
void Play() VTK_OVERRIDE;
void Play() override;
/**
* Standard VCR functionality: Stop recording or playing.
*/
void Stop() VTK_OVERRIDE;
void Stop() override;
/**
* Grab a single video frame.
*/
void Grab() VTK_OVERRIDE;
void Grab() override;
//@{
/**
* Request a particular frame size (set the third value to 1).
*/
void SetFrameSize(int x, int y, int z) VTK_OVERRIDE;
void SetFrameSize(int dim[3]) VTK_OVERRIDE {
void SetFrameSize(int x, int y, int z) override;
void SetFrameSize(int dim[3]) override {
this->SetFrameSize(dim[0], dim[1], dim[2]); };
//@}
/**
* Request a particular frame rate (default 30 frames per second).
*/
void SetFrameRate(float rate) VTK_OVERRIDE;
void SetFrameRate(float rate) override;
/**
* Request a particular output format (default: VTK_RGB).
*/
void SetOutputFormat(int format) VTK_OVERRIDE;
void SetOutputFormat(int format) override;
//@{
/**
......@@ -105,13 +105,13 @@ public:
* Initialize the driver (this is called automatically when the
* first grab is done).
*/
void Initialize() VTK_OVERRIDE;
void Initialize() override;
/**
* Free the driver (this is called automatically inside the
* destructor).
*/
void ReleaseSystemResources() VTK_OVERRIDE;
void ReleaseSystemResources() override;
//@{
/**
......@@ -133,7 +133,7 @@ protected:
void CheckBuffer();
void UnpackRasterLine(char *outptr, char *inptr,
int start, int count) VTK_OVERRIDE;
int start, int count) override;
void DoVFWFormatSetup();
void DoVFWFormatCheck();
......
......@@ -164,7 +164,7 @@ public:
*/
void MapScalarsThroughTable2(void *input, unsigned char *output,
int inputDataType, int numberOfValues,
int inputIncrement, int outputFormat) VTK_OVERRIDE;
int inputIncrement, int outputFormat) override;
/**
* Returns the (x, r, g, b) values as an array.
......
......@@ -34,17 +34,17 @@ class VTKRENDERINGOPENGL_EXPORT vtkWin32OpenGLRenderWindow : public vtkOpenGLRen
public:
static vtkWin32OpenGLRenderWindow *New();
vtkTypeMacro(vtkWin32OpenGLRenderWindow, vtkOpenGLRenderWindow);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Begin the rendering process.
*/
void Start(void) VTK_OVERRIDE;
void Start(void) override;
/**
* End the rendering process and display the image.
*/
void Frame(void) VTK_OVERRIDE;
void Frame(void) override;
/**
* Create the window
......@@ -57,24 +57,24 @@ public:
* should be possible to call them multiple times, even changing WindowId
* in-between. This is what WindowRemap does.
*/
void Initialize(void) VTK_OVERRIDE;
void Initialize(void) override;
/**
* Finalize the rendering window. This will shutdown all system-specific
* resources. After having called this, it should be possible to destroy
* a window that was used for a SetWindowId() call without any ill effects.
*/
void Finalize(void) VTK_OVERRIDE;
void Finalize(void) override;
/**
* Change the window to fill the entire screen.
*/
void SetFullScreen(int) VTK_OVERRIDE;
void SetFullScreen(int) override;
/**
* Remap the window.
*/
void WindowRemap(void) VTK_OVERRIDE;
void WindowRemap(void) override;
/**
* Set the preferred window size to full screen.
......@@ -84,57 +84,57 @@ public:
/**
* Set the size of the window in pixels.
*/
void SetSize(int width, int height) VTK_OVERRIDE;
void SetSize(int a[2]) VTK_OVERRIDE { vtkOpenGLRenderWindow::SetSize(a); }
void SetSize(int width, int height) override;
void SetSize(int a[2]) override { vtkOpenGLRenderWindow::SetSize(a); }
/**
* Get the current size of the window in pixels.
*/
int *GetSize() VTK_OVERRIDE;
int *GetSize() override;
/**
* Set the position of the window.
*/
void SetPosition(int x, int y) VTK_OVERRIDE;
void SetPosition(int a[2]) VTK_OVERRIDE { vtkOpenGLRenderWindow::SetPosition(a); }
void SetPosition(int x, int y) override;
void SetPosition(int a[2]) override { vtkOpenGLRenderWindow::SetPosition(a); }
/**
* Get the current size of the screen in pixels.
*/
int *GetScreenSize() VTK_OVERRIDE;
int *GetScreenSize() override;
/**
* Get the position in screen coordinates of the window.
*/
int *GetPosition() VTK_OVERRIDE;
int *GetPosition() override;
/**
* Set the name of the window. This appears at the top of the window
* normally.
*/
void SetWindowName(const char*) VTK_OVERRIDE;
void SetWindowName(const char*) override;
/**
* Set this RenderWindow's window id to a pre-existing window.
*/
void SetWindowInfo(char*) VTK_OVERRIDE;
void SetWindowInfo(char*) override;
/**
* Sets the WindowInfo that will be used after a WindowRemap.
*/
void SetNextWindowInfo(char*) VTK_OVERRIDE;
void SetNextWindowInfo(char*) override;
/**
* Sets the HWND id of the window that WILL BE created.
*/
void SetParentInfo(char*);
void *GetGenericDisplayId() VTK_OVERRIDE { return (void*)this->ContextId; }
void *GetGenericWindowId() VTK_OVERRIDE { return (void*)this->WindowId; }
void *GetGenericParentId() VTK_OVERRIDE { return (void*)this->ParentId; }
void *GetGenericContext() VTK_OVERRIDE { return (void*)this->DeviceContext; }
void *GetGenericDrawable() VTK_OVERRIDE { return (void*)this->WindowId; }
void SetDisplayId(void*) VTK_OVERRIDE;
void *GetGenericDisplayId() override { return (void*)this->ContextId; }
void *GetGenericWindowId() override { return (void*)this->WindowId; }
void *GetGenericParentId() override { return (void*)this->ParentId; }
void *GetGenericContext() override { return (void*)this->DeviceContext; }
void *GetGenericDrawable() override { return (void*)this->WindowId; }
void SetDisplayId(void*) override;
/**
* Get the window id.
......@@ -145,19 +145,19 @@ public:
* Set the window id to a pre-existing window.
*/
virtual void SetWindowId(HWND);
void SetWindowId(void *foo) VTK_OVERRIDE { this->SetWindowId((HWND)foo); }
void SetWindowId(void *foo) override { this->SetWindowId((HWND)foo); }
/**
* Initialize the render window from the information associated
* with the currently activated OpenGL context.
*/
bool InitializeFromCurrentContext() VTK_OVERRIDE;
bool InitializeFromCurrentContext() override;
/**
* Set the window's parent id to a pre-existing window.
*/
virtual void SetParentId(HWND);
void SetParentId(void *foo) VTK_OVERRIDE { this->SetParentId((HWND)foo); }
void SetParentId(void *foo) override { this->SetParentId((HWND)foo); }
/**
* Set the window's context id
......@@ -179,7 +179,7 @@ public:
* This is the generic prototype as required by the vtkRenderWindow
* parent.
*/
void SetNextWindowId(void *arg) VTK_OVERRIDE;
void SetNextWindowId(void *arg) override;
/**
* Prescribe that the window be created in a stereo-capable mode. This
......@@ -187,22 +187,22 @@ public:
* overrides the superclass method since this class can actually check
* whether the window has been realized yet.
*/
void SetStereoCapableWindow(int capable) VTK_OVERRIDE;
void SetStereoCapableWindow(int capable) override;
/**
* Make this windows OpenGL context the current context.
*/
void MakeCurrent() VTK_OVERRIDE;
void MakeCurrent() override;
/**
* Tells if this window is the current OpenGL context for the calling thread.
*/
bool IsCurrent() VTK_OVERRIDE;
bool IsCurrent() override;
/**
* Get report of capabilities for the render window
*/
const char *ReportCapabilities() VTK_OVERRIDE;
const char *ReportCapabilities() override;
/**
* Does this render window support OpenGL? 0-false, 1-true
......@@ -212,14 +212,14 @@ public:
/**
* Is this render window using hardware acceleration? 0-false, 1-true
*/
int IsDirect() VTK_OVERRIDE;
int IsDirect() override;
/**
* Check to see if a mouse button has been pressed or mouse wheel activated.
* All other events are ignored by this method.
* This is a useful check to abort a long render.
*/
int GetEventPending() VTK_OVERRIDE;
int GetEventPending() override;
//@{
/**
......@@ -253,26 +253,26 @@ public:
* Hide or Show the mouse cursor, it is nice to be able to hide the
* default cursor if you want VTK to display a 3D cursor instead.
*/
void HideCursor() VTK_OVERRIDE;
void ShowCursor() VTK_OVERRIDE;
void HideCursor() override;
void ShowCursor() override;
//@}
/**
* Set cursor position in window (note that (0,0) is the lower left corner).
*/
void SetCursorPosition(int x, int y) VTK_OVERRIDE;
void SetCursorPosition(int x, int y) override;
/**
* Change the shape of the cursor
*/
void SetCurrentCursor(int) VTK_OVERRIDE;
void SetCurrentCursor(int) override;
bool DetectDPI() VTK_OVERRIDE;
bool DetectDPI() override;
/**
* Override the default implementation so that we can actively switch between
* on and off screen rendering.
*/
void SetOffScreenRendering(int offscreen) VTK_OVERRIDE;
void SetOffScreenRendering(int offscreen) override;
protected:
vtkWin32OpenGLRenderWindow();
......@@ -317,8 +317,8 @@ protected:
char *Capabilities;
int WindowIdReferenceCount;
void ResizeWhileOffscreen(int xsize, int ysize);
void CreateAWindow() VTK_OVERRIDE;
void DestroyWindow() VTK_OVERRIDE;
void CreateAWindow() override;
void DestroyWindow() override;
void InitializeApplication();
void CleanUpOffScreenRendering(void);
void CreateOffScreenDC(int xsize, int ysize, HDC aHdc);
......
......@@ -48,12 +48,12 @@ public:
static vtkWin32RenderWindowInteractor *New();
vtkTypeMacro(vtkWin32RenderWindowInteractor,vtkRenderWindowInteractor);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Initialize the event handler
*/
void Initialize() VTK_OVERRIDE;
void Initialize() override;
//@{
/**
......@@ -65,8 +65,8 @@ public:
* and all other interactors associated with the widget are disabled
* when their data is not displayed.
*/
void Enable() VTK_OVERRIDE;
void Disable() VTK_OVERRIDE;
void Enable() override;
void Disable() override;
//@}
//@{
......@@ -86,7 +86,7 @@ public:
* calls PostQuitMessage(0) to terminate the application. An application can Specify
* ExitMethod for alternative behavior (i.e. suppression of keyboard exit)
*/
void TerminateApp(void) VTK_OVERRIDE;
void TerminateApp(void) override;
friend VTKRENDERINGOPENGL_EXPORT LRESULT CALLBACK vtkHandleMessage(HWND hwnd,UINT uMsg, WPARAM w, LPARAM l);
friend VTKRENDERINGOPENGL_EXPORT LRESULT CALLBACK vtkHandleMessage2(HWND hwnd,UINT uMsg, WPARAM w, LPARAM l, vtkWin32RenderWindowInteractor *me);
......@@ -130,7 +130,7 @@ public:
* These methods correspond to the the Exit, User and Pick
* callbacks. They allow for the Style to invoke them.
*/
void ExitCallback() VTK_OVERRIDE;
void ExitCallback() override;
protected:
vtkWin32RenderWindowInteractor();
......@@ -158,8 +158,8 @@ protected:
* Win32-specific internal timer methods. See the superclass for detailed
* documentation.
*/
int InternalCreateTimer(int timerId, int timerType, unsigned long duration) VTK_OVERRIDE;
int InternalDestroyTimer(int platformTimerId) VTK_OVERRIDE;
int InternalCreateTimer(int timerId, int timerType, unsigned long duration) override;
int InternalDestroyTimer(int platformTimerId) override;
//@}
/**
......@@ -167,7 +167,7 @@ protected:
* call this method it will loop processing events until the
* application is exited.
*/
void StartEventLoop() VTK_OVERRIDE;
void StartEventLoop() override;
#ifdef VTK_USE_TDX
vtkTDxWinDevice *Device;
......
......@@ -37,17 +37,17 @@ class VTKRENDERINGOPENGL2_EXPORT vtkWin32OpenGLRenderWindow : public vtkOpenGLRe
public:
static vtkWin32OpenGLRenderWindow *New();
vtkTypeMacro(vtkWin32OpenGLRenderWindow,vtkOpenGLRenderWindow);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Begin the rendering process.
*/
void Start(void) VTK_OVERRIDE;
void Start(void) override;
/**
* End the rendering process and display the image.
*/
void Frame(void) VTK_OVERRIDE;
void Frame(void) override;
/**
* Create the window
......@@ -60,24 +60,24 @@ public:
* should be possible to call them multiple times, even changing WindowId
* in-between. This is what WindowRemap does.
*/
void Initialize(void) VTK_OVERRIDE;
void Initialize(void) override;
/**
* Finalize the rendering window. This will shutdown all system-specific
* resources. After having called this, it should be possible to destroy
* a window that was used for a SetWindowId() call without any ill effects.
*/
void Finalize(void) VTK_OVERRIDE;
void Finalize(void) override;
/**
* Change the window to fill the entire screen.
*/
void SetFullScreen(int) VTK_OVERRIDE;
void SetFullScreen(int) override;
/**
* Remap the window.
*/
void WindowRemap(void) VTK_OVERRIDE;
void WindowRemap(void) override;
/**
* Set the preferred window size to full screen.
......@@ -88,60 +88,60 @@ public:
/**
* Set the size of the window in pixels.
*/
void SetSize(int,int) VTK_OVERRIDE;
void SetSize(int a[2]) VTK_OVERRIDE {vtkOpenGLRenderWindow::SetSize(a);};
void SetSize(int,int) override;
void SetSize(int a[2]) override {vtkOpenGLRenderWindow::SetSize(a);};
//@}
/**
* Get the current size of the window in pixels.
*/
int *GetSize() VTK_OVERRIDE;
int *GetSize() override;
//@{
/**
* Set the position of the window.
*/
void SetPosition(int,int) VTK_OVERRIDE;
void SetPosition(int a[2]) VTK_OVERRIDE {vtkOpenGLRenderWindow::SetPosition(a);}
void SetPosition(int,int) override;
void SetPosition(int a[2]) override {vtkOpenGLRenderWindow::SetPosition(a);}
//@}
/**
* Get the current size of the screen in pixels.
*/
int *GetScreenSize() VTK_OVERRIDE;
int *GetScreenSize() override;
/**
* Get the position in screen coordinates of the window.
*/
int *GetPosition() VTK_OVERRIDE;
int *GetPosition() override;
/**
* Set the name of the window. This appears at the top of the window
* normally.
*/
void SetWindowName(const char *) VTK_OVERRIDE;
void SetWindowName(const char *) override;
/**
* Set this RenderWindow's window id to a pre-existing window.
*/
void SetWindowInfo(char *) VTK_OVERRIDE;
void SetWindowInfo(char *) override;
/**
* Sets the WindowInfo that will be used after a WindowRemap.
*/
void SetNextWindowInfo(char *) VTK_OVERRIDE;
void SetNextWindowInfo(char *) override;
/**
* Sets the HWND id of the window that WILL BE created.
*/
void SetParentInfo(char *) override;
void *GetGenericDisplayId() VTK_OVERRIDE {return (void *)this->ContextId;}
void *GetGenericWindowId() VTK_OVERRIDE {return (void *)this->WindowId;}
void *GetGenericParentId() VTK_OVERRIDE {return (void *)this->ParentId;}
void *GetGenericContext() VTK_OVERRIDE {return (void *)this->DeviceContext;}
void *GetGenericDrawable() VTK_OVERRIDE {return (void *)this->WindowId;}
void SetDisplayId(void *) VTK_OVERRIDE;
void *GetGenericDisplayId() override {return (void *)this->ContextId;}
void *GetGenericWindowId() override {return (void *)this->WindowId;}
void *GetGenericParentId() override {return (void *)this->ParentId;}
void *GetGenericContext() override {return (void *)this->DeviceContext;}
void *GetGenericDrawable() override {return (void *)this->WindowId;}
void SetDisplayId(void *) override;
/**
* Get the window id.
......@@ -153,21 +153,21 @@ public:
* Set the window id to a pre-existing window.
*/
void SetWindowId(HWND);
void SetWindowId(void *foo) VTK_OVERRIDE {this->SetWindowId((HWND)foo);}
void SetWindowId(void *foo) override {this->SetWindowId((HWND)foo);}
//@}
/**
* Initialize the render window from the information associated
* with the currently activated OpenGL context.
*/
bool InitializeFromCurrentContext() VTK_OVERRIDE;
bool InitializeFromCurrentContext() override;
//@{
/**
* Set the window's parent id to a pre-existing window.
*/
void SetParentId(HWND);
void SetParentId(void *foo) VTK_OVERRIDE {this->SetParentId((HWND)foo);}
void SetParentId(void *foo) override {this->SetParentId((HWND)foo);}
//@}
void SetContextId(HGLRC); // hsr
......@@ -183,7 +183,7 @@ public:
* This is the generic prototype as required by the vtkRenderWindow
* parent.
*/
void SetNextWindowId(void *arg) VTK_OVERRIDE;
void SetNextWindowId(void *arg) override;
/**
* Prescribe that the window be created in a stereo-capable mode. This
......@@ -191,34 +191,34 @@ public:
* overrides the superclass method since this class can actually check
* whether the window has been realized yet.
*/
void SetStereoCapableWindow(int capable) VTK_OVERRIDE;
void SetStereoCapableWindow(int capable) override;
/**
* Make this windows OpenGL context the current context.
*/
void MakeCurrent() VTK_OVERRIDE;
void MakeCurrent() override;
/**
* Tells if this window is the current OpenGL context for the calling thread.
*/
bool IsCurrent() VTK_OVERRIDE;
bool IsCurrent() override;
/**
* Get report of capabilities for the render window
*/
const char *ReportCapabilities() VTK_OVERRIDE;
const char *ReportCapabilities() override;
/**
* Is this render window using hardware acceleration? 0-false, 1-true
*/
int IsDirect() VTK_OVERRIDE;
int IsDirect() override;
/**
* Check to see if a mouse button has been pressed or mouse wheel activated.
* All other events are ignored by this method.
* This is a useful check to abort a long render.
*/
int GetEventPending() VTK_OVERRIDE;
int GetEventPending() override;
//@{
/**
......@@ -242,23 +242,23 @@ public:
* Set cursor position in window (note that (0,0) is the lower left
* corner).
*/
void HideCursor() VTK_OVERRIDE;
void ShowCursor() VTK_OVERRIDE;
void SetCursorPosition(int x, int y) VTK_OVERRIDE;
void HideCursor() override;
void ShowCursor() override;
void SetCursorPosition(int x, int y) override;
//@}
/**
* Change the shape of the cursor
*/
void SetCurrentCursor(int) VTK_OVERRIDE;
void SetCurrentCursor(int) override;
bool DetectDPI() VTK_OVERRIDE;
bool DetectDPI() override;
/**
* Override the default implementation so that we can actively switch between
* on and off screen rendering.
*/
void SetOffScreenRendering(int offscreen) VTK_OVERRIDE;
void SetOffScreenRendering(int offscreen) override;
//@{
/**
......@@ -268,8 +268,8 @@ public:
* and when done releasing resources restore
* the prior context
*/
void PushContext() VTK_OVERRIDE;
void PopContext() VTK_OVERRIDE;
void PushContext() override;
void PopContext() override;
//@}
/**
......@@ -315,8 +315,8 @@ protected:
int WindowIdReferenceCount;
void ResizeWhileOffscreen(int xsize, int ysize);
void CreateAWindow() VTK_OVERRIDE;
void DestroyWindow() VTK_OVERRIDE;
void CreateAWindow() override;
void DestroyWindow() override;
void InitializeApplication();
void CleanUpOffScreenRendering(void);
void CreateOffScreenWindow(int width,int height);
......
......@@ -48,12 +48,12 @@ public:
static vtkWin32RenderWindowInteractor *New();
vtkTypeMacro(vtkWin32RenderWindowInteractor,vtkRenderWindowInteractor);
void PrintSelf(ostream