diff --git a/Base/CLI/itkPluginFilterWatcher.h b/Base/CLI/itkPluginFilterWatcher.h index 76411312c4382350eaf980aa34c14fa4a3433c0e..65b6c8c0751509f6dcd07c345c3ed94e5694828f 100644 --- a/Base/CLI/itkPluginFilterWatcher.h +++ b/Base/CLI/itkPluginFilterWatcher.h @@ -44,7 +44,7 @@ protected: //----------------------------------------------------------------------------- /** Callback method to show the ProgressEvent */ -virtual void ShowProgress() +void ShowProgress() override { if (this->GetProcess()) { @@ -109,7 +109,7 @@ virtual void ShowProgress() //----------------------------------------------------------------------------- /** Callback method to show the StartEvent */ -virtual void StartFilter() +void StartFilter() override { this->SetSteps(0); this->SetIterations(0); @@ -151,7 +151,7 @@ virtual void StartFilter() //----------------------------------------------------------------------------- /** Callback method to show the EndEvent */ -virtual void EndFilter() +void EndFilter() override { this->GetTimeProbe().Stop(); if (!this->GetQuiet()) diff --git a/Base/CLI/vtkPluginFilterWatcher.cxx b/Base/CLI/vtkPluginFilterWatcher.cxx index 8bee6177676d03359e5a2110a1bcb27809d26b1e..dccf0e66b9ec60d74598e336e5eca15d303a4f4d 100644 --- a/Base/CLI/vtkPluginFilterWatcher.cxx +++ b/Base/CLI/vtkPluginFilterWatcher.cxx @@ -11,9 +11,9 @@ public: static vtkPluginWatcherStart *New() { return new vtkPluginWatcherStart; } - virtual void Execute(vtkObject *vtkNotUsed(caller), + void Execute(vtkObject *vtkNotUsed(caller), unsigned long event, - void* vtkNotUsed(v)) + void* vtkNotUsed(v)) override { if (event == vtkCommand::StartEvent && this->Watcher) { @@ -70,9 +70,9 @@ public: return new vtkPluginWatcherEnd; } - virtual void Execute(vtkObject *vtkNotUsed(caller), + void Execute(vtkObject *vtkNotUsed(caller), unsigned long event, - void* vtkNotUsed(v)) + void* vtkNotUsed(v)) override { if (event == vtkCommand::EndEvent && this->Watcher) { @@ -119,9 +119,9 @@ public: return new vtkPluginWatcherProgress; } - virtual void Execute(vtkObject *vtkNotUsed(caller), + void Execute(vtkObject *vtkNotUsed(caller), unsigned long event, - void* vtkNotUsed(v)) + void* vtkNotUsed(v)) override { if (event == vtkCommand::ProgressEvent && this->Watcher) { diff --git a/Base/Logic/vtkDataIOManagerLogic.h b/Base/Logic/vtkDataIOManagerLogic.h index cc3e1eb1092d85693f365ef7b789675b8057c16e..7f233a75cab463e041aa24ec2399307f0b3e495f 100755 --- a/Base/Logic/vtkDataIOManagerLogic.h +++ b/Base/Logic/vtkDataIOManagerLogic.h @@ -28,7 +28,7 @@ class VTK_SLICER_BASE_LOGIC_EXPORT vtkDataIOManagerLogic : public vtkSlicerModul /// The Usual vtk class functions static vtkDataIOManagerLogic *New(); vtkTypeMacro(vtkDataIOManagerLogic,vtkSlicerModuleLogic); - virtual void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; vtkGetObjectMacro ( DataIOManager, vtkDataIOManager ); virtual void SetAndObserveDataIOManager ( vtkDataIOManager *); @@ -62,7 +62,7 @@ class VTK_SLICER_BASE_LOGIC_EXPORT vtkDataIOManagerLogic : public vtkSlicerModul protected: vtkDataIOManagerLogic(); - virtual ~vtkDataIOManagerLogic(); + ~vtkDataIOManagerLogic() override; vtkDataIOManagerLogic(const vtkDataIOManagerLogic&); void operator=(const vtkDataIOManagerLogic&); diff --git a/Base/Logic/vtkImageFillROI.h b/Base/Logic/vtkImageFillROI.h index 1ba8552e03759a20c02b0380e3d957adc8457d39..d8ce20657f16c38fdeac7b3756a10cf47529b63f 100644 --- a/Base/Logic/vtkImageFillROI.h +++ b/Base/Logic/vtkImageFillROI.h @@ -38,7 +38,7 @@ class VTK_SLICER_BASE_LOGIC_EXPORT vtkImageFillROI : public vtkImageAlgorithm public: static vtkImageFillROI *New(); vtkTypeMacro(vtkImageFillROI,vtkImageAlgorithm); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; vtkSetMacro(Value, double); vtkGetMacro(Value, double); @@ -81,7 +81,7 @@ public: protected: vtkImageFillROI(); - ~vtkImageFillROI(); + ~vtkImageFillROI() override; vtkPoints *Points; double Value; @@ -90,9 +90,9 @@ protected: /// Reimplemented. /// Not threaded because too simple a filter - virtual int RequestData(vtkInformation* request, + int RequestData(vtkInformation* request, vtkInformationVector** inputVectors, - vtkInformationVector* outputVector) VTK_OVERRIDE; + vtkInformationVector* outputVector) override; private: vtkImageFillROI(const vtkImageFillROI&); diff --git a/Base/Logic/vtkImageRectangularSource.h b/Base/Logic/vtkImageRectangularSource.h index 9280fe243bead48f6c235769ffae993344483c8b..aee014c3ea8e0001df6fd4ea5a3555daa0cfc434 100644 --- a/Base/Logic/vtkImageRectangularSource.h +++ b/Base/Logic/vtkImageRectangularSource.h @@ -16,7 +16,7 @@ class VTK_SLICER_BASE_LOGIC_EXPORT vtkImageRectangularSource : public vtkImageA public: static vtkImageRectangularSource *New(); vtkTypeMacro(vtkImageRectangularSource,vtkImageAlgorithm); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// /// Set/Get the extent of the whole output image. @@ -81,7 +81,7 @@ public: protected: vtkImageRectangularSource(); - ~vtkImageRectangularSource(); + ~vtkImageRectangularSource() override; int **Corners; @@ -93,8 +93,8 @@ protected: int OutputScalarType; int InsideGraySlopeFlag; - virtual int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE; - virtual void ExecuteDataWithInformation(vtkDataObject *output, vtkInformation* outInfo) VTK_OVERRIDE; + int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override; + void ExecuteDataWithInformation(vtkDataObject *output, vtkInformation* outInfo) override; private: vtkImageRectangularSource(const vtkImageRectangularSource&); /// Not implemented. void operator=(const vtkImageRectangularSource&); /// Not implemented. diff --git a/Base/Logic/vtkSlicerApplicationLogic.h b/Base/Logic/vtkSlicerApplicationLogic.h index 2bc0441f66582ea64348d35efa4604fc1a390602..c66ed071f1dc33b9bc86b9801764180aa87c5f51 100644 --- a/Base/Logic/vtkSlicerApplicationLogic.h +++ b/Base/Logic/vtkSlicerApplicationLogic.h @@ -52,7 +52,7 @@ class VTK_SLICER_BASE_LOGIC_EXPORT vtkSlicerApplicationLogic /// The Usual vtk class functions static vtkSlicerApplicationLogic *New(); vtkTypeMacro(vtkSlicerApplicationLogic, vtkMRMLApplicationLogic); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Update the data IO, local and remote, with the new scene /// For stand alone applications, follow the set up steps in @@ -214,7 +214,7 @@ class VTK_SLICER_BASE_LOGIC_EXPORT vtkSlicerApplicationLogic protected: vtkSlicerApplicationLogic(); - ~vtkSlicerApplicationLogic(); + ~vtkSlicerApplicationLogic() override; /// Callback used by a MultiThreader to start a processing thread static itk::ITK_THREAD_RETURN_TYPE ProcessingThreaderCallback( void * ); diff --git a/Base/Logic/vtkSlicerApplicationLogicRequests.h b/Base/Logic/vtkSlicerApplicationLogicRequests.h index 5d2172344935a57cd55ede97941f3e16f4330539..8c86aab17829ec73be1ba280e9aee64af34f26b7 100644 --- a/Base/Logic/vtkSlicerApplicationLogicRequests.h +++ b/Base/Logic/vtkSlicerApplicationLogicRequests.h @@ -51,7 +51,7 @@ public: m_DeleteFile = deleteFile; } - void Execute(vtkSlicerApplicationLogic* appLogic) + void Execute(vtkSlicerApplicationLogic* appLogic) override { // This method needs to read the data into the specific type of node and set up an // appropriate storage and display node. @@ -252,7 +252,7 @@ public: m_DeleteFile = deleteFile; } - void Execute(vtkSlicerApplicationLogic* appLogic) + void Execute(vtkSlicerApplicationLogic* appLogic) override { if (m_SourceNodes.size() != m_TargetNodes.size()) { @@ -513,7 +513,7 @@ public: m_ParentTransformNode = parentTransformNode; } - void Execute(vtkSlicerApplicationLogic* appLogic) + void Execute(vtkSlicerApplicationLogic* appLogic) override { vtkMRMLScene* scene = appLogic->GetMRMLScene(); vtkMRMLTransformableNode* node = vtkMRMLTransformableNode::SafeDownCast( @@ -541,7 +541,7 @@ public: m_SubjectHierarchySiblingNode = siblingNode; } - void Execute(vtkSlicerApplicationLogic* appLogic) + void Execute(vtkSlicerApplicationLogic* appLogic) override { vtkMRMLScene* scene = appLogic->GetMRMLScene(); @@ -595,7 +595,7 @@ public: m_Filename = filename; } - void Execute(vtkSlicerApplicationLogic* appLogic) + void Execute(vtkSlicerApplicationLogic* appLogic) override { if (m_SourceNodes.size() != m_TargetNodes.size()) { diff --git a/Base/Logic/vtkSlicerFiducialsLogic.h b/Base/Logic/vtkSlicerFiducialsLogic.h index 9e2036ba32ef388f613a2ea7d1f1bf49a492f98e..4ea373aec4d6c1c10925891e1c9e18043ace7f15 100644 --- a/Base/Logic/vtkSlicerFiducialsLogic.h +++ b/Base/Logic/vtkSlicerFiducialsLogic.h @@ -35,7 +35,7 @@ class VTK_SLICER_BASE_LOGIC_EXPORT vtkSlicerFiducialsLogic : public vtkMRMLAbstr /// The Usual vtk class functions static vtkSlicerFiducialsLogic *New(); vtkTypeMacro(vtkSlicerFiducialsLogic, vtkMRMLAbstractLogic); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Get the currently selected list from the scene. Returns NULL if no /// selection node or no active fiducial list id is set on the selection @@ -72,7 +72,7 @@ class VTK_SLICER_BASE_LOGIC_EXPORT vtkSlicerFiducialsLogic : public vtkMRMLAbstr protected: vtkSlicerFiducialsLogic(); - ~vtkSlicerFiducialsLogic(); + ~vtkSlicerFiducialsLogic() override; vtkSlicerFiducialsLogic(const vtkSlicerFiducialsLogic&); void operator=(const vtkSlicerFiducialsLogic&); }; diff --git a/Base/Logic/vtkSlicerGlyphSource2D.h b/Base/Logic/vtkSlicerGlyphSource2D.h index 880ab8e809fd2c6d7bad21f4e951edb4b3bcb482..c041ba3af286481d391de515fe973bf392418482 100644 --- a/Base/Logic/vtkSlicerGlyphSource2D.h +++ b/Base/Logic/vtkSlicerGlyphSource2D.h @@ -53,7 +53,7 @@ class VTK_SLICER_BASE_LOGIC_EXPORT vtkSlicerGlyphSource2D : public vtkPolyDataAl { public: vtkTypeMacro(vtkSlicerGlyphSource2D,vtkPolyDataAlgorithm); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// /// Construct a vertex glyph centered at the origin, scale 1.0, white in @@ -135,9 +135,9 @@ public: protected: vtkSlicerGlyphSource2D(); - ~vtkSlicerGlyphSource2D() {}; + ~vtkSlicerGlyphSource2D() override {}; - int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE; + int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override; double Center[3]; double Scale; diff --git a/Base/Logic/vtkSlicerModuleLogic.h b/Base/Logic/vtkSlicerModuleLogic.h index 63097af2ec3f36a9e0f7a8a512b23160b5669cc5..e4dada026c20f047428954b8151b5f5b67883b01 100644 --- a/Base/Logic/vtkSlicerModuleLogic.h +++ b/Base/Logic/vtkSlicerModuleLogic.h @@ -27,7 +27,7 @@ public: /// The Usual vtk class functions static vtkSlicerModuleLogic *New(); vtkTypeMacro(vtkSlicerModuleLogic, vtkMRMLAbstractLogic); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Get access to overall application state virtual vtkSlicerApplicationLogic* GetApplicationLogic(); @@ -39,7 +39,7 @@ public: protected: vtkSlicerModuleLogic(); - virtual ~vtkSlicerModuleLogic(); + ~vtkSlicerModuleLogic() override; private: diff --git a/Base/Logic/vtkSlicerScriptedLoadableModuleLogic.h b/Base/Logic/vtkSlicerScriptedLoadableModuleLogic.h index a58d6d38860369d1e4ce1a8ee0ba288efa6b2e5f..8ad8ced6c1573ac5c91ab79ede0368cfd3df4efc 100644 --- a/Base/Logic/vtkSlicerScriptedLoadableModuleLogic.h +++ b/Base/Logic/vtkSlicerScriptedLoadableModuleLogic.h @@ -36,14 +36,14 @@ public: static vtkSlicerScriptedLoadableModuleLogic *New(); vtkTypeMacro(vtkSlicerScriptedLoadableModuleLogic, vtkSlicerModuleLogic); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; bool SetPythonSource(const std::string& pythonSource); protected: vtkSlicerScriptedLoadableModuleLogic(); - virtual ~vtkSlicerScriptedLoadableModuleLogic(); + ~vtkSlicerScriptedLoadableModuleLogic() override; // virtual void SetMRMLSceneInternal(vtkMRMLScene* newScene); diff --git a/Base/Logic/vtkSlicerTask.h b/Base/Logic/vtkSlicerTask.h index 9bd4899dc3fe8f825e7388c831fe6d9e36c9fcc8..1bb4e3693ac4e3cbae0341b1b96d8596b194ab42 100644 --- a/Base/Logic/vtkSlicerTask.h +++ b/Base/Logic/vtkSlicerTask.h @@ -11,7 +11,7 @@ class VTK_SLICER_BASE_LOGIC_EXPORT vtkSlicerTask : public vtkObject public: static vtkSlicerTask *New(); vtkTypeMacro(vtkSlicerTask,vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; typedef vtkMRMLAbstractLogic::TaskFunctionPointer TaskFunctionPointer; @@ -50,7 +50,7 @@ public: protected: vtkSlicerTask(); - virtual ~vtkSlicerTask(); + ~vtkSlicerTask() override; vtkSlicerTask(const vtkSlicerTask&); void operator=(const vtkSlicerTask&); diff --git a/Base/Logic/vtkSystemInformation.h b/Base/Logic/vtkSystemInformation.h index ab8df0ba32673d6433c38809c2665624d8605785..abca548c3eb8e7328f489375e917bf9a4b3ffaae 100644 --- a/Base/Logic/vtkSystemInformation.h +++ b/Base/Logic/vtkSystemInformation.h @@ -21,7 +21,7 @@ class VTK_SLICER_BASE_LOGIC_EXPORT vtkSystemInformation : public vtkObject public: static vtkSystemInformation *New(); vtkTypeMacro(vtkSystemInformation,vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; const char * GetVendorString(); const char * GetVendorID(); @@ -96,7 +96,7 @@ protected: vtkSmartPointer NewOffscreenRenderWindow(); vtkSystemInformation(); - virtual ~vtkSystemInformation(); + ~vtkSystemInformation() override; vtkSystemInformation(const vtkSystemInformation&); void operator=(const vtkSystemInformation&); diff --git a/Base/Logic/vtkTransformVisualizerGlyph3D.h b/Base/Logic/vtkTransformVisualizerGlyph3D.h index 39012af5454e96d750990efc12465533fe3858d8..39c4844fcd6fa134ce0d1c4e6beecc9d48acacda 100644 --- a/Base/Logic/vtkTransformVisualizerGlyph3D.h +++ b/Base/Logic/vtkTransformVisualizerGlyph3D.h @@ -46,7 +46,7 @@ class VTK_SLICER_BASE_LOGIC_EXPORT vtkTransformVisualizerGlyph3D : public vtkGly { public: vtkTypeMacro(vtkTransformVisualizerGlyph3D,vtkGlyph3D); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; static vtkTransformVisualizerGlyph3D *New(); /// If true then glyphs are only scaled with the scalar value along x axis (y and z scaling is 1). @@ -80,7 +80,7 @@ public: protected: vtkTransformVisualizerGlyph3D(); - ~vtkTransformVisualizerGlyph3D() {}; + ~vtkTransformVisualizerGlyph3D() override {}; bool ScaleDirectional; @@ -88,7 +88,7 @@ protected: double MagnitudeThresholdLower; double MagnitudeThresholdUpper; - virtual int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE; + int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override; private: vtkTransformVisualizerGlyph3D(const vtkTransformVisualizerGlyph3D&); // Not implemented. diff --git a/Base/QTApp/qSlicerAboutDialog.h b/Base/QTApp/qSlicerAboutDialog.h index 4f38e50d7bb003d3e092d82fefff46e6d9910f4f..f5cabfc6f3331509e8d48f8fd87acdbcc5ff511b 100644 --- a/Base/QTApp/qSlicerAboutDialog.h +++ b/Base/QTApp/qSlicerAboutDialog.h @@ -39,7 +39,7 @@ class Q_SLICER_BASE_QTAPP_EXPORT qSlicerAboutDialog : Q_OBJECT public: qSlicerAboutDialog(QWidget *parentWidget = 0); - virtual ~qSlicerAboutDialog(); + ~qSlicerAboutDialog() override; Q_INVOKABLE void setLogo(const QPixmap& newLogo); diff --git a/Base/QTApp/qSlicerApplicationHelper.h b/Base/QTApp/qSlicerApplicationHelper.h index cfcc6e80079c25b47b05e9948026789c6ee0ecf1..2d969e4d58e4e67e9e1aafe59f14400ad8ea53b7 100644 --- a/Base/QTApp/qSlicerApplicationHelper.h +++ b/Base/QTApp/qSlicerApplicationHelper.h @@ -42,7 +42,7 @@ public: typedef qSlicerApplicationHelper Self; qSlicerApplicationHelper(QObject * parent = 0); - virtual ~qSlicerApplicationHelper(); + ~qSlicerApplicationHelper() override; static void preInitializeApplication(const char* argv0, ctkProxyStyle* style); diff --git a/Base/QTApp/qSlicerErrorReportDialog.h b/Base/QTApp/qSlicerErrorReportDialog.h index 377bd555da1e1e876a38475ec5e540315283a776..332270bb53d324165cdf6b73836a893d649bf609 100644 --- a/Base/QTApp/qSlicerErrorReportDialog.h +++ b/Base/QTApp/qSlicerErrorReportDialog.h @@ -39,7 +39,7 @@ class Q_SLICER_BASE_QTAPP_EXPORT qSlicerErrorReportDialog : Q_OBJECT public: qSlicerErrorReportDialog(QWidget *parentWidget = 0); - virtual ~qSlicerErrorReportDialog(); + ~qSlicerErrorReportDialog() override; protected slots: void onLogFileOpen(); diff --git a/Base/QTApp/qSlicerMainWindow.h b/Base/QTApp/qSlicerMainWindow.h index edf6d1d581ddb0520c5d85526fc275ed109d552a..6afd4719e4e6f5c723f950605fcb767da2c08bf5 100644 --- a/Base/QTApp/qSlicerMainWindow.h +++ b/Base/QTApp/qSlicerMainWindow.h @@ -48,7 +48,7 @@ public: typedef QMainWindow Superclass; qSlicerMainWindow(QWidget *parent=0); - virtual ~qSlicerMainWindow(); + ~qSlicerMainWindow() override; /// Return a pointer to the module selector toolbar that can change the /// current module. @@ -141,11 +141,11 @@ protected: /// Forward the dragEnterEvent to the IOManager which will /// decide if it could accept a drag/drop or not. /// \sa dropEvent() - virtual void dragEnterEvent(QDragEnterEvent *event); + void dragEnterEvent(QDragEnterEvent *event) override; /// Forward the dropEvent to the IOManager. /// \sa dragEnterEvent() - virtual void dropEvent(QDropEvent *event); + void dropEvent(QDropEvent *event) override; /// Reimplemented to catch activationChange/show/hide events. /// More specifically it allows to: @@ -153,10 +153,10 @@ protected: /// associated dialog are visible or not. /// 2. set the state of ErrorLog button based on the activation state of /// the error log dialog. - virtual bool eventFilter(QObject* object, QEvent* event); + bool eventFilter(QObject* object, QEvent* event) override; - virtual void closeEvent(QCloseEvent *event); - virtual void showEvent(QShowEvent *event); + void closeEvent(QCloseEvent *event) override; + void showEvent(QShowEvent *event) override; protected: QScopedPointer d_ptr; diff --git a/Base/QTCLI/DesignerPlugins/qSlicerCLIProgressBarPlugin.h b/Base/QTCLI/DesignerPlugins/qSlicerCLIProgressBarPlugin.h index 8116b5857210d962421593d1503a31fcac394c80..7980cf75ade94d004acbf37f2579ba2e5c359911 100644 --- a/Base/QTCLI/DesignerPlugins/qSlicerCLIProgressBarPlugin.h +++ b/Base/QTCLI/DesignerPlugins/qSlicerCLIProgressBarPlugin.h @@ -31,11 +31,11 @@ class Q_SLICER_BASE_QTCLI_PLUGINS_EXPORT qSlicerCLIProgressBarPlugin public: qSlicerCLIProgressBarPlugin(QObject* parent = 0); - QWidget *createWidget(QWidget* parent); - QString domXml() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget* parent) override; + QString domXml() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; #endif diff --git a/Base/QTCLI/DesignerPlugins/qSlicerQTCLIAbstractPlugin.h b/Base/QTCLI/DesignerPlugins/qSlicerQTCLIAbstractPlugin.h index d9b322eed11b9b666bfd39b1f86b99d5d07b9de3..eb2d63c5e7f100249ac6703de3dadecf7855adc6 100644 --- a/Base/QTCLI/DesignerPlugins/qSlicerQTCLIAbstractPlugin.h +++ b/Base/QTCLI/DesignerPlugins/qSlicerQTCLIAbstractPlugin.h @@ -37,11 +37,11 @@ public: qSlicerQTCLIAbstractPlugin(); // Don't reimplement this method. - QString group() const; + QString group() const override; // You can reimplement these methods - virtual QIcon icon() const; - virtual QString toolTip() const; - virtual QString whatsThis() const; + QIcon icon() const override; + QString toolTip() const override; + QString whatsThis() const override; }; #endif diff --git a/Base/QTCLI/DesignerPlugins/qSlicerQTCLIPlugins.h b/Base/QTCLI/DesignerPlugins/qSlicerQTCLIPlugins.h index dc018a302f451eac5ea6fb02ad62ed4c49649953..70fec338a2deb7a877260d8d9957f041cda9325e 100644 --- a/Base/QTCLI/DesignerPlugins/qSlicerQTCLIPlugins.h +++ b/Base/QTCLI/DesignerPlugins/qSlicerQTCLIPlugins.h @@ -37,7 +37,7 @@ class Q_SLICER_BASE_QTCLI_PLUGINS_EXPORT qSlicerQTCLIPlugins Q_INTERFACES(QDesignerCustomWidgetCollectionInterface); public: - QList customWidgets() const + QList customWidgets() const override { QList plugins; plugins << new qSlicerCLIProgressBarPlugin; diff --git a/Base/QTCLI/qSlicerCLIModule.h b/Base/QTCLI/qSlicerCLIModule.h index 890085467e96148cc419fe6b827352844a2d2005..d9a569949f6d7e5f7b2930f019078f5cf7186e0e 100644 --- a/Base/QTCLI/qSlicerCLIModule.h +++ b/Base/QTCLI/qSlicerCLIModule.h @@ -44,7 +44,7 @@ public: typedef qSlicerAbstractModule Superclass; qSlicerCLIModule(QWidget *parent=0); - virtual ~qSlicerCLIModule(); + ~qSlicerCLIModule() override; /// /// Assign the module XML description. @@ -52,12 +52,12 @@ public: void setXmlModuleDescription(const QString& xmlModuleDescription); /// Optionally set in the module XML description - virtual int index() const; + int index() const override; /// /// Return help/acknowledgement text - virtual QString helpText() const; - virtual QString acknowledgementText() const; + QString helpText() const override; + QString acknowledgementText() const override; /// Set temporary directory associated with the module void setTempDirectory(const QString& tempDirectory); @@ -78,18 +78,18 @@ public: /// 'createLogic' method. Q_INVOKABLE vtkSlicerCLIModuleLogic* cliModuleLogic(); - virtual QString title() const; + QString title() const override; /// Extracted from the "category" field - virtual QStringList categories() const; + QStringList categories() const override; /// Extracted from the "contributor" field - virtual QStringList contributors() const; + QStringList contributors() const override; /// Specify editable node types - virtual QStringList associatedNodeTypes()const; + QStringList associatedNodeTypes()const override; - virtual QImage logo() const; + QImage logo() const override; void setLogo(const ModuleLogo& logo); /// Convert a ModuleLogo into a QIcon @@ -102,15 +102,15 @@ public: protected: /// - virtual void setup(); + void setup() override; /// /// Create and return the widget representation associated to this module - virtual qSlicerAbstractModuleRepresentation * createWidgetRepresentation(); + qSlicerAbstractModuleRepresentation * createWidgetRepresentation() override; /// /// Create and return the logic associated to this module - virtual vtkMRMLAbstractLogic* createLogic(); + vtkMRMLAbstractLogic* createLogic() override; protected: QScopedPointer d_ptr; diff --git a/Base/QTCLI/qSlicerCLIModuleUIHelper.h b/Base/QTCLI/qSlicerCLIModuleUIHelper.h index cc8c4d795c8f72786f1dd5752262cc1ccae945b6..9c63fc95abce0ffbd862e376dba633e3ab5df539 100644 --- a/Base/QTCLI/qSlicerCLIModuleUIHelper.h +++ b/Base/QTCLI/qSlicerCLIModuleUIHelper.h @@ -45,7 +45,7 @@ class Q_SLICER_BASE_QTCLI_EXPORT qSlicerWidgetValueWrapper: public QObject Q_OBJECT public: qSlicerWidgetValueWrapper(const QString& _name, const QString& _label, QObject* parent); - virtual ~qSlicerWidgetValueWrapper(); + ~qSlicerWidgetValueWrapper() override; virtual QVariant value() = 0; QString label(){ return this->Label; } QString name(){ return this->Name; } @@ -106,7 +106,7 @@ class Q_SLICER_BASE_QTCLI_EXPORT qSlicerCLIModuleUIHelper: public QObject public: qSlicerCLIModuleUIHelper(qSlicerCLIModuleWidget* cliModuleWidget); - virtual ~qSlicerCLIModuleUIHelper(); + ~qSlicerCLIModuleUIHelper() override; /// Create the widget associated with the given \a moduleParameter /// The caller is responsible to delete the widget. diff --git a/Base/QTCLI/qSlicerCLIModuleWidgetEventPlayer.h b/Base/QTCLI/qSlicerCLIModuleWidgetEventPlayer.h index 72747c7228d0b33c438b007d841eed1181bee10c..21c5dff9800058953d9c96d0bfc6620fb735220f 100644 --- a/Base/QTCLI/qSlicerCLIModuleWidgetEventPlayer.h +++ b/Base/QTCLI/qSlicerCLIModuleWidgetEventPlayer.h @@ -36,7 +36,7 @@ public: qSlicerCLIModuleWidgetEventPlayer(QObject* parent = 0); using Superclass::playEvent; - bool playEvent(QObject *Object, const QString &Command, const QString &Arguments, bool &Error); + bool playEvent(QObject *Object, const QString &Command, const QString &Arguments, bool &Error) override; private: qSlicerCLIModuleWidgetEventPlayer(const qSlicerCLIModuleWidgetEventPlayer&); // NOT implemented diff --git a/Base/QTCLI/vtkSlicerCLIModuleLogic.cxx b/Base/QTCLI/vtkSlicerCLIModuleLogic.cxx index 63b9beec547d337657f02cb40a8c461df8834d84..a9f2e8cfe9c2d6ede27503e76153ac67b3f7c67b 100644 --- a/Base/QTCLI/vtkSlicerCLIModuleLogic.cxx +++ b/Base/QTCLI/vtkSlicerCLIModuleLogic.cxx @@ -89,7 +89,7 @@ public: { return new vtkSlicerCLIRescheduleCallback; } - virtual void Execute(vtkObject* caller, unsigned long eid, void *callData) + void Execute(vtkObject* caller, unsigned long eid, void *callData) override { if (std::find(this->ThreadIDs.begin(), this->ThreadIDs.end(), vtkMultiThreader::GetCurrentThreadID()) != this->ThreadIDs.end()) @@ -143,7 +143,7 @@ protected: this->CLIModuleLogic = 0; this->Delay = 0; } - ~vtkSlicerCLIRescheduleCallback() + ~vtkSlicerCLIRescheduleCallback() override { this->SetCLIModuleLogic(0); } @@ -166,7 +166,7 @@ public: { return new vtkSlicerCLIOneShotCallbackCallback; } - virtual void Execute(vtkObject* caller, unsigned long eid, void *callData) + void Execute(vtkObject* caller, unsigned long eid, void *callData) override { if (callData) { @@ -188,7 +188,7 @@ public: } protected: vtkSlicerCLIOneShotCallbackCallback() {} - ~vtkSlicerCLIOneShotCallbackCallback() {} + ~vtkSlicerCLIOneShotCallbackCallback() override {} }; //---------------------------------------------------------------------------- diff --git a/Base/QTCLI/vtkSlicerCLIModuleLogic.h b/Base/QTCLI/vtkSlicerCLIModuleLogic.h index bb5871540c9ae9ce3942eb0eec0107e70881150c..95b179eb0cd321380c401c13472650cb36d1d262 100644 --- a/Base/QTCLI/vtkSlicerCLIModuleLogic.h +++ b/Base/QTCLI/vtkSlicerCLIModuleLogic.h @@ -45,7 +45,7 @@ class Q_SLICER_BASE_QTCLI_EXPORT vtkSlicerCLIModuleLogic : public: static vtkSlicerCLIModuleLogic *New(); vtkTypeMacro(vtkSlicerCLIModuleLogic,vtkSlicerModuleLogic); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// The default module description is used when creating new nodes. /// \sa CreateNode() @@ -109,18 +109,18 @@ public: // { this->LazyEvaluateModuleTarget(node->GetModuleDescription()); } /// Set the application logic - virtual void SetMRMLApplicationLogic(vtkMRMLApplicationLogic* logic) VTK_OVERRIDE; + void SetMRMLApplicationLogic(vtkMRMLApplicationLogic* logic) override; protected: /// Reimplemented to observe NodeAddedEvent. - virtual void SetMRMLSceneInternal(vtkMRMLScene * newScene) VTK_OVERRIDE; + void SetMRMLSceneInternal(vtkMRMLScene * newScene) override; /// Reimplemented for AutoRun mode. - virtual void OnMRMLSceneNodeAdded(vtkMRMLNode* node) VTK_OVERRIDE; + void OnMRMLSceneNodeAdded(vtkMRMLNode* node) override; /// Reimplemented to observe CLI node. - virtual void ProcessMRMLNodesEvents(vtkObject *caller, unsigned long event, - void *callData) VTK_OVERRIDE; + void ProcessMRMLNodesEvents(vtkObject *caller, unsigned long event, + void *callData) override; /// Reimplemented to observe vtkSlicerApplicationLogic. - void ProcessMRMLLogicsEvents(vtkObject*, long unsigned int, void*) VTK_OVERRIDE; + void ProcessMRMLLogicsEvents(vtkObject*, long unsigned int, void*) override; std::string ConstructTemporaryFileName(const std::string& tag, @@ -158,7 +158,7 @@ protected: private: vtkSlicerCLIModuleLogic(); - virtual ~vtkSlicerCLIModuleLogic(); + ~vtkSlicerCLIModuleLogic() override; vtkSlicerCLIModuleLogic(const vtkSlicerCLIModuleLogic&); void operator=(const vtkSlicerCLIModuleLogic&); diff --git a/Base/QTCore/Testing/Cxx/qSlicerAbstractCoreModuleTest1.cxx b/Base/QTCore/Testing/Cxx/qSlicerAbstractCoreModuleTest1.cxx index eb1289161d57afe8abf3f8a6a0dcf56d9de44144..616cad6980a2894cab612386f6d72d74e468a940 100644 --- a/Base/QTCore/Testing/Cxx/qSlicerAbstractCoreModuleTest1.cxx +++ b/Base/QTCore/Testing/Cxx/qSlicerAbstractCoreModuleTest1.cxx @@ -36,7 +36,7 @@ public: { ++Count; } - virtual ~AModuleWidgetRepresentation() + ~AModuleWidgetRepresentation() override { --Count; } @@ -44,7 +44,7 @@ public: static int Count; protected: - virtual void setup () {} + void setup () override {} }; @@ -54,18 +54,18 @@ int AModuleWidgetRepresentation::Count = 0; class AModule: public qSlicerAbstractCoreModule { public: - virtual QString title()const { return "A Title";} - virtual qSlicerAbstractModuleRepresentation* createWidgetRepresentation() + QString title()const override { return "A Title";} + qSlicerAbstractModuleRepresentation* createWidgetRepresentation() override { return new AModuleWidgetRepresentation(); } - virtual vtkMRMLAbstractLogic* createLogic() + vtkMRMLAbstractLogic* createLogic() override { return 0; } protected: - virtual void setup () {} + void setup () override {} }; //----------------------------------------------------------------------------- diff --git a/Base/QTCore/qSlicerAbstractCoreModule.h b/Base/QTCore/qSlicerAbstractCoreModule.h index 0b5583e231d06f6e3a68dd5c1f5ca8d3c0dded73..7f21e25d5852ac144486514e175f408057291dfc 100644 --- a/Base/QTCore/qSlicerAbstractCoreModule.h +++ b/Base/QTCore/qSlicerAbstractCoreModule.h @@ -40,7 +40,7 @@ class qSlicerAbstractCoreModulePrivate; #define qSlicerGetTitleMacro(_TITLE) \ static QString staticTitle() { return _TITLE; } \ - virtual QString title()const { return _TITLE; } + QString title() const override { return _TITLE; } /// \brief qSlicerAbstractCoreModule is the base class of any module in Slicer. // @@ -193,7 +193,7 @@ public: /// is initialized (module manager, iomanager...). Most of the /// initialization must be done in qSlicerAbstractCoreModule::setup() qSlicerAbstractCoreModule(QObject *parent=0); - virtual ~qSlicerAbstractCoreModule(); + ~qSlicerAbstractCoreModule() override; virtual void printAdditionalInfo(); diff --git a/Base/QTCore/qSlicerAbstractModuleFactoryManager.h b/Base/QTCore/qSlicerAbstractModuleFactoryManager.h index 325a9bbe3f0ddda620010956c73a62d7a679ea44..2151f7b9d90845f810c15131b5b0b1c0ff717ac2 100644 --- a/Base/QTCore/qSlicerAbstractModuleFactoryManager.h +++ b/Base/QTCore/qSlicerAbstractModuleFactoryManager.h @@ -91,7 +91,7 @@ public: /// Destructor, Deallocates resources /// Unregister (and delete) all registered factories. - virtual ~qSlicerAbstractModuleFactoryManager(); + ~qSlicerAbstractModuleFactoryManager() override; /// Print internal state using qDebug() virtual void printAdditionalInfo(); diff --git a/Base/QTCore/qSlicerAbstractModuleRepresentation.h b/Base/QTCore/qSlicerAbstractModuleRepresentation.h index 17acbfa1d6d3cd78988330c5a9ca285e73f53bae..656d1d929ee2c6a798326afdf8de34c00e07623a 100644 --- a/Base/QTCore/qSlicerAbstractModuleRepresentation.h +++ b/Base/QTCore/qSlicerAbstractModuleRepresentation.h @@ -45,7 +45,7 @@ public: typedef qSlicerObject Superclass; qSlicerAbstractModuleRepresentation(); - virtual ~qSlicerAbstractModuleRepresentation(); + ~qSlicerAbstractModuleRepresentation() override; /// Set/Get module name QString moduleName()const; diff --git a/Base/QTCore/qSlicerCoreApplication.h b/Base/QTCore/qSlicerCoreApplication.h index 174bafeec640c3d5c84183aa347ad46e4c1e2f57..033c5daab89de1a5c56721ece9aa31da23c5fc5f 100644 --- a/Base/QTCore/qSlicerCoreApplication.h +++ b/Base/QTCore/qSlicerCoreApplication.h @@ -99,7 +99,7 @@ public: typedef QApplication Superclass; qSlicerCoreApplication(int &argc, char **argv); - virtual ~qSlicerCoreApplication(); + ~qSlicerCoreApplication() override; /// Return a reference to the application singleton static qSlicerCoreApplication* application(); diff --git a/Base/QTCore/qSlicerCoreIOManager.h b/Base/QTCore/qSlicerCoreIOManager.h index f767ed0d2f581a7c2ddba1afe73ab726a7c861c5..ac7fb8c356a8218f1c1dd9e9d9c9f1941f725fd2 100644 --- a/Base/QTCore/qSlicerCoreIOManager.h +++ b/Base/QTCore/qSlicerCoreIOManager.h @@ -51,7 +51,7 @@ class Q_SLICER_BASE_QTCORE_EXPORT qSlicerCoreIOManager:public QObject public: qSlicerCoreIOManager(QObject* parent = 0); - virtual ~qSlicerCoreIOManager(); + ~qSlicerCoreIOManager() override; /// Return the file type associated with a \a file Q_INVOKABLE qSlicerIO::IOFileType fileType(const QString& file)const; diff --git a/Base/QTCore/qSlicerCorePythonManager.h b/Base/QTCore/qSlicerCorePythonManager.h index 7b4c41e84c6c8c90bd938d96056f116feabd7ad2..e8f43f2205da4d45446859c796adc837e2e4f029 100644 --- a/Base/QTCore/qSlicerCorePythonManager.h +++ b/Base/QTCore/qSlicerCorePythonManager.h @@ -40,7 +40,7 @@ class Q_SLICER_BASE_QTCORE_EXPORT qSlicerCorePythonManager : public ctkAbstractP public: typedef ctkAbstractPythonManager Superclass; qSlicerCorePythonManager(QObject* parent=0); - ~qSlicerCorePythonManager(); + ~qSlicerCorePythonManager() override; /// Convenient function allowing to add a VTK object to the interpreter main module Q_INVOKABLE void addVTKObjectToPythonMain(const QString& name, vtkObject * object); @@ -54,7 +54,7 @@ public: Q_INVOKABLE void appendPythonPaths(const QStringList& paths); /// List of directories containing Python modules. - virtual QStringList pythonPaths(); + QStringList pythonPaths() override; /// Convert a string to a safe python string literal. /// Backslash, single-quote characters are escaped @@ -69,7 +69,7 @@ public: protected: - virtual void preInitialization(); + void preInitialization() override; ctkVTKPythonQtWrapperFactory* Factory; }; diff --git a/Base/QTCore/qSlicerExtensionDownloadTask.h b/Base/QTCore/qSlicerExtensionDownloadTask.h index 5dc463563e65c4b884c94728a98be316c55efa81..63a6533326a317a9d6d46de28e9791cdab759600 100644 --- a/Base/QTCore/qSlicerExtensionDownloadTask.h +++ b/Base/QTCore/qSlicerExtensionDownloadTask.h @@ -46,7 +46,7 @@ public: QObject* parent = 0); /// Destructor. - virtual ~qSlicerExtensionDownloadTask(); + ~qSlicerExtensionDownloadTask() override; /// Get extension metadata. QVariantMap metadata() const; diff --git a/Base/QTCore/qSlicerExtensionsManagerModel.cxx b/Base/QTCore/qSlicerExtensionsManagerModel.cxx index af0194073baacaa3e904b5bb62a4ed9df8e2e083..c22a4fae0f2336424ba6807d7116f1a9ad6d17e0 100644 --- a/Base/QTCore/qSlicerExtensionsManagerModel.cxx +++ b/Base/QTCore/qSlicerExtensionsManagerModel.cxx @@ -77,7 +77,7 @@ struct UpdateDownloadInformation class QStandardItemModelWithRole : public QStandardItemModel { public: - QHash roleNames() const + QHash roleNames() const override { return this->CustomRoleNames; } diff --git a/Base/QTCore/qSlicerExtensionsManagerModel.h b/Base/QTCore/qSlicerExtensionsManagerModel.h index 17b2b27a1e69e525aa486aa48f4459f582b1917d..2c8b7c5c461faa317b3fbf1a54e3fcab2ae29fb5 100644 --- a/Base/QTCore/qSlicerExtensionsManagerModel.h +++ b/Base/QTCore/qSlicerExtensionsManagerModel.h @@ -67,7 +67,7 @@ public: explicit qSlicerExtensionsManagerModel(QObject* parent = 0); /// Destructor - virtual ~qSlicerExtensionsManagerModel(); + ~qSlicerExtensionsManagerModel() override; /// \brief Extension metadata typedef typedef QVariantMap ExtensionMetadataType; diff --git a/Base/QTCore/qSlicerFileReader.h b/Base/QTCore/qSlicerFileReader.h index 2e4d863beea85551891a6e79fb70a2738bc1eb1e..0901d4c1178c5770dc47db3e0b4239660b618ee9 100644 --- a/Base/QTCore/qSlicerFileReader.h +++ b/Base/QTCore/qSlicerFileReader.h @@ -38,7 +38,7 @@ class Q_SLICER_BASE_QTCORE_EXPORT qSlicerFileReader public: typedef qSlicerIO Superclass; explicit qSlicerFileReader(QObject* parent = 0); - virtual ~qSlicerFileReader(); + ~qSlicerFileReader() override; /// Return a list of the supported extensions. Please read /// QFileDialog::nameFilters for the allowed formats diff --git a/Base/QTCore/qSlicerFileWriter.h b/Base/QTCore/qSlicerFileWriter.h index 6ae400c67b1e6196b37d7bb4f13f746a48dfdb93..d17f84c512b43e725913b7736bd51142d1b359e1 100644 --- a/Base/QTCore/qSlicerFileWriter.h +++ b/Base/QTCore/qSlicerFileWriter.h @@ -33,7 +33,7 @@ class Q_SLICER_BASE_QTCORE_EXPORT qSlicerFileWriter Q_OBJECT public: qSlicerFileWriter(QObject* parent = 0); - virtual ~qSlicerFileWriter(); + ~qSlicerFileWriter() override; /// Return true if the object is handled by the writer. virtual bool canWriteObject(vtkObject* object)const; diff --git a/Base/QTCore/qSlicerIO.h b/Base/QTCore/qSlicerIO.h index d0efd55fe599ae312ebd0125b5c53d707b0de6ff..d0dd73d30844bead7ba6c320ee5e521b33d86d3b 100644 --- a/Base/QTCore/qSlicerIO.h +++ b/Base/QTCore/qSlicerIO.h @@ -45,7 +45,7 @@ class Q_SLICER_BASE_QTCORE_EXPORT qSlicerIO public: typedef QObject Superclass; explicit qSlicerIO(QObject* parent = 0); - virtual ~qSlicerIO(); + ~qSlicerIO() override; typedef QString IOFileType; typedef QVariantMap IOProperties; diff --git a/Base/QTCore/qSlicerModuleManager.h b/Base/QTCore/qSlicerModuleManager.h index f07b487ef5cb0c1b9f4ec7c28bad5503565a7081..a6b34613bd96b2b52c465d241e76f02362cfe045 100644 --- a/Base/QTCore/qSlicerModuleManager.h +++ b/Base/QTCore/qSlicerModuleManager.h @@ -41,7 +41,7 @@ class Q_SLICER_BASE_QTCORE_EXPORT qSlicerModuleManager : public QObject public: typedef QObject Superclass; qSlicerModuleManager(QObject* newParent = 0); - virtual ~qSlicerModuleManager(); + ~qSlicerModuleManager() override; /// Print internal state using qDebug() virtual void printAdditionalInfo(); diff --git a/Base/QTCore/qSlicerPersistentCookieJar.h b/Base/QTCore/qSlicerPersistentCookieJar.h index 72f62b1393494fea71a3edfabd0782532274f9db..c71455ef7127b6ae23c4fab9d2f2a34d6a8ac70d 100644 --- a/Base/QTCore/qSlicerPersistentCookieJar.h +++ b/Base/QTCore/qSlicerPersistentCookieJar.h @@ -44,13 +44,13 @@ class Q_SLICER_BASE_QTCORE_EXPORT qSlicerPersistentCookieJar: public QNetworkCoo public: typedef QNetworkCookieJar Superclass; qSlicerPersistentCookieJar(QObject *parent = 0); - virtual ~qSlicerPersistentCookieJar(); + ~qSlicerPersistentCookieJar() override; QString filePath()const; void setFilePath(const QString& filePath); - QList cookiesForUrl(const QUrl & url) const; - bool setCookiesFromUrl(const QList & cookieList, const QUrl & url); + QList cookiesForUrl(const QUrl & url) const override; + bool setCookiesFromUrl(const QList & cookieList, const QUrl & url) override; protected: QScopedPointer d_ptr; diff --git a/Base/QTCore/qSlicerSceneBundleReader.h b/Base/QTCore/qSlicerSceneBundleReader.h index efd14dd31519938cd2cd58ab20d0b4390f729b5d..4dfc38e80a8a7691b9dcb0f7c50839ab60ef2484 100644 --- a/Base/QTCore/qSlicerSceneBundleReader.h +++ b/Base/QTCore/qSlicerSceneBundleReader.h @@ -38,17 +38,17 @@ public: typedef qSlicerFileReader Superclass; qSlicerSceneBundleReader(QObject* _parent = 0); - virtual QString description()const; + QString description()const override; /// Support QString("SceneFile") - virtual qSlicerIO::IOFileType fileType()const; + qSlicerIO::IOFileType fileType()const override; /// Support only .mrb files - virtual QStringList extensions()const; + QStringList extensions()const override; /// the supported properties are: /// QString fileName: the path of the mrml scene to load /// bool clear: whether the current should be cleared or not - virtual bool load(const qSlicerIO::IOProperties& properties); + bool load(const qSlicerIO::IOProperties& properties) override; }; diff --git a/Base/QTCore/qSlicerScriptedFileWriter.h b/Base/QTCore/qSlicerScriptedFileWriter.h index 802d4c8625e5399e5379b669236c099f26b15cc7..1829e690925d8ccbde7b1817377fbdf107ccddeb 100644 --- a/Base/QTCore/qSlicerScriptedFileWriter.h +++ b/Base/QTCore/qSlicerScriptedFileWriter.h @@ -40,7 +40,7 @@ class Q_SLICER_BASE_QTCORE_EXPORT qSlicerScriptedFileWriter public: typedef qSlicerFileWriter Superclass; qSlicerScriptedFileWriter(QObject* parent = 0); - virtual ~qSlicerScriptedFileWriter(); + ~qSlicerScriptedFileWriter() override; QString pythonSource()const; @@ -52,23 +52,23 @@ public: /// Reimplemented to propagate to python methods /// \sa qSlicerIO::description() - virtual QString description()const; + QString description()const override; /// Reimplemented to propagate to python methods /// \sa qSlicerIO::fileType() - virtual IOFileType fileType()const; + IOFileType fileType()const override; /// Reimplemented to propagate to python methods /// \sa qSlicerFileWriter::canWriteObject() - virtual bool canWriteObject(vtkObject* object)const; + bool canWriteObject(vtkObject* object)const override; /// Reimplemented to propagate to python methods /// \sa qSlicerFileWriter::extensions() - virtual QStringList extensions(vtkObject* object)const; + QStringList extensions(vtkObject* object)const override; /// Reimplemented to propagate to python methods /// \sa qSlicerFileWriter::write() - virtual bool write(const qSlicerIO::IOProperties& properties); + bool write(const qSlicerIO::IOProperties& properties) override; protected: QScopedPointer d_ptr; diff --git a/Base/QTCore/qSlicerSlicer2SceneReader.h b/Base/QTCore/qSlicerSlicer2SceneReader.h index 80683a0d790e7f7ea891593ed715eb2446cf300f..ee3b8b5793d7283c9a4aaa1c46d8e089054c6625 100644 --- a/Base/QTCore/qSlicerSlicer2SceneReader.h +++ b/Base/QTCore/qSlicerSlicer2SceneReader.h @@ -37,16 +37,16 @@ public: typedef qSlicerFileReader Superclass; qSlicerSlicer2SceneReader(QObject* parent = 0); qSlicerSlicer2SceneReader(vtkSlicerApplicationLogic* logic, QObject* parent = 0); - virtual ~qSlicerSlicer2SceneReader(); + ~qSlicerSlicer2SceneReader() override; vtkSlicerApplicationLogic* applicationLogic()const; void setApplicationLogic(vtkSlicerApplicationLogic* logic); - virtual QString description()const; - virtual IOFileType fileType()const; - virtual QStringList extensions()const; + QString description()const override; + IOFileType fileType()const override; + QStringList extensions()const override; - virtual bool load(const IOProperties& properties); + bool load(const IOProperties& properties) override; protected: QScopedPointer d_ptr; diff --git a/Base/QTCore/qSlicerXcedeCatalogReader.h b/Base/QTCore/qSlicerXcedeCatalogReader.h index 2a76b9e808bd54f504f6afd3135db861a4a988f5..5ec6f6dca7b47b37212513bc39fafe4740bac0ac 100644 --- a/Base/QTCore/qSlicerXcedeCatalogReader.h +++ b/Base/QTCore/qSlicerXcedeCatalogReader.h @@ -38,16 +38,16 @@ public: typedef qSlicerFileReader Superclass; qSlicerXcedeCatalogReader(QObject* parent = 0); qSlicerXcedeCatalogReader(vtkMRMLColorLogic* logic, QObject* parent = 0); - virtual ~qSlicerXcedeCatalogReader(); + ~qSlicerXcedeCatalogReader() override; vtkMRMLColorLogic* colorLogic()const; void setColorLogic(vtkMRMLColorLogic* logic); - virtual QString description()const; - virtual IOFileType fileType()const; - virtual QStringList extensions()const; + QString description()const override; + IOFileType fileType()const override; + QStringList extensions()const override; - virtual bool load(const IOProperties& properties); + bool load(const IOProperties& properties) override; protected: QScopedPointer d_ptr; diff --git a/Base/QTGUI/DesignerPlugins/qSlicerDirectoryListViewPlugin.h b/Base/QTGUI/DesignerPlugins/qSlicerDirectoryListViewPlugin.h index 9f30bd5f815634c4d8fc086c7cad1fe7c48d51d2..6678ef4ba0572ba5eaabfe8ce7df275717dd1115 100644 --- a/Base/QTGUI/DesignerPlugins/qSlicerDirectoryListViewPlugin.h +++ b/Base/QTGUI/DesignerPlugins/qSlicerDirectoryListViewPlugin.h @@ -31,11 +31,11 @@ class Q_SLICER_DESIGNER_PLUGINS_EXPORT qSlicerDirectoryListViewPlugin public: qSlicerDirectoryListViewPlugin(QObject* parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; #endif diff --git a/Base/QTGUI/DesignerPlugins/qSlicerModulePanelPlugin.h b/Base/QTGUI/DesignerPlugins/qSlicerModulePanelPlugin.h index 695c3e0f2bc7bb0e64e6408c67a16b64622aab38..217c8ab84bf2f51347d73cde959838bd8ce8921b 100644 --- a/Base/QTGUI/DesignerPlugins/qSlicerModulePanelPlugin.h +++ b/Base/QTGUI/DesignerPlugins/qSlicerModulePanelPlugin.h @@ -31,11 +31,11 @@ class Q_SLICER_DESIGNER_PLUGINS_EXPORT qSlicerModulePanelPlugin public: qSlicerModulePanelPlugin(QObject* parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; #endif diff --git a/Base/QTGUI/DesignerPlugins/qSlicerModulesListViewPlugin.h b/Base/QTGUI/DesignerPlugins/qSlicerModulesListViewPlugin.h index 9ea347369df47839723ec771dc943af98b252b77..72eada1a681d03ae614b0f4513bd8ab75c528e8c 100644 --- a/Base/QTGUI/DesignerPlugins/qSlicerModulesListViewPlugin.h +++ b/Base/QTGUI/DesignerPlugins/qSlicerModulesListViewPlugin.h @@ -31,11 +31,11 @@ class Q_SLICER_DESIGNER_PLUGINS_EXPORT qSlicerModulesListViewPlugin public: qSlicerModulesListViewPlugin(QObject* parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; #endif diff --git a/Base/QTGUI/DesignerPlugins/qSlicerMouseModeToolBarPlugin.h b/Base/QTGUI/DesignerPlugins/qSlicerMouseModeToolBarPlugin.h index 6422c66d74f9bc94b6eb2a1e46b03b7af5a83afc..efd3a1cc90602c179de6b0b05783dd3bcc52cf0f 100644 --- a/Base/QTGUI/DesignerPlugins/qSlicerMouseModeToolBarPlugin.h +++ b/Base/QTGUI/DesignerPlugins/qSlicerMouseModeToolBarPlugin.h @@ -31,11 +31,11 @@ class Q_SLICER_DESIGNER_PLUGINS_EXPORT qSlicerMouseModeToolBarPlugin public: qSlicerMouseModeToolBarPlugin(QObject* parent = 0); - QWidget *createWidget(QWidget* parent); - QString domXml() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget* parent) override; + QString domXml() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; #endif diff --git a/Base/QTGUI/DesignerPlugins/qSlicerQTGUIAbstractPlugin.h b/Base/QTGUI/DesignerPlugins/qSlicerQTGUIAbstractPlugin.h index 344da447018c38a6698c34bf4d5ff1e0f1e0c52f..beb224f208f5f733559105a6041884109b25829b 100644 --- a/Base/QTGUI/DesignerPlugins/qSlicerQTGUIAbstractPlugin.h +++ b/Base/QTGUI/DesignerPlugins/qSlicerQTGUIAbstractPlugin.h @@ -37,11 +37,11 @@ public: qSlicerQTGUIAbstractPlugin(); // Don't reimplement this method. - QString group() const; + QString group() const override; // You can reimplement these methods - virtual QIcon icon() const; - virtual QString toolTip() const; - virtual QString whatsThis() const; + QIcon icon() const override; + QString toolTip() const override; + QString whatsThis() const override; }; #endif diff --git a/Base/QTGUI/DesignerPlugins/qSlicerQTGUIPlugins.h b/Base/QTGUI/DesignerPlugins/qSlicerQTGUIPlugins.h index f4b4b115463abbc8ab7c92a549999e149e745d02..45749cd5ff934dcf6b311e5feb4d6e7a0c8ca88c 100644 --- a/Base/QTGUI/DesignerPlugins/qSlicerQTGUIPlugins.h +++ b/Base/QTGUI/DesignerPlugins/qSlicerQTGUIPlugins.h @@ -41,7 +41,7 @@ class Q_SLICER_DESIGNER_PLUGINS_EXPORT qSlicerQTGUIPlugins Q_INTERFACES(QDesignerCustomWidgetCollectionInterface); public: - QList customWidgets() const + QList customWidgets() const override { QList plugins; plugins << new qSlicerWidgetPlugin; diff --git a/Base/QTGUI/DesignerPlugins/qSlicerWidgetPlugin.h b/Base/QTGUI/DesignerPlugins/qSlicerWidgetPlugin.h index c073b454352c59ea290481cb360576f082df1e9c..24a768c2948c06a6c6a7d1c8471e8629c71e00da 100644 --- a/Base/QTGUI/DesignerPlugins/qSlicerWidgetPlugin.h +++ b/Base/QTGUI/DesignerPlugins/qSlicerWidgetPlugin.h @@ -31,12 +31,12 @@ class Q_SLICER_DESIGNER_PLUGINS_EXPORT qSlicerWidgetPlugin public: qSlicerWidgetPlugin(QObject* parent = 0); - QWidget *createWidget(QWidget* parentWidget); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget* parentWidget) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; #endif diff --git a/Base/QTGUI/StylePlugins/qSlicerStylePlugin.h b/Base/QTGUI/StylePlugins/qSlicerStylePlugin.h index 873752aea1c619c79e7a9fd73a6905fb758317e2..23621aa59e0112966c4d6693b90d08a1a169f117 100644 --- a/Base/QTGUI/StylePlugins/qSlicerStylePlugin.h +++ b/Base/QTGUI/StylePlugins/qSlicerStylePlugin.h @@ -40,10 +40,10 @@ public: /// Constructors qSlicerStylePlugin(); - virtual ~qSlicerStylePlugin(); + ~qSlicerStylePlugin() override; // QStyle plugin classes to overloaded when creating custom style plugins - virtual QStyle* create(const QString & key); + QStyle* create(const QString & key) override; virtual QStringList keys() const; }; diff --git a/Base/QTGUI/Testing/Cxx/qSlicerAbstractModuleTest1.cxx b/Base/QTGUI/Testing/Cxx/qSlicerAbstractModuleTest1.cxx index 5701e8efc754358a4ac479953818c8b6b67a7d34..65b6bd4af980b4182ed485557125febe7644714d 100644 --- a/Base/QTGUI/Testing/Cxx/qSlicerAbstractModuleTest1.cxx +++ b/Base/QTGUI/Testing/Cxx/qSlicerAbstractModuleTest1.cxx @@ -25,18 +25,18 @@ class AModule: public qSlicerAbstractModule { public: - virtual QString title()const { return "A Title";} - virtual qSlicerAbstractModuleRepresentation* createWidgetRepresentation() + QString title()const override { return "A Title";} + qSlicerAbstractModuleRepresentation* createWidgetRepresentation() override { return 0; } - virtual vtkMRMLAbstractLogic* createLogic() + vtkMRMLAbstractLogic* createLogic() override { return 0; } protected: - virtual void setup () {} + void setup () override {} }; int qSlicerAbstractModuleTest1(int, char * [] ) diff --git a/Base/QTGUI/Testing/Cxx/qSlicerLoadableModuleWithPythonTest.cxx b/Base/QTGUI/Testing/Cxx/qSlicerLoadableModuleWithPythonTest.cxx index 1e7efb440f554215ca88bdc3b2985a0e2817b560..40481d89c4a05174c1bfff4ced34610df44114fd 100644 --- a/Base/QTGUI/Testing/Cxx/qSlicerLoadableModuleWithPythonTest.cxx +++ b/Base/QTGUI/Testing/Cxx/qSlicerLoadableModuleWithPythonTest.cxx @@ -33,22 +33,22 @@ public: typedef qSlicerLoadableModule Superclass; qSlicerLoadableHelloWorldModule(QObject *parent=0):Superclass(parent){} - virtual ~qSlicerLoadableHelloWorldModule(){} + ~qSlicerLoadableHelloWorldModule() override{} - virtual QString helpText()const { return QString("helpText"); } - virtual QString acknowledgementText()const { return QString("acknowledgementText"); } + QString helpText()const override { return QString("helpText"); } + QString acknowledgementText()const override { return QString("acknowledgementText"); } qSlicerGetTitleMacro("Loadable Hello world"); protected: /// Create and return the widget representation associated to this module - virtual qSlicerAbstractModuleRepresentation * createWidgetRepresentation() + qSlicerAbstractModuleRepresentation * createWidgetRepresentation() override { return 0; } /// Create and return the logic associated to this module - virtual vtkMRMLAbstractLogic* createLogic() + vtkMRMLAbstractLogic* createLogic() override { return 0; } diff --git a/Base/QTGUI/qSlicerAbstractModule.h b/Base/QTGUI/qSlicerAbstractModule.h index b51b779b02b5eca9107eec4bce91c3fac181ab72..8ddef4f00660f1ce792cb89b69c91903f1b843ec 100644 --- a/Base/QTGUI/qSlicerAbstractModule.h +++ b/Base/QTGUI/qSlicerAbstractModule.h @@ -49,7 +49,7 @@ public: typedef qSlicerAbstractCoreModule Superclass; qSlicerAbstractModule(QObject *parent=0); - virtual ~qSlicerAbstractModule(); + ~qSlicerAbstractModule() override; /// Icon of the module. Anytime a graphical representation of the module /// is needed, the icon is used. It's the icon shown in the module selector diff --git a/Base/QTGUI/qSlicerAbstractModuleWidget.h b/Base/QTGUI/qSlicerAbstractModuleWidget.h index 29f9084d3c5263771c0ae9af867b9a8dec397582..c103a3000f4ed7734e3b552138a7e30b1eb2d59d 100644 --- a/Base/QTGUI/qSlicerAbstractModuleWidget.h +++ b/Base/QTGUI/qSlicerAbstractModuleWidget.h @@ -45,7 +45,7 @@ public: /// Constructor /// \sa QWidget qSlicerAbstractModuleWidget(QWidget *parent=0); - virtual ~qSlicerAbstractModuleWidget(); + ~qSlicerAbstractModuleWidget() override; /// The enter and exit methods are called when the module panel changes. /// These give the module a chance to do any setup or shutdown operations @@ -58,13 +58,13 @@ public: bool isEntered()const; /// Node editing - Q_INVOKABLE virtual bool setEditedNode(vtkMRMLNode* node, QString role = QString(), QString context = QString()); - Q_INVOKABLE virtual double nodeEditable(vtkMRMLNode* node); + Q_INVOKABLE bool setEditedNode(vtkMRMLNode* node, QString role = QString(), QString context = QString()) override; + Q_INVOKABLE double nodeEditable(vtkMRMLNode* node) override; protected: QScopedPointer d_ptr; - virtual void setup(); + void setup() override; private: Q_DECLARE_PRIVATE(qSlicerAbstractModuleWidget); diff --git a/Base/QTGUI/qSlicerActionsDialog.h b/Base/QTGUI/qSlicerActionsDialog.h index 37f03e784f60e4c97903c717266bd040b60c7842..483716045f31d43eaa865a4b711436e4135c869c 100644 --- a/Base/QTGUI/qSlicerActionsDialog.h +++ b/Base/QTGUI/qSlicerActionsDialog.h @@ -36,7 +36,7 @@ class Q_SLICER_BASE_QTGUI_EXPORT qSlicerActionsDialog: public QDialog public: typedef QDialog Superclass; qSlicerActionsDialog(QWidget* parentWidget =0); - virtual ~qSlicerActionsDialog(); + ~qSlicerActionsDialog() override; void addAction(QAction* action, const QString& group=QString()); void addActions(const QList& actions, const QString& group=QString()); diff --git a/Base/QTGUI/qSlicerDataDialog.h b/Base/QTGUI/qSlicerDataDialog.h index 04dc73db14a5e222cae345951c0917d6493485ad..98f559bd30768ee7d8fa67746978b15246df9161 100644 --- a/Base/QTGUI/qSlicerDataDialog.h +++ b/Base/QTGUI/qSlicerDataDialog.h @@ -39,18 +39,18 @@ class Q_SLICER_BASE_QTGUI_EXPORT qSlicerDataDialog : public qSlicerFileDialog public: typedef qSlicerFileDialog Superclass; qSlicerDataDialog(QObject* parent =0); - virtual ~qSlicerDataDialog(); + ~qSlicerDataDialog() override; - virtual qSlicerIO::IOFileType fileType()const; - virtual QString description()const; - virtual qSlicerFileDialog::IOAction action()const; + qSlicerIO::IOFileType fileType()const override; + QString description()const override; + qSlicerFileDialog::IOAction action()const override; - virtual bool isMimeDataAccepted(const QMimeData* mimeData)const; - virtual void dropEvent(QDropEvent *event); + bool isMimeDataAccepted(const QMimeData* mimeData)const override; + void dropEvent(QDropEvent *event) override; /// run the dialog to select the file/files/directory - Q_INVOKABLE virtual bool exec(const qSlicerIO::IOProperties& readerProperties = - qSlicerIO::IOProperties()); + Q_INVOKABLE bool exec(const qSlicerIO::IOProperties& readerProperties = + qSlicerIO::IOProperties()) override; public Q_SLOTS: /// for programmatic population of dialog diff --git a/Base/QTGUI/qSlicerDataDialog_p.h b/Base/QTGUI/qSlicerDataDialog_p.h index eccaf0a3dbffadbbdf483b333deac80619442f5c..fbd7b8af552eb893a1033b427749e86f6b0cfa39 100644 --- a/Base/QTGUI/qSlicerDataDialog_p.h +++ b/Base/QTGUI/qSlicerDataDialog_p.h @@ -36,7 +36,7 @@ class qSlicerDataDialogPrivate Q_OBJECT public: explicit qSlicerDataDialogPrivate(QWidget* _parent=0); - virtual ~qSlicerDataDialogPrivate(); + ~qSlicerDataDialogPrivate() override; QList selectedFiles()const; public slots: diff --git a/Base/QTGUI/qSlicerDirectoryListView.h b/Base/QTGUI/qSlicerDirectoryListView.h index d929bf8680ddca91820d15b950b7ff5da207352b..5d16406afe64237daf986f3588b1833ce06a137d 100644 --- a/Base/QTGUI/qSlicerDirectoryListView.h +++ b/Base/QTGUI/qSlicerDirectoryListView.h @@ -43,7 +43,7 @@ public: explicit qSlicerDirectoryListView(QWidget* parent = 0); /// Destructor - virtual ~qSlicerDirectoryListView(); + ~qSlicerDirectoryListView() override; /// Return True if the \a path has already been added bool hasDirectory(const QString& path)const; @@ -52,8 +52,8 @@ public: QStringList selectedDirectoryList(bool absolutePath = false)const; - void dragEnterEvent(QDragEnterEvent *event); - virtual void dropEvent(QDropEvent *event); + void dragEnterEvent(QDragEnterEvent *event) override; + void dropEvent(QDropEvent *event) override; public slots: diff --git a/Base/QTGUI/qSlicerExtensionsInstallWidget_p.h b/Base/QTGUI/qSlicerExtensionsInstallWidget_p.h index 9876f2a817ec44485e4057e23fb5094ee7e81bb2..5b4a55eb25754f42f99625fe379939a7983d596d 100644 --- a/Base/QTGUI/qSlicerExtensionsInstallWidget_p.h +++ b/Base/QTGUI/qSlicerExtensionsInstallWidget_p.h @@ -54,7 +54,7 @@ protected: public: typedef qSlicerWebWidgetPrivate Superclass; qSlicerExtensionsInstallWidgetPrivate(qSlicerExtensionsInstallWidget& object); - virtual ~qSlicerExtensionsInstallWidgetPrivate(); + ~qSlicerExtensionsInstallWidgetPrivate() override; /// Return the URL allowing to retrieve the extension list page /// associated with the current architecture, operating system and slicer revision. @@ -62,8 +62,8 @@ public: void setFailurePage(const QStringList &errors); - virtual void initializeWebChannel(QWebChannel* webChannel); - virtual void initializeWebChannelTransport(QByteArray& webChannelScript); + void initializeWebChannel(QWebChannel* webChannel) override; + void initializeWebChannelTransport(QByteArray& webChannelScript) override; void registerExtensionsManagerModel(qSlicerExtensionsManagerModel* oldModel, qSlicerExtensionsManagerModel* newModel); qSlicerExtensionsManagerModel * ExtensionsManagerModel; diff --git a/Base/QTGUI/qSlicerExtensionsManageWidget.cxx b/Base/QTGUI/qSlicerExtensionsManageWidget.cxx index 41f9e43368a9e45399ad2a00abcf1b73068c329d..ef8ae10e74f0b3b3379e602e97fa1d57ce1db408 100644 --- a/Base/QTGUI/qSlicerExtensionsManageWidget.cxx +++ b/Base/QTGUI/qSlicerExtensionsManageWidget.cxx @@ -119,8 +119,8 @@ public: : QStyledItemDelegate(parent), List(list) {} // -------------------------------------------------------------------------- - virtual void paint(QPainter * painter, const QStyleOptionViewItem& option, - const QModelIndex& index) const + void paint(QPainter * painter, const QStyleOptionViewItem& option, + const QModelIndex& index) const override { QStyleOptionViewItem modifiedOption = option; QListWidgetItem * const item = this->List->itemFromIndex(index); @@ -354,7 +354,7 @@ public: } // -------------------------------------------------------------------------- - virtual QSize sizeHint() const + QSize sizeHint() const override { QSize hint = this->Superclass::sizeHint(); hint.setHeight(qRound(this->Text.size().height() + 0.5) + @@ -363,7 +363,7 @@ public: } // -------------------------------------------------------------------------- - virtual void paintEvent(QPaintEvent *) + void paintEvent(QPaintEvent *) override { QPainter painter(this); const QRect cr = this->contentsRect(); @@ -417,7 +417,7 @@ public: } // -------------------------------------------------------------------------- - virtual void mouseMoveEvent(QMouseEvent * e) + void mouseMoveEvent(QMouseEvent * e) override { Superclass::mouseMoveEvent(e); @@ -438,7 +438,7 @@ public: } // -------------------------------------------------------------------------- - virtual void mouseReleaseEvent(QMouseEvent * e) + void mouseReleaseEvent(QMouseEvent * e) override { Superclass::mouseReleaseEvent(e); diff --git a/Base/QTGUI/qSlicerExtensionsManageWidget.h b/Base/QTGUI/qSlicerExtensionsManageWidget.h index 6486e780519b3f346879e1d5337699fe88924da1..1eb8c8dc72ff42102bec305816129afbfbcf58b2 100644 --- a/Base/QTGUI/qSlicerExtensionsManageWidget.h +++ b/Base/QTGUI/qSlicerExtensionsManageWidget.h @@ -44,7 +44,7 @@ public: explicit qSlicerExtensionsManageWidget(QWidget* parent = 0); /// Destructor - virtual ~qSlicerExtensionsManageWidget(); + ~qSlicerExtensionsManageWidget() override; Q_INVOKABLE qSlicerExtensionsManagerModel* extensionsManagerModel()const; Q_INVOKABLE void setExtensionsManagerModel(qSlicerExtensionsManagerModel* model); diff --git a/Base/QTGUI/qSlicerExtensionsManagerDialog.h b/Base/QTGUI/qSlicerExtensionsManagerDialog.h index fd82c36eeb5550f9ee163f61c053c356e290b117..b2693a07f3b380c70bb4876c1dd2c3280d553e99 100644 --- a/Base/QTGUI/qSlicerExtensionsManagerDialog.h +++ b/Base/QTGUI/qSlicerExtensionsManagerDialog.h @@ -43,7 +43,7 @@ public: explicit qSlicerExtensionsManagerDialog(QWidget* parent = 0); /// Destructor - virtual ~qSlicerExtensionsManagerDialog(); + ~qSlicerExtensionsManagerDialog() override; Q_INVOKABLE qSlicerExtensionsManagerModel* extensionsManagerModel()const; Q_INVOKABLE void setExtensionsManagerModel(qSlicerExtensionsManagerModel* model); diff --git a/Base/QTGUI/qSlicerExtensionsManagerWidget.h b/Base/QTGUI/qSlicerExtensionsManagerWidget.h index 494db86d5efd3c1220a9672240cbc588f3b096f8..05f67ad3f11a12405a6602f4dba76e2816186849 100644 --- a/Base/QTGUI/qSlicerExtensionsManagerWidget.h +++ b/Base/QTGUI/qSlicerExtensionsManagerWidget.h @@ -46,7 +46,7 @@ public: explicit qSlicerExtensionsManagerWidget(QWidget* parent = 0); /// Destructor - virtual ~qSlicerExtensionsManagerWidget(); + ~qSlicerExtensionsManagerWidget() override; Q_INVOKABLE qSlicerExtensionsManagerModel* extensionsManagerModel()const; Q_INVOKABLE void setExtensionsManagerModel(qSlicerExtensionsManagerModel* model); @@ -69,7 +69,7 @@ protected slots: void onMessageLogged(const QString& text, ctkErrorLogLevel::LogLevels level); protected: - virtual void timerEvent(QTimerEvent*); + void timerEvent(QTimerEvent*) override; QScopedPointer d_ptr; diff --git a/Base/QTGUI/qSlicerExtensionsRestoreWidget.cxx b/Base/QTGUI/qSlicerExtensionsRestoreWidget.cxx index 6b64a6d1c1bd8c874596a80d8cb390ea3db5bb8d..ab57a4436169c71727857c11a96aec30b50e5608 100644 --- a/Base/QTGUI/qSlicerExtensionsRestoreWidget.cxx +++ b/Base/QTGUI/qSlicerExtensionsRestoreWidget.cxx @@ -45,7 +45,7 @@ public: bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, - const QModelIndex &index) + const QModelIndex &index) override { bool isEnabled = index.data(qSlicerRestoreExtensions::EnabledRole).toBool(); @@ -60,7 +60,7 @@ public: } // -------------------------------------------------------------------------- - void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const + void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const override { QRect r = option.rect; @@ -102,7 +102,7 @@ public: QApplication::style()->drawControl(QStyle::CE_CheckBox, &cbOpt, painter); } - QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const + QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const override { Q_UNUSED(option); Q_UNUSED(index); diff --git a/Base/QTGUI/qSlicerExtensionsRestoreWidget.h b/Base/QTGUI/qSlicerExtensionsRestoreWidget.h index c71a55a7f63f4f09db77b538333004df9539e915..13ac9bc78d47ca76bc8b5cec0337300df8a54446 100644 --- a/Base/QTGUI/qSlicerExtensionsRestoreWidget.h +++ b/Base/QTGUI/qSlicerExtensionsRestoreWidget.h @@ -27,7 +27,7 @@ public: explicit qSlicerExtensionsRestoreWidget(QWidget* parent = 0); /// Destructor - virtual ~qSlicerExtensionsRestoreWidget(); + ~qSlicerExtensionsRestoreWidget() override; Q_INVOKABLE qSlicerExtensionsManagerModel* extensionsManagerModel()const; Q_INVOKABLE void setExtensionsManagerModel(qSlicerExtensionsManagerModel* model); @@ -38,7 +38,7 @@ public: QAction* installSelectedAction() const; // Events - void showEvent(QShowEvent* event); + void showEvent(QShowEvent* event) override; protected slots : void onSelectAllExtensionsTriggered(); diff --git a/Base/QTGUI/qSlicerFileDialog.h b/Base/QTGUI/qSlicerFileDialog.h index ee3d9ef8e5072813077ecfb0e142d62992d5d0c2..27f4d7ac5d9f9159168fbeb7ed4184d87c6d934e 100644 --- a/Base/QTGUI/qSlicerFileDialog.h +++ b/Base/QTGUI/qSlicerFileDialog.h @@ -49,7 +49,7 @@ class Q_SLICER_BASE_QTGUI_EXPORT qSlicerFileDialog : public QObject public: typedef QObject Superclass; qSlicerFileDialog(QObject* parent =0); - virtual ~qSlicerFileDialog(); + ~qSlicerFileDialog() override; virtual qSlicerIO::IOFileType fileType()const = 0; @@ -114,27 +114,27 @@ class Q_SLICER_BASE_QTGUI_EXPORT qSlicerStandardFileDialog public: qSlicerStandardFileDialog(QObject* parent=0); - virtual ~qSlicerStandardFileDialog(); + ~qSlicerStandardFileDialog() override; /// Reimplemented to return the fileType set by setFileType() /// \sa fileType, setFileType() - virtual qSlicerIO::IOFileType fileType()const; + qSlicerIO::IOFileType fileType()const override; virtual void setFileType(qSlicerIO::IOFileType fileType); /// Reimplemented to return the description set by setDescription() /// \sa description, setDescription() - virtual QString description() const; + QString description() const override; virtual void setDescription(const QString& description); /// Reimplemented to return the IOAction set by setAction() /// \sa action, setAction() - virtual qSlicerFileDialog::IOAction action()const; + qSlicerFileDialog::IOAction action()const override; /// Set the action of the file dialog. To be called by python. /// \sa action, action() void setAction(IOAction action); - virtual bool exec(const qSlicerIO::IOProperties& ioProperties = - qSlicerIO::IOProperties()); + bool exec(const qSlicerIO::IOProperties& ioProperties = + qSlicerIO::IOProperties()) override; /// Properties availables with IOPorperties: fileMode, multipleFiles, fileType. static QStringList getOpenFileName(qSlicerIO::IOProperties ioProperties = @@ -143,7 +143,7 @@ public: qSlicerIO::IOProperties()); /// Return the list of nodes created by exec(). - virtual QStringList loadedNodes()const; + QStringList loadedNodes()const override; protected: static ctkFileDialog* createFileDialog(const qSlicerIO::IOProperties& ioProperties = diff --git a/Base/QTGUI/qSlicerFileWriterOptionsWidget.h b/Base/QTGUI/qSlicerFileWriterOptionsWidget.h index 516d017c235ba8cbb6f8a05f215912cdd9f5d58d..b52027d86d5ef51290bd4d09404d5807453226b9 100644 --- a/Base/QTGUI/qSlicerFileWriterOptionsWidget.h +++ b/Base/QTGUI/qSlicerFileWriterOptionsWidget.h @@ -34,7 +34,7 @@ class Q_SLICER_BASE_QTGUI_EXPORT qSlicerFileWriterOptionsWidget public: typedef qSlicerIOOptionsWidget Superclass; explicit qSlicerFileWriterOptionsWidget(QWidget* parent = 0); - virtual ~qSlicerFileWriterOptionsWidget(); + ~qSlicerFileWriterOptionsWidget() override; public slots: /// Set the object to write (typically a scene or a MRML node) diff --git a/Base/QTGUI/qSlicerIOOptionsWidget.h b/Base/QTGUI/qSlicerIOOptionsWidget.h index b0060aa4c6fbf9964b5362c7ce1cb8189134f658..91e43e28f1615eee826f8c0a1b0d1722d8107d81 100644 --- a/Base/QTGUI/qSlicerIOOptionsWidget.h +++ b/Base/QTGUI/qSlicerIOOptionsWidget.h @@ -35,11 +35,11 @@ class Q_SLICER_BASE_QTGUI_EXPORT qSlicerIOOptionsWidget public: typedef qSlicerIOOptions Superclass; explicit qSlicerIOOptionsWidget(QWidget* parent = 0); - virtual ~qSlicerIOOptionsWidget(); + ~qSlicerIOOptionsWidget() override; /// Returns true if the options have been set and if they are /// meaningful - virtual bool isValid()const; + bool isValid()const override; // Update GUI widgets based on properties. // Derived classes can override this method to set default @@ -57,7 +57,7 @@ protected: using Superclass::d_ptr; Q_DECLARE_PRIVATE_D(qGetPtrHelper(qSlicerIOOptions::d_ptr), qSlicerIOOptions); qSlicerIOOptionsWidget(qSlicerIOOptionsPrivate* pimpl, QWidget* parent); - virtual void updateValid(); + void updateValid() override; }; #endif diff --git a/Base/QTGUI/qSlicerLoadableModule.h b/Base/QTGUI/qSlicerLoadableModule.h index 48c851f4ded8542e507d4acd628bae6e72354c96..d9e4896ee675b0fef7e7dedef6d6f0bfc6fcd7f3 100644 --- a/Base/QTGUI/qSlicerLoadableModule.h +++ b/Base/QTGUI/qSlicerLoadableModule.h @@ -41,11 +41,11 @@ public: typedef qSlicerLoadableModule Self; typedef qSlicerAbstractModule Superclass; qSlicerLoadableModule(QObject *parent=0); - virtual ~qSlicerLoadableModule(); + ~qSlicerLoadableModule() override; /// Return help/acknowledgement text - virtual QString helpText()const; - virtual QString acknowledgementText()const; + QString helpText()const override; + QString acknowledgementText()const override; /// \brief Import python extensions associated with \a modulePath. /// @@ -81,7 +81,7 @@ public: const QString& moduleName); protected: - virtual void setup(); + void setup() override; protected: QScopedPointer d_ptr; diff --git a/Base/QTGUI/qSlicerModelsDialog.h b/Base/QTGUI/qSlicerModelsDialog.h index 833a106a0cec1890e3564cb32d416a7b39d2394d..d2c788a5ec9a3910edf3a7796dfa956a1e7e7f96 100644 --- a/Base/QTGUI/qSlicerModelsDialog.h +++ b/Base/QTGUI/qSlicerModelsDialog.h @@ -37,17 +37,17 @@ class Q_SLICER_BASE_QTGUI_EXPORT qSlicerModelsDialog : public qSlicerFileDialog public: typedef qSlicerFileDialog Superclass; qSlicerModelsDialog(QObject* parent =0); - virtual ~qSlicerModelsDialog(); + ~qSlicerModelsDialog() override; - virtual qSlicerIO::IOFileType fileType()const; - virtual QString description()const; - virtual qSlicerFileDialog::IOAction action()const; + qSlicerIO::IOFileType fileType()const override; + QString description()const override; + qSlicerFileDialog::IOAction action()const override; /// run the dialog to select the file/files/directory - virtual bool exec(const qSlicerIO::IOProperties& readerProperties = - qSlicerIO::IOProperties()); + bool exec(const qSlicerIO::IOProperties& readerProperties = + qSlicerIO::IOProperties()) override; - virtual QStringList loadedNodes()const; + QStringList loadedNodes()const override; protected: QScopedPointer d_ptr; diff --git a/Base/QTGUI/qSlicerModelsDialog_p.h b/Base/QTGUI/qSlicerModelsDialog_p.h index 89a7960c42491c1818e75c02eafcf9424fce011b..834a3346db778ce2d856e4a540b85079df85fcb0 100644 --- a/Base/QTGUI/qSlicerModelsDialog_p.h +++ b/Base/QTGUI/qSlicerModelsDialog_p.h @@ -54,7 +54,7 @@ protected: qSlicerModelsDialog* const q_ptr; public: explicit qSlicerModelsDialogPrivate(qSlicerModelsDialog& object, QWidget* parentWidget = 0); - virtual ~qSlicerModelsDialogPrivate(); + ~qSlicerModelsDialogPrivate() override; void init(); diff --git a/Base/QTGUI/qSlicerModuleFactoryFilterModel.h b/Base/QTGUI/qSlicerModuleFactoryFilterModel.h index d2dc43243b8db36b2c43eed2992b2335f42b01b4..4db1cff9724d2881b85ead5c4f3bcfbbcfec108e 100644 --- a/Base/QTGUI/qSlicerModuleFactoryFilterModel.h +++ b/Base/QTGUI/qSlicerModuleFactoryFilterModel.h @@ -57,7 +57,7 @@ public: explicit qSlicerModuleFactoryFilterModel(QObject* parent = 0); /// Destructor - virtual ~qSlicerModuleFactoryFilterModel(); + ~qSlicerModuleFactoryFilterModel() override; bool showToLoad()const; bool showToIgnore()const; @@ -69,9 +69,9 @@ public: bool hideAllWhenShowModulesIsEmpty()const; void setHideAllWhenShowModulesIsEmpty(bool hide); - virtual Qt::DropActions supportedDropActions()const; - virtual bool dropMimeData(const QMimeData *data, Qt::DropAction action, - int row, int column, const QModelIndex &parent); + Qt::DropActions supportedDropActions()const override; + bool dropMimeData(const QMimeData *data, Qt::DropAction action, + int row, int column, const QModelIndex &parent) override; public slots: void setShowToLoad(bool show); @@ -87,9 +87,9 @@ signals: protected: QScopedPointer d_ptr; - virtual bool lessThan(const QModelIndex& leftIndex, - const QModelIndex& rightIndex)const; - virtual bool filterAcceptsRow(int source_row, const QModelIndex& source_parent)const; + bool lessThan(const QModelIndex& leftIndex, + const QModelIndex& rightIndex)const override; + bool filterAcceptsRow(int source_row, const QModelIndex& source_parent)const override; private: Q_DECLARE_PRIVATE(qSlicerModuleFactoryFilterModel); diff --git a/Base/QTGUI/qSlicerModuleSelectorToolBar.h b/Base/QTGUI/qSlicerModuleSelectorToolBar.h index 0fd876405044d79988ede2a24cd3ed80229cfe2a..a88439ad40b279166d1875c45b53886c05f470e9 100644 --- a/Base/QTGUI/qSlicerModuleSelectorToolBar.h +++ b/Base/QTGUI/qSlicerModuleSelectorToolBar.h @@ -51,7 +51,7 @@ public: /// toolbar area) qSlicerModuleSelectorToolBar(const QString& title, QWidget* parent = 0); qSlicerModuleSelectorToolBar(QWidget* parent = 0); - virtual ~qSlicerModuleSelectorToolBar(); + ~qSlicerModuleSelectorToolBar() override; /// Returns a pointer to the modules menu used to populate the list of modules qSlicerModulesMenu* modulesMenu()const; diff --git a/Base/QTGUI/qSlicerModulesListView.h b/Base/QTGUI/qSlicerModulesListView.h index bd939556ff03c4e462c6463fc2be252e23b9cc2c..8176425cfbdaef95c61ba571ab4b380cc834bf72 100644 --- a/Base/QTGUI/qSlicerModulesListView.h +++ b/Base/QTGUI/qSlicerModulesListView.h @@ -51,7 +51,7 @@ public: explicit qSlicerModulesListView(QWidget* parent = 0); /// Destructor - virtual ~qSlicerModulesListView(); + ~qSlicerModulesListView() override; /// Set the module factory manager that contains the list of modules /// and modules to ignore @@ -105,7 +105,7 @@ protected slots: protected: QScopedPointer d_ptr; - virtual void keyPressEvent(QKeyEvent * event); + void keyPressEvent(QKeyEvent * event) override; private: Q_DECLARE_PRIVATE(qSlicerModulesListView); diff --git a/Base/QTGUI/qSlicerModulesMenu.h b/Base/QTGUI/qSlicerModulesMenu.h index ff5dc23a74efec2b24e31a1a4100c0b1ce380c85..9fb56833a7d59dc5d40accc1a1f7789de7e7937f 100644 --- a/Base/QTGUI/qSlicerModulesMenu.h +++ b/Base/QTGUI/qSlicerModulesMenu.h @@ -62,7 +62,7 @@ public: /// toolbar area) qSlicerModulesMenu(const QString& title, QWidget* parent = 0); qSlicerModulesMenu(QWidget* parent = 0); - virtual ~qSlicerModulesMenu(); + ~qSlicerModulesMenu() override; /// QAction* moduleAction(const QString& moduleName)const; diff --git a/Base/QTGUI/qSlicerMouseModeToolBar.h b/Base/QTGUI/qSlicerMouseModeToolBar.h index 1844708f81af9e8f8cbb928f22c6f604abbe265a..5d2db0dff902edabff439701d1c1d340f574aae2 100644 --- a/Base/QTGUI/qSlicerMouseModeToolBar.h +++ b/Base/QTGUI/qSlicerMouseModeToolBar.h @@ -51,7 +51,7 @@ public: /// Title is the name of the toolbar (can appear using right click on the toolbar area) qSlicerMouseModeToolBar(const QString& title, QWidget* parent = 0); qSlicerMouseModeToolBar(QWidget* parent = 0); - virtual ~qSlicerMouseModeToolBar(); + ~qSlicerMouseModeToolBar() override; /// For testing, return the active action text QString activeActionText(); diff --git a/Base/QTGUI/qSlicerNodeWriter.h b/Base/QTGUI/qSlicerNodeWriter.h index 5649cff78e9d05da97ed4236954e26b478524395..dc5bab96da0dbef0b7e98304003a5f3616553201 100644 --- a/Base/QTGUI/qSlicerNodeWriter.h +++ b/Base/QTGUI/qSlicerNodeWriter.h @@ -42,32 +42,32 @@ public: bool useCompression, QObject* parent); - virtual ~qSlicerNodeWriter(); + ~qSlicerNodeWriter() override; void setSupportUseCompression(bool useCompression); bool supportUseCompression()const; - virtual QString description()const; - virtual IOFileType fileType()const; + QString description()const override; + IOFileType fileType()const override; /// Return true if the object is handled by the writer. - virtual bool canWriteObject(vtkObject* object)const; + bool canWriteObject(vtkObject* object)const override; /// Return a list of the supported extensions for a particuliar object. /// Please read QFileDialog::nameFilters for the allowed formats /// Example: "Image (*.jpg *.png *.tiff)", "Model (*.vtk)" - virtual QStringList extensions(vtkObject* object)const; + QStringList extensions(vtkObject* object)const override; /// Write the node referenced by "nodeID" into the "fileName" file. /// Optionally, "useCompression" can be specified. /// Return true on success, false otherwise. /// Create a storage node if the storable node doesn't have any. - virtual bool write(const qSlicerIO::IOProperties& properties); + bool write(const qSlicerIO::IOProperties& properties) override; virtual vtkMRMLNode* getNodeByID(const char *id)const; /// Return a qSlicerIONodeWriterOptionsWidget - virtual qSlicerIOOptions* options()const; + qSlicerIOOptions* options()const override; protected: void setNodeClassNames(const QStringList& nodeClassNames); diff --git a/Base/QTGUI/qSlicerNodeWriterOptionsWidget.cxx b/Base/QTGUI/qSlicerNodeWriterOptionsWidget.cxx index e670c51738af969d838f3d2f876c9664c3c3b5f9..919f29994fd89f7b8779ca0197d7eb87dc2b4cbd 100644 --- a/Base/QTGUI/qSlicerNodeWriterOptionsWidget.cxx +++ b/Base/QTGUI/qSlicerNodeWriterOptionsWidget.cxx @@ -35,7 +35,7 @@ class qSlicerNodeWriterOptionsWidgetPrivate , public Ui_qSlicerNodeWriterOptionsWidget { public: - virtual ~qSlicerNodeWriterOptionsWidgetPrivate(); + ~qSlicerNodeWriterOptionsWidgetPrivate() override; virtual void setupUi(QWidget* widget); }; diff --git a/Base/QTGUI/qSlicerNodeWriterOptionsWidget.h b/Base/QTGUI/qSlicerNodeWriterOptionsWidget.h index 83e8f4793abebd537a013a37096bc8d4e4fddb56..711679b8a44202d838bcd7a1fa76e81b11cc1ad7 100644 --- a/Base/QTGUI/qSlicerNodeWriterOptionsWidget.h +++ b/Base/QTGUI/qSlicerNodeWriterOptionsWidget.h @@ -35,15 +35,15 @@ class Q_SLICER_BASE_QTGUI_EXPORT qSlicerNodeWriterOptionsWidget public: typedef qSlicerFileWriterOptionsWidget Superclass; explicit qSlicerNodeWriterOptionsWidget(QWidget* parent = 0); - virtual ~qSlicerNodeWriterOptionsWidget(); + ~qSlicerNodeWriterOptionsWidget() override; bool showUseCompression()const; void setShowUseCompression(bool show); - virtual bool isValid()const; + bool isValid()const override; public slots: - virtual void setObject(vtkObject* object); + void setObject(vtkObject* object) override; protected slots: virtual void setUseCompression(bool use); diff --git a/Base/QTGUI/qSlicerPythonManager.h b/Base/QTGUI/qSlicerPythonManager.h index c73361e04ebea8a07054ab1401e45589fefa8717..2ce61c511d488414a5e65edd55bbcb95593d5b21 100644 --- a/Base/QTGUI/qSlicerPythonManager.h +++ b/Base/QTGUI/qSlicerPythonManager.h @@ -26,12 +26,12 @@ class Q_SLICER_BASE_QTGUI_EXPORT qSlicerPythonManager : public qSlicerCorePython public: typedef qSlicerCorePythonManager Superclass; qSlicerPythonManager(QObject* parent=0); - ~qSlicerPythonManager(); + ~qSlicerPythonManager() override; protected: - virtual void preInitialization(); - virtual void executeInitializationScripts(); + void preInitialization() override; + void executeInitializationScripts() override; private: diff --git a/Base/QTGUI/qSlicerSaveDataDialog.h b/Base/QTGUI/qSlicerSaveDataDialog.h index e2cd75bd89493c2d69a42245ab75caed9ec0227a..ebee5be101d47c3e409654ed4394046ead8f3ba2 100644 --- a/Base/QTGUI/qSlicerSaveDataDialog.h +++ b/Base/QTGUI/qSlicerSaveDataDialog.h @@ -35,15 +35,15 @@ class Q_SLICER_BASE_QTGUI_EXPORT qSlicerSaveDataDialog : public qSlicerFileDialo public: typedef QObject Superclass; qSlicerSaveDataDialog(QObject* parent = 0); - virtual ~qSlicerSaveDataDialog(); + ~qSlicerSaveDataDialog() override; - virtual qSlicerIO::IOFileType fileType()const; - virtual QString description()const; - virtual qSlicerFileDialog::IOAction action()const; + qSlicerIO::IOFileType fileType()const override; + QString description()const override; + qSlicerFileDialog::IOAction action()const override; /// Open the data dialog and save the nodes/scene - virtual bool exec(const qSlicerIO::IOProperties& readerProperties = - qSlicerIO::IOProperties()); + bool exec(const qSlicerIO::IOProperties& readerProperties = + qSlicerIO::IOProperties()) override; protected: QScopedPointer d_ptr; diff --git a/Base/QTGUI/qSlicerSaveDataDialog_p.h b/Base/QTGUI/qSlicerSaveDataDialog_p.h index b9c62bf3c500938c6bcce6344e57a41f2c46c5d2..345f0a45c94c2479473b51bff4cab7ca1901e441 100644 --- a/Base/QTGUI/qSlicerSaveDataDialog_p.h +++ b/Base/QTGUI/qSlicerSaveDataDialog_p.h @@ -36,7 +36,7 @@ class qSlicerSaveDataDialogPrivate public: typedef qSlicerSaveDataDialogPrivate Self; explicit qSlicerSaveDataDialogPrivate(QWidget* _parent=0); - virtual ~qSlicerSaveDataDialogPrivate(); + ~qSlicerSaveDataDialogPrivate() override; void populateItems(); @@ -55,7 +55,7 @@ public slots: bool save(); /// Reimplemented from QDialog::accept(), only accept the dialog if /// save() is successful. - virtual void accept(); + void accept() override; protected slots: void formatChanged(); @@ -132,12 +132,12 @@ class qSlicerFileNameItemDelegate : public QStyledItemDelegate public: typedef QStyledItemDelegate Superclass; qSlicerFileNameItemDelegate( QObject * parent = 0 ); - virtual QWidget* createEditor( QWidget * parent, + QWidget* createEditor( QWidget * parent, const QStyleOptionViewItem & option, - const QModelIndex & index ) const; - virtual void setModelData(QWidget *editor, + const QModelIndex & index ) const override; + void setModelData(QWidget *editor, QAbstractItemModel *model, - const QModelIndex &index) const; + const QModelIndex &index) const override; static QString fixupFileName(const QString& fileName, const QString& extension, vtkMRMLScene *mrmlScene, const QString &nodeID); /// Generate a regular expression that can ensure a filename has a valid diff --git a/Base/QTGUI/qSlicerScriptedFileDialog.h b/Base/QTGUI/qSlicerScriptedFileDialog.h index 00ae0c2533e9d19cb166a3d710be6a51aa2584de..5706e530545fc19189d8fb5eb5d2a58c77097535 100644 --- a/Base/QTGUI/qSlicerScriptedFileDialog.h +++ b/Base/QTGUI/qSlicerScriptedFileDialog.h @@ -40,7 +40,7 @@ class Q_SLICER_BASE_QTGUI_EXPORT qSlicerScriptedFileDialog public: typedef qSlicerStandardFileDialog Superclass; qSlicerScriptedFileDialog(QObject* parent = 0); - virtual ~qSlicerScriptedFileDialog(); + ~qSlicerScriptedFileDialog() override; QString pythonSource()const; @@ -51,12 +51,12 @@ public: Q_INVOKABLE PyObject* self() const; /// Reimplemented to propagate to python methods - virtual bool isMimeDataAccepted(const QMimeData* mimeData)const; + bool isMimeDataAccepted(const QMimeData* mimeData)const override; /// Reimplemented to propagate to python methods - virtual void dropEvent(QDropEvent* event); + void dropEvent(QDropEvent* event) override; /// Reimplemented to propagate to python methods - virtual bool exec(const qSlicerIO::IOProperties& ioProperties = - qSlicerIO::IOProperties()); + bool exec(const qSlicerIO::IOProperties& ioProperties = + qSlicerIO::IOProperties()) override; /// Return the ioProperties when exec() is being called. /// \sa exec() diff --git a/Base/QTGUI/qSlicerScriptedLoadableModule.h b/Base/QTGUI/qSlicerScriptedLoadableModule.h index eddc2d5d910ade167f3d82dbd2894282bc6d3d88..b13a7a212d4b16121e5da0a81527568e63f15905 100644 --- a/Base/QTGUI/qSlicerScriptedLoadableModule.h +++ b/Base/QTGUI/qSlicerScriptedLoadableModule.h @@ -52,57 +52,57 @@ public: typedef qSlicerLoadableModule Superclass; typedef qSlicerScriptedLoadableModulePrivate Pimpl; qSlicerScriptedLoadableModule(QObject *parent=0); - virtual ~qSlicerScriptedLoadableModule(); + ~qSlicerScriptedLoadableModule() override; QString pythonSource()const; bool setPythonSource(const QString& newPythonSource); - virtual QString title()const ; + QString title()const override ; void setTitle(const QString& newTitle); - virtual QStringList categories()const; + QStringList categories()const override; void setCategories(const QStringList& newCategories); - virtual QStringList contributors()const; + QStringList contributors()const override; void setContributors(const QStringList& newContributors); - virtual QStringList associatedNodeTypes()const; + QStringList associatedNodeTypes()const override; void setAssociatedNodeTypes(const QStringList& newAssociatedNodeTypes); - virtual QString helpText()const; + QString helpText()const override; void setHelpText(const QString& newHelpText); - virtual QString acknowledgementText()const; + QString acknowledgementText()const override; void setAcknowledgementText(const QString& newAcknowledgementText); virtual QVariantMap extensions()const; void setExtensions(const QVariantMap& extensions); - virtual QIcon icon()const; + QIcon icon()const override; void setIcon(const QIcon& newIcon); - virtual QStringList dependencies() const; + QStringList dependencies() const override; void setDependencies(const QStringList& dependencies); - virtual int index() const; + int index() const override; void setIndex(const int index); /// Enable/Disable hide state of the module /// Needs to be hidden before the module menu is created. - virtual bool isHidden()const; + bool isHidden()const override; void setHidden(bool hidden); protected: - virtual void setup(); + void setup() override; void registerFileDialog(); void registerIO(); - virtual qSlicerAbstractModuleRepresentation* createWidgetRepresentation(); + qSlicerAbstractModuleRepresentation* createWidgetRepresentation() override; - virtual vtkMRMLAbstractLogic* createLogic(); + vtkMRMLAbstractLogic* createLogic() override; protected: QScopedPointer d_ptr; diff --git a/Base/QTGUI/qSlicerScriptedLoadableModuleWidget.h b/Base/QTGUI/qSlicerScriptedLoadableModuleWidget.h index 89341159f3df2c85d03c0cb2a3d1a173009ad9fe..505709a417313f2e96b3a852b0bc7f10f8989820 100644 --- a/Base/QTGUI/qSlicerScriptedLoadableModuleWidget.h +++ b/Base/QTGUI/qSlicerScriptedLoadableModuleWidget.h @@ -42,7 +42,7 @@ public: typedef qSlicerAbstractModuleWidget Superclass; typedef qSlicerScriptedLoadableModuleWidgetPrivate Pimpl; qSlicerScriptedLoadableModuleWidget(QWidget * parentWidget=0); - virtual ~qSlicerScriptedLoadableModuleWidget(); + ~qSlicerScriptedLoadableModuleWidget() override; QString pythonSource()const; bool setPythonSource(const QString& newPythonSource, const QString& className = QLatin1String("")); @@ -50,14 +50,14 @@ public: /// Convenience method allowing to retrieve the associated scripted instance Q_INVOKABLE PyObject* self() const; - virtual void enter(); - virtual void exit(); + void enter() override; + void exit() override; - virtual bool setEditedNode(vtkMRMLNode* node, QString role = QString(), QString context = QString()); - virtual double nodeEditable(vtkMRMLNode* node); + bool setEditedNode(vtkMRMLNode* node, QString role = QString(), QString context = QString()) override; + double nodeEditable(vtkMRMLNode* node) override; protected: - virtual void setup(); + void setup() override; protected: QScopedPointer d_ptr; diff --git a/Base/QTGUI/qSlicerSettingsDeveloperPanel.h b/Base/QTGUI/qSlicerSettingsDeveloperPanel.h index c534dc284826de3ba00ec57d236de480deeff787..375c3b9d64312e3e031ba9473ba12b571208e201 100644 --- a/Base/QTGUI/qSlicerSettingsDeveloperPanel.h +++ b/Base/QTGUI/qSlicerSettingsDeveloperPanel.h @@ -45,7 +45,7 @@ public: explicit qSlicerSettingsDeveloperPanel(QWidget* parent = 0); /// Destructor - virtual ~qSlicerSettingsDeveloperPanel(); + ~qSlicerSettingsDeveloperPanel() override; public slots: diff --git a/Base/QTGUI/qSlicerSettingsExtensionsPanel.h b/Base/QTGUI/qSlicerSettingsExtensionsPanel.h index 79544485522c13b9179d07655e20e55aa03acd42..39bd08da00b38ae0349622271e9cb5a4d0857b56 100644 --- a/Base/QTGUI/qSlicerSettingsExtensionsPanel.h +++ b/Base/QTGUI/qSlicerSettingsExtensionsPanel.h @@ -45,7 +45,7 @@ public: explicit qSlicerSettingsExtensionsPanel(QWidget* parent = 0); /// Destructor - virtual ~qSlicerSettingsExtensionsPanel(); + ~qSlicerSettingsExtensionsPanel() override; signals: void extensionsServerUrlChanged(const QString& url); diff --git a/Base/QTGUI/qSlicerSettingsGeneralPanel.h b/Base/QTGUI/qSlicerSettingsGeneralPanel.h index b76dcfcf75e53b7a71622714183bc116ec1ed9cf..217cd951f2a40bc8a53a68fa5937d9185c48aac3 100644 --- a/Base/QTGUI/qSlicerSettingsGeneralPanel.h +++ b/Base/QTGUI/qSlicerSettingsGeneralPanel.h @@ -45,7 +45,7 @@ public: explicit qSlicerSettingsGeneralPanel(QWidget* parent = 0); /// Destructor - virtual ~qSlicerSettingsGeneralPanel(); + ~qSlicerSettingsGeneralPanel() override; public slots: void setDefaultScenePath(const QString& path); diff --git a/Base/QTGUI/qSlicerSettingsModulesPanel.h b/Base/QTGUI/qSlicerSettingsModulesPanel.h index 2ce55d4e09400291fb1664d5ac84ab4f91bf2c32..ed1347ec5bd80a0c51012ab184a2126375a62a56 100644 --- a/Base/QTGUI/qSlicerSettingsModulesPanel.h +++ b/Base/QTGUI/qSlicerSettingsModulesPanel.h @@ -57,7 +57,7 @@ public: explicit qSlicerSettingsModulesPanel(QWidget* parent = 0); /// Destructor - virtual ~qSlicerSettingsModulesPanel(); + ~qSlicerSettingsModulesPanel() override; /// Get the \a modulesToAlwaysIgnore list. /// \sa setModulesToAlwaysIgnore(const QStringList& modulesNames) diff --git a/Base/QTGUI/qSlicerSettingsPythonPanel.h b/Base/QTGUI/qSlicerSettingsPythonPanel.h index 2818d39029502e46065fd9e089831d243613f80c..944539bfd71554f371fa7cf6cc45c7f39f743b19 100644 --- a/Base/QTGUI/qSlicerSettingsPythonPanel.h +++ b/Base/QTGUI/qSlicerSettingsPythonPanel.h @@ -45,7 +45,7 @@ public: explicit qSlicerSettingsPythonPanel(QWidget* parent = 0); /// Destructor - virtual ~qSlicerSettingsPythonPanel(); + ~qSlicerSettingsPythonPanel() override; protected slots: diff --git a/Base/QTGUI/qSlicerSettingsStylesPanel.h b/Base/QTGUI/qSlicerSettingsStylesPanel.h index 1cbc4bfc04e43a320e6dcbc11205eccc9042f4e0..078d181549e38acfae2ca2e51b2c14f72b17b0c4 100644 --- a/Base/QTGUI/qSlicerSettingsStylesPanel.h +++ b/Base/QTGUI/qSlicerSettingsStylesPanel.h @@ -46,7 +46,7 @@ public: explicit qSlicerSettingsStylesPanel(QWidget* parent = 0); /// Destructor - virtual ~qSlicerSettingsStylesPanel(); + ~qSlicerSettingsStylesPanel() override; /// Return list of all available styles. /// diff --git a/Base/QTGUI/qSlicerSettingsViewsPanel.h b/Base/QTGUI/qSlicerSettingsViewsPanel.h index d8d62acf2db290541f94f1e4a8a5f4f066b5b938..fb7fd9bb0091193a61100f57d2d576329e4c9645 100644 --- a/Base/QTGUI/qSlicerSettingsViewsPanel.h +++ b/Base/QTGUI/qSlicerSettingsViewsPanel.h @@ -52,7 +52,7 @@ public: explicit qSlicerSettingsViewsPanel(QWidget* parent = 0); /// Destructor - virtual ~qSlicerSettingsViewsPanel(); + ~qSlicerSettingsViewsPanel() override; /// Get current value as string QString currentMSAA() const; diff --git a/Base/QTGUI/qSlicerSingletonViewFactory.h b/Base/QTGUI/qSlicerSingletonViewFactory.h index dd4eeb99a2be5691dd8ebc59f16243a45d1985ee..77ecb0ecd3120516be5db5add5681a24779152e3 100644 --- a/Base/QTGUI/qSlicerSingletonViewFactory.h +++ b/Base/QTGUI/qSlicerSingletonViewFactory.h @@ -41,10 +41,10 @@ class Q_SLICER_BASE_QTGUI_EXPORT qSlicerSingletonViewFactory : public ctkLayoutV public: typedef ctkLayoutViewFactory Superclass; qSlicerSingletonViewFactory(QObject* parent=0); - virtual ~qSlicerSingletonViewFactory(); + ~qSlicerSingletonViewFactory() override; /// Reimplemented to support custom element names - virtual QStringList supportedElementNames()const; + QStringList supportedElementNames()const override; /// Set the singleton widget instance that will be used to create the view /// The factory will become responsible for deleting the widget @@ -61,7 +61,7 @@ protected: QScopedPointer d_ptr; /// Reimplemented to instantiate desired singleton widget from the element. - Q_INVOKABLE virtual QWidget* createViewFromXML(QDomElement layoutElement); + Q_INVOKABLE QWidget* createViewFromXML(QDomElement layoutElement) override; private: Q_DECLARE_PRIVATE(qSlicerSingletonViewFactory) diff --git a/Base/QTGUI/qSlicerViewersToolBar.h b/Base/QTGUI/qSlicerViewersToolBar.h index c6b866d4b7cc3053ad401e071a3d6c3745b577f2..4d8fbba4fc13cd854b567d636b23881764ac286e 100644 --- a/Base/QTGUI/qSlicerViewersToolBar.h +++ b/Base/QTGUI/qSlicerViewersToolBar.h @@ -47,7 +47,7 @@ public: /// Title is the name of the toolbar (can appear using right click on the toolbar area) qSlicerViewersToolBar(const QString& title, QWidget* parent = 0); qSlicerViewersToolBar(QWidget* parent = 0); - virtual ~qSlicerViewersToolBar(); + ~qSlicerViewersToolBar() override; public slots: diff --git a/Base/QTGUI/qSlicerWebWidget.cxx b/Base/QTGUI/qSlicerWebWidget.cxx index 4f421b1c6c824bdf5481ff05a3dded0371e27504..ef98b008f780604ac7009b28e4f6cad83ec624c1 100644 --- a/Base/QTGUI/qSlicerWebWidget.cxx +++ b/Base/QTGUI/qSlicerWebWidget.cxx @@ -55,8 +55,8 @@ class qSlicerWebEngineView : public QWebEngineView { public: qSlicerWebEngineView(QWidget *parent = Q_NULLPTR) : QWebEngineView(parent){} - virtual ~qSlicerWebEngineView(){} - virtual QSize sizeHint() const + ~qSlicerWebEngineView() override{} + QSize sizeHint() const override { // arbitrary values to address https://issues.slicer.org/view.php?id=4613 return QSize(150, 150); diff --git a/Base/QTGUI/qSlicerWebWidget.h b/Base/QTGUI/qSlicerWebWidget.h index 1b3772c179d6a45a848491fd452911a965396a6b..277430fc1a83c7931c5b04329e3fb4c9e8e3168d 100644 --- a/Base/QTGUI/qSlicerWebWidget.h +++ b/Base/QTGUI/qSlicerWebWidget.h @@ -57,7 +57,7 @@ public: explicit qSlicerWebWidget(QWidget* parent = 0); /// Destructor - virtual ~qSlicerWebWidget(); + ~qSlicerWebWidget() override; /// \brief Return true if external URL should be open with desktop service. /// @@ -122,7 +122,7 @@ protected: /// Event filter used to capture WebView Show and Hide events in order to both set /// "document.webkitHidden" property and trigger the associated event. - bool eventFilter(QObject *obj, QEvent *event); + bool eventFilter(QObject *obj, QEvent *event) override; virtual bool acceptNavigationRequest(const QUrl & url, QWebEnginePage::NavigationType type, bool isMainFrame); diff --git a/Base/QTGUI/qSlicerWebWidget_p.h b/Base/QTGUI/qSlicerWebWidget_p.h index 293d46b380508494714f55e099f5eb5c96700ea5..576a15839f508102393f68e7c9e1ef27ff2f53ab 100644 --- a/Base/QTGUI/qSlicerWebWidget_p.h +++ b/Base/QTGUI/qSlicerWebWidget_p.h @@ -42,10 +42,10 @@ class Q_SLICER_BASE_QTGUI_EXPORT qSlicerWebEnginePage: public QWebEnginePage friend class qSlicerWebWidgetPrivate; public: qSlicerWebEnginePage(QWebEngineProfile *profile, QObject *parent = nullptr); - virtual ~qSlicerWebEnginePage(); + ~qSlicerWebEnginePage() override; protected: - virtual bool acceptNavigationRequest(const QUrl & url, QWebEnginePage::NavigationType type, bool isMainFrame) + bool acceptNavigationRequest(const QUrl & url, QWebEnginePage::NavigationType type, bool isMainFrame) override { Q_ASSERT(this->WebWidget); return this->WebWidget->acceptNavigationRequest(url, type, isMainFrame); @@ -56,14 +56,14 @@ protected: return this->QWebEnginePage::acceptNavigationRequest(url, type, isMainFrame); } - virtual QWebEnginePage *createWindow(QWebEnginePage::WebWindowType type) + QWebEnginePage *createWindow(QWebEnginePage::WebWindowType type) override { Q_UNUSED(type); qWarning() << "qSlicerWebEnginePage: createWindow not implemented"; return nullptr; } - virtual bool certificateError(const QWebEngineCertificateError &certificateError) + bool certificateError(const QWebEngineCertificateError &certificateError) override { qDebug() << "[SSL] [" << qPrintable(certificateError.url().host().trimmed()) << "]" << qPrintable(certificateError.errorDescription()); @@ -83,7 +83,7 @@ protected: public: qSlicerWebWidgetPrivate(qSlicerWebWidget& object); - virtual ~qSlicerWebWidgetPrivate(); + ~qSlicerWebWidgetPrivate() override; virtual void init(); diff --git a/Base/QTGUI/qSlicerWidget.h b/Base/QTGUI/qSlicerWidget.h index 6dcf153f60d94b93ef2938f99861e6176a22795e..09c4b6cc698a3bddccee36f19e9ab8ce5e78efdd 100644 --- a/Base/QTGUI/qSlicerWidget.h +++ b/Base/QTGUI/qSlicerWidget.h @@ -41,10 +41,10 @@ class Q_SLICER_BASE_QTGUI_EXPORT qSlicerWidget : public QWidget, public virtual QVTK_OBJECT public: qSlicerWidget(QWidget *parent=0, Qt::WindowFlags f=0); - virtual ~qSlicerWidget(); + ~qSlicerWidget() override; public slots: - virtual void setMRMLScene(vtkMRMLScene* scene); + void setMRMLScene(vtkMRMLScene* scene) override; signals: void mrmlSceneChanged(vtkMRMLScene*); diff --git a/CMake/vtkSlicerObjectFactory.h.in b/CMake/vtkSlicerObjectFactory.h.in index ad8c9a45cdfe3e94a43a4074c926d5e356260304..1db0f552808d7c68eda8bc646f109498c2badaab 100644 --- a/CMake/vtkSlicerObjectFactory.h.in +++ b/CMake/vtkSlicerObjectFactory.h.in @@ -25,11 +25,11 @@ public: static @vtk-module@ObjectFactory * New(); vtkTypeMacro(@vtk-module@ObjectFactory, vtkObjectFactory) - const char * GetDescription() VTK_OVERRIDE { return "@vtk-module@ factory overrides."; } + const char * GetDescription() override { return "@vtk-module@ factory overrides."; } - const char * GetVTKSourceVersion() VTK_OVERRIDE; + const char * GetVTKSourceVersion() override; - void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream &os, vtkIndent indent) override; protected: @vtk-module@ObjectFactory(); diff --git a/Libs/FreeSurfer/vtkFSLookupTable.h b/Libs/FreeSurfer/vtkFSLookupTable.h index 08decfaf7e752d7c418ba92eb3fbe40f5189630f..7d8acca975209f7f38d27da89377fd8b073a2381 100644 --- a/Libs/FreeSurfer/vtkFSLookupTable.h +++ b/Libs/FreeSurfer/vtkFSLookupTable.h @@ -24,11 +24,11 @@ class VTK_FreeSurfer_EXPORT vtkFSLookupTable : public vtkLookupTable public: static vtkFSLookupTable *New(); vtkTypeMacro(vtkFSLookupTable,vtkLookupTable); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; // Description: // Copy the contents from another LookupTable - void DeepCopy(vtkScalarsToColors *lut) VTK_OVERRIDE; + void DeepCopy(vtkScalarsToColors *lut) override; vtkGetMacro(LowThresh,float); vtkSetMacro(LowThresh,float); @@ -72,23 +72,23 @@ public: /// /// from vtkScalarsToColors - double *GetRange() VTK_OVERRIDE; + double *GetRange() override; /// /// don't do anything as it's overriding the LUTs low threshold with the /// scalar values' lowest value using vtkLookupTable::SetRange; - void SetRange(double, double) VTK_OVERRIDE; + void SetRange(double, double) override; /// /// Given a scalar value val, return an rgba color value /// returns array of length 3, 0-255 - const unsigned char *MapValue(double val) VTK_OVERRIDE; + const unsigned char *MapValue(double val) override; /// /// passes val to MapValue - void GetColor(double, double[3]) VTK_OVERRIDE; + void GetColor(double, double[3]) override; /// /// take input scalars and push them through the calculation to get colours /// to put int the output array - void MapScalarsThroughTable2(void* input, unsigned char* output, int inputDataType, int numberOfValues, int inputIncrement, int outputIncrement) VTK_OVERRIDE; + void MapScalarsThroughTable2(void* input, unsigned char* output, int inputDataType, int numberOfValues, int inputIncrement, int outputIncrement) override; /// /// Type constant, can have different types of colour scales @@ -104,10 +104,10 @@ public: // Description: // Get the number of available colors for mapping to. - virtual vtkIdType GetNumberOfAvailableColors() VTK_OVERRIDE; + vtkIdType GetNumberOfAvailableColors() override; protected: vtkFSLookupTable(); - ~vtkFSLookupTable(); + ~vtkFSLookupTable() override; /// /// Low cut off, values passed in that are below this level are mapped to diff --git a/Libs/FreeSurfer/vtkFSSurfaceAnnotationReader.h b/Libs/FreeSurfer/vtkFSSurfaceAnnotationReader.h index 42feeb1178bc95620c86b2dba1e950815ffb73c1..4d4468bf6c1181191035f113bb2726e27de11ecb 100644 --- a/Libs/FreeSurfer/vtkFSSurfaceAnnotationReader.h +++ b/Libs/FreeSurfer/vtkFSSurfaceAnnotationReader.h @@ -34,7 +34,7 @@ class VTK_FreeSurfer_EXPORT vtkFSSurfaceAnnotationReader : public vtkDataReader public: static vtkFSSurfaceAnnotationReader *New(); vtkTypeMacro(vtkFSSurfaceAnnotationReader,vtkDataReader); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; vtkIntArray *GetOutput(); void SetOutput(vtkIntArray *output); @@ -75,7 +75,7 @@ public: }; protected: vtkFSSurfaceAnnotationReader(); - ~vtkFSSurfaceAnnotationReader(); + ~vtkFSSurfaceAnnotationReader() override; vtkIntArray *Labels; vtkLookupTable *Colors; diff --git a/Libs/FreeSurfer/vtkFSSurfaceLabelReader.h b/Libs/FreeSurfer/vtkFSSurfaceLabelReader.h index f9e65ba5a7c8a1cb216fbdefdab257403491e552..2d9407660aaf901b4562ace9e2abf373d385d9e8 100644 --- a/Libs/FreeSurfer/vtkFSSurfaceLabelReader.h +++ b/Libs/FreeSurfer/vtkFSSurfaceLabelReader.h @@ -31,7 +31,7 @@ class VTK_FreeSurfer_EXPORT vtkFSSurfaceLabelReader : public vtkDataReader public: static vtkFSSurfaceLabelReader *New(); vtkTypeMacro(vtkFSSurfaceLabelReader,vtkDataReader); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; vtkFloatArray *GetOutput() {return this->Scalars; }; @@ -78,7 +78,7 @@ public: protected: vtkFSSurfaceLabelReader(); - ~vtkFSSurfaceLabelReader(); + ~vtkFSSurfaceLabelReader() override; vtkFloatArray *Scalars; diff --git a/Libs/FreeSurfer/vtkFSSurfaceReader.h b/Libs/FreeSurfer/vtkFSSurfaceReader.h index 74207d39e7a659df4efb23dd03271629cd5fb900..7a43376208e0dcdf33869c4704c65f69af0a03e1 100644 --- a/Libs/FreeSurfer/vtkFSSurfaceReader.h +++ b/Libs/FreeSurfer/vtkFSSurfaceReader.h @@ -36,7 +36,7 @@ class VTK_FreeSurfer_EXPORT vtkFSSurfaceReader : public vtkAbstractPolyDataReade public: static vtkFSSurfaceReader *New(); vtkTypeMacro(vtkFSSurfaceReader, vtkAbstractPolyDataReader); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// old previous versions constants enum @@ -51,12 +51,12 @@ public: protected: vtkFSSurfaceReader(); - ~vtkFSSurfaceReader(); + ~vtkFSSurfaceReader() override; int RequestData( vtkInformation *, vtkInformationVector **, - vtkInformationVector *outputVector) VTK_OVERRIDE; + vtkInformationVector *outputVector) override; private: vtkFSSurfaceReader(const vtkFSSurfaceReader&); /// Not implemented. diff --git a/Libs/FreeSurfer/vtkFSSurfaceScalarReader.h b/Libs/FreeSurfer/vtkFSSurfaceScalarReader.h index 979b5db23b7ca5108958ac18cb656bf5d6ad6d63..bae5f3b740da7d921a309259a40a647defdaa613 100644 --- a/Libs/FreeSurfer/vtkFSSurfaceScalarReader.h +++ b/Libs/FreeSurfer/vtkFSSurfaceScalarReader.h @@ -30,7 +30,7 @@ class VTK_FreeSurfer_EXPORT vtkFSSurfaceScalarReader : public vtkDataReader public: static vtkFSSurfaceScalarReader *New(); vtkTypeMacro(vtkFSSurfaceScalarReader,vtkDataReader); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; vtkFloatArray *GetOutput(); void SetOutput(vtkFloatArray *output); @@ -46,7 +46,7 @@ public: }; protected: vtkFSSurfaceScalarReader(); - ~vtkFSSurfaceScalarReader(); + ~vtkFSSurfaceScalarReader() override; vtkFloatArray * Scalars; diff --git a/Libs/FreeSurfer/vtkFSSurfaceWFileReader.h b/Libs/FreeSurfer/vtkFSSurfaceWFileReader.h index 14aaea308c347bca9ffc583df3af4d994bdad82e..ed68829d301880d05e888caeada7fd84c23c96f4 100644 --- a/Libs/FreeSurfer/vtkFSSurfaceWFileReader.h +++ b/Libs/FreeSurfer/vtkFSSurfaceWFileReader.h @@ -30,7 +30,7 @@ class VTK_FreeSurfer_EXPORT vtkFSSurfaceWFileReader : public vtkDataReader public: static vtkFSSurfaceWFileReader *New(); vtkTypeMacro(vtkFSSurfaceWFileReader,vtkDataReader); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; vtkFloatArray *GetOutput(); void SetOutput(vtkFloatArray *output); @@ -56,7 +56,7 @@ public: protected: vtkFSSurfaceWFileReader(); - ~vtkFSSurfaceWFileReader(); + ~vtkFSSurfaceWFileReader() override; vtkFloatArray * Scalars; diff --git a/Libs/MRML/CLI/vtkMRMLCommandLineModuleNode.h b/Libs/MRML/CLI/vtkMRMLCommandLineModuleNode.h index fc23c87b6e64fe16de9fc06bd42861c8da69bd9e..1ddbb76d6665194c1150f69b122cfa3699f396c2 100644 --- a/Libs/MRML/CLI/vtkMRMLCommandLineModuleNode.h +++ b/Libs/MRML/CLI/vtkMRMLCommandLineModuleNode.h @@ -28,21 +28,21 @@ class VTK_MRML_CLI_EXPORT vtkMRMLCommandLineModuleNode : public vtkMRMLNode public: static vtkMRMLCommandLineModuleNode *New(); vtkTypeMacro(vtkMRMLCommandLineModuleNode, vtkMRMLNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Set node attributes - virtual void ReadXMLAttributes(const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes(const char** atts) override; /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE + const char* GetNodeTagName() override {return "CommandLineModule";} /// List of events that can be fired on or by the node. @@ -289,15 +289,15 @@ public: static ModuleDescription GetRegisteredModuleDescription(const std::string& name); /// Reimplemented for internal reasons. - virtual void Modified() VTK_OVERRIDE; + void Modified() override; protected: void AbortProcess(); - virtual void ProcessMRMLEvents(vtkObject *caller, unsigned long event, - void *callData) VTK_OVERRIDE; + void ProcessMRMLEvents(vtkObject *caller, unsigned long event, + void *callData) override; private: vtkMRMLCommandLineModuleNode(); - ~vtkMRMLCommandLineModuleNode(); + ~vtkMRMLCommandLineModuleNode() override; vtkMRMLCommandLineModuleNode(const vtkMRMLCommandLineModuleNode&); void operator=(const vtkMRMLCommandLineModuleNode&); diff --git a/Libs/MRML/Core/Testing/vtkMRMLColorNodeTest1.cxx b/Libs/MRML/Core/Testing/vtkMRMLColorNodeTest1.cxx index d2086524295ce7f5517ef23315a291e6f4813183..78640f17cba13b47b5e15224ac467227ad2d0179 100644 --- a/Libs/MRML/Core/Testing/vtkMRMLColorNodeTest1.cxx +++ b/Libs/MRML/Core/Testing/vtkMRMLColorNodeTest1.cxx @@ -28,12 +28,12 @@ public: vtkTypeMacro(vtkMRMLColorNodeTestHelper1,vtkMRMLColorNode); - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE + vtkMRMLNode* CreateNodeInstance() override { return vtkMRMLColorNodeTestHelper1::New(); } - const char * GetTypeAsString() VTK_OVERRIDE + const char * GetTypeAsString() override { return "vtkMRMLColorNodeTestHelper1"; } @@ -43,8 +43,8 @@ public: std::cout << "vtkMRMLColorNodeTestHelper1 pretending to read a file " << std::endl; return EXIT_SUCCESS; } - virtual int GetNumberOfColors() VTK_OVERRIDE {return 1;} - virtual bool GetColor(int vtkNotUsed(ind), double color[4]) VTK_OVERRIDE + int GetNumberOfColors() override {return 1;} + bool GetColor(int vtkNotUsed(ind), double color[4]) override { color[0] = 10; color[1] = 100; @@ -52,7 +52,7 @@ public: return true; } - vtkMRMLStorageNode* CreateDefaultStorageNode() VTK_OVERRIDE + vtkMRMLStorageNode* CreateDefaultStorageNode() override { // just some random storage node to pass the storage node test of basic MRML node tests return vtkMRMLColorTableStorageNode::New(); diff --git a/Libs/MRML/Core/Testing/vtkMRMLCoreTestingUtilitiesTest.cxx b/Libs/MRML/Core/Testing/vtkMRMLCoreTestingUtilitiesTest.cxx index 4702312b7972b4ea4e986820c02902a043c4bb98..ba888d9941bff23b624764a525c082e8d11acaa0 100644 --- a/Libs/MRML/Core/Testing/vtkMRMLCoreTestingUtilitiesTest.cxx +++ b/Libs/MRML/Core/Testing/vtkMRMLCoreTestingUtilitiesTest.cxx @@ -51,11 +51,11 @@ class vtkMRMLCoreTestingUtilitiesNode : public vtkMRMLNode public: static vtkMRMLCoreTestingUtilitiesNode *New(); vtkTypeMacro(vtkMRMLCoreTestingUtilitiesNode, vtkMRMLNode); - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE + vtkMRMLNode* CreateNodeInstance() override { return vtkMRMLCoreTestingUtilitiesNode::New(); } - virtual const char* GetNodeTagName() VTK_OVERRIDE + const char* GetNodeTagName() override { return "Testing"; } diff --git a/Libs/MRML/Core/Testing/vtkMRMLDiffusionTensorDisplayPropertiesNodeTest1.cxx b/Libs/MRML/Core/Testing/vtkMRMLDiffusionTensorDisplayPropertiesNodeTest1.cxx index c6bd9060186dd27f9df033167ccacc1e7af01854..03b2138e2f1e4ab96975ee054b71d79d1d2d9385 100644 --- a/Libs/MRML/Core/Testing/vtkMRMLDiffusionTensorDisplayPropertiesNodeTest1.cxx +++ b/Libs/MRML/Core/Testing/vtkMRMLDiffusionTensorDisplayPropertiesNodeTest1.cxx @@ -26,11 +26,11 @@ public: vtkTypeMacro(vtkMRMLDiffusionTensorDisplayPropertiesNodeTestHelper1,vtkMRMLDiffusionTensorDisplayPropertiesNode); - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE + vtkMRMLNode* CreateNodeInstance() override { return vtkMRMLDiffusionTensorDisplayPropertiesNodeTestHelper1::New(); } - virtual const char* GetNodeTagName() VTK_OVERRIDE + const char* GetNodeTagName() override { return "vtkMRMLDiffusionTensorDisplayPropertiesNodeTestHelper1"; } diff --git a/Libs/MRML/Core/Testing/vtkMRMLDisplayNodeTest1.cxx b/Libs/MRML/Core/Testing/vtkMRMLDisplayNodeTest1.cxx index 8f91d2ef36769fd06f428b308a3fd26a15235663..4e7b8f36339797e3ce90206469c185f12190bfcf 100644 --- a/Libs/MRML/Core/Testing/vtkMRMLDisplayNodeTest1.cxx +++ b/Libs/MRML/Core/Testing/vtkMRMLDisplayNodeTest1.cxx @@ -26,7 +26,7 @@ public: vtkTypeMacro(vtkMRMLDisplayNodeTestHelper1,vtkMRMLDisplayNode); - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE + vtkMRMLNode* CreateNodeInstance() override { return vtkMRMLDisplayNodeTestHelper1::New(); } @@ -42,7 +42,7 @@ public: return EXIT_SUCCESS; } - virtual const char* GetNodeTagName() VTK_OVERRIDE + const char* GetNodeTagName() override { return "Testing is good"; } diff --git a/Libs/MRML/Core/Testing/vtkMRMLDisplayableHierarchyNodeTest1.cxx b/Libs/MRML/Core/Testing/vtkMRMLDisplayableHierarchyNodeTest1.cxx index 320d194e4f458c6abb592b73346b2b3277b8de02..1b32b90e9710f19cdf9945b7780166c060a34a44 100644 --- a/Libs/MRML/Core/Testing/vtkMRMLDisplayableHierarchyNodeTest1.cxx +++ b/Libs/MRML/Core/Testing/vtkMRMLDisplayableHierarchyNodeTest1.cxx @@ -53,11 +53,11 @@ public: vtkTypeMacro(vtkMRMLDisplayableHierarchyNodeTestHelper1, vtkMRMLDisplayableNode); - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE + vtkMRMLNode* CreateNodeInstance() override { return vtkMRMLDisplayableHierarchyNodeTestHelper1::New(); } - virtual const char* GetNodeTagName() VTK_OVERRIDE + const char* GetNodeTagName() override { return "vtkMRMLNodeTestHelper1"; } diff --git a/Libs/MRML/Core/Testing/vtkMRMLDisplayableNodeTest1.cxx b/Libs/MRML/Core/Testing/vtkMRMLDisplayableNodeTest1.cxx index 463568fba8b2df0f047a10380ddb739fd44385ed..e708a6c76fffba21c80a7bf514fbbea375eee0eb 100644 --- a/Libs/MRML/Core/Testing/vtkMRMLDisplayableNodeTest1.cxx +++ b/Libs/MRML/Core/Testing/vtkMRMLDisplayableNodeTest1.cxx @@ -44,16 +44,16 @@ public: } return InternalDisplayNodes; } - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE + vtkMRMLNode* CreateNodeInstance() override { return vtkMRMLDisplayableNodeTestHelper1::New(); } - virtual const char* GetNodeTagName() VTK_OVERRIDE + const char* GetNodeTagName() override { return "vtkMRMLDisplayableNodeTestHelper1"; } - virtual vtkMRMLStorageNode* CreateDefaultStorageNode() VTK_OVERRIDE + vtkMRMLStorageNode* CreateDefaultStorageNode() override { // just some random storage node to pass the storage node test of basic MRML node tests return vtkMRMLStorageNode::SafeDownCast(vtkMRMLModelStorageNode::New()); @@ -70,11 +70,11 @@ public: vtkTypeMacro(vtkMRMLDisplayNodeTestHelper, vtkMRMLDisplayNode); - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE + vtkMRMLNode* CreateNodeInstance() override { return vtkMRMLDisplayNodeTestHelper::New(); } - virtual const char* GetNodeTagName() VTK_OVERRIDE + const char* GetNodeTagName() override { return "vtkMRMLDisplayNodeTestHelper"; } diff --git a/Libs/MRML/Core/Testing/vtkMRMLHierarchyNodeTest1.cxx b/Libs/MRML/Core/Testing/vtkMRMLHierarchyNodeTest1.cxx index d54b311dfd9f30d132cb4641779ab661a3adcd45..5a49d4091a2b7cacd45c31e4ed7a5acf8aabc14e 100644 --- a/Libs/MRML/Core/Testing/vtkMRMLHierarchyNodeTest1.cxx +++ b/Libs/MRML/Core/Testing/vtkMRMLHierarchyNodeTest1.cxx @@ -26,11 +26,11 @@ public: vtkTypeMacro(vtkMRMLHierarchyNodeTestHelper1,vtkMRMLHierarchyNode); - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE + vtkMRMLNode* CreateNodeInstance() override { return vtkMRMLHierarchyNodeTestHelper1::New(); } - virtual const char* GetNodeTagName() VTK_OVERRIDE + const char* GetNodeTagName() override { return "vtkMRMLHierarchyNodeTestHelper1"; } diff --git a/Libs/MRML/Core/Testing/vtkMRMLNodeTest1.cxx b/Libs/MRML/Core/Testing/vtkMRMLNodeTest1.cxx index 7e9bc628ea12a241400e90e102c5cd931c94cd77..22f69968ccb65a27a464556c3f44997adc637abb 100644 --- a/Libs/MRML/Core/Testing/vtkMRMLNodeTest1.cxx +++ b/Libs/MRML/Core/Testing/vtkMRMLNodeTest1.cxx @@ -52,11 +52,11 @@ public: return this->NodeReferences; } - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE + vtkMRMLNode* CreateNodeInstance() override { return vtkMRMLNodeTestHelper1::New(); } - virtual const char* GetNodeTagName() VTK_OVERRIDE + const char* GetNodeTagName() override { return "vtkMRMLNodeTestHelper1"; } @@ -68,7 +68,7 @@ public: } return this->NodeReferences[std::string(refrole)].size(); } - virtual void ProcessMRMLEvents( vtkObject *caller, unsigned long event, void *callData ) VTK_OVERRIDE + void ProcessMRMLEvents( vtkObject *caller, unsigned long event, void *callData ) override { Superclass::ProcessMRMLEvents(caller, event, callData); this->LastMRMLEventCaller = caller; @@ -87,10 +87,10 @@ public: vtkSetStdVectorMacro(TestingFloatVector, std::vector); vtkGetStdVectorMacro(TestingFloatVector, std::vector); - virtual void SetSceneReferences() VTK_OVERRIDE; - virtual void UpdateReferenceID(const char *oldID, const char *newID) VTK_OVERRIDE; - virtual void WriteXML(ostream& of, int nIndent) VTK_OVERRIDE; - virtual void ReadXMLAttributes(const char** atts) VTK_OVERRIDE; + void SetSceneReferences() override; + void UpdateReferenceID(const char *oldID, const char *newID) override; + void WriteXML(ostream& of, int nIndent) override; + void ReadXMLAttributes(const char** atts) override; char* OtherNodeID; std::vector TestingStringVector; @@ -107,7 +107,7 @@ private: this->LastMRMLEventCaller = NULL; this->LastMRMLEventId = 0; } - ~vtkMRMLNodeTestHelper1() + ~vtkMRMLNodeTestHelper1() override { this->SetOtherNodeID(NULL); } @@ -124,11 +124,11 @@ public: vtkTypeMacro(vtkMRMLStorageNodeTestHelper,vtkMRMLStorageNode); - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE + vtkMRMLNode* CreateNodeInstance() override { return vtkMRMLStorageNodeTestHelper::New(); } - virtual const char* GetNodeTagName() VTK_OVERRIDE + const char* GetNodeTagName() override { return "vtkMRMLStorageNodeTestHelper"; } @@ -136,25 +136,25 @@ public: void SetOtherNodeID(const char* id); vtkGetStringMacro(OtherNodeID); - virtual void SetSceneReferences() VTK_OVERRIDE; - virtual void UpdateReferenceID(const char *oldID, const char *newID) VTK_OVERRIDE; - virtual void WriteXML(ostream& of, int nIndent) VTK_OVERRIDE; - virtual void ReadXMLAttributes(const char** atts) VTK_OVERRIDE; + void SetSceneReferences() override; + void UpdateReferenceID(const char *oldID, const char *newID) override; + void WriteXML(ostream& of, int nIndent) override; + void ReadXMLAttributes(const char** atts) override; // Implemented to satisfy the storage node interface - virtual bool CanReadInReferenceNode(vtkMRMLNode* refNode) VTK_OVERRIDE + bool CanReadInReferenceNode(vtkMRMLNode* refNode) override { return refNode->IsA("vtkMRMLNodeTestHelper1"); } - virtual bool CanWriteFromReferenceNode(vtkMRMLNode* refNode) VTK_OVERRIDE + bool CanWriteFromReferenceNode(vtkMRMLNode* refNode) override { return refNode->IsA("vtkMRMLNodeTestHelper1"); } - virtual void InitializeSupportedWriteFileTypes() VTK_OVERRIDE + void InitializeSupportedWriteFileTypes() override { this->SupportedWriteFileTypes->InsertNextValue(".noop"); } - virtual int ReadDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE + int ReadDataInternal(vtkMRMLNode *refNode) override { vtkMRMLNodeTestHelper1 * node = vtkMRMLNodeTestHelper1::SafeDownCast(refNode); if(!node) @@ -164,7 +164,7 @@ public: } return 1; } - virtual int WriteDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE + int WriteDataInternal(vtkMRMLNode *refNode) override { vtkMRMLNodeTestHelper1 * node = vtkMRMLNodeTestHelper1::SafeDownCast(refNode); if(!node) @@ -183,7 +183,7 @@ private: this->OtherNodeID = NULL; this->DefaultWriteFileExtension = "noop"; } - ~vtkMRMLStorageNodeTestHelper() + ~vtkMRMLStorageNodeTestHelper() override { this->SetOtherNodeID(NULL); } diff --git a/Libs/MRML/Core/Testing/vtkMRMLSceneEventRecorder.h b/Libs/MRML/Core/Testing/vtkMRMLSceneEventRecorder.h index f4af85209adab304b8d4877c3caddf16bb3bbd1f..7d917a199293ffaa9602f05034fc17fc2360d4e7 100644 --- a/Libs/MRML/Core/Testing/vtkMRMLSceneEventRecorder.h +++ b/Libs/MRML/Core/Testing/vtkMRMLSceneEventRecorder.h @@ -41,12 +41,12 @@ class vtkMRMLSceneEventRecorder : public vtkCommand public: vtkTypeMacro(vtkMRMLSceneEventRecorder, vtkCommand); static vtkMRMLSceneEventRecorder *New(); - virtual void Execute(vtkObject *caller, unsigned long eventId, - void *callData) VTK_OVERRIDE; + void Execute(vtkObject *caller, unsigned long eventId, + void *callData) override; // List of node that should be updated when NodeAddedEvent is caught std::map CalledEvents; std::map LastEventMTime; protected: vtkMRMLSceneEventRecorder(); - virtual ~vtkMRMLSceneEventRecorder(); + ~vtkMRMLSceneEventRecorder() override; }; diff --git a/Libs/MRML/Core/Testing/vtkMRMLSceneTest1.cxx b/Libs/MRML/Core/Testing/vtkMRMLSceneTest1.cxx index 0bb4ac1af2012189e18daf089a1c7f279d8ad636..d3013ea4ead4ef0e3fc64a75d34250b93760e404 100644 --- a/Libs/MRML/Core/Testing/vtkMRMLSceneTest1.cxx +++ b/Libs/MRML/Core/Testing/vtkMRMLSceneTest1.cxx @@ -26,10 +26,10 @@ public: static vtkMRMLCustomNode *New(); vtkTypeMacro(vtkMRMLCustomNode, vtkMRMLNode); - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; - virtual const char* GetNodeTagName() VTK_OVERRIDE { return "Custom"; } + vtkMRMLNode* CreateNodeInstance() override; + const char* GetNodeTagName() override { return "Custom"; } - virtual void Reset(vtkMRMLNode* defaultNode) VTK_OVERRIDE + void Reset(vtkMRMLNode* defaultNode) override { ++this->ResetCount; this->vtkMRMLNode::Reset(defaultNode); @@ -39,7 +39,7 @@ public: protected: vtkMRMLCustomNode():ResetCount(0){} - ~vtkMRMLCustomNode(){} + ~vtkMRMLCustomNode() override{} vtkMRMLCustomNode(const vtkMRMLCustomNode&); void operator=(const vtkMRMLCustomNode&); }; @@ -55,12 +55,12 @@ public: static vtkMRMLAnotherCustomNode *New(); vtkTypeMacro(vtkMRMLAnotherCustomNode, vtkMRMLNode); - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; - virtual const char* GetNodeTagName() VTK_OVERRIDE { return "AnotherCustom"; } + vtkMRMLNode* CreateNodeInstance() override; + const char* GetNodeTagName() override { return "AnotherCustom"; } protected: vtkMRMLAnotherCustomNode(){} - ~vtkMRMLAnotherCustomNode(){} + ~vtkMRMLAnotherCustomNode() override{} vtkMRMLAnotherCustomNode(const vtkMRMLAnotherCustomNode&); void operator=(const vtkMRMLAnotherCustomNode&); }; diff --git a/Libs/MRML/Core/Testing/vtkMRMLSceneTest2.cxx b/Libs/MRML/Core/Testing/vtkMRMLSceneTest2.cxx index 368c4f89c2a25f84c8f9732b6b2673193967c9fc..e5255bec7ee826384e424c2505e9e6f4935ee552 100644 --- a/Libs/MRML/Core/Testing/vtkMRMLSceneTest2.cxx +++ b/Libs/MRML/Core/Testing/vtkMRMLSceneTest2.cxx @@ -55,14 +55,14 @@ public: // List of node that should be updated when NodeAddedEvent is caught std::vector NodeAddedClassNames; - virtual void ResetNumberOfEvents() + void ResetNumberOfEvents() override { vtkMRMLCoreTestingUtilities::vtkMRMLNodeCallback::ResetNumberOfEvents(); this->NumberOfSingletonNodes = 0; this->NodeAddedClassNames.clear(); } - virtual void Execute(vtkObject* caller, unsigned long eid, void *calldata) + void Execute(vtkObject* caller, unsigned long eid, void *calldata) override { vtkMRMLCoreTestingUtilities::vtkMRMLNodeCallback::Execute(caller, eid, calldata); @@ -175,7 +175,7 @@ protected: { this->NumberOfSingletonNodes = 0; } - ~vtkMRMLSceneCallback() {}; + ~vtkMRMLSceneCallback() override {}; }; // class vtkMRMLSceneCallback diff --git a/Libs/MRML/Core/Testing/vtkMRMLStorableNodeTest1.cxx b/Libs/MRML/Core/Testing/vtkMRMLStorableNodeTest1.cxx index 4f0abd607a759453b96132c55fa18d2b8dc350df..50d86a655af26a3193d49bba973a12cb8e66bff7 100644 --- a/Libs/MRML/Core/Testing/vtkMRMLStorableNodeTest1.cxx +++ b/Libs/MRML/Core/Testing/vtkMRMLStorableNodeTest1.cxx @@ -27,18 +27,18 @@ public: vtkTypeMacro(vtkMRMLStorableNodeTestHelper1,vtkMRMLStorableNode); - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE + vtkMRMLNode* CreateNodeInstance() override { return vtkMRMLStorableNodeTestHelper1::New(); } - virtual const char* GetNodeTagName() VTK_OVERRIDE + const char* GetNodeTagName() override { return "vtkMRMLStorableNodeTestHelper1"; } // for testing purposes, return a valid storage node, // vtkMRMLStorageNode::New returns NULL - virtual vtkMRMLStorageNode* CreateDefaultStorageNode() VTK_OVERRIDE { return vtkMRMLModelStorageNode::New(); } + vtkMRMLStorageNode* CreateDefaultStorageNode() override { return vtkMRMLModelStorageNode::New(); } }; vtkStandardNewMacro(vtkMRMLStorableNodeTestHelper1); diff --git a/Libs/MRML/Core/Testing/vtkMRMLStorageNodeTest1.cxx b/Libs/MRML/Core/Testing/vtkMRMLStorageNodeTest1.cxx index 5f45f9e82a57210b924ae1776147761fcf9005f9..eeb69ce842d31b841d7b4f60c4bf18038dbe5b66 100644 --- a/Libs/MRML/Core/Testing/vtkMRMLStorageNodeTest1.cxx +++ b/Libs/MRML/Core/Testing/vtkMRMLStorageNodeTest1.cxx @@ -30,11 +30,11 @@ public: vtkTypeMacro(vtkMRMLStorageNodeTestHelper1,vtkMRMLStorageNode); - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE + vtkMRMLNode* CreateNodeInstance() override { return vtkMRMLStorageNodeTestHelper1::New(); } - virtual const char* GetNodeTagName() VTK_OVERRIDE + const char* GetNodeTagName() override { return "vtkMRMLStorageNodeTestHelper1"; } @@ -42,11 +42,11 @@ public: virtual bool CanApplyNonLinearTransforms() { return false; } virtual void ApplyTransform(vtkAbstractTransform* vtkNotUsed(transform)) { return; } - bool CanReadInReferenceNode(vtkMRMLNode * refNode) VTK_OVERRIDE + bool CanReadInReferenceNode(vtkMRMLNode * refNode) override { return refNode->IsA(this->SupportedClass); } - int ReadDataInternal(vtkMRMLNode * vtkNotUsed(refNode)) VTK_OVERRIDE + int ReadDataInternal(vtkMRMLNode * vtkNotUsed(refNode)) override { return this->ReadDataReturnValue; } diff --git a/Libs/MRML/Core/Testing/vtkMRMLTransformableNodeTest1.cxx b/Libs/MRML/Core/Testing/vtkMRMLTransformableNodeTest1.cxx index cab978e99cdfa0c153c38e1a343bb73ba1bafb0e..840858129349b93587569ab704c5c1ac50300392 100644 --- a/Libs/MRML/Core/Testing/vtkMRMLTransformableNodeTest1.cxx +++ b/Libs/MRML/Core/Testing/vtkMRMLTransformableNodeTest1.cxx @@ -30,11 +30,11 @@ public: vtkTypeMacro(vtkMRMLTransformableNodeTestHelper1,vtkMRMLTransformableNode); - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE + vtkMRMLNode* CreateNodeInstance() override { return vtkMRMLTransformableNodeTestHelper1::New(); } - virtual const char* GetNodeTagName() VTK_OVERRIDE + const char* GetNodeTagName() override { return "vtkMRMLTransformableNodeTestHelper1"; } diff --git a/Libs/MRML/Core/Testing/vtkMRMLVolumeDisplayNodeTest1.cxx b/Libs/MRML/Core/Testing/vtkMRMLVolumeDisplayNodeTest1.cxx index 46794ddbbe0bd78cd9458f83326805ea4f2792e3..4b370b01c54b873b6234d8531d6621665e6b54f2 100644 --- a/Libs/MRML/Core/Testing/vtkMRMLVolumeDisplayNodeTest1.cxx +++ b/Libs/MRML/Core/Testing/vtkMRMLVolumeDisplayNodeTest1.cxx @@ -26,7 +26,7 @@ public: vtkTypeMacro(vtkMRMLVolumeDisplayNodeTestHelper1,vtkMRMLVolumeDisplayNode); - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE + vtkMRMLNode* CreateNodeInstance() override { return vtkMRMLVolumeDisplayNodeTestHelper1::New(); } @@ -42,7 +42,7 @@ public: return EXIT_SUCCESS; } - virtual const char* GetNodeTagName() VTK_OVERRIDE + const char* GetNodeTagName() override { return "Testing is good"; } diff --git a/Libs/MRML/Core/Testing/vtkMRMLVolumeNodeEventsTest.cxx b/Libs/MRML/Core/Testing/vtkMRMLVolumeNodeEventsTest.cxx index cdf1648ce735f030b1a5b65e8fe1969e917cd513..81185bb51ff40115ff34a7dc89cd8e701d2cfa51 100644 --- a/Libs/MRML/Core/Testing/vtkMRMLVolumeNodeEventsTest.cxx +++ b/Libs/MRML/Core/Testing/vtkMRMLVolumeNodeEventsTest.cxx @@ -35,8 +35,8 @@ public: // Provide a concrete New. static vtkMRMLTestVolumeNode *New(); vtkTypeMacro(vtkMRMLTestVolumeNode,vtkMRMLVolumeNode); - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE {return vtkMRMLTestVolumeNode::New();} - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "vtkMRMLTestVolumeNode";} + vtkMRMLNode* CreateNodeInstance() override {return vtkMRMLTestVolumeNode::New();} + const char* GetNodeTagName() override {return "vtkMRMLTestVolumeNode";} }; vtkStandardNewMacro(vtkMRMLTestVolumeNode); diff --git a/Libs/MRML/Core/Testing/vtkMRMLVolumeNodeTest1.cxx b/Libs/MRML/Core/Testing/vtkMRMLVolumeNodeTest1.cxx index 81709769116dc379e6439b75ffe351e16fabb739..eb00f29e8939eaad0cbf100d24f29eb09a22fbd1 100644 --- a/Libs/MRML/Core/Testing/vtkMRMLVolumeNodeTest1.cxx +++ b/Libs/MRML/Core/Testing/vtkMRMLVolumeNodeTest1.cxx @@ -33,16 +33,16 @@ public: vtkTypeMacro(vtkMRMLVolumeNodeTestHelper1,vtkMRMLVolumeNode); - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE + vtkMRMLNode* CreateNodeInstance() override { return vtkMRMLVolumeNodeTestHelper1::New(); } - virtual const char* GetNodeTagName() VTK_OVERRIDE + const char* GetNodeTagName() override { return "vtkMRMLVolumeNodeTestHelper1"; } - virtual vtkMRMLStorageNode* CreateDefaultStorageNode() VTK_OVERRIDE { return vtkMRMLVolumeArchetypeStorageNode::New(); } + vtkMRMLStorageNode* CreateDefaultStorageNode() override { return vtkMRMLVolumeArchetypeStorageNode::New(); } }; vtkStandardNewMacro(vtkMRMLVolumeNodeTestHelper1); diff --git a/Libs/MRML/Core/vtkCacheManager.h b/Libs/MRML/Core/vtkCacheManager.h index 55816a745f265bddeb588e5215747dbf82e20cd7..9be9f6da67c2a5fb5aded53d78a376e4f8a01e2b 100644 --- a/Libs/MRML/Core/vtkCacheManager.h +++ b/Libs/MRML/Core/vtkCacheManager.h @@ -25,7 +25,7 @@ class VTK_MRML_EXPORT vtkCacheManager : public vtkObject /// The Usual vtk class functions static vtkCacheManager *New(); vtkTypeMacro(vtkCacheManager, vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; vtkGetMacro (InsufficientFreeBufferNotificationFlag, int ); vtkSetMacro (InsufficientFreeBufferNotificationFlag, int ); @@ -174,7 +174,7 @@ class VTK_MRML_EXPORT vtkCacheManager : public vtkObject protected: vtkCacheManager(); - virtual ~vtkCacheManager(); + ~vtkCacheManager() override; vtkCacheManager(const vtkCacheManager&); void operator=(const vtkCacheManager&); diff --git a/Libs/MRML/Core/vtkCodedEntry.h b/Libs/MRML/Core/vtkCodedEntry.h index 6aef9d20a4355376fcccd700153c6bc9c403dc7c..3ee618150b52be55c50a0a230dbda68f29b3eba5 100644 --- a/Libs/MRML/Core/vtkCodedEntry.h +++ b/Libs/MRML/Core/vtkCodedEntry.h @@ -29,7 +29,7 @@ public: static vtkCodedEntry *New(); vtkTypeMacro(vtkCodedEntry, vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Reset state of object virtual void Initialize(); @@ -80,7 +80,7 @@ public: protected: vtkCodedEntry(); - ~vtkCodedEntry(); + ~vtkCodedEntry() override; vtkCodedEntry(const vtkCodedEntry&); void operator=(const vtkCodedEntry&); diff --git a/Libs/MRML/Core/vtkDataFileFormatHelper.h b/Libs/MRML/Core/vtkDataFileFormatHelper.h index 6ac11bd0193423f11dfcaf3849eaa374eb159ccf..7e74c1f2d0cdcbf859054b953f3194c5a8dc032b 100644 --- a/Libs/MRML/Core/vtkDataFileFormatHelper.h +++ b/Libs/MRML/Core/vtkDataFileFormatHelper.h @@ -23,7 +23,7 @@ class VTK_MRML_EXPORT vtkDataFileFormatHelper : public vtkObject /// The Usual vtk class functions static vtkDataFileFormatHelper *New(); vtkTypeMacro(vtkDataFileFormatHelper, vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; static std::string GetFileExtensionFromFormatString( const char* fileformat); @@ -44,7 +44,7 @@ class VTK_MRML_EXPORT vtkDataFileFormatHelper : public vtkObject protected: vtkDataFileFormatHelper(); - virtual ~vtkDataFileFormatHelper(); + ~vtkDataFileFormatHelper() override; vtkStringArray* SupportedWriteFileExtensions; vtkStringArray* SupportedWriteFileGenericNames; diff --git a/Libs/MRML/Core/vtkDataIOManager.h b/Libs/MRML/Core/vtkDataIOManager.h index 1bcd288436b6a5e79912880a7982650e19cefc1b..8a5d1b88f46b9ff7028a9f0f447516d7e569f6dc 100644 --- a/Libs/MRML/Core/vtkDataIOManager.h +++ b/Libs/MRML/Core/vtkDataIOManager.h @@ -24,7 +24,7 @@ class VTK_MRML_EXPORT vtkDataIOManager : public vtkObject /// The Usual vtk class functions static vtkDataIOManager *New(); vtkTypeMacro(vtkDataIOManager,vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; vtkGetObjectMacro ( DataTransferCollection, vtkCollection ); void SetDataTransferCollection(vtkCollection* dataTransfer ); vtkGetObjectMacro ( CacheManager, vtkCacheManager ); @@ -117,7 +117,7 @@ class VTK_MRML_EXPORT vtkDataIOManager : public vtkObject protected: vtkDataIOManager(); - virtual ~vtkDataIOManager(); + ~vtkDataIOManager() override; vtkDataIOManager(const vtkDataIOManager&); void operator=(const vtkDataIOManager&); diff --git a/Libs/MRML/Core/vtkDataTransfer.h b/Libs/MRML/Core/vtkDataTransfer.h index bb1ca2094712c73952764f683f62e2a60f6af31b..bf5c267d31622bd7ac84d5fc7f424e8e4bf94b34 100644 --- a/Libs/MRML/Core/vtkDataTransfer.h +++ b/Libs/MRML/Core/vtkDataTransfer.h @@ -15,7 +15,7 @@ class VTK_MRML_EXPORT vtkDataTransfer : public vtkObject /// The Usual vtk class functions static vtkDataTransfer *New(); vtkTypeMacro(vtkDataTransfer, vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; vtkGetStringMacro ( SourceURI ); vtkSetStringMacro ( SourceURI ); vtkGetStringMacro ( DestinationURI ); @@ -104,7 +104,7 @@ class VTK_MRML_EXPORT vtkDataTransfer : public vtkObject protected: vtkDataTransfer(); - virtual ~vtkDataTransfer(); + ~vtkDataTransfer() override; vtkDataTransfer(const vtkDataTransfer&); void operator=(const vtkDataTransfer&); diff --git a/Libs/MRML/Core/vtkEventBroker.h b/Libs/MRML/Core/vtkEventBroker.h index 99da230beafdc26f4b90e3e6cc748cb74b493971..ad7fd3266c6d1e4c9f56ae137d035087e32ea775 100644 --- a/Libs/MRML/Core/vtkEventBroker.h +++ b/Libs/MRML/Core/vtkEventBroker.h @@ -50,7 +50,7 @@ class VTK_MRML_EXPORT vtkEventBroker : public vtkObject { public: vtkTypeMacro(vtkEventBroker, vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; typedef std::set< vtkObservation * > ObservationVector; @@ -243,7 +243,7 @@ public: protected: vtkEventBroker(); - virtual ~vtkEventBroker(); + ~vtkEventBroker() override; vtkEventBroker(const vtkEventBroker&); void operator=(const vtkEventBroker&); diff --git a/Libs/MRML/Core/vtkITKTransformInverse.h b/Libs/MRML/Core/vtkITKTransformInverse.h index 7f281744328e1f71f24ffa915b5da03cf1abf639..77d22b45d418fae783f144ae185326d86ee0f0b8 100644 --- a/Libs/MRML/Core/vtkITKTransformInverse.h +++ b/Libs/MRML/Core/vtkITKTransformInverse.h @@ -51,40 +51,40 @@ namespace itk /** Define all computation methods as unimplemented to make sure they are not used (the inherited implementations are for the forward transform, so they would not give correct results) */ using Superclass::TransformPoint; - virtual typename Superclass::OutputPointType TransformPoint( - const typename Superclass::InputPointType&) const ITK_OVERRIDE + typename Superclass::OutputPointType TransformPoint( + const typename Superclass::InputPointType&) const override { itkExceptionMacro( "Only storage methods are implemented for InverseBSplineTransform" ); } - virtual void ComputeJacobianWithRespectToParameters( + void ComputeJacobianWithRespectToParameters( const typename Superclass::InputPointType &, - typename Superclass::JacobianType &) const ITK_OVERRIDE + typename Superclass::JacobianType &) const override { itkExceptionMacro( "Only storage methods are implemented for InverseBSplineTransform" ); } // Deprecated in ITKv5. It should be removed when ITK_LEGACY_REMOVE is set to ON. - virtual void ComputeJacobianWithRespectToPosition( + void ComputeJacobianWithRespectToPosition( const typename Superclass::InputPointType &, - typename Superclass::JacobianType &) const ITK_OVERRIDE + typename Superclass::JacobianType &) const override { itkExceptionMacro( "Only storage methods are implemented for InverseBSplineTransform" ); } - virtual void ComputeJacobianWithRespectToPosition( + void ComputeJacobianWithRespectToPosition( const typename Superclass::InputPointType &, - typename Superclass::JacobianPositionType &) const ITK_OVERRIDE + typename Superclass::JacobianPositionType &) const override { itkExceptionMacro( "Only storage methods are implemented for InverseBSplineTransform" ); } // Deprecated in ITKv5. It should be removed when ITK_LEGACY_REMOVE is set to ON. - virtual void ComputeInverseJacobianWithRespectToPosition( + void ComputeInverseJacobianWithRespectToPosition( const typename Superclass::InputPointType &, - typename Superclass::JacobianType &) const ITK_OVERRIDE + typename Superclass::JacobianType &) const override { itkExceptionMacro( "Only storage methods are implemented for InverseBSplineTransform" ); } - virtual void ComputeInverseJacobianWithRespectToPosition( + void ComputeInverseJacobianWithRespectToPosition( const typename Superclass::InputPointType &, - typename Superclass::InverseJacobianPositionType &) const ITK_OVERRIDE + typename Superclass::InverseJacobianPositionType &) const override { itkExceptionMacro( "Only storage methods are implemented for InverseBSplineTransform" ); } @@ -118,39 +118,39 @@ namespace itk /** Define all computation methods as unimplemented to make sure they are not used (the inherited implementations are for the forward transform, so they would not give correct results) */ using Superclass::TransformPoint; - virtual typename Superclass::OutputPointType TransformPoint( - const typename Superclass::InputPointType&) const ITK_OVERRIDE + typename Superclass::OutputPointType TransformPoint( + const typename Superclass::InputPointType&) const override { itkExceptionMacro( "Only storage methods are implemented for InverseBSplineTransform" ); } - virtual void ComputeJacobianWithRespectToParameters( + void ComputeJacobianWithRespectToParameters( const typename Superclass::InputPointType &, - typename Superclass::JacobianType &) const ITK_OVERRIDE + typename Superclass::JacobianType &) const override { itkExceptionMacro( "Only storage methods are implemented for InverseBSplineTransform" ); } // Deprecated in ITKv5. It should be removed when ITK_LEGACY_REMOVE is set to ON. - virtual void ComputeJacobianWithRespectToPosition( + void ComputeJacobianWithRespectToPosition( const typename Superclass::InputPointType &, - typename Superclass::JacobianType &) const ITK_OVERRIDE + typename Superclass::JacobianType &) const override { itkExceptionMacro( "Only storage methods are implemented for InverseBSplineTransform" ); } - virtual void ComputeJacobianWithRespectToPosition( + void ComputeJacobianWithRespectToPosition( const typename Superclass::InputPointType &, - typename Superclass::JacobianPositionType &) const ITK_OVERRIDE + typename Superclass::JacobianPositionType &) const override { itkExceptionMacro( "Only storage methods are implemented for InverseBSplineTransform" ); } - virtual void ComputeInverseJacobianWithRespectToPosition( + void ComputeInverseJacobianWithRespectToPosition( const typename Superclass::InputPointType &, - typename Superclass::JacobianType &) const ITK_OVERRIDE + typename Superclass::JacobianType &) const override { itkExceptionMacro( "Only storage methods are implemented for InverseBSplineTransform" ); } - virtual void ComputeInverseJacobianWithRespectToPosition( + void ComputeInverseJacobianWithRespectToPosition( const typename Superclass::InputPointType &, - typename Superclass::InverseJacobianPositionType &) const ITK_OVERRIDE + typename Superclass::InverseJacobianPositionType &) const override { itkExceptionMacro( "Only storage methods are implemented for InverseBSplineTransform" ); } @@ -177,66 +177,66 @@ namespace itk /** Define all computation methods as unimplemented to make sure they are not used (the inherited implementations are for the forward transform, so they would not give correct results) */ - virtual typename Superclass::OutputPointType TransformPoint( - const typename Superclass::InputPointType&) const ITK_OVERRIDE + typename Superclass::OutputPointType TransformPoint( + const typename Superclass::InputPointType&) const override { itkExceptionMacro( "Only storage methods are implemented for InverseDisplacementFieldTransform" ); } - virtual void ComputeJacobianWithRespectToParameters( + void ComputeJacobianWithRespectToParameters( const typename Superclass::InputPointType &, - typename Superclass::JacobianType &) const ITK_OVERRIDE + typename Superclass::JacobianType &) const override { itkExceptionMacro( "Only storage methods are implemented for InverseDisplacementFieldTransform" ); } - virtual void ComputeJacobianWithRespectToParameters( + void ComputeJacobianWithRespectToParameters( const typename Superclass::IndexType &, - typename Superclass::JacobianType &) const ITK_OVERRIDE + typename Superclass::JacobianType &) const override { itkExceptionMacro( "Only storage methods are implemented for InverseDisplacementFieldTransform" ); } // Deprecated in ITKv5. It should be removed when ITK_LEGACY_REMOVE is set to ON. - virtual void ComputeJacobianWithRespectToPosition( + void ComputeJacobianWithRespectToPosition( const typename Superclass::InputPointType &, - typename Superclass::JacobianType &) const ITK_OVERRIDE + typename Superclass::JacobianType &) const override { itkExceptionMacro( "Only storage methods are implemented for InverseDisplacementFieldTransform" ); } - virtual void ComputeJacobianWithRespectToPosition( + void ComputeJacobianWithRespectToPosition( const typename Superclass::InputPointType &, - typename Superclass::JacobianPositionType &) const ITK_OVERRIDE + typename Superclass::JacobianPositionType &) const override { itkExceptionMacro( "Only storage methods are implemented for InverseDisplacementFieldTransform" ); } - virtual void ComputeJacobianWithRespectToPosition( + void ComputeJacobianWithRespectToPosition( const typename Superclass::IndexType &, - typename Superclass::JacobianPositionType &) const ITK_OVERRIDE + typename Superclass::JacobianPositionType &) const override { itkExceptionMacro( "Only storage methods are implemented for InverseDisplacementFieldTransform" ); } - virtual void ComputeInverseJacobianWithRespectToPosition( + void ComputeInverseJacobianWithRespectToPosition( const typename Superclass::InputPointType &, - typename Superclass::JacobianType &) const ITK_OVERRIDE + typename Superclass::JacobianType &) const override { itkExceptionMacro( "Only storage methods are implemented for InverseDisplacementFieldTransform" ); } - virtual void ComputeInverseJacobianWithRespectToPosition( + void ComputeInverseJacobianWithRespectToPosition( const typename Superclass::InputPointType &, - typename Superclass::InverseJacobianPositionType &) const ITK_OVERRIDE + typename Superclass::InverseJacobianPositionType &) const override { itkExceptionMacro( "Only storage methods are implemented for InverseDisplacementFieldTransform" ); } - virtual void GetInverseJacobianOfForwardFieldWithRespectToPosition( + void GetInverseJacobianOfForwardFieldWithRespectToPosition( const typename Superclass::InputPointType &, typename Superclass::JacobianPositionType &, - bool useSVD = false ) const ITK_OVERRIDE + bool useSVD = false ) const override { (void)useSVD; // unused itkExceptionMacro( "Only storage methods are implemented for InverseDisplacementFieldTransform" ); } - virtual void GetInverseJacobianOfForwardFieldWithRespectToPosition( + void GetInverseJacobianOfForwardFieldWithRespectToPosition( const typename Superclass::IndexType &, typename Superclass::JacobianPositionType &, - bool useSVD = false ) const ITK_OVERRIDE + bool useSVD = false ) const override { (void)useSVD; // unused itkExceptionMacro( "Only storage methods are implemented for InverseDisplacementFieldTransform" ); @@ -263,45 +263,45 @@ namespace itk /** Define all computation methods as unimplemented to make sure they are not used (the inherited implementations are for the forward transform, so they would not give correct results) */ - virtual typename Superclass::OutputPointType TransformPoint( - const typename Superclass::InputPointType&) const ITK_OVERRIDE + typename Superclass::OutputPointType TransformPoint( + const typename Superclass::InputPointType&) const override { itkExceptionMacro( "Only storage methods are implemented for InverseThinPlateSplineKernelTransform" ); } - virtual void ComputeDeformationContribution(const typename Superclass::InputPointType &, - typename Superclass::OutputPointType &) const ITK_OVERRIDE + void ComputeDeformationContribution(const typename Superclass::InputPointType &, + typename Superclass::OutputPointType &) const override { itkExceptionMacro( "Only storage methods are implemented for InverseThinPlateSplineKernelTransform" ); } - virtual void ComputeJacobianWithRespectToParameters( + void ComputeJacobianWithRespectToParameters( const typename Superclass::InputPointType &, - typename Superclass::JacobianType &) const ITK_OVERRIDE + typename Superclass::JacobianType &) const override { itkExceptionMacro( "Only storage methods are implemented for InverseThinPlateSplineKernelTransform" ); } // Deprecated in ITKv5. It should be removed when ITK_LEGACY_REMOVE is set to ON. - virtual void ComputeJacobianWithRespectToPosition( + void ComputeJacobianWithRespectToPosition( const typename Superclass::InputPointType &, - typename Superclass::JacobianType &) const ITK_OVERRIDE + typename Superclass::JacobianType &) const override { itkExceptionMacro( "Only storage methods are implemented for InverseThinPlateSplineKernelTransform" ); } - virtual void ComputeJacobianWithRespectToPosition( + void ComputeJacobianWithRespectToPosition( const typename Superclass::InputPointType &, - typename Superclass::JacobianPositionType &) const ITK_OVERRIDE + typename Superclass::JacobianPositionType &) const override { itkExceptionMacro( "Only storage methods are implemented for InverseThinPlateSplineKernelTransform" ); } // Deprecated in ITKv5. It should be removed when ITK_LEGACY_REMOVE is set to ON. - virtual void ComputeInverseJacobianWithRespectToPosition( + void ComputeInverseJacobianWithRespectToPosition( const typename Superclass::InputPointType &, - typename Superclass::JacobianType &) const ITK_OVERRIDE + typename Superclass::JacobianType &) const override { itkExceptionMacro( "Only storage methods are implemented for InverseThinPlateSplineKernelTransform" ); } - virtual void ComputeInverseJacobianWithRespectToPosition( + void ComputeInverseJacobianWithRespectToPosition( const typename Superclass::InputPointType &, - typename Superclass::InverseJacobianPositionType &) const ITK_OVERRIDE + typename Superclass::InverseJacobianPositionType &) const override { itkExceptionMacro( "Only storage methods are implemented for InverseThinPlateSplineKernelTransform" ); } diff --git a/Libs/MRML/Core/vtkImageBimodalAnalysis.h b/Libs/MRML/Core/vtkImageBimodalAnalysis.h index 0f58d09045f02d00de081c7560327c4ad41d9c97..ac2c210c453609ddd57bc4ec5824d4a70eb6029d 100644 --- a/Libs/MRML/Core/vtkImageBimodalAnalysis.h +++ b/Libs/MRML/Core/vtkImageBimodalAnalysis.h @@ -36,7 +36,7 @@ class VTK_MRML_EXPORT vtkImageBimodalAnalysis : public vtkImageAlgorithm public: static vtkImageBimodalAnalysis *New(); vtkTypeMacro(vtkImageBimodalAnalysis,vtkImageAlgorithm); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// /// Set the type of data, if known @@ -70,7 +70,7 @@ public: protected: vtkImageBimodalAnalysis(); - ~vtkImageBimodalAnalysis() {}; + ~vtkImageBimodalAnalysis() override {}; int Modality; @@ -84,8 +84,8 @@ protected: int Offset; - virtual int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE; - void ExecuteDataWithInformation(vtkDataObject *, vtkInformation*) VTK_OVERRIDE; + int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override; + void ExecuteDataWithInformation(vtkDataObject *, vtkInformation*) override; private: vtkImageBimodalAnalysis(const vtkImageBimodalAnalysis&); diff --git a/Libs/MRML/Core/vtkMRMLAbstractLayoutNode.h b/Libs/MRML/Core/vtkMRMLAbstractLayoutNode.h index 5a13a85a4b9c99c84b528e6e098a26edc0b068dc..565c85de3c56c26b47042b8cc6c9d4c62cf8fffa 100644 --- a/Libs/MRML/Core/vtkMRMLAbstractLayoutNode.h +++ b/Libs/MRML/Core/vtkMRMLAbstractLayoutNode.h @@ -34,20 +34,20 @@ class VTK_MRML_EXPORT vtkMRMLAbstractLayoutNode : public vtkMRMLNode { public: vtkTypeMacro(vtkMRMLAbstractLayoutNode,vtkMRMLNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Set node attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; protected: vtkMRMLAbstractLayoutNode(); - ~vtkMRMLAbstractLayoutNode(); + ~vtkMRMLAbstractLayoutNode() override; vtkMRMLAbstractLayoutNode(const vtkMRMLAbstractLayoutNode&); void operator=(const vtkMRMLAbstractLayoutNode&); diff --git a/Libs/MRML/Core/vtkMRMLAbstractViewNode.h b/Libs/MRML/Core/vtkMRMLAbstractViewNode.h index 133c02b9bb8dd16b516262605ad960d0735c8644..626d2c7b9c528c375fa410eb8cd9fa3c1b12b445 100644 --- a/Libs/MRML/Core/vtkMRMLAbstractViewNode.h +++ b/Libs/MRML/Core/vtkMRMLAbstractViewNode.h @@ -39,24 +39,24 @@ class VTK_MRML_EXPORT vtkMRMLAbstractViewNode { public: vtkTypeMacro(vtkMRMLAbstractViewNode,vtkMRMLNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; //-------------------------------------------------------------------------- /// MRMLNode methods //-------------------------------------------------------------------------- /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// \brief Reimplemented to preserve layout label when reset. /// \sa GetLayoutLabel() - virtual void Reset(vtkMRMLNode* defaultNode) VTK_OVERRIDE; + void Reset(vtkMRMLNode* defaultNode) override; /// Name of the layout. Must be unique between all the view nodes of the /// same type because it is used as a singleton tag. @@ -261,7 +261,7 @@ public: protected: vtkMRMLAbstractViewNode(); - ~vtkMRMLAbstractViewNode(); + ~vtkMRMLAbstractViewNode() override; vtkMRMLAbstractViewNode(const vtkMRMLAbstractViewNode&); void operator=(const vtkMRMLAbstractViewNode&); diff --git a/Libs/MRML/Core/vtkMRMLBSplineTransformNode.h b/Libs/MRML/Core/vtkMRMLBSplineTransformNode.h index cdf6f05a25888ddd60aa6dbeacef271fd76bd0a7..cb1ea3d33e54fb1851255e25ed299f1b96c9629d 100644 --- a/Libs/MRML/Core/vtkMRMLBSplineTransformNode.h +++ b/Libs/MRML/Core/vtkMRMLBSplineTransformNode.h @@ -29,36 +29,36 @@ class VTK_MRML_EXPORT vtkMRMLBSplineTransformNode : public vtkMRMLTransformNode public: static vtkMRMLBSplineTransformNode *New(); vtkTypeMacro(vtkMRMLBSplineTransformNode,vtkMRMLTransformNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "BSplineTransform";}; + const char* GetNodeTagName() override {return "BSplineTransform";}; /// /// Create default storage node or NULL if does not have one - virtual vtkMRMLStorageNode* CreateDefaultStorageNode() VTK_OVERRIDE + vtkMRMLStorageNode* CreateDefaultStorageNode() override { return Superclass::CreateDefaultStorageNode(); }; protected: vtkMRMLBSplineTransformNode(); - ~vtkMRMLBSplineTransformNode(); + ~vtkMRMLBSplineTransformNode() override; vtkMRMLBSplineTransformNode(const vtkMRMLBSplineTransformNode&); void operator=(const vtkMRMLBSplineTransformNode&); diff --git a/Libs/MRML/Core/vtkMRMLCameraNode.h b/Libs/MRML/Core/vtkMRMLCameraNode.h index 522cbf18a35fb2b7d7690094291a270976da0750..21888761d3d18bf71d86ea588e842b67d9351acb 100644 --- a/Libs/MRML/Core/vtkMRMLCameraNode.h +++ b/Libs/MRML/Core/vtkMRMLCameraNode.h @@ -31,30 +31,30 @@ class VTK_MRML_EXPORT vtkMRMLCameraNode : public vtkMRMLTransformableNode public: static vtkMRMLCameraNode *New(); vtkTypeMacro(vtkMRMLCameraNode,vtkMRMLTransformableNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; //-------------------------------------------------------------------------- /// MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode* node) VTK_OVERRIDE; + void Copy(vtkMRMLNode* node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "Camera";}; + const char* GetNodeTagName() override {return "Camera";}; /// /// Set the camera active tag, i.e. the tag for which object (view) this @@ -133,9 +133,9 @@ public: /// /// alternative method to propagate events generated in Camera nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; /// This is the transform that was last applied /// to the position, focal point, and up vector @@ -154,16 +154,16 @@ public: }; /// Mark the active tag node as references. - virtual void SetSceneReferences() VTK_OVERRIDE; + void SetSceneReferences() override; /// /// Updates this node if it depends on other nodes /// when the node is deleted in the scene - virtual void UpdateReferences() VTK_OVERRIDE; + void UpdateReferences() override; /// /// Update the stored reference to another node in the scene - virtual void UpdateReferenceID(const char* oldID, const char* newID) VTK_OVERRIDE; + void UpdateReferenceID(const char* oldID, const char* newID) override; /// Reset the clipping range just based on its position and focal point void ResetClippingRange(); @@ -250,7 +250,7 @@ public: protected: vtkMRMLCameraNode(); - ~vtkMRMLCameraNode(); + ~vtkMRMLCameraNode() override; vtkMRMLCameraNode(const vtkMRMLCameraNode&); void operator=(const vtkMRMLCameraNode&); diff --git a/Libs/MRML/Core/vtkMRMLChartNode.h b/Libs/MRML/Core/vtkMRMLChartNode.h index 13cb87abea4fa9a92f86aa82b6c4f39d5a1c46cd..eefbcde08fcb3785277e9b1fda8b4c8938380ee1 100644 --- a/Libs/MRML/Core/vtkMRMLChartNode.h +++ b/Libs/MRML/Core/vtkMRMLChartNode.h @@ -41,30 +41,30 @@ class VTK_MRML_EXPORT vtkMRMLChartNode : public vtkMRMLNode static vtkMRMLChartNode *New(); vtkTypeMacro(vtkMRMLChartNode,vtkMRMLNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Set node attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE + const char* GetNodeTagName() override {return "Chart";} /// /// Method to propagate events generated in mrml - virtual void ProcessMRMLEvents ( vtkObject *caller, unsigned long event, void *callData ) VTK_OVERRIDE; + void ProcessMRMLEvents ( vtkObject *caller, unsigned long event, void *callData ) override; //---------------------------------------------------------------- /// Access methods @@ -158,23 +158,23 @@ class VTK_MRML_EXPORT vtkMRMLChartNode : public vtkMRMLNode /// Updates this node if it depends on other nodes /// when the node is deleted in the scene - virtual void SetSceneReferences() VTK_OVERRIDE; + void SetSceneReferences() override; /// /// Updates this node if it depends on other nodes /// when the node is deleted in the scene - virtual void UpdateReferences() VTK_OVERRIDE; + void UpdateReferences() override; /// /// Update the stored reference to another node in the scene - virtual void UpdateReferenceID(const char *oldID, const char *newID) VTK_OVERRIDE; + void UpdateReferenceID(const char *oldID, const char *newID) override; protected: //---------------------------------------------------------------- /// Constructor and destroctor //---------------------------------------------------------------- vtkMRMLChartNode(); - ~vtkMRMLChartNode(); + ~vtkMRMLChartNode() override; vtkMRMLChartNode(const vtkMRMLChartNode&); void operator=(const vtkMRMLChartNode&); diff --git a/Libs/MRML/Core/vtkMRMLChartViewNode.h b/Libs/MRML/Core/vtkMRMLChartViewNode.h index c0ae824e0b0e1a832fb75c72954f3069b84b5ace..e760cab93bb52b288afe277ee02d8d50600533be 100644 --- a/Libs/MRML/Core/vtkMRMLChartViewNode.h +++ b/Libs/MRML/Core/vtkMRMLChartViewNode.h @@ -25,30 +25,30 @@ class VTK_MRML_EXPORT vtkMRMLChartViewNode : public vtkMRMLAbstractViewNode public: static vtkMRMLChartViewNode *New(); vtkTypeMacro(vtkMRMLChartViewNode, vtkMRMLAbstractViewNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; //-------------------------------------------------------------------------- /// MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE; + const char* GetNodeTagName() override; /// /// Set the Chart node id displayed in this Chart View @@ -61,11 +61,11 @@ public: /// /// Updates this node if it depends on other nodes /// when the node is deleted in the scene - virtual void UpdateReferences() VTK_OVERRIDE; + void UpdateReferences() override; /// /// Update the stored reference to another node in the scene - virtual void UpdateReferenceID(const char *oldID, const char *newID) VTK_OVERRIDE; + void UpdateReferenceID(const char *oldID, const char *newID) override; /// /// Events @@ -76,7 +76,7 @@ public: protected: vtkMRMLChartViewNode(); - ~vtkMRMLChartViewNode(); + ~vtkMRMLChartViewNode() override; vtkMRMLChartViewNode(const vtkMRMLChartViewNode&); void operator=(const vtkMRMLChartViewNode&); diff --git a/Libs/MRML/Core/vtkMRMLClipModelsNode.h b/Libs/MRML/Core/vtkMRMLClipModelsNode.h index 06e8e4e1c6282808b65f18a680f324fcbba3eb60..2d1d4454dc6380c178aff0a9e4ad4871f385cfa3 100644 --- a/Libs/MRML/Core/vtkMRMLClipModelsNode.h +++ b/Libs/MRML/Core/vtkMRMLClipModelsNode.h @@ -28,30 +28,30 @@ class VTK_MRML_EXPORT vtkMRMLClipModelsNode : public vtkMRMLNode public: static vtkMRMLClipModelsNode *New(); vtkTypeMacro(vtkMRMLClipModelsNode,vtkMRMLNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; //-------------------------------------------------------------------------- /// MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "ClipModels";} + const char* GetNodeTagName() override {return "ClipModels";} /// /// Indicates the type of clipping @@ -109,7 +109,7 @@ public: protected: vtkMRMLClipModelsNode(); - ~vtkMRMLClipModelsNode(); + ~vtkMRMLClipModelsNode() override; vtkMRMLClipModelsNode(const vtkMRMLClipModelsNode&); void operator=(const vtkMRMLClipModelsNode&); diff --git a/Libs/MRML/Core/vtkMRMLColorNode.h b/Libs/MRML/Core/vtkMRMLColorNode.h index 879ca70e2e478583cabac7c4bb1a644291e7e3bb..3bb3fcd59fe924c223b831f619879cd51c026b2a 100644 --- a/Libs/MRML/Core/vtkMRMLColorNode.h +++ b/Libs/MRML/Core/vtkMRMLColorNode.h @@ -49,38 +49,38 @@ class VTK_MRML_EXPORT vtkMRMLColorNode : public vtkMRMLStorableNode public: static vtkMRMLColorNode *New(); vtkTypeMacro(vtkMRMLColorNode,vtkMRMLStorableNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; //-------------------------------------------------------------------------- /// MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Set node attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "Color";}; + const char* GetNodeTagName() override {return "Color";}; /// /// Reset node attributes to the initilal state as defined in the constructor. /// NOTE: it preserves values several dynamic attributes that may be set by an application: type, name - virtual void Reset(vtkMRMLNode* defaultNode) VTK_OVERRIDE; + void Reset(vtkMRMLNode* defaultNode) override; /// /// - virtual void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; /// /// Set Type to type, then build colours and set names @@ -94,7 +94,7 @@ public: void SetTypeToUser(); void SetTypeToFile(); - void ProcessMRMLEvents ( vtkObject *caller, unsigned long event, void *callData ) VTK_OVERRIDE; + void ProcessMRMLEvents ( vtkObject *caller, unsigned long event, void *callData ) override; /// Return the lowest and highest integers, for use in looping. /// Override in subclasses when more enums are added. @@ -186,7 +186,7 @@ public: void SetNamesFromColors(); /// \sa vtkMRMLStorableNode::GetModifiedSinceRead() - virtual bool GetModifiedSinceRead() VTK_OVERRIDE; + bool GetModifiedSinceRead() override; /// The list of valid color node types, added to in subclasses /// For backward compatibility, User and File keep the numbers that @@ -202,7 +202,7 @@ public: protected: vtkMRMLColorNode(); - virtual ~vtkMRMLColorNode(); + ~vtkMRMLColorNode() override; vtkMRMLColorNode(const vtkMRMLColorNode&); void operator=(const vtkMRMLColorNode&); diff --git a/Libs/MRML/Core/vtkMRMLColorTableNode.h b/Libs/MRML/Core/vtkMRMLColorTableNode.h index a671215c1b159cb58882c79abd2c3365b2f01af8..f81e0f805e779547e8949ecabd85237b9307bbbe 100644 --- a/Libs/MRML/Core/vtkMRMLColorTableNode.h +++ b/Libs/MRML/Core/vtkMRMLColorTableNode.h @@ -28,33 +28,33 @@ class VTK_MRML_EXPORT vtkMRMLColorTableNode : public vtkMRMLColorNode public: static vtkMRMLColorTableNode *New(); vtkTypeMacro(vtkMRMLColorTableNode,vtkMRMLColorNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; //-------------------------------------------------------------------------- /// MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Set node attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "ColorTable";} + const char* GetNodeTagName() override {return "ColorTable";} /// Access lookup table object that stores table values. /// \sa SetAndObserveLookupTable() - vtkLookupTable* GetLookupTable() VTK_OVERRIDE; + vtkLookupTable* GetLookupTable() override; /// Set lookup table object that this object will use. /// \sa GetLookupTable() @@ -70,7 +70,7 @@ public: /// /// Get/Set for Type - void SetType(int type) VTK_OVERRIDE; + void SetType(int type) override; //GetType is defined in ColorTableNode class via macro. void SetTypeToFullRainbow(); void SetTypeToGrey(); @@ -110,7 +110,7 @@ public: void SetTypeToCoolTint3(); - void ProcessMRMLEvents ( vtkObject *caller, unsigned long event, void *callData ) VTK_OVERRIDE; + void ProcessMRMLEvents ( vtkObject *caller, unsigned long event, void *callData ) override; /// /// The list of valid table types @@ -185,12 +185,12 @@ public: /// /// Return the lowest and highest integers, for use in looping - int GetFirstType () VTK_OVERRIDE { return this->FullRainbow; }; - int GetLastType () VTK_OVERRIDE { return this->CoolTint3; }; + int GetFirstType () override { return this->FullRainbow; }; + int GetLastType () override { return this->CoolTint3; }; /// /// return a text string describing the colour look up table type - virtual const char * GetTypeAsString() VTK_OVERRIDE; + const char * GetTypeAsString() override; /// /// Set the size of the colour table if it's a User table @@ -198,7 +198,7 @@ public: /// /// Set the size of the colour table if it's a User table - virtual int GetNumberOfColors() VTK_OVERRIDE; + int GetNumberOfColors() override; /// /// keep track of where we last added a colour @@ -219,7 +219,7 @@ public: /// Retrieve the color associated to the index /// Return true if the color exists, false otherwise - virtual bool GetColor(int entry, double color[4]) VTK_OVERRIDE; + bool GetColor(int entry, double color[4]) override; /// /// clear out the names list @@ -227,15 +227,15 @@ public: /// /// reset when close the scene - virtual void Reset(vtkMRMLNode* defaultNode) VTK_OVERRIDE; + void Reset(vtkMRMLNode* defaultNode) override; /// /// Create default storage node or NULL if does not have one - virtual vtkMRMLStorageNode* CreateDefaultStorageNode() VTK_OVERRIDE; + vtkMRMLStorageNode* CreateDefaultStorageNode() override; protected: vtkMRMLColorTableNode(); - virtual ~vtkMRMLColorTableNode(); + ~vtkMRMLColorTableNode() override; vtkMRMLColorTableNode(const vtkMRMLColorTableNode&); void operator=(const vtkMRMLColorTableNode&); diff --git a/Libs/MRML/Core/vtkMRMLColorTableStorageNode.h b/Libs/MRML/Core/vtkMRMLColorTableStorageNode.h index ac2067a21444f6ed79a8c9b4cd3f02fa2e3fadd2..dae5b134a3f33a03307ecc140110689b79705866 100644 --- a/Libs/MRML/Core/vtkMRMLColorTableStorageNode.h +++ b/Libs/MRML/Core/vtkMRMLColorTableStorageNode.h @@ -26,33 +26,33 @@ class VTK_MRML_EXPORT vtkMRMLColorTableStorageNode : public vtkMRMLStorageNode public: static vtkMRMLColorTableStorageNode *New(); vtkTypeMacro(vtkMRMLColorTableStorageNode,vtkMRMLStorageNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Get node XML tag name (like Storage, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "ColorTableStorage";}; + const char* GetNodeTagName() override {return "ColorTableStorage";}; /// Return true if the node can be read in - virtual bool CanReadInReferenceNode(vtkMRMLNode* refNode) VTK_OVERRIDE; + bool CanReadInReferenceNode(vtkMRMLNode* refNode) override; protected: vtkMRMLColorTableStorageNode(); - ~vtkMRMLColorTableStorageNode(); + ~vtkMRMLColorTableStorageNode() override; vtkMRMLColorTableStorageNode(const vtkMRMLColorTableStorageNode&); void operator=(const vtkMRMLColorTableStorageNode&); /// Initialize all the supported read file types - virtual void InitializeSupportedReadFileTypes() VTK_OVERRIDE; + void InitializeSupportedReadFileTypes() override; /// Initialize all the supported write file types - virtual void InitializeSupportedWriteFileTypes() VTK_OVERRIDE; + void InitializeSupportedWriteFileTypes() override; /// Read data and set it in the referenced node - virtual int ReadDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int ReadDataInternal(vtkMRMLNode *refNode) override; /// Write data from a referenced node - virtual int WriteDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int WriteDataInternal(vtkMRMLNode *refNode) override; /// maximum valid number of colours to read in int MaximumColorID; diff --git a/Libs/MRML/Core/vtkMRMLCoreTestingUtilities.h b/Libs/MRML/Core/vtkMRMLCoreTestingUtilities.h index f70d649b75ac0447cf22eae30644ea85ad650f9a..72fdc870910aa01f134cdd8356a792a9c83a3ec9 100644 --- a/Libs/MRML/Core/vtkMRMLCoreTestingUtilities.h +++ b/Libs/MRML/Core/vtkMRMLCoreTestingUtilities.h @@ -117,9 +117,9 @@ class VTK_MRML_EXPORT vtkMRMLNodeCallback : public vtkCallbackCommand { public: static vtkMRMLNodeCallback *New() {return new vtkMRMLNodeCallback;} - void PrintSelf(ostream& os, vtkIndent indent); + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual void Execute(vtkObject* caller, unsigned long eid, void *callData); + void Execute(vtkObject* caller, unsigned long eid, void *callData) override; virtual void ResetNumberOfEvents(); void SetMRMLNode(vtkMRMLNode*); @@ -135,7 +135,7 @@ public: protected: vtkMRMLNodeCallback(); - ~vtkMRMLNodeCallback(); + ~vtkMRMLNodeCallback() override; void SetErrorString(const char* error); diff --git a/Libs/MRML/Core/vtkMRMLCrosshairNode.h b/Libs/MRML/Core/vtkMRMLCrosshairNode.h index 548538ae42798d22f72ac44d9939deb27b1e015b..c92405b70cdb3aad01fc3db53add87008c2be3b5 100644 --- a/Libs/MRML/Core/vtkMRMLCrosshairNode.h +++ b/Libs/MRML/Core/vtkMRMLCrosshairNode.h @@ -27,7 +27,7 @@ class VTK_MRML_EXPORT vtkMRMLCrosshairNode : public vtkMRMLNode public: static vtkMRMLCrosshairNode *New(); vtkTypeMacro(vtkMRMLCrosshairNode,vtkMRMLNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// CursorPositionModifiedEvent is invoked when the cursor position is modified, /// for example a mouse pointer is moved in a slice view. @@ -36,23 +36,23 @@ class VTK_MRML_EXPORT vtkMRMLCrosshairNode : public vtkMRMLNode CursorPositionModifiedEvent = 22000 }; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Set node attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "Crosshair";}; + const char* GetNodeTagName() override {return "Crosshair";}; /// /// configures the crosshair appearance and behavior @@ -153,7 +153,7 @@ class VTK_MRML_EXPORT vtkMRMLCrosshairNode : public vtkMRMLNode protected: vtkMRMLCrosshairNode(); - ~vtkMRMLCrosshairNode(); + ~vtkMRMLCrosshairNode() override; vtkMRMLCrosshairNode(const vtkMRMLCrosshairNode&); void operator=(const vtkMRMLCrosshairNode&); diff --git a/Libs/MRML/Core/vtkMRMLDiffusionImageVolumeNode.h b/Libs/MRML/Core/vtkMRMLDiffusionImageVolumeNode.h index 2c05f5c7a928528aeee700d9e47ae845d70b7874..d80f42f703090fb8291250fb4489bfe0fa344383 100644 --- a/Libs/MRML/Core/vtkMRMLDiffusionImageVolumeNode.h +++ b/Libs/MRML/Core/vtkMRMLDiffusionImageVolumeNode.h @@ -32,25 +32,25 @@ class VTK_MRML_EXPORT vtkMRMLDiffusionImageVolumeNode : public vtkMRMLTensorVolu public: static vtkMRMLDiffusionImageVolumeNode *New(); vtkTypeMacro(vtkMRMLDiffusionImageVolumeNode,vtkMRMLTensorVolumeNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Set node attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "DiffusionImageVolume";} + const char* GetNodeTagName() override {return "DiffusionImageVolume";} /// Description: /// String ID of the storage MRML node @@ -85,7 +85,7 @@ class VTK_MRML_EXPORT vtkMRMLDiffusionImageVolumeNode : public vtkMRMLTensorVolu /// /// Update the stored reference to another node in the scene - virtual void UpdateReferenceID(const char *oldID, const char *newID) VTK_OVERRIDE; + void UpdateReferenceID(const char *oldID, const char *newID) override; /// /// Finds the storage node and read the data @@ -94,25 +94,25 @@ class VTK_MRML_EXPORT vtkMRMLDiffusionImageVolumeNode : public vtkMRMLTensorVolu /// /// Updates this node if it depends on other nodes /// when the node is deleted in the scene - void UpdateReferences() VTK_OVERRIDE; + void UpdateReferences() override; /// /// alternative method to propagate events generated in Display nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; /// /// Create default storage node or NULL if does not have one - virtual vtkMRMLStorageNode* CreateDefaultStorageNode() VTK_OVERRIDE + vtkMRMLStorageNode* CreateDefaultStorageNode() override { return Superclass::CreateDefaultStorageNode(); } protected: vtkMRMLDiffusionImageVolumeNode(); - ~vtkMRMLDiffusionImageVolumeNode(); + ~vtkMRMLDiffusionImageVolumeNode() override; vtkMRMLDiffusionImageVolumeNode(const vtkMRMLDiffusionImageVolumeNode&); void operator=(const vtkMRMLDiffusionImageVolumeNode&); diff --git a/Libs/MRML/Core/vtkMRMLDiffusionTensorDisplayPropertiesNode.h b/Libs/MRML/Core/vtkMRMLDiffusionTensorDisplayPropertiesNode.h index ba9b4bb61dfcfdbbd90875d921c2bc9bb8bf6b00..5f2079620ac9147b9f72c9035a3663a76498b041 100644 --- a/Libs/MRML/Core/vtkMRMLDiffusionTensorDisplayPropertiesNode.h +++ b/Libs/MRML/Core/vtkMRMLDiffusionTensorDisplayPropertiesNode.h @@ -37,29 +37,29 @@ class VTK_MRML_EXPORT vtkMRMLDiffusionTensorDisplayPropertiesNode : public vtkMR public: static vtkMRMLDiffusionTensorDisplayPropertiesNode *New(); vtkTypeMacro(vtkMRMLDiffusionTensorDisplayPropertiesNode,vtkMRMLColorTableNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; //-------------------------------------------------------------------------- /// MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Read node attributes from a MRML file in XML format. - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object. - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "DiffusionTensorDisplayProperties";} + const char* GetNodeTagName() override {return "DiffusionTensorDisplayProperties";} //-------------------------------------------------------------------------- /// Display Information: Types of scalars that may be generated from tensors. @@ -448,13 +448,13 @@ class VTK_MRML_EXPORT vtkMRMLDiffusionTensorDisplayPropertiesNode : public vtkMR /// /// Create default storage node or NULL if does not have one - virtual vtkMRMLStorageNode* CreateDefaultStorageNode() VTK_OVERRIDE { + vtkMRMLStorageNode* CreateDefaultStorageNode() override { return 0; } protected: vtkMRMLDiffusionTensorDisplayPropertiesNode(); - ~vtkMRMLDiffusionTensorDisplayPropertiesNode(); + ~vtkMRMLDiffusionTensorDisplayPropertiesNode() override; vtkMRMLDiffusionTensorDisplayPropertiesNode(const vtkMRMLDiffusionTensorDisplayPropertiesNode&); void operator=(const vtkMRMLDiffusionTensorDisplayPropertiesNode&); diff --git a/Libs/MRML/Core/vtkMRMLDiffusionTensorVolumeDisplayNode.h b/Libs/MRML/Core/vtkMRMLDiffusionTensorVolumeDisplayNode.h index d3e0be260a44e60d029561d46efb0c3a2324989d..18e5b7e91de2799bb14dcc296d92e6504a8f7d46 100644 --- a/Libs/MRML/Core/vtkMRMLDiffusionTensorVolumeDisplayNode.h +++ b/Libs/MRML/Core/vtkMRMLDiffusionTensorVolumeDisplayNode.h @@ -42,46 +42,46 @@ class VTK_MRML_EXPORT vtkMRMLDiffusionTensorVolumeDisplayNode : public vtkMRMLGl public: static vtkMRMLDiffusionTensorVolumeDisplayNode *New(); vtkTypeMacro(vtkMRMLDiffusionTensorVolumeDisplayNode,vtkMRMLGlyphableVolumeDisplayNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Set node attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "DiffusionTensorVolumeDisplay";} + const char* GetNodeTagName() override {return "DiffusionTensorVolumeDisplay";} //virtual vtkPolyData* ExecuteGlyphPipeLineAndGetPolyData( vtkImageData* ); /// /// Updates this node if it depends on other nodes /// when the node is deleted in the scene - virtual void UpdateReferences() VTK_OVERRIDE; + void UpdateReferences() override; /// /// Finds the storage node and read the data - virtual void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; /// /// Update the stored reference to another node in the scene - virtual void UpdateReferenceID(const char *oldID, const char *newID) VTK_OVERRIDE; + void UpdateReferenceID(const char *oldID, const char *newID) override; /// /// alternative method to propagate events generated in Display nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; //-------------------------------------------------------------------------- /// Display Information @@ -145,14 +145,14 @@ class VTK_MRML_EXPORT vtkMRMLDiffusionTensorVolumeDisplayNode : public vtkMRMLGl }; /// Get the input of the pipeline - virtual vtkAlgorithmOutput* GetInputImageDataConnection() VTK_OVERRIDE; + vtkAlgorithmOutput* GetInputImageDataConnection() override; /// /// Get background mask stencil /// Reimplemented to return 0 when the background mask is not used. - virtual vtkAlgorithmOutput* GetBackgroundImageStencilDataConnection() VTK_OVERRIDE; + vtkAlgorithmOutput* GetBackgroundImageStencilDataConnection() override; - virtual void UpdateImageDataPipeline() VTK_OVERRIDE; + void UpdateImageDataPipeline() override; vtkGetObjectMacro(DTIMathematics, vtkDiffusionTensorMathematics); vtkGetObjectMacro(DTIMathematicsAlpha, vtkDiffusionTensorMathematics); @@ -161,31 +161,31 @@ class VTK_MRML_EXPORT vtkMRMLDiffusionTensorVolumeDisplayNode : public vtkMRMLGl /// /// get associated slice glyph display node or NULL if not set - virtual std::vector< vtkMRMLGlyphableVolumeSliceDisplayNode*> GetSliceGlyphDisplayNodes( vtkMRMLVolumeNode* node ) VTK_OVERRIDE; + std::vector< vtkMRMLGlyphableVolumeSliceDisplayNode*> GetSliceGlyphDisplayNodes( vtkMRMLVolumeNode* node ) override; /// /// add slice glyph display nodes if not already present and return it - virtual void AddSliceGlyphDisplayNodes( vtkMRMLVolumeNode* node ) VTK_OVERRIDE; + void AddSliceGlyphDisplayNodes( vtkMRMLVolumeNode* node ) override; /// /// Defines the expected range of the output data for given imageData after /// having been mapped through the current display options - virtual void GetDisplayScalarRange(double range[2]) VTK_OVERRIDE; + void GetDisplayScalarRange(double range[2]) override; static int GetNumberOfScalarInvariants(); static int GetNthScalarInvariant(int i); protected: vtkMRMLDiffusionTensorVolumeDisplayNode(); - ~vtkMRMLDiffusionTensorVolumeDisplayNode(); + ~vtkMRMLDiffusionTensorVolumeDisplayNode() override; vtkMRMLDiffusionTensorVolumeDisplayNode(const vtkMRMLDiffusionTensorVolumeDisplayNode&); void operator=(const vtkMRMLDiffusionTensorVolumeDisplayNode&); /// Set the input of the pipeline - virtual void SetInputToImageDataPipeline(vtkAlgorithmOutput *imageDataConnection) VTK_OVERRIDE; + void SetInputToImageDataPipeline(vtkAlgorithmOutput *imageDataConnection) override; - virtual vtkAlgorithmOutput* GetScalarImageDataConnection() VTK_OVERRIDE; + vtkAlgorithmOutput* GetScalarImageDataConnection() override; static std::vector GetSupportedColorModes(); diff --git a/Libs/MRML/Core/vtkMRMLDiffusionTensorVolumeNode.h b/Libs/MRML/Core/vtkMRMLDiffusionTensorVolumeNode.h index a21f19b1542449baf7f68d600499a144ba4c8c2f..f3a3ff481bfcf53195ba0935f641ad648dd11267 100644 --- a/Libs/MRML/Core/vtkMRMLDiffusionTensorVolumeNode.h +++ b/Libs/MRML/Core/vtkMRMLDiffusionTensorVolumeNode.h @@ -33,12 +33,12 @@ class VTK_MRML_EXPORT vtkMRMLDiffusionTensorVolumeNode : public vtkMRMLDiffusion public: static vtkMRMLDiffusionTensorVolumeNode *New(); vtkTypeMacro(vtkMRMLDiffusionTensorVolumeNode,vtkMRMLDiffusionImageVolumeNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE { return "DiffusionTensorVolume"; } + const char* GetNodeTagName() override { return "DiffusionTensorVolume"; } /// Associated volume display MRML node virtual void SetAndObserveDisplayNodeID(const char *DisplayNodeID); @@ -47,14 +47,14 @@ class VTK_MRML_EXPORT vtkMRMLDiffusionTensorVolumeNode : public vtkMRMLDiffusion virtual vtkMRMLDiffusionTensorVolumeDisplayNode* GetDiffusionTensorVolumeDisplayNode(); /// Create default storage node or NULL if does not have one - virtual vtkMRMLStorageNode* CreateDefaultStorageNode() VTK_OVERRIDE; + vtkMRMLStorageNode* CreateDefaultStorageNode() override; /// Create and observe default display node - virtual void CreateDefaultDisplayNodes() VTK_OVERRIDE; + void CreateDefaultDisplayNodes() override; protected: vtkMRMLDiffusionTensorVolumeNode(); - ~vtkMRMLDiffusionTensorVolumeNode(); + ~vtkMRMLDiffusionTensorVolumeNode() override; vtkMRMLDiffusionTensorVolumeNode(const vtkMRMLDiffusionTensorVolumeNode&); void operator=(const vtkMRMLDiffusionTensorVolumeNode&); diff --git a/Libs/MRML/Core/vtkMRMLDiffusionTensorVolumeSliceDisplayNode.h b/Libs/MRML/Core/vtkMRMLDiffusionTensorVolumeSliceDisplayNode.h index 5d5095a2eb9294a339fa4ca285b60f20cc1120ae..f4516d588ec0a18ac4f0276761ffb6e522812009 100644 --- a/Libs/MRML/Core/vtkMRMLDiffusionTensorVolumeSliceDisplayNode.h +++ b/Libs/MRML/Core/vtkMRMLDiffusionTensorVolumeSliceDisplayNode.h @@ -34,69 +34,69 @@ class VTK_MRML_EXPORT vtkMRMLDiffusionTensorVolumeSliceDisplayNode public: static vtkMRMLDiffusionTensorVolumeSliceDisplayNode *New ( ); vtkTypeMacro ( vtkMRMLDiffusionTensorVolumeSliceDisplayNode,vtkMRMLGlyphableVolumeSliceDisplayNode ); - void PrintSelf ( ostream& os, vtkIndent indent ) VTK_OVERRIDE; + void PrintSelf ( ostream& os, vtkIndent indent ) override; //-------------------------------------------------------------------------- /// MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance () VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance () override; /// /// Read node attributes from XML (MRML) file - virtual void ReadXMLAttributes ( const char** atts ) VTK_OVERRIDE; + void ReadXMLAttributes ( const char** atts ) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML ( ostream& of, int indent ) VTK_OVERRIDE; + void WriteXML ( ostream& of, int indent ) override; /// /// Copy the node's attributes to this object - virtual void Copy ( vtkMRMLNode *node ) VTK_OVERRIDE; + void Copy ( vtkMRMLNode *node ) override; /// /// Get node XML tag name (like Volume, UnstructuredGrid) - virtual const char* GetNodeTagName () VTK_OVERRIDE {return "DiffusionTensorVolumeSliceDisplayNode";} + const char* GetNodeTagName () override {return "DiffusionTensorVolumeSliceDisplayNode";} /// /// Updates this node if it depends on other nodes /// when the node is deleted in the scene - virtual void UpdateReferences() VTK_OVERRIDE; + void UpdateReferences() override; /// /// Finds the storage node and read the data - virtual void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; /// /// Update the stored reference to another node in the scene - virtual void UpdateReferenceID(const char *oldID, const char *newID) VTK_OVERRIDE; + void UpdateReferenceID(const char *oldID, const char *newID) override; /// /// alternative method to propagate events generated in Display nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; /// Return the glyph producer output for the input image data. /// \sa GetOutputPolyData() - virtual vtkAlgorithmOutput* GetOutputMeshConnection() VTK_OVERRIDE; + vtkAlgorithmOutput* GetOutputMeshConnection() override; /// /// Update the pipeline based on this node attributes - virtual void UpdateAssignedAttribute() VTK_OVERRIDE; + void UpdateAssignedAttribute() override; /// /// Set ImageData for a volume slice - virtual void SetSliceImagePort(vtkAlgorithmOutput *imagePort) VTK_OVERRIDE; + void SetSliceImagePort(vtkAlgorithmOutput *imagePort) override; /// /// Set slice to RAS transformation - virtual void SetSlicePositionMatrix(vtkMatrix4x4 *matrix) VTK_OVERRIDE; + void SetSlicePositionMatrix(vtkMatrix4x4 *matrix) override; /// /// Set slice to IJK transformation - virtual void SetSliceGlyphRotationMatrix(vtkMatrix4x4 *matrix) VTK_OVERRIDE; + void SetSliceGlyphRotationMatrix(vtkMatrix4x4 *matrix) override; //-------------------------------------------------------------------------- /// Display Information: Geometry to display (not mutually exclusive) @@ -187,7 +187,7 @@ class VTK_MRML_EXPORT vtkMRMLDiffusionTensorVolumeSliceDisplayNode protected: vtkMRMLDiffusionTensorVolumeSliceDisplayNode ( ); - ~vtkMRMLDiffusionTensorVolumeSliceDisplayNode ( ); + ~vtkMRMLDiffusionTensorVolumeSliceDisplayNode ( ) override; vtkMRMLDiffusionTensorVolumeSliceDisplayNode ( const vtkMRMLDiffusionTensorVolumeSliceDisplayNode& ); void operator= ( const vtkMRMLDiffusionTensorVolumeSliceDisplayNode& ); diff --git a/Libs/MRML/Core/vtkMRMLDiffusionWeightedVolumeDisplayNode.h b/Libs/MRML/Core/vtkMRMLDiffusionWeightedVolumeDisplayNode.h index 5c7812da086cb823524c0600b4a5240eeef2c410..3a8db2d251be48fd65287941bb8e2ab0c1bf6d30 100644 --- a/Libs/MRML/Core/vtkMRMLDiffusionWeightedVolumeDisplayNode.h +++ b/Libs/MRML/Core/vtkMRMLDiffusionWeightedVolumeDisplayNode.h @@ -37,32 +37,32 @@ class VTK_MRML_EXPORT vtkMRMLDiffusionWeightedVolumeDisplayNode : public vtkMRML public: static vtkMRMLDiffusionWeightedVolumeDisplayNode *New(); vtkTypeMacro(vtkMRMLDiffusionWeightedVolumeDisplayNode,vtkMRMLScalarVolumeDisplayNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Set node attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "DiffusionWeightedVolumeDisplay";} + const char* GetNodeTagName() override {return "DiffusionWeightedVolumeDisplay";} /// /// Get the pipeline input - virtual vtkAlgorithmOutput* GetInputImageDataConnection() VTK_OVERRIDE; + vtkAlgorithmOutput* GetInputImageDataConnection() override; - virtual void UpdateImageDataPipeline() VTK_OVERRIDE; + void UpdateImageDataPipeline() override; //-------------------------------------------------------------------------- /// Display Information @@ -75,15 +75,15 @@ class VTK_MRML_EXPORT vtkMRMLDiffusionWeightedVolumeDisplayNode : public vtkMRML protected: vtkMRMLDiffusionWeightedVolumeDisplayNode(); - ~vtkMRMLDiffusionWeightedVolumeDisplayNode(); + ~vtkMRMLDiffusionWeightedVolumeDisplayNode() override; vtkMRMLDiffusionWeightedVolumeDisplayNode(const vtkMRMLDiffusionWeightedVolumeDisplayNode&); void operator=(const vtkMRMLDiffusionWeightedVolumeDisplayNode&); /// /// Set the input of the pipeline - virtual void SetInputToImageDataPipeline(vtkAlgorithmOutput *imageDataConnection) VTK_OVERRIDE; + void SetInputToImageDataPipeline(vtkAlgorithmOutput *imageDataConnection) override; - virtual vtkAlgorithmOutput* GetScalarImageDataConnection() VTK_OVERRIDE; + vtkAlgorithmOutput* GetScalarImageDataConnection() override; /// This property holds the current diffusion component used for display. int DiffusionComponent; diff --git a/Libs/MRML/Core/vtkMRMLDiffusionWeightedVolumeNode.h b/Libs/MRML/Core/vtkMRMLDiffusionWeightedVolumeNode.h index d9d0eafec57723787911736882e8df623083a4ad..846d06575c6a096f616bb0bf260e3f112d8aac17 100644 --- a/Libs/MRML/Core/vtkMRMLDiffusionWeightedVolumeNode.h +++ b/Libs/MRML/Core/vtkMRMLDiffusionWeightedVolumeNode.h @@ -36,25 +36,25 @@ class VTK_MRML_EXPORT vtkMRMLDiffusionWeightedVolumeNode : public vtkMRMLScalarV public: static vtkMRMLDiffusionWeightedVolumeNode *New(); vtkTypeMacro(vtkMRMLDiffusionWeightedVolumeNode,vtkMRMLScalarVolumeNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Set node attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "DiffusionWeightedVolume";} + const char* GetNodeTagName() override {return "DiffusionWeightedVolume";} /// void SetNumberOfGradients(int val); @@ -94,15 +94,15 @@ class VTK_MRML_EXPORT vtkMRMLDiffusionWeightedVolumeNode : public vtkMRMLScalarV /// /// Create default storage node or NULL if does not have one - virtual vtkMRMLStorageNode* CreateDefaultStorageNode() VTK_OVERRIDE; + vtkMRMLStorageNode* CreateDefaultStorageNode() override; /// /// Create and observe default display node - virtual void CreateDefaultDisplayNodes() VTK_OVERRIDE; + void CreateDefaultDisplayNodes() override; protected: vtkMRMLDiffusionWeightedVolumeNode(); - ~vtkMRMLDiffusionWeightedVolumeNode(); + ~vtkMRMLDiffusionWeightedVolumeNode() override; vtkMRMLDiffusionWeightedVolumeNode(const vtkMRMLDiffusionWeightedVolumeNode&); void operator=(const vtkMRMLDiffusionWeightedVolumeNode&); diff --git a/Libs/MRML/Core/vtkMRMLDisplayNode.h b/Libs/MRML/Core/vtkMRMLDisplayNode.h index f88506ea1b2269b5effb78af24d2e282c452b271..6fc192f07b5f61a6e0d59a6bc83ba0d5d59cdc98 100644 --- a/Libs/MRML/Core/vtkMRMLDisplayNode.h +++ b/Libs/MRML/Core/vtkMRMLDisplayNode.h @@ -38,7 +38,7 @@ class VTK_MRML_EXPORT vtkMRMLDisplayNode : public vtkMRMLNode { public: vtkTypeMacro(vtkMRMLDisplayNode,vtkMRMLNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Representation models /// \sa GetRepresentation(), SetRepresentation() @@ -91,33 +91,33 @@ public: /// Read node attributes from XML file. /// \sa vtkMRMLParser - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// Write this node's information to a MRML file in XML format. /// \sa vtkMRMLScene::Commit() - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// Copy the node's attributes to this object. - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// Propagate ModifiedEvent generated by the texture image data or the color /// node. /// \sa TextureImageDataConnection, ColorNode - virtual void ProcessMRMLEvents(vtkObject *caller, unsigned long event, - void *callData) VTK_OVERRIDE; + void ProcessMRMLEvents(vtkObject *caller, unsigned long event, + void *callData) override; /// Mark the color and views nodes as references. - virtual void SetSceneReferences() VTK_OVERRIDE; + void SetSceneReferences() override; /// Updates this node if it depends on other nodes /// when the node is deleted in the scene. - virtual void UpdateReferences() VTK_OVERRIDE; + void UpdateReferences() override; /// Finds the storage node and read the data. - virtual void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; /// Update the stored reference to another node in the scene. - virtual void UpdateReferenceID(const char *oldID, const char *newID) VTK_OVERRIDE; + void UpdateReferenceID(const char *oldID, const char *newID) override; /// Set the color of the display node. /// \sa Color, GetColor() @@ -484,7 +484,7 @@ public: protected: vtkMRMLDisplayNode(); - ~vtkMRMLDisplayNode(); + ~vtkMRMLDisplayNode() override; vtkMRMLDisplayNode(const vtkMRMLDisplayNode&); void operator=(const vtkMRMLDisplayNode&); diff --git a/Libs/MRML/Core/vtkMRMLDisplayableHierarchyNode.h b/Libs/MRML/Core/vtkMRMLDisplayableHierarchyNode.h index 44e1fc7cdecff3c00bcb4e9312527fdbc21d1299..dcf197c25c3c361055491f5bf17bad39c6662b76 100644 --- a/Libs/MRML/Core/vtkMRMLDisplayableHierarchyNode.h +++ b/Libs/MRML/Core/vtkMRMLDisplayableHierarchyNode.h @@ -27,46 +27,46 @@ class VTK_MRML_EXPORT vtkMRMLDisplayableHierarchyNode : public vtkMRMLHierarchyN public: static vtkMRMLDisplayableHierarchyNode *New(); vtkTypeMacro(vtkMRMLDisplayableHierarchyNode,vtkMRMLHierarchyNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; //-------------------------------------------------------------------------- /// MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, DisplayableHierarchy) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "DisplayableHierarchy";} + const char* GetNodeTagName() override {return "DisplayableHierarchy";} /// Set the display node as reference into the scene - virtual void SetSceneReferences() VTK_OVERRIDE; + void SetSceneReferences() override; /// /// Updates this node if it depends on other nodes /// when the node is deleted in the scene - virtual void UpdateReferences() VTK_OVERRIDE; + void UpdateReferences() override; /// /// Finds the Displayable node and read the data - virtual void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; /// /// Update the stored reference to another node in the scene - virtual void UpdateReferenceID(const char *oldID, const char *newID) VTK_OVERRIDE; + void UpdateReferenceID(const char *oldID, const char *newID) override; /// /// String ID of the corresponding displayable MRML node @@ -124,9 +124,9 @@ public: /// /// alternative method to propagate events generated in Display nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; /// DisplayModifiedEvent is generated when display node parameters is changed enum @@ -137,7 +137,7 @@ public: protected: vtkMRMLDisplayableHierarchyNode(); - ~vtkMRMLDisplayableHierarchyNode(); + ~vtkMRMLDisplayableHierarchyNode() override; vtkMRMLDisplayableHierarchyNode(const vtkMRMLDisplayableHierarchyNode&); void operator=(const vtkMRMLDisplayableHierarchyNode&); diff --git a/Libs/MRML/Core/vtkMRMLDisplayableNode.h b/Libs/MRML/Core/vtkMRMLDisplayableNode.h index dc635a93577ccd1f552c1e313efdaacaae53696d..c9f1a44688c65b1eeba681c8b2e2f587ec7905fd 100644 --- a/Libs/MRML/Core/vtkMRMLDisplayableNode.h +++ b/Libs/MRML/Core/vtkMRMLDisplayableNode.h @@ -44,23 +44,23 @@ class VTK_MRML_EXPORT vtkMRMLDisplayableNode : public vtkMRMLTransformableNode { public: vtkTypeMacro(vtkMRMLDisplayableNode,vtkMRMLTransformableNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; //-------------------------------------------------------------------------- /// MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE = 0; + vtkMRMLNode* CreateNodeInstance() override = 0; - virtual const char* GetNodeTagName() VTK_OVERRIDE = 0; + const char* GetNodeTagName() override = 0; /// /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// Write this node's information to a vector of strings for passing to a CLI. /// If the prefix is not an empty string, it gets pushed onto the vector @@ -74,7 +74,7 @@ public: /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Convenience method that sets the first display node ID. @@ -158,9 +158,9 @@ public: /// /// alternative method to propagate events generated in Display nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; /// DisplayModifiedEvent is fired when: /// - a new display node is observed @@ -209,11 +209,11 @@ public: /// /// Override default selectable setting to notify display node /// about the change. - virtual void SetSelectable(int) VTK_OVERRIDE; + void SetSelectable(int) override; protected: vtkMRMLDisplayableNode(); - ~vtkMRMLDisplayableNode(); + ~vtkMRMLDisplayableNode() override; vtkMRMLDisplayableNode(const vtkMRMLDisplayableNode&); void operator=(const vtkMRMLDisplayableNode&); @@ -224,15 +224,15 @@ public: /// /// Called when a node reference ID is added (list size increased). - virtual void OnNodeReferenceAdded(vtkMRMLNodeReference *reference) VTK_OVERRIDE; + void OnNodeReferenceAdded(vtkMRMLNodeReference *reference) override; /// /// Called when a node reference ID is modified. - virtual void OnNodeReferenceModified(vtkMRMLNodeReference *reference) VTK_OVERRIDE; + void OnNodeReferenceModified(vtkMRMLNodeReference *reference) override; /// /// Called after a node reference ID is removed (list size decreased). - virtual void OnNodeReferenceRemoved(vtkMRMLNodeReference *reference) VTK_OVERRIDE; + void OnNodeReferenceRemoved(vtkMRMLNodeReference *reference) override; private: diff --git a/Libs/MRML/Core/vtkMRMLDoubleArrayNode.h b/Libs/MRML/Core/vtkMRMLDoubleArrayNode.h index 9b1ecbd33438c47dc38a928b61f1fb8dcae82ec8..574225e0dd711d4fd739f03d01aced368a629223 100644 --- a/Libs/MRML/Core/vtkMRMLDoubleArrayNode.h +++ b/Libs/MRML/Core/vtkMRMLDoubleArrayNode.h @@ -41,30 +41,30 @@ public: static vtkMRMLDoubleArrayNode *New(); vtkTypeMacro(vtkMRMLDoubleArrayNode,vtkMRMLStorableNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Set node attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE + const char* GetNodeTagName() override {return "DoubleArray";} /// /// Method to propagate events generated in mrml - virtual void ProcessMRMLEvents ( vtkObject *caller, unsigned long event, void *callData ) VTK_OVERRIDE; + void ProcessMRMLEvents ( vtkObject *caller, unsigned long event, void *callData ) override; //---------------------------------------------------------------- /// Get and Set Macros @@ -179,14 +179,14 @@ public: /// /// Create default storage node or NULL if does not have one - virtual vtkMRMLStorageNode* CreateDefaultStorageNode() VTK_OVERRIDE; + vtkMRMLStorageNode* CreateDefaultStorageNode() override; //---------------------------------------------------------------- /// Constructor and destroctor //---------------------------------------------------------------- protected: vtkMRMLDoubleArrayNode(); - ~vtkMRMLDoubleArrayNode(); + ~vtkMRMLDoubleArrayNode() override; vtkMRMLDoubleArrayNode(const vtkMRMLDoubleArrayNode&); void operator=(const vtkMRMLDoubleArrayNode&); diff --git a/Libs/MRML/Core/vtkMRMLDoubleArrayStorageNode.h b/Libs/MRML/Core/vtkMRMLDoubleArrayStorageNode.h index fb4d8e78d1bac674727a3e8b795a637dd1805bd2..d19b8a2a11514f1f32485e20fc4ff1a37b5b0fe1 100644 --- a/Libs/MRML/Core/vtkMRMLDoubleArrayStorageNode.h +++ b/Libs/MRML/Core/vtkMRMLDoubleArrayStorageNode.h @@ -26,33 +26,33 @@ class VTK_MRML_EXPORT vtkMRMLDoubleArrayStorageNode : public vtkMRMLStorageNode public: static vtkMRMLDoubleArrayStorageNode *New(); vtkTypeMacro(vtkMRMLDoubleArrayStorageNode,vtkMRMLStorageNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Get node XML tag name (like Storage, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "DoubleArrayStorage";} + const char* GetNodeTagName() override {return "DoubleArrayStorage";} /// Return true if the node can be read in - virtual bool CanReadInReferenceNode(vtkMRMLNode *refNode) VTK_OVERRIDE; + bool CanReadInReferenceNode(vtkMRMLNode *refNode) override; protected: vtkMRMLDoubleArrayStorageNode(); - ~vtkMRMLDoubleArrayStorageNode(); + ~vtkMRMLDoubleArrayStorageNode() override; vtkMRMLDoubleArrayStorageNode(const vtkMRMLDoubleArrayStorageNode&); void operator=(const vtkMRMLDoubleArrayStorageNode&); /// Initialize all the supported write file types - virtual void InitializeSupportedReadFileTypes() VTK_OVERRIDE; + void InitializeSupportedReadFileTypes() override; /// Initialize all the supported write file types - virtual void InitializeSupportedWriteFileTypes() VTK_OVERRIDE; + void InitializeSupportedWriteFileTypes() override; /// Read data and set it in the referenced node - virtual int ReadDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int ReadDataInternal(vtkMRMLNode *refNode) override; /// Write data from a referenced node - virtual int WriteDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int WriteDataInternal(vtkMRMLNode *refNode) override; }; diff --git a/Libs/MRML/Core/vtkMRMLFiducial.h b/Libs/MRML/Core/vtkMRMLFiducial.h index 0878765d0ebcd8c82f9ef60ca48fc31d6c59950e..06b765e2bdc8c317034f6e2f71014bfec1a3e3a4 100644 --- a/Libs/MRML/Core/vtkMRMLFiducial.h +++ b/Libs/MRML/Core/vtkMRMLFiducial.h @@ -34,7 +34,7 @@ public: /// static vtkMRMLFiducial *New(); vtkTypeMacro(vtkMRMLFiducial,vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; //-------------------------------------------------------------------------- /// MRML methods @@ -89,7 +89,7 @@ public: protected: vtkMRMLFiducial(); - ~vtkMRMLFiducial(); + ~vtkMRMLFiducial() override; vtkMRMLFiducial(const vtkMRMLFiducial&); void operator=(const vtkMRMLFiducial&); diff --git a/Libs/MRML/Core/vtkMRMLFiducialListNode.h b/Libs/MRML/Core/vtkMRMLFiducialListNode.h index 9f2aec0abcc9600f9769102212ddb699e4fb7f2b..9899e6c83d852e41a49cdebbc26738c5246c6ed6 100644 --- a/Libs/MRML/Core/vtkMRMLFiducialListNode.h +++ b/Libs/MRML/Core/vtkMRMLFiducialListNode.h @@ -51,32 +51,32 @@ public: /// static vtkMRMLFiducialListNode *New(); vtkTypeMacro(vtkMRMLFiducialListNode,vtkMRMLTransformableNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; ///-------------------------------------------------------------------------- /// MRMLNode methods ///-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Set node attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "FiducialList";} + const char* GetNodeTagName() override {return "FiducialList";} /// - virtual void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; /// update display node ids - void UpdateReferences() VTK_OVERRIDE; + void UpdateReferences() override; /// Get/Set for Symbol scale /// vtkSetMacro(SymbolScale,double); @@ -177,7 +177,7 @@ public: int IsFiducialPresent(vtkMRMLFiducial *o); /// Process events from the MRML scene - void ProcessMRMLEvents ( vtkObject *caller, unsigned long event, void *callData ) VTK_OVERRIDE; + void ProcessMRMLEvents ( vtkObject *caller, unsigned long event, void *callData ) override; /// DisplayModifiedEvent is generated when display node parameters is changed /// PolyDataModifiedEvent is generated when something else is changed @@ -252,11 +252,11 @@ public: void SetGlyphTypeFromString(const char *glyphString); /// transform utility functions - virtual bool CanApplyNonLinearTransforms()const VTK_OVERRIDE; - virtual void ApplyTransform(vtkAbstractTransform* transform) VTK_OVERRIDE; + bool CanApplyNonLinearTransforms()const override; + void ApplyTransform(vtkAbstractTransform* transform) override; /// Create default storage node or NULL if does not have one - virtual vtkMRMLStorageNode* CreateDefaultStorageNode() VTK_OVERRIDE; + vtkMRMLStorageNode* CreateDefaultStorageNode() override; /// move a fiducial point in the collection, one up/down /// returns -1 on failure (current index is out of bounds, the fid is already @@ -303,7 +303,7 @@ public: protected: vtkMRMLFiducialListNode(); - ~vtkMRMLFiducialListNode(); + ~vtkMRMLFiducialListNode() override; vtkMRMLFiducialListNode(const vtkMRMLFiducialListNode&); void operator=(const vtkMRMLFiducialListNode&); diff --git a/Libs/MRML/Core/vtkMRMLFiducialListStorageNode.h b/Libs/MRML/Core/vtkMRMLFiducialListStorageNode.h index 6b91546d358990efaeae7f48698e85188a068d21..91e3dc2768c050542c51597f58978b918b5ad49b 100644 --- a/Libs/MRML/Core/vtkMRMLFiducialListStorageNode.h +++ b/Libs/MRML/Core/vtkMRMLFiducialListStorageNode.h @@ -33,37 +33,37 @@ public: /// static vtkMRMLFiducialListStorageNode *New(); vtkTypeMacro(vtkMRMLFiducialListStorageNode,vtkMRMLStorageNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Get node XML tag name (like Storage, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "FiducialListStorage";} + const char* GetNodeTagName() override {return "FiducialListStorage";} /// Get/Set the storage node version vtkGetMacro(Version, int); vtkSetMacro(Version, int); - virtual bool CanReadInReferenceNode(vtkMRMLNode *refNode) VTK_OVERRIDE; + bool CanReadInReferenceNode(vtkMRMLNode *refNode) override; protected: vtkMRMLFiducialListStorageNode(); - ~vtkMRMLFiducialListStorageNode(); + ~vtkMRMLFiducialListStorageNode() override; vtkMRMLFiducialListStorageNode(const vtkMRMLFiducialListStorageNode&); void operator=(const vtkMRMLFiducialListStorageNode&); /// Initialize all the supported write file types - virtual void InitializeSupportedReadFileTypes() VTK_OVERRIDE; + void InitializeSupportedReadFileTypes() override; /// Initialize all the supported write file types - virtual void InitializeSupportedWriteFileTypes() VTK_OVERRIDE; + void InitializeSupportedWriteFileTypes() override; /// Read data and set it in the referenced node - virtual int ReadDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int ReadDataInternal(vtkMRMLNode *refNode) override; /// Write data from a referenced node - virtual int WriteDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int WriteDataInternal(vtkMRMLNode *refNode) override; /// the storage node version // version 1 has the old glyph numbering (pre svn 12553), starting at 0 diff --git a/Libs/MRML/Core/vtkMRMLFreeSurferModelOverlayStorageNode.h b/Libs/MRML/Core/vtkMRMLFreeSurferModelOverlayStorageNode.h index 25decf2744828496eb33c82e634014367581d5ac..3f4b1a94515bfca2ae765ff3caf09b483addb667 100644 --- a/Libs/MRML/Core/vtkMRMLFreeSurferModelOverlayStorageNode.h +++ b/Libs/MRML/Core/vtkMRMLFreeSurferModelOverlayStorageNode.h @@ -26,9 +26,9 @@ class VTK_MRML_EXPORT vtkMRMLFreeSurferModelOverlayStorageNode public: static vtkMRMLFreeSurferModelOverlayStorageNode *New(); vtkTypeMacro(vtkMRMLFreeSurferModelOverlayStorageNode,vtkMRMLModelStorageNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Copy data from a referenced node's filename to new location. @@ -38,32 +38,32 @@ public: /// /// Get node XML tag name (like Storage, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "FreeSurferModelOverlayStorage";} + const char* GetNodeTagName() override {return "FreeSurferModelOverlayStorage";} /// Return true if reference node can be written from - virtual bool CanWriteFromReferenceNode(vtkMRMLNode *refNode) VTK_OVERRIDE; + bool CanWriteFromReferenceNode(vtkMRMLNode *refNode) override; protected: vtkMRMLFreeSurferModelOverlayStorageNode(); - ~vtkMRMLFreeSurferModelOverlayStorageNode(); + ~vtkMRMLFreeSurferModelOverlayStorageNode() override; vtkMRMLFreeSurferModelOverlayStorageNode(const vtkMRMLFreeSurferModelOverlayStorageNode&); void operator=(const vtkMRMLFreeSurferModelOverlayStorageNode&); /// Initialize all the supported read file types - virtual void InitializeSupportedReadFileTypes() VTK_OVERRIDE; + void InitializeSupportedReadFileTypes() override; /// Initialize all the supported write file types - virtual void InitializeSupportedWriteFileTypes() VTK_OVERRIDE; + void InitializeSupportedWriteFileTypes() override; /// /// Read data and set it in the referenced node /// NOTE: Subclasses should implement this method - virtual int ReadDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int ReadDataInternal(vtkMRMLNode *refNode) override; /// /// Write data from a referenced node /// NOTE: Subclasses should implement this method - virtual int WriteDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int WriteDataInternal(vtkMRMLNode *refNode) override; bool ReadScalarOverlay(const std::string& fullName, vtkMRMLModelNode* modelNode); bool ReadScalarOverlayAnnot(const std::string& fullName, vtkMRMLModelNode* modelNode); diff --git a/Libs/MRML/Core/vtkMRMLFreeSurferModelStorageNode.h b/Libs/MRML/Core/vtkMRMLFreeSurferModelStorageNode.h index e39f071a7e37a0908b9b54c9fadaa384317ff59d..fa422c11730dd6287573659c826176b0811470b1 100644 --- a/Libs/MRML/Core/vtkMRMLFreeSurferModelStorageNode.h +++ b/Libs/MRML/Core/vtkMRMLFreeSurferModelStorageNode.h @@ -27,13 +27,13 @@ class VTK_MRML_EXPORT vtkMRMLFreeSurferModelStorageNode : public vtkMRMLModelSto public: static vtkMRMLFreeSurferModelStorageNode *New(); vtkTypeMacro(vtkMRMLFreeSurferModelStorageNode,vtkMRMLModelStorageNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Copy data from a referenced node's filename to new location. @@ -43,15 +43,15 @@ class VTK_MRML_EXPORT vtkMRMLFreeSurferModelStorageNode : public vtkMRMLModelSto /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Storage, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "FreeSurferModelStorage";}; + const char* GetNodeTagName() override {return "FreeSurferModelStorage";}; /// /// Control use of the triangle stipper when reading the polydata @@ -60,15 +60,15 @@ class VTK_MRML_EXPORT vtkMRMLFreeSurferModelStorageNode : public vtkMRMLModelSto protected: vtkMRMLFreeSurferModelStorageNode(); - ~vtkMRMLFreeSurferModelStorageNode(); + ~vtkMRMLFreeSurferModelStorageNode() override; vtkMRMLFreeSurferModelStorageNode(const vtkMRMLFreeSurferModelStorageNode&); void operator=(const vtkMRMLFreeSurferModelStorageNode&); /// Initialize all the supported write file types - virtual void InitializeSupportedReadFileTypes() VTK_OVERRIDE; + void InitializeSupportedReadFileTypes() override; /// Read data and set it in the referenced node - virtual int ReadDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int ReadDataInternal(vtkMRMLNode *refNode) override; int UseStripper; }; diff --git a/Libs/MRML/Core/vtkMRMLFreeSurferProceduralColorNode.h b/Libs/MRML/Core/vtkMRMLFreeSurferProceduralColorNode.h index 9a7b76855e222e93b76b17227cc92850f92f5e0b..36284d814b52d7dccdcea28901b57fd3026ec6f2 100644 --- a/Libs/MRML/Core/vtkMRMLFreeSurferProceduralColorNode.h +++ b/Libs/MRML/Core/vtkMRMLFreeSurferProceduralColorNode.h @@ -29,45 +29,45 @@ class VTK_MRML_EXPORT vtkMRMLFreeSurferProceduralColorNode : public vtkMRMLProce public: static vtkMRMLFreeSurferProceduralColorNode *New(); vtkTypeMacro(vtkMRMLFreeSurferProceduralColorNode,vtkMRMLProceduralColorNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; //-------------------------------------------------------------------------- /// MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Set node attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "FreeSurferProceduralColor";}; + const char* GetNodeTagName() override {return "FreeSurferProceduralColor";}; /// /// - virtual void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; /// /// Set the lookup table as a freesurfer lookup table, and get it as a /// vtkLookupTable or an vtkFSLookupTable - vtkLookupTable *GetLookupTable() VTK_OVERRIDE; + vtkLookupTable *GetLookupTable() override; vtkFSLookupTable *GetFSLookupTable(); virtual void SetLookupTable(vtkFSLookupTable* newLookupTable); - virtual vtkScalarsToColors* GetScalarsToColors() VTK_OVERRIDE; + vtkScalarsToColors* GetScalarsToColors() override; /// /// Get/Set for Type - void SetType(int type) VTK_OVERRIDE; + void SetType(int type) override; void SetTypeToHeat(); void SetTypeToBlueRed(); void SetTypeToRedBlue(); @@ -76,7 +76,7 @@ public: void SetTypeToLabels(); void SetTypeToCustom(); - void ProcessMRMLEvents ( vtkObject *caller, unsigned long event, void *callData ) VTK_OVERRIDE; + void ProcessMRMLEvents ( vtkObject *caller, unsigned long event, void *callData ) override; /// /// The list of valid table types @@ -102,12 +102,12 @@ public: /// /// Return the lowest and the highest integers, for use in looping (don't /// create labels) - int GetFirstType() VTK_OVERRIDE { return this->Heat; }; - int GetLastType () VTK_OVERRIDE { return this->GreenRed; }; + int GetFirstType() override { return this->Heat; }; + int GetLastType () override { return this->GreenRed; }; /// /// return a text string describing the colour look up table type - const char * GetTypeAsString() VTK_OVERRIDE; + const char * GetTypeAsString() override; /// /// DisplayModifiedEvent is generated when display node parameters is changed @@ -121,19 +121,19 @@ public: vtkGetStringMacro(LabelsFileName); vtkSetStringMacro(LabelsFileName); - virtual int GetNumberOfColors() VTK_OVERRIDE; - virtual bool GetColor(int entry, double color[4]) VTK_OVERRIDE; + int GetNumberOfColors() override; + bool GetColor(int entry, double color[4]) override; protected: vtkMRMLFreeSurferProceduralColorNode(); - ~vtkMRMLFreeSurferProceduralColorNode(); + ~vtkMRMLFreeSurferProceduralColorNode() override; vtkMRMLFreeSurferProceduralColorNode(const vtkMRMLFreeSurferProceduralColorNode&); void operator=(const vtkMRMLFreeSurferProceduralColorNode&); /// /// Set values in the names vector from the colour rgba entries in the colour /// table - bool SetNameFromColor(int index) VTK_OVERRIDE; + bool SetNameFromColor(int index) override; /// /// a lookup table tailored with FreeSurfer colours, constructed according to Type diff --git a/Libs/MRML/Core/vtkMRMLGlyphableVolumeDisplayNode.h b/Libs/MRML/Core/vtkMRMLGlyphableVolumeDisplayNode.h index d69b6bb088cc236b9e6a68a0c15e47d121842c9c..ec053dd2b0b106add41182502e0d4657158019e7 100644 --- a/Libs/MRML/Core/vtkMRMLGlyphableVolumeDisplayNode.h +++ b/Libs/MRML/Core/vtkMRMLGlyphableVolumeDisplayNode.h @@ -32,29 +32,29 @@ class VTK_MRML_EXPORT vtkMRMLGlyphableVolumeDisplayNode : public vtkMRMLScalarVo public: static vtkMRMLGlyphableVolumeDisplayNode *New(); vtkTypeMacro(vtkMRMLGlyphableVolumeDisplayNode,vtkMRMLScalarVolumeDisplayNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "GlyphableVolumeDisplay";} + const char* GetNodeTagName() override {return "GlyphableVolumeDisplay";} /// /// Update the stored reference to another node in the scene - virtual void UpdateReferenceID(const char *oldID, const char *newID) VTK_OVERRIDE; + void UpdateReferenceID(const char *oldID, const char *newID) override; //-------------------------------------------------------------------------- /// Display Information @@ -84,16 +84,16 @@ class VTK_MRML_EXPORT vtkMRMLGlyphableVolumeDisplayNode : public vtkMRMLScalarVo }; /// Set Glyph color node ID as reference to the scene - virtual void SetSceneReferences() VTK_OVERRIDE; + void SetSceneReferences() override; /// /// Updates this node if it depends on other nodes /// when the node is deleted in the scene - virtual void UpdateReferences() VTK_OVERRIDE; + void UpdateReferences() override; /// /// Finds the storage node and read the data - virtual void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; /// /// String ID of the color MRML node @@ -107,12 +107,12 @@ class VTK_MRML_EXPORT vtkMRMLGlyphableVolumeDisplayNode : public vtkMRMLScalarVo /// /// alternative method to propagate events generated in Display nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; /// /// set gray colormap - void SetDefaultColorMap(/*int isLabelMap*/) VTK_OVERRIDE; + void SetDefaultColorMap(/*int isLabelMap*/) override; /// /// get associated slice glyph display node or NULL if not set @@ -134,14 +134,14 @@ class VTK_MRML_EXPORT vtkMRMLGlyphableVolumeDisplayNode : public vtkMRMLScalarVo /// /// Defines the expected range of the output data for given imageData after /// having been mapped through the current display options - virtual void GetDisplayScalarRange(double range[2]) VTK_OVERRIDE + void GetDisplayScalarRange(double range[2]) override { this->Superclass::GetDisplayScalarRange(range); } protected: vtkMRMLGlyphableVolumeDisplayNode(); - ~vtkMRMLGlyphableVolumeDisplayNode(); + ~vtkMRMLGlyphableVolumeDisplayNode() override; vtkMRMLGlyphableVolumeDisplayNode(const vtkMRMLGlyphableVolumeDisplayNode&); void operator=(const vtkMRMLGlyphableVolumeDisplayNode&); diff --git a/Libs/MRML/Core/vtkMRMLGlyphableVolumeSliceDisplayNode.h b/Libs/MRML/Core/vtkMRMLGlyphableVolumeSliceDisplayNode.h index c7c0b12a79f0da27779e58816608e29b3f794a38..40bf21f1592908fce666380e1cbb7258e1c16167 100644 --- a/Libs/MRML/Core/vtkMRMLGlyphableVolumeSliceDisplayNode.h +++ b/Libs/MRML/Core/vtkMRMLGlyphableVolumeSliceDisplayNode.h @@ -37,62 +37,62 @@ class VTK_MRML_EXPORT vtkMRMLGlyphableVolumeSliceDisplayNode : public vtkMRMLMod public: static vtkMRMLGlyphableVolumeSliceDisplayNode *New ( ); vtkTypeMacro ( vtkMRMLGlyphableVolumeSliceDisplayNode,vtkMRMLModelDisplayNode ); - void PrintSelf ( ostream& os, vtkIndent indent ) VTK_OVERRIDE; + void PrintSelf ( ostream& os, vtkIndent indent ) override; //-------------------------------------------------------------------------- /// MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance () VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance () override; /// /// Read node attributes from XML (MRML) file - virtual void ReadXMLAttributes ( const char** atts ) VTK_OVERRIDE; + void ReadXMLAttributes ( const char** atts ) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML ( ostream& of, int indent ) VTK_OVERRIDE; + void WriteXML ( ostream& of, int indent ) override; /// /// Copy the node's attributes to this object - virtual void Copy ( vtkMRMLNode *node ) VTK_OVERRIDE; + void Copy ( vtkMRMLNode *node ) override; /// /// Get node XML tag name (like Volume, UnstructuredGrid) - virtual const char* GetNodeTagName () VTK_OVERRIDE {return "GlyphableVolumeSliceDisplayNode";} + const char* GetNodeTagName () override {return "GlyphableVolumeSliceDisplayNode";} /// /// Updates this node if it depends on other nodes /// when the node is deleted in the scene - virtual void UpdateReferences() VTK_OVERRIDE; + void UpdateReferences() override; - virtual void UpdateReferenceID(const char *oldID, const char *newID) VTK_OVERRIDE + void UpdateReferenceID(const char *oldID, const char *newID) override { Superclass::UpdateReferenceID(oldID, newID); } /// /// Finds the storage node and read the data - virtual void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; /// /// alternative method to propagate events generated in Display nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; /// Return the output of the glyph producer for the input image data. /// The output is connected as the input of the slice transform. /// It must be reimplemented in subclasses. /// \sa GetOutputPolyData(), GetSliceOutputPort() - virtual vtkAlgorithmOutput* GetOutputMeshConnection() VTK_OVERRIDE; + vtkAlgorithmOutput* GetOutputMeshConnection() override; /// Return the glyph polydata for the input slice image. /// This is the polydata to use in a 3D view. /// Reimplemented to by-pass the check on the input polydata. /// \sa GetSliceOutputPolyData(), GetOutputPolyDataConnection() - virtual vtkPolyData* GetOutputMesh() VTK_OVERRIDE; + vtkPolyData* GetOutputMesh() override; /// Return the glyph polyData transformed to slice XY. /// This is the polydata to use in a 2D slice. @@ -101,7 +101,7 @@ class VTK_MRML_EXPORT vtkMRMLGlyphableVolumeSliceDisplayNode : public vtkMRMLMod /// /// Update the pipeline based on this node attributes - virtual void UpdateAssignedAttribute() VTK_OVERRIDE; + void UpdateAssignedAttribute() override; /// /// Set imageData of a volume slice. This is used as the input of the display @@ -192,7 +192,7 @@ class VTK_MRML_EXPORT vtkMRMLGlyphableVolumeSliceDisplayNode : public vtkMRMLMod //-------------------------------------------------------------------------- protected: vtkMRMLGlyphableVolumeSliceDisplayNode ( ); - ~vtkMRMLGlyphableVolumeSliceDisplayNode ( ); + ~vtkMRMLGlyphableVolumeSliceDisplayNode ( ) override; vtkMRMLGlyphableVolumeSliceDisplayNode ( const vtkMRMLGlyphableVolumeSliceDisplayNode& ); void operator= ( const vtkMRMLGlyphableVolumeSliceDisplayNode& ); diff --git a/Libs/MRML/Core/vtkMRMLGridTransformNode.h b/Libs/MRML/Core/vtkMRMLGridTransformNode.h index ae49daea3dd6a290c380641dcf938a75a56319e8..24865176f087e6ef22d44352e6a47a876a0624e4 100644 --- a/Libs/MRML/Core/vtkMRMLGridTransformNode.h +++ b/Libs/MRML/Core/vtkMRMLGridTransformNode.h @@ -26,29 +26,29 @@ class VTK_MRML_EXPORT vtkMRMLGridTransformNode : public vtkMRMLTransformNode public: static vtkMRMLGridTransformNode *New(); vtkTypeMacro(vtkMRMLGridTransformNode,vtkMRMLTransformNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "GridTransform";} + const char* GetNodeTagName() override {return "GridTransform";} protected: vtkMRMLGridTransformNode(); - ~vtkMRMLGridTransformNode(); + ~vtkMRMLGridTransformNode() override; vtkMRMLGridTransformNode(const vtkMRMLGridTransformNode&); void operator=(const vtkMRMLGridTransformNode&); }; diff --git a/Libs/MRML/Core/vtkMRMLHierarchyNode.h b/Libs/MRML/Core/vtkMRMLHierarchyNode.h index 0b9524f2e3cfba7f66634f400ade13a0f90bf310..30d2d8f61757c681fcc1a47cb3b396cc9dcb509a 100644 --- a/Libs/MRML/Core/vtkMRMLHierarchyNode.h +++ b/Libs/MRML/Core/vtkMRMLHierarchyNode.h @@ -30,41 +30,41 @@ class VTK_MRML_EXPORT vtkMRMLHierarchyNode : public vtkMRMLNode public: static vtkMRMLHierarchyNode *New(); vtkTypeMacro(vtkMRMLHierarchyNode,vtkMRMLNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "Hierarchy";} + const char* GetNodeTagName() override {return "Hierarchy";} /// Set the reference node to current scene. - virtual void SetSceneReferences() VTK_OVERRIDE; + void SetSceneReferences() override; /// /// Updates this node if it depends on other nodes /// when the node is deleted in the scene - virtual void UpdateReferences() VTK_OVERRIDE; + void UpdateReferences() override; /// /// Observe the reference transform node - virtual void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; /// /// Update the stored reference to another node in the scene - virtual void UpdateReferenceID(const char *oldID, const char *newID) VTK_OVERRIDE; + void UpdateReferenceID(const char *oldID, const char *newID) override; /// /// Associated prent MRML node @@ -167,7 +167,7 @@ public: protected: vtkMRMLHierarchyNode(); - ~vtkMRMLHierarchyNode(); + ~vtkMRMLHierarchyNode() override; vtkMRMLHierarchyNode(const vtkMRMLHierarchyNode&); void operator=(const vtkMRMLHierarchyNode&); diff --git a/Libs/MRML/Core/vtkMRMLHierarchyStorageNode.h b/Libs/MRML/Core/vtkMRMLHierarchyStorageNode.h index 0126d21f31c0d55c2418e197d18f07d93df7d463..d89792a132d2de2ca36fa6195a193ebe3e1ce701 100644 --- a/Libs/MRML/Core/vtkMRMLHierarchyStorageNode.h +++ b/Libs/MRML/Core/vtkMRMLHierarchyStorageNode.h @@ -27,33 +27,33 @@ class VTK_MRML_EXPORT vtkMRMLHierarchyStorageNode : public vtkMRMLStorageNode public: static vtkMRMLHierarchyStorageNode *New(); vtkTypeMacro(vtkMRMLHierarchyStorageNode,vtkMRMLStorageNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; // Description: // Get node XML tag name (like Storage, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "HierarchyStorage";} + const char* GetNodeTagName() override {return "HierarchyStorage";} /// Return true if reference node can be read in - virtual bool CanReadInReferenceNode(vtkMRMLNode *refNode) VTK_OVERRIDE; + bool CanReadInReferenceNode(vtkMRMLNode *refNode) override; protected: vtkMRMLHierarchyStorageNode(); - ~vtkMRMLHierarchyStorageNode(); + ~vtkMRMLHierarchyStorageNode() override; vtkMRMLHierarchyStorageNode(const vtkMRMLHierarchyStorageNode&); void operator=(const vtkMRMLHierarchyStorageNode&); // Initialize all the supported read file types - virtual void InitializeSupportedReadFileTypes() VTK_OVERRIDE; + void InitializeSupportedReadFileTypes() override; // Initialize all the supported write file types - virtual void InitializeSupportedWriteFileTypes() VTK_OVERRIDE; + void InitializeSupportedWriteFileTypes() override; // Read data and set it in the referenced node - virtual int ReadDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int ReadDataInternal(vtkMRMLNode *refNode) override; // Write data from a referenced node - virtual int WriteDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int WriteDataInternal(vtkMRMLNode *refNode) override; }; #endif diff --git a/Libs/MRML/Core/vtkMRMLInteractionNode.h b/Libs/MRML/Core/vtkMRMLInteractionNode.h index dbc8f4f3a428c5965f5ad6359a8d6edc90115a1c..41ac1a7de99b88f17ce8749946910b523568aa7d 100644 --- a/Libs/MRML/Core/vtkMRMLInteractionNode.h +++ b/Libs/MRML/Core/vtkMRMLInteractionNode.h @@ -8,21 +8,21 @@ class VTK_MRML_EXPORT vtkMRMLInteractionNode : public vtkMRMLNode public: static vtkMRMLInteractionNode *New(); vtkTypeMacro(vtkMRMLInteractionNode,vtkMRMLNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "Interaction";} + const char* GetNodeTagName() override {return "Interaction";} /// Get/Set Current and Last mouse mode. vtkGetMacro(CurrentInteractionMode, int); @@ -80,7 +80,7 @@ public: protected: vtkMRMLInteractionNode(); - ~vtkMRMLInteractionNode(); + ~vtkMRMLInteractionNode() override; vtkMRMLInteractionNode(const vtkMRMLInteractionNode&); void operator=(const vtkMRMLInteractionNode&); diff --git a/Libs/MRML/Core/vtkMRMLLabelMapVolumeDisplayNode.h b/Libs/MRML/Core/vtkMRMLLabelMapVolumeDisplayNode.h index 1e69b79dd1cfcff23864442f161aabe405d9295b..795786da29a8a41e15d69be4ff7ddd248f7d3dd9 100644 --- a/Libs/MRML/Core/vtkMRMLLabelMapVolumeDisplayNode.h +++ b/Libs/MRML/Core/vtkMRMLLabelMapVolumeDisplayNode.h @@ -28,37 +28,37 @@ class VTK_MRML_EXPORT vtkMRMLLabelMapVolumeDisplayNode : public vtkMRMLVolumeDis public: static vtkMRMLLabelMapVolumeDisplayNode *New(); vtkTypeMacro(vtkMRMLLabelMapVolumeDisplayNode,vtkMRMLVolumeDisplayNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "LabelMapVolumeDisplay";} + const char* GetNodeTagName() override {return "LabelMapVolumeDisplay";} /// /// alternative method to propagate events generated in Display nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; /// /// set default labels colormap - virtual void SetDefaultColorMap() VTK_OVERRIDE; + void SetDefaultColorMap() override; /// Set the pipeline input - virtual void SetInputImageDataConnection(vtkAlgorithmOutput *imageDataConnection) VTK_OVERRIDE; + void SetInputImageDataConnection(vtkAlgorithmOutput *imageDataConnection) override; /// Get the pipeline input - virtual vtkImageData* GetInputImageData() VTK_OVERRIDE; + vtkImageData* GetInputImageData() override; /// Gets the pipeline output - virtual vtkAlgorithmOutput* GetOutputImageDataConnection() VTK_OVERRIDE; + vtkAlgorithmOutput* GetOutputImageDataConnection() override; - virtual void UpdateImageDataPipeline() VTK_OVERRIDE; + void UpdateImageDataPipeline() override; protected: vtkMRMLLabelMapVolumeDisplayNode(); - virtual ~vtkMRMLLabelMapVolumeDisplayNode(); + ~vtkMRMLLabelMapVolumeDisplayNode() override; vtkMRMLLabelMapVolumeDisplayNode(const vtkMRMLLabelMapVolumeDisplayNode&); void operator=(const vtkMRMLLabelMapVolumeDisplayNode&); diff --git a/Libs/MRML/Core/vtkMRMLLabelMapVolumeNode.h b/Libs/MRML/Core/vtkMRMLLabelMapVolumeNode.h index 06da88476b825f10b1a7c9c4a67009a82cc8ecd0..ec99062129000220077a8aa0d96ab49b0cc7e4fb 100644 --- a/Libs/MRML/Core/vtkMRMLLabelMapVolumeNode.h +++ b/Libs/MRML/Core/vtkMRMLLabelMapVolumeNode.h @@ -39,11 +39,11 @@ class VTK_MRML_EXPORT vtkMRMLLabelMapVolumeNode : public vtkMRMLScalarVolumeNode static vtkMRMLLabelMapVolumeNode *New(); vtkTypeMacro(vtkMRMLLabelMapVolumeNode,vtkMRMLScalarVolumeNode); - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "LabelMapVolume";} + const char* GetNodeTagName() override {return "LabelMapVolume";} /// /// Make a 'None' volume node with blank image data @@ -51,11 +51,11 @@ class VTK_MRML_EXPORT vtkMRMLLabelMapVolumeNode : public vtkMRMLScalarVolumeNode /// /// Create and observe default display node - virtual void CreateDefaultDisplayNodes() VTK_OVERRIDE; + void CreateDefaultDisplayNodes() override; protected: vtkMRMLLabelMapVolumeNode(); - ~vtkMRMLLabelMapVolumeNode(); + ~vtkMRMLLabelMapVolumeNode() override; vtkMRMLLabelMapVolumeNode(const vtkMRMLLabelMapVolumeNode&); void operator=(const vtkMRMLLabelMapVolumeNode&); }; diff --git a/Libs/MRML/Core/vtkMRMLLayoutNode.h b/Libs/MRML/Core/vtkMRMLLayoutNode.h index e0dfc25942a5246d75950b69f7ca1f97a42721fd..fecaafe922eca2517e89aa6a57f31ced20df604b 100644 --- a/Libs/MRML/Core/vtkMRMLLayoutNode.h +++ b/Libs/MRML/Core/vtkMRMLLayoutNode.h @@ -15,21 +15,21 @@ class VTK_MRML_EXPORT vtkMRMLLayoutNode : public vtkMRMLAbstractLayoutNode public: static vtkMRMLLayoutNode *New(); vtkTypeMacro(vtkMRMLLayoutNode,vtkMRMLAbstractLayoutNode); - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; + void PrintSelf(ostream& os, vtkIndent indent) override; //-------------------------------------------------------------------------- /// MRML methods //-------------------------------------------------------------------------- /// Set node attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// Get/Set for Current layout vtkGetMacro(ViewArrangement, int); @@ -73,7 +73,7 @@ public: vtkSetStringMacro(SelectedModule); /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "Layout";} + const char* GetNodeTagName() override {return "Layout";} enum SlicerLayout { @@ -162,7 +162,7 @@ protected: protected: vtkMRMLLayoutNode(); - ~vtkMRMLLayoutNode(); + ~vtkMRMLLayoutNode() override; vtkMRMLLayoutNode(const vtkMRMLLayoutNode&); void operator=(const vtkMRMLLayoutNode&); diff --git a/Libs/MRML/Core/vtkMRMLLinearTransformNode.h b/Libs/MRML/Core/vtkMRMLLinearTransformNode.h index 8ee7929f06e401de6012fbadf4bf54d92585f176..fb8af26f829684603eb5c301aea63fbbdad4e299 100644 --- a/Libs/MRML/Core/vtkMRMLLinearTransformNode.h +++ b/Libs/MRML/Core/vtkMRMLLinearTransformNode.h @@ -33,36 +33,36 @@ class VTK_MRML_EXPORT vtkMRMLLinearTransformNode : public vtkMRMLTransformNode public: static vtkMRMLLinearTransformNode *New(); vtkTypeMacro(vtkMRMLLinearTransformNode,vtkMRMLTransformNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "LinearTransform";}; + const char* GetNodeTagName() override {return "LinearTransform";}; /// /// Create default storage node or NULL if does not have one - virtual vtkMRMLStorageNode* CreateDefaultStorageNode() VTK_OVERRIDE + vtkMRMLStorageNode* CreateDefaultStorageNode() override { return Superclass::CreateDefaultStorageNode(); }; protected: vtkMRMLLinearTransformNode(); - ~vtkMRMLLinearTransformNode(); + ~vtkMRMLLinearTransformNode() override; vtkMRMLLinearTransformNode(const vtkMRMLLinearTransformNode&); void operator=(const vtkMRMLLinearTransformNode&); }; diff --git a/Libs/MRML/Core/vtkMRMLLogic.h b/Libs/MRML/Core/vtkMRMLLogic.h index cf9f7b8c2b2dbfbef10c8fb9a41285813e0eee51..68a4b2cd5e3cc370b36a2ab224aefb3d050430a0 100644 --- a/Libs/MRML/Core/vtkMRMLLogic.h +++ b/Libs/MRML/Core/vtkMRMLLogic.h @@ -33,7 +33,7 @@ public: /// The Usual vtk class functions static vtkMRMLLogic *New(); vtkTypeMacro(vtkMRMLLogic,vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE { this->Superclass::PrintSelf(os, indent); } + void PrintSelf(ostream& os, vtkIndent indent) override { this->Superclass::PrintSelf(os, indent); } vtkMRMLScene* GetScene() {return this->Scene;}; void SetScene(vtkMRMLScene* scene) {this->Scene = scene;}; @@ -52,7 +52,7 @@ public: protected: vtkMRMLLogic(); - virtual ~vtkMRMLLogic(); + ~vtkMRMLLogic() override; vtkMRMLLogic(const vtkMRMLLogic&); void operator=(const vtkMRMLLogic&); diff --git a/Libs/MRML/Core/vtkMRMLMarkupsStorageNode.h b/Libs/MRML/Core/vtkMRMLMarkupsStorageNode.h index d080aecd0adc6653001f852d4f362a3f2fd0bd1f..3722e356b5b5961e823efcb2d0f2783934b30173 100644 --- a/Libs/MRML/Core/vtkMRMLMarkupsStorageNode.h +++ b/Libs/MRML/Core/vtkMRMLMarkupsStorageNode.h @@ -37,24 +37,24 @@ class VTK_MRML_EXPORT vtkMRMLMarkupsStorageNode : public vtkMRMLStorageNode public: static vtkMRMLMarkupsStorageNode *New(); vtkTypeMacro(vtkMRMLMarkupsStorageNode,vtkMRMLStorageNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Get node XML tag name (like Storage, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "MarkupsStorage";}; + const char* GetNodeTagName() override {return "MarkupsStorage";}; /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; - virtual bool CanReadInReferenceNode(vtkMRMLNode *refNode) VTK_OVERRIDE; + bool CanReadInReferenceNode(vtkMRMLNode *refNode) override; /// Coordinate system options enum @@ -84,24 +84,24 @@ public: protected: vtkMRMLMarkupsStorageNode(); - ~vtkMRMLMarkupsStorageNode(); + ~vtkMRMLMarkupsStorageNode() override; vtkMRMLMarkupsStorageNode(const vtkMRMLMarkupsStorageNode&); void operator=(const vtkMRMLMarkupsStorageNode&); /// Initialize all the supported write file types - virtual void InitializeSupportedReadFileTypes() VTK_OVERRIDE; + void InitializeSupportedReadFileTypes() override; /// Initialize all the supported write file types - virtual void InitializeSupportedWriteFileTypes() VTK_OVERRIDE; + void InitializeSupportedWriteFileTypes() override; /// Read data and set it in the referenced node /// Needs to be implemented by subclasses - virtual int ReadDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int ReadDataInternal(vtkMRMLNode *refNode) override; /// Write data from a referenced node /// There can be any number of points associated with a /// markup, so subclasses need to implement this for their markup type - virtual int WriteDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int WriteDataInternal(vtkMRMLNode *refNode) override; /// Extract the first quoted string from an input string and return it. /// Used in parsing the input strings in \sa ReadDataInternal. diff --git a/Libs/MRML/Core/vtkMRMLModelDisplayNode.h b/Libs/MRML/Core/vtkMRMLModelDisplayNode.h index 15c2e8eb0b59085b3133f37deaf92ca8eb3743ab..031dd31cd2f96e1a62906d3c5bc09f417998f3c9 100644 --- a/Libs/MRML/Core/vtkMRMLModelDisplayNode.h +++ b/Libs/MRML/Core/vtkMRMLModelDisplayNode.h @@ -38,7 +38,7 @@ class VTK_MRML_EXPORT vtkMRMLModelDisplayNode : public vtkMRMLDisplayNode public: static vtkMRMLModelDisplayNode *New(); vtkTypeMacro(vtkMRMLModelDisplayNode,vtkMRMLDisplayNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; enum SliceDisplayModeType { @@ -50,20 +50,20 @@ public: /// /// Read node attributes from XML file - virtual void ReadXMLAttributes(const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes(const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "ModelDisplay";} + const char* GetNodeTagName() override {return "ModelDisplay";} /// Set and observe mesh for this model. It should be the output /// mesh connection of the model node. @@ -106,11 +106,11 @@ public: /// are removed, therefore if a GUI or other component observes the mesh, then it will detect that /// the scalar is deleted and so it may deactivate the selected scalar. /// \sa SetActiveAttributeLocation() - virtual void SetActiveScalarName(const char *scalarName) VTK_OVERRIDE; + void SetActiveScalarName(const char *scalarName) override; /// Reimplemented to update pipeline with new value /// \sa SetActiveScalarName() - virtual void SetActiveAttributeLocation(int location) VTK_OVERRIDE; + void SetActiveAttributeLocation(int location) override; /// Sets active scalar name and attribute location in one step. /// It is preferable to use this method instead of calling SetActiveScalarName @@ -120,7 +120,7 @@ public: /// Reimplemented to update scalar range accordingly /// \sa SetActiveScalarName() - virtual void SetScalarRangeFlag(int flag) VTK_OVERRIDE; + void SetScalarRangeFlag(int flag) override; /// Set whether to threshold the model display node. /// \sa ThresholdEnabled, GetThresholdEnabled() @@ -172,13 +172,13 @@ public: protected: vtkMRMLModelDisplayNode(); - ~vtkMRMLModelDisplayNode(); + ~vtkMRMLModelDisplayNode() override; vtkMRMLModelDisplayNode(const vtkMRMLModelDisplayNode&); void operator=(const vtkMRMLModelDisplayNode&); - virtual void ProcessMRMLEvents(vtkObject *caller, + void ProcessMRMLEvents(vtkObject *caller, unsigned long event, - void *callData) VTK_OVERRIDE; + void *callData) override; /// To be reimplemented in subclasses if the input of the pipeline changes virtual void SetInputToMeshPipeline(vtkAlgorithmOutput* meshConnection); diff --git a/Libs/MRML/Core/vtkMRMLModelHierarchyNode.h b/Libs/MRML/Core/vtkMRMLModelHierarchyNode.h index 92e971efd6cca7853b0c98dfa2b3d4767a91e4c2..844df6937c58517822b9c82bfc0b9aa29c35cb10 100644 --- a/Libs/MRML/Core/vtkMRMLModelHierarchyNode.h +++ b/Libs/MRML/Core/vtkMRMLModelHierarchyNode.h @@ -25,43 +25,43 @@ class VTK_MRML_EXPORT vtkMRMLModelHierarchyNode : public vtkMRMLDisplayableHiera public: static vtkMRMLModelHierarchyNode *New(); vtkTypeMacro(vtkMRMLModelHierarchyNode,vtkMRMLDisplayableHierarchyNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; //-------------------------------------------------------------------------- /// MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, ModelHierarchy) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "ModelHierarchy";} + const char* GetNodeTagName() override {return "ModelHierarchy";} /// /// Updates this node if it depends on other nodes /// when the node is deleted in the scene - virtual void UpdateReferences() VTK_OVERRIDE; + void UpdateReferences() override; /// /// Finds the model node and read the data - virtual void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; /// /// Update the stored reference to another node in the scene - virtual void UpdateReferenceID(const char *oldID, const char *newID) VTK_OVERRIDE; + void UpdateReferenceID(const char *oldID, const char *newID) override; /// /// String ID of the model MRML node @@ -100,14 +100,14 @@ public: /// /// alternative method to propagate events generated in Display nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; protected: vtkMRMLModelHierarchyNode(); - ~vtkMRMLModelHierarchyNode(); + ~vtkMRMLModelHierarchyNode() override; vtkMRMLModelHierarchyNode(const vtkMRMLModelHierarchyNode&); void operator=(const vtkMRMLModelHierarchyNode&); diff --git a/Libs/MRML/Core/vtkMRMLModelNode.h b/Libs/MRML/Core/vtkMRMLModelNode.h index f06b4660113dc42ecdefc4b3b7daea1ac22f9611..14d155c7af779e45c1eee469db5643d294fd15a0 100644 --- a/Libs/MRML/Core/vtkMRMLModelNode.h +++ b/Libs/MRML/Core/vtkMRMLModelNode.h @@ -44,25 +44,25 @@ class VTK_MRML_EXPORT vtkMRMLModelNode : public vtkMRMLDisplayableNode public: static vtkMRMLModelNode *New(); vtkTypeMacro(vtkMRMLModelNode,vtkMRMLDisplayableNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; //-------------------------------------------------------------------------- /// MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "Model";}; + const char* GetNodeTagName() override {return "Model";}; /// Description: /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// alternative method to propagate events generated in Display nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; /// Get associated model display MRML node vtkMRMLModelDisplayNode* GetModelDisplayNode(); @@ -217,12 +217,12 @@ public: /// This method returns the bounds of the object with any transforms that may /// be applied to it. /// \sa GetBounds() - virtual void GetRASBounds(double bounds[6]) VTK_OVERRIDE; + void GetRASBounds(double bounds[6]) override; /// Get bounding box in global RAS form (xmin,xmax, ymin,ymax, zmin,zmax). /// This method always returns the bounds of the untransformed object. /// \sa GetRASBounds() - virtual void GetBounds(double bounds[6]) VTK_OVERRIDE; + void GetBounds(double bounds[6]) override; /// Transforms bounds from the local coordinate system to the RAS (world) /// coordinate system. Only the corner points are used for determining the @@ -230,15 +230,15 @@ public: /// bounds may not fully contain the transformed model points. virtual void TransformBoundsToRAS(double inputBounds_Local[6], double outputBounds_RAS[6]); - virtual bool CanApplyNonLinearTransforms()const VTK_OVERRIDE; - virtual void ApplyTransform(vtkAbstractTransform* transform) VTK_OVERRIDE; + bool CanApplyNonLinearTransforms()const override; + void ApplyTransform(vtkAbstractTransform* transform) override; - virtual vtkMRMLStorageNode* CreateDefaultStorageNode() VTK_OVERRIDE; + vtkMRMLStorageNode* CreateDefaultStorageNode() override; - virtual std::string GetDefaultStorageNodeClassName(const char* filename /* =NULL */) VTK_OVERRIDE; + std::string GetDefaultStorageNodeClassName(const char* filename /* =NULL */) override; /// Create and observe default display node - virtual void CreateDefaultDisplayNodes() VTK_OVERRIDE; + void CreateDefaultDisplayNodes() override; /// Reimplemented to take into account the modified time of the mesh. /// Returns true if the node (default behavior) or the mesh are modified @@ -247,11 +247,11 @@ public: /// So if you invoke MeshModifiedEvent without calling Modified() on the /// mesh, GetModifiedSinceRead() won't return true. /// \sa vtkMRMLStorableNode::GetModifiedSinceRead() - virtual bool GetModifiedSinceRead() VTK_OVERRIDE; + bool GetModifiedSinceRead() override; protected: vtkMRMLModelNode(); - ~vtkMRMLModelNode(); + ~vtkMRMLModelNode() override; vtkMRMLModelNode(const vtkMRMLModelNode&); void operator=(const vtkMRMLModelNode&); @@ -264,11 +264,11 @@ protected: /// /// Called when a node reference ID is added (list size increased). - virtual void OnNodeReferenceAdded(vtkMRMLNodeReference *reference) VTK_OVERRIDE; + void OnNodeReferenceAdded(vtkMRMLNodeReference *reference) override; /// /// Called when a node reference ID is modified. - virtual void OnNodeReferenceModified(vtkMRMLNodeReference *reference) VTK_OVERRIDE; + void OnNodeReferenceModified(vtkMRMLNodeReference *reference) override; /// Internal function that sets the mesh to all the display nodes. diff --git a/Libs/MRML/Core/vtkMRMLModelStorageNode.h b/Libs/MRML/Core/vtkMRMLModelStorageNode.h index af35adb793f10049ac4cf0e932bd7b9436b8c27d..d13764c6aee47998d9fad6c86d386ceed5a8d099 100644 --- a/Libs/MRML/Core/vtkMRMLModelStorageNode.h +++ b/Libs/MRML/Core/vtkMRMLModelStorageNode.h @@ -27,40 +27,40 @@ class VTK_MRML_EXPORT vtkMRMLModelStorageNode : public vtkMRMLStorageNode public: static vtkMRMLModelStorageNode *New(); vtkTypeMacro(vtkMRMLModelStorageNode,vtkMRMLStorageNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Get node XML tag name (like Storage, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "ModelStorage";} + const char* GetNodeTagName() override {return "ModelStorage";} /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// Return true if the reference node can be read in - virtual bool CanReadInReferenceNode(vtkMRMLNode *refNode) VTK_OVERRIDE; + bool CanReadInReferenceNode(vtkMRMLNode *refNode) override; protected: vtkMRMLModelStorageNode(); - ~vtkMRMLModelStorageNode(); + ~vtkMRMLModelStorageNode() override; vtkMRMLModelStorageNode(const vtkMRMLModelStorageNode&); void operator=(const vtkMRMLModelStorageNode&); /// Initialize all the supported read file types - virtual void InitializeSupportedReadFileTypes() VTK_OVERRIDE; + void InitializeSupportedReadFileTypes() override; /// Initialize all the supported write file types - virtual void InitializeSupportedWriteFileTypes() VTK_OVERRIDE; + void InitializeSupportedWriteFileTypes() override; /// Get data node that is associated with this storage node vtkMRMLModelNode* GetAssociatedDataNode(); /// Read data and set it in the referenced node - virtual int ReadDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int ReadDataInternal(vtkMRMLNode *refNode) override; /// Write data from a referenced node - virtual int WriteDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int WriteDataInternal(vtkMRMLNode *refNode) override; }; diff --git a/Libs/MRML/Core/vtkMRMLNRRDStorageNode.h b/Libs/MRML/Core/vtkMRMLNRRDStorageNode.h index de630d7e97a341598c28c7362ffcf0471ff93d09..c21c160ee84d7f3f82b2ebeffa1b50decf3ecf80 100644 --- a/Libs/MRML/Core/vtkMRMLNRRDStorageNode.h +++ b/Libs/MRML/Core/vtkMRMLNRRDStorageNode.h @@ -28,25 +28,25 @@ class VTK_MRML_EXPORT vtkMRMLNRRDStorageNode : public vtkMRMLStorageNode public: static vtkMRMLNRRDStorageNode *New(); vtkTypeMacro(vtkMRMLNRRDStorageNode,vtkMRMLStorageNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Storage, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "NRRDStorage";} + const char* GetNodeTagName() override {return "NRRDStorage";} /// /// Center image on read @@ -58,13 +58,13 @@ class VTK_MRML_EXPORT vtkMRMLNRRDStorageNode : public vtkMRMLStorageNode int ParseDiffusionInformation(vtkTeemNRRDReader *reader,vtkDoubleArray *grad,vtkDoubleArray *bvalues); /// Return true if the node can be read in. - virtual bool CanReadInReferenceNode(vtkMRMLNode *refNode) VTK_OVERRIDE; + bool CanReadInReferenceNode(vtkMRMLNode *refNode) override; /// /// Configure the storage node for data exchange. This is an /// opportunity to optimize the storage node's settings, for /// instance to turn off compression. - virtual void ConfigureForDataExchange() VTK_OVERRIDE; + void ConfigureForDataExchange() override; /// Compression parameter corresponding to minimum compression (fast) std::string GetCompressionParameterFastest() { return "gzip_fastest"; }; @@ -75,21 +75,21 @@ class VTK_MRML_EXPORT vtkMRMLNRRDStorageNode : public vtkMRMLStorageNode protected: vtkMRMLNRRDStorageNode(); - ~vtkMRMLNRRDStorageNode(); + ~vtkMRMLNRRDStorageNode() override; vtkMRMLNRRDStorageNode(const vtkMRMLNRRDStorageNode&); void operator=(const vtkMRMLNRRDStorageNode&); /// Initialize all the supported write file types - virtual void InitializeSupportedReadFileTypes() VTK_OVERRIDE; + void InitializeSupportedReadFileTypes() override; /// Initialize all the supported write file types - virtual void InitializeSupportedWriteFileTypes() VTK_OVERRIDE; + void InitializeSupportedWriteFileTypes() override; /// Read data and set it in the referenced node - virtual int ReadDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int ReadDataInternal(vtkMRMLNode *refNode) override; /// Write data from a referenced node - virtual int WriteDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int WriteDataInternal(vtkMRMLNode *refNode) override; /// Convert compression parameter string to gzip compression level int GetGzipCompressionLevelFromCompressionParameter(std::string parameter); diff --git a/Libs/MRML/Core/vtkMRMLNode.h b/Libs/MRML/Core/vtkMRMLNode.h index 916bca700c517a3e431d8cd179bb42c7a4a2ee43..74059504038b95e0dc346bf79c40e4131433229e 100644 --- a/Libs/MRML/Core/vtkMRMLNode.h +++ b/Libs/MRML/Core/vtkMRMLNode.h @@ -144,7 +144,7 @@ class VTK_MRML_EXPORT vtkMRMLNode : public vtkObject public: vtkTypeMacro(vtkMRMLNode,vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// \brief Create instance of the default node. Like New only virtual. /// @@ -431,7 +431,7 @@ public: /// of the instance variables). /// /// \sa GetDisableModifiedEvent() - virtual void Modified() VTK_OVERRIDE + void Modified() override { if (!this->GetDisableModifiedEvent()) { @@ -743,7 +743,7 @@ protected: public: vtkTypeMacro(vtkMRMLNodeReference,vtkObject); static vtkMRMLNodeReference *New(); - void PrintSelf(ostream& vtkNotUsed(os), vtkIndent vtkNotUsed(indent)) VTK_OVERRIDE {}; + void PrintSelf(ostream& vtkNotUsed(os), vtkIndent vtkNotUsed(indent)) override {}; public: vtkSetStringMacro(ReferenceRole); @@ -768,7 +768,7 @@ protected: protected: vtkMRMLNodeReference(); - virtual ~vtkMRMLNodeReference(); + ~vtkMRMLNodeReference() override; vtkMRMLNodeReference(const vtkMRMLNodeReference&); void operator=(const vtkMRMLNodeReference&); @@ -791,7 +791,7 @@ protected: vtkMRMLNode(); /// critical to have a virtual destructor! - virtual ~vtkMRMLNode(); + ~vtkMRMLNode() override; vtkMRMLNode(const vtkMRMLNode&); void operator=(const vtkMRMLNode&); diff --git a/Libs/MRML/Core/vtkMRMLPETProceduralColorNode.h b/Libs/MRML/Core/vtkMRMLPETProceduralColorNode.h index 2c695301802dc6f77056100ad7c708e026fc524a..d73423fbac4e9553840bca526ffee7dae8a29972 100644 --- a/Libs/MRML/Core/vtkMRMLPETProceduralColorNode.h +++ b/Libs/MRML/Core/vtkMRMLPETProceduralColorNode.h @@ -8,40 +8,40 @@ class VTK_MRML_EXPORT vtkMRMLPETProceduralColorNode : public vtkMRMLProceduralCo public: static vtkMRMLPETProceduralColorNode *New(); vtkTypeMacro(vtkMRMLPETProceduralColorNode,vtkMRMLProceduralColorNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; //-------------------------------------------------------------------------- /// MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Set node attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "PETProceduralColor";} + const char* GetNodeTagName() override {return "PETProceduralColor";} /// /// - virtual void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; /// /// Get/Set for Type. In SetType, set up the custom colour options for this /// set of colours - virtual void SetType(int type) VTK_OVERRIDE; + void SetType(int type) override; - void ProcessMRMLEvents ( vtkObject *caller, unsigned long event, void *callData ) VTK_OVERRIDE; + void ProcessMRMLEvents ( vtkObject *caller, unsigned long event, void *callData ) override; /// The list of valid procedural types //enum @@ -67,17 +67,17 @@ public: }; /// Return the lowest and the highest integers, for use in looping - int GetFirstType() VTK_OVERRIDE { return this->PETheat; } - int GetLastType() VTK_OVERRIDE { return this->PETMIP; } + int GetFirstType() override { return this->PETheat; } + int GetLastType() override { return this->PETMIP; } - const char *GetTypeAsString() VTK_OVERRIDE; + const char *GetTypeAsString() override; void SetTypeToHeat(); void SetTypeToRainbow(); void SetTypeToMIP(); protected: vtkMRMLPETProceduralColorNode(); - ~vtkMRMLPETProceduralColorNode(); + ~vtkMRMLPETProceduralColorNode() override; vtkMRMLPETProceduralColorNode(const vtkMRMLPETProceduralColorNode&); void operator=(const vtkMRMLPETProceduralColorNode&); }; diff --git a/Libs/MRML/Core/vtkMRMLParser.h b/Libs/MRML/Core/vtkMRMLParser.h index 477126bd7976386002d3255649b6b4b422b428f2..7f2a32d0b6050c76bc4f4c9f5de99e1055aefa2c 100644 --- a/Libs/MRML/Core/vtkMRMLParser.h +++ b/Libs/MRML/Core/vtkMRMLParser.h @@ -42,12 +42,12 @@ public: protected: vtkMRMLParser() : MRMLScene(NULL),NodeCollection(NULL){}; - ~vtkMRMLParser() {}; + ~vtkMRMLParser() override {}; vtkMRMLParser(const vtkMRMLParser&); void operator=(const vtkMRMLParser&); - virtual void StartElement(const char* name, const char** atts) VTK_OVERRIDE; - virtual void EndElement (const char *name) VTK_OVERRIDE; + void StartElement(const char* name, const char** atts) override; + void EndElement (const char *name) override; private: vtkMRMLScene* MRMLScene; diff --git a/Libs/MRML/Core/vtkMRMLPlotChartNode.h b/Libs/MRML/Core/vtkMRMLPlotChartNode.h index e186ed7deba013e9fb207cdb5bad93106f2caa65..61abfd7f9aa4c449125a79dc9660400a1e5e8fbe 100644 --- a/Libs/MRML/Core/vtkMRMLPlotChartNode.h +++ b/Libs/MRML/Core/vtkMRMLPlotChartNode.h @@ -40,31 +40,31 @@ class VTK_MRML_EXPORT vtkMRMLPlotChartNode : public vtkMRMLNode static vtkMRMLPlotChartNode *New(); vtkTypeMacro(vtkMRMLPlotChartNode,vtkMRMLNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Set node attributes. - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object. - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model). - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "PlotChart";}; + const char* GetNodeTagName() override {return "PlotChart";}; /// /// Method to propagate events generated in mrml. - virtual void ProcessMRMLEvents(vtkObject *caller, + void ProcessMRMLEvents(vtkObject *caller, unsigned long event, - void *callData) VTK_OVERRIDE; + void *callData) override; /// PlotModifiedEvent is fired when: /// - a new plot node is observed @@ -279,21 +279,21 @@ class VTK_MRML_EXPORT vtkMRMLPlotChartNode : public vtkMRMLNode /// Constructor and destructor //---------------------------------------------------------------- vtkMRMLPlotChartNode(); - ~vtkMRMLPlotChartNode(); + ~vtkMRMLPlotChartNode() override; vtkMRMLPlotChartNode(const vtkMRMLPlotChartNode&); void operator=(const vtkMRMLPlotChartNode&); /// /// Called when a node reference ID is added (list size increased). - virtual void OnNodeReferenceAdded(vtkMRMLNodeReference *reference) VTK_OVERRIDE; + void OnNodeReferenceAdded(vtkMRMLNodeReference *reference) override; /// /// Called when a node reference ID is modified. - virtual void OnNodeReferenceModified(vtkMRMLNodeReference *reference) VTK_OVERRIDE; + void OnNodeReferenceModified(vtkMRMLNodeReference *reference) override; /// /// Called after a node reference ID is removed (list size decreased). - virtual void OnNodeReferenceRemoved(vtkMRMLNodeReference *reference) VTK_OVERRIDE; + void OnNodeReferenceRemoved(vtkMRMLNodeReference *reference) override; static const char* PlotSeriesNodeReferenceRole; diff --git a/Libs/MRML/Core/vtkMRMLPlotSeriesNode.h b/Libs/MRML/Core/vtkMRMLPlotSeriesNode.h index 140519deaaeee801139e236fe69b520cc2e38669..a15b8b7f883251fcb52b35db0b03cd17e1859c4f 100644 --- a/Libs/MRML/Core/vtkMRMLPlotSeriesNode.h +++ b/Libs/MRML/Core/vtkMRMLPlotSeriesNode.h @@ -79,25 +79,25 @@ public: LineStyle_Last // must be last }; - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; //---------------------------------------------------------------- /// Standard methods for MRML nodes //---------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Set node attributes. - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Get node XML tag name (like Volume, Model). - virtual const char* GetNodeTagName() VTK_OVERRIDE { return "PlotSeries"; }; + const char* GetNodeTagName() override { return "PlotSeries"; }; /// /// Set and observe Table node ID. @@ -116,9 +116,9 @@ public: /// /// Method to propagate events generated in Plot nodes. - virtual void ProcessMRMLEvents (vtkObject *caller, + void ProcessMRMLEvents (vtkObject *caller, unsigned long event, - void *callData) VTK_OVERRIDE; + void *callData) override; /// /// TableModifiedEvent is send when the parent table is modified @@ -228,7 +228,7 @@ public: //---------------------------------------------------------------- protected: vtkMRMLPlotSeriesNode(); - ~vtkMRMLPlotSeriesNode(); + ~vtkMRMLPlotSeriesNode() override; vtkMRMLPlotSeriesNode(const vtkMRMLPlotSeriesNode&); void operator=(const vtkMRMLPlotSeriesNode&); @@ -240,7 +240,7 @@ protected: /// /// Called when a node reference ID is added (list size increased). - virtual void OnNodeReferenceAdded(vtkMRMLNodeReference *reference) VTK_OVERRIDE + void OnNodeReferenceAdded(vtkMRMLNodeReference *reference) override { Superclass::OnNodeReferenceAdded(reference); if (std::string(reference->GetReferenceRole()) == this->TableNodeReferenceRole) @@ -251,7 +251,7 @@ protected: /// /// Called when a node reference ID is modified. - virtual void OnNodeReferenceModified(vtkMRMLNodeReference *reference) VTK_OVERRIDE + void OnNodeReferenceModified(vtkMRMLNodeReference *reference) override { Superclass::OnNodeReferenceModified(reference); if (std::string(reference->GetReferenceRole()) == this->TableNodeReferenceRole) @@ -262,7 +262,7 @@ protected: /// /// Called after a node reference ID is removed (list size decreased). - virtual void OnNodeReferenceRemoved(vtkMRMLNodeReference *reference) VTK_OVERRIDE + void OnNodeReferenceRemoved(vtkMRMLNodeReference *reference) override { Superclass::OnNodeReferenceRemoved(reference); if (std::string(reference->GetReferenceRole()) == this->TableNodeReferenceRole) @@ -275,7 +275,7 @@ protected: /// Copy the node's attributes to this object /// This is used only internally. /// Externally CopyWithScene has to be called. - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; //---------------------------------------------------------------- /// Data diff --git a/Libs/MRML/Core/vtkMRMLPlotViewNode.h b/Libs/MRML/Core/vtkMRMLPlotViewNode.h index 58dff40afb89ede43e3acc21a42816b65960ab29..dd925fcf606bc5c12d366b4edca5fc9fa9420943 100644 --- a/Libs/MRML/Core/vtkMRMLPlotViewNode.h +++ b/Libs/MRML/Core/vtkMRMLPlotViewNode.h @@ -32,7 +32,7 @@ class VTK_MRML_EXPORT vtkMRMLPlotViewNode : public vtkMRMLAbstractViewNode public: static vtkMRMLPlotViewNode *New(); vtkTypeMacro(vtkMRMLPlotViewNode, vtkMRMLAbstractViewNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Enum of the available plot types enum { @@ -47,23 +47,23 @@ public: /// MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Read node attributes from XML file. - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object. - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model). - virtual const char* GetNodeTagName() VTK_OVERRIDE { return "PlotView"; }; + const char* GetNodeTagName() override { return "PlotView"; }; /// /// Set and Update the PlotChart node id displayed in this PlotView. @@ -112,9 +112,9 @@ public: /// /// Method to propagate events generated in mrml. - virtual void ProcessMRMLEvents(vtkObject *caller, + void ProcessMRMLEvents(vtkObject *caller, unsigned long event, - void *callData) VTK_OVERRIDE; + void *callData) override; /// PlotModifiedEvent is fired when: /// - a new PlotChart node is observed @@ -133,7 +133,7 @@ public: protected: vtkMRMLPlotViewNode(); - ~vtkMRMLPlotViewNode(); + ~vtkMRMLPlotViewNode() override; vtkMRMLPlotViewNode(const vtkMRMLPlotViewNode&); void operator=(const vtkMRMLPlotViewNode&); @@ -144,15 +144,15 @@ protected: /// /// Called when a node reference ID is added (list size increased). - virtual void OnNodeReferenceAdded(vtkMRMLNodeReference *reference) VTK_OVERRIDE; + void OnNodeReferenceAdded(vtkMRMLNodeReference *reference) override; /// /// Called when a node reference ID is modified. - virtual void OnNodeReferenceModified(vtkMRMLNodeReference *reference) VTK_OVERRIDE; + void OnNodeReferenceModified(vtkMRMLNodeReference *reference) override; /// /// Called after a node reference ID is removed (list size decreased). - virtual void OnNodeReferenceRemoved(vtkMRMLNodeReference *reference) VTK_OVERRIDE; + void OnNodeReferenceRemoved(vtkMRMLNodeReference *reference) override; bool DoPropagatePlotChartSelection; diff --git a/Libs/MRML/Core/vtkMRMLProceduralColorNode.h b/Libs/MRML/Core/vtkMRMLProceduralColorNode.h index 0f316bda167820466127b886e14d46eea0bc239a..efc9574e7d4351782ed2c47b55ebe99b6e5a9f90 100644 --- a/Libs/MRML/Core/vtkMRMLProceduralColorNode.h +++ b/Libs/MRML/Core/vtkMRMLProceduralColorNode.h @@ -29,39 +29,39 @@ class VTK_MRML_EXPORT vtkMRMLProceduralColorNode : public vtkMRMLColorNode public: static vtkMRMLProceduralColorNode *New(); vtkTypeMacro(vtkMRMLProceduralColorNode,vtkMRMLColorNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; //-------------------------------------------------------------------------- /// MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Set node attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "ProceduralColor";}; + const char* GetNodeTagName() override {return "ProceduralColor";}; /// /// - virtual void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; /// /// return a text string describing the colour look up table type - virtual const char * GetTypeAsString() VTK_OVERRIDE; + const char * GetTypeAsString() override; - void ProcessMRMLEvents ( vtkObject *caller, unsigned long event, void *callData ) VTK_OVERRIDE; + void ProcessMRMLEvents ( vtkObject *caller, unsigned long event, void *callData ) override; /// The list of valid procedural types //enum @@ -92,26 +92,26 @@ public: /// the continuous color transfer function to a look up table /// with a number of entries defined by NumberOfTableValues /// \sa ConvertedCTFtoLUT, SetNumberOfTableValues() - virtual vtkLookupTable * GetLookupTable() VTK_OVERRIDE; + vtkLookupTable * GetLookupTable() override; /// Reimplemented vtkMRMLColorNode::GetScalarsToColors() to return the /// transfer function instead of the empty lookuptable /// \sa ColorTransferFunction, GetColorTransferFunction() - virtual vtkScalarsToColors* GetScalarsToColors() VTK_OVERRIDE; + vtkScalarsToColors* GetScalarsToColors() override; /// set up some names, going from the points defined in the transfer function /// \sa vtkMRMLColorNode::SetColorName() - bool SetNameFromColor(int index) VTK_OVERRIDE; + bool SetNameFromColor(int index) override; /// Returns how many nodes define the color /// transfer function - virtual int GetNumberOfColors() VTK_OVERRIDE; + int GetNumberOfColors() override; /// Retrieve color transfer function entry value - virtual bool GetColor(int entry, double color[4]) VTK_OVERRIDE; + bool GetColor(int entry, double color[4]) override; /// Create default storage node or NULL if does not have one - virtual vtkMRMLStorageNode* CreateDefaultStorageNode() VTK_OVERRIDE; + vtkMRMLStorageNode* CreateDefaultStorageNode() override; /// Get number of entries used when discretizing /// the color transfer function into a lookup table @@ -125,7 +125,7 @@ public: protected: vtkMRMLProceduralColorNode(); - ~vtkMRMLProceduralColorNode(); + ~vtkMRMLProceduralColorNode() override; vtkMRMLProceduralColorNode(const vtkMRMLProceduralColorNode&); void operator=(const vtkMRMLProceduralColorNode&); diff --git a/Libs/MRML/Core/vtkMRMLProceduralColorStorageNode.h b/Libs/MRML/Core/vtkMRMLProceduralColorStorageNode.h index a5a860bce0426482daf563789aa076a8cfc1d6b1..6b73b677aa23487ff56613f565086f433742150c 100644 --- a/Libs/MRML/Core/vtkMRMLProceduralColorStorageNode.h +++ b/Libs/MRML/Core/vtkMRMLProceduralColorStorageNode.h @@ -27,33 +27,33 @@ class VTK_MRML_EXPORT vtkMRMLProceduralColorStorageNode : public vtkMRMLStorageN public: static vtkMRMLProceduralColorStorageNode *New(); vtkTypeMacro(vtkMRMLProceduralColorStorageNode,vtkMRMLStorageNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Get node XML tag name (like Storage, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "ProceduralColorStorage";} + const char* GetNodeTagName() override {return "ProceduralColorStorage";} /// Return true if the node can be read in - virtual bool CanReadInReferenceNode(vtkMRMLNode* refNode) VTK_OVERRIDE; + bool CanReadInReferenceNode(vtkMRMLNode* refNode) override; protected: vtkMRMLProceduralColorStorageNode(); - ~vtkMRMLProceduralColorStorageNode(); + ~vtkMRMLProceduralColorStorageNode() override; vtkMRMLProceduralColorStorageNode(const vtkMRMLProceduralColorStorageNode&); void operator=(const vtkMRMLProceduralColorStorageNode&); /// Initialize all the supported read file types - virtual void InitializeSupportedReadFileTypes() VTK_OVERRIDE; + void InitializeSupportedReadFileTypes() override; /// Initialize all the supported write file types - virtual void InitializeSupportedWriteFileTypes() VTK_OVERRIDE; + void InitializeSupportedWriteFileTypes() override; /// Read data and set it in the referenced node - virtual int ReadDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int ReadDataInternal(vtkMRMLNode *refNode) override; /// Write data from a referenced node - virtual int WriteDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int WriteDataInternal(vtkMRMLNode *refNode) override; }; diff --git a/Libs/MRML/Core/vtkMRMLROIListNode.h b/Libs/MRML/Core/vtkMRMLROIListNode.h index 11f1023a1ffb24166a35f451262f5f5cdf6fe0e2..66dfec893a0fdbce71ebb634e201ee3c93f2d7f5 100644 --- a/Libs/MRML/Core/vtkMRMLROIListNode.h +++ b/Libs/MRML/Core/vtkMRMLROIListNode.h @@ -12,36 +12,36 @@ class VTK_MRML_EXPORT vtkMRMLROIListNode : public vtkMRMLNode public: static vtkMRMLROIListNode *New(); vtkTypeMacro(vtkMRMLROIListNode,vtkMRMLNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; //-------------------------------------------------------------------------- /// MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Set node attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "ROIList";} + const char* GetNodeTagName() override {return "ROIList";} /// /// - virtual void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; /// /// update display node ids - void UpdateReferences() VTK_OVERRIDE; + void UpdateReferences() override; /// /// Get the number of ROIs in the list @@ -93,7 +93,7 @@ class VTK_MRML_EXPORT vtkMRMLROIListNode : public vtkMRMLNode /// Remove all ROIs from the list void RemoveAllROIs(); - void ProcessMRMLEvents ( vtkObject *caller, unsigned long event, void *callData ) VTK_OVERRIDE; + void ProcessMRMLEvents ( vtkObject *caller, unsigned long event, void *callData ) override; /// DisplayModifiedEvent is generated when display node parameters is changed /// PolyDataModifiedEvent is generated when something else is changed @@ -172,7 +172,7 @@ class VTK_MRML_EXPORT vtkMRMLROIListNode : public vtkMRMLNode protected: vtkMRMLROIListNode(); - ~vtkMRMLROIListNode(); + ~vtkMRMLROIListNode() override; vtkMRMLROIListNode(const vtkMRMLROIListNode&); void operator=(const vtkMRMLROIListNode&); diff --git a/Libs/MRML/Core/vtkMRMLROINode.h b/Libs/MRML/Core/vtkMRMLROINode.h index a053a033f6e68e0d4dc06e3990ae61ee1f4fb9e7..a36259b5d5a5530857155034c48efd08a547d359 100644 --- a/Libs/MRML/Core/vtkMRMLROINode.h +++ b/Libs/MRML/Core/vtkMRMLROINode.h @@ -14,38 +14,38 @@ class VTK_MRML_EXPORT vtkMRMLROINode : public vtkMRMLTransformableNode public: static vtkMRMLROINode *New(); vtkTypeMacro(vtkMRMLROINode,vtkMRMLTransformableNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; //-------------------------------------------------------------------------- /// MRML methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Set node attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; virtual void ReadXMLString( const char *keyValuePairs); /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "MRMLROINode";} + const char* GetNodeTagName() override {return "MRMLROINode";} /// /// - virtual void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; /// /// update display node ids - void UpdateReferences() VTK_OVERRIDE; + void UpdateReferences() override; /// /// Indicates if the ROI is visible @@ -98,15 +98,15 @@ public: vtkSetStringMacro(LabelText); vtkGetStringMacro(LabelText); - void ProcessMRMLEvents ( vtkObject *caller, unsigned long event, void *callData ) VTK_OVERRIDE; + void ProcessMRMLEvents ( vtkObject *caller, unsigned long event, void *callData ) override; vtkGetStringMacro(VolumeNodeID); vtkSetStringMacro(VolumeNodeID); /// /// transform utility functions - virtual bool CanApplyNonLinearTransforms()const VTK_OVERRIDE; - virtual void ApplyTransform(vtkAbstractTransform* transform) VTK_OVERRIDE; + bool CanApplyNonLinearTransforms()const override; + void ApplyTransform(vtkAbstractTransform* transform) override; /// Description /// get transformed planes for the ROI region @@ -114,7 +114,7 @@ public: protected: vtkMRMLROINode(); - ~vtkMRMLROINode(); + ~vtkMRMLROINode() override; vtkMRMLROINode(const vtkMRMLROINode&); void operator=(const vtkMRMLROINode&); int Visibility; diff --git a/Libs/MRML/Core/vtkMRMLScalarVolumeDisplayNode.h b/Libs/MRML/Core/vtkMRMLScalarVolumeDisplayNode.h index ccd9e5c53678b7cf055ebf30be72560276feaad5..bed4c51c8af77762908a352e9d32d6aa131554bc 100644 --- a/Libs/MRML/Core/vtkMRMLScalarVolumeDisplayNode.h +++ b/Libs/MRML/Core/vtkMRMLScalarVolumeDisplayNode.h @@ -43,25 +43,25 @@ class VTK_MRML_EXPORT vtkMRMLScalarVolumeDisplayNode : public vtkMRMLVolumeDispl public: static vtkMRMLScalarVolumeDisplayNode *New(); vtkTypeMacro(vtkMRMLScalarVolumeDisplayNode,vtkMRMLVolumeDisplayNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "VolumeDisplay";} + const char* GetNodeTagName() override {return "VolumeDisplay";} //-------------------------------------------------------------------------- @@ -133,27 +133,27 @@ class VTK_MRML_EXPORT vtkMRMLScalarVolumeDisplayNode : public vtkMRMLVolumeDispl vtkSetMacro(Interpolate, int); vtkBooleanMacro(Interpolate, int); - virtual void SetDefaultColorMap() VTK_OVERRIDE; + void SetDefaultColorMap() override; /// /// alternative method to propagate events generated in Display nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; /// Set the pipeline input - virtual void SetInputImageDataConnection(vtkAlgorithmOutput *imageDataConnection) VTK_OVERRIDE; + void SetInputImageDataConnection(vtkAlgorithmOutput *imageDataConnection) override; /// Gets the pipeline input - virtual vtkAlgorithmOutput* GetInputImageDataConnection() VTK_OVERRIDE; + vtkAlgorithmOutput* GetInputImageDataConnection() override; /// Gets the pipeline output - virtual vtkAlgorithmOutput* GetOutputImageDataConnection() VTK_OVERRIDE; + vtkAlgorithmOutput* GetOutputImageDataConnection() override; /// /// Get/set background mask stencil - virtual void SetBackgroundImageStencilDataConnection(vtkAlgorithmOutput *imageDataConnection) VTK_OVERRIDE; - virtual vtkAlgorithmOutput* GetBackgroundImageStencilDataConnection() VTK_OVERRIDE; + void SetBackgroundImageStencilDataConnection(vtkAlgorithmOutput *imageDataConnection) override; + vtkAlgorithmOutput* GetBackgroundImageStencilDataConnection() override; /// /// Parse a string with window and level as double|double, and add a preset @@ -188,11 +188,11 @@ class VTK_MRML_EXPORT vtkMRMLScalarVolumeDisplayNode : public vtkMRMLVolumeDispl protected: vtkMRMLScalarVolumeDisplayNode(); - virtual ~vtkMRMLScalarVolumeDisplayNode(); + ~vtkMRMLScalarVolumeDisplayNode() override; vtkMRMLScalarVolumeDisplayNode(const vtkMRMLScalarVolumeDisplayNode&); void operator=(const vtkMRMLScalarVolumeDisplayNode&); - virtual void SetColorNodeInternal(vtkMRMLColorNode* newColorNode) VTK_OVERRIDE; + void SetColorNodeInternal(vtkMRMLColorNode* newColorNode) override; void UpdateLookupTable(vtkMRMLColorNode* newColorNode); void CalculateAutoLevels(); @@ -201,7 +201,7 @@ protected: vtkImageData* GetScalarImageData(); virtual vtkAlgorithmOutput* GetScalarImageDataConnection(); - virtual void SetInputToImageDataPipeline(vtkAlgorithmOutput *imageDataConnection) VTK_OVERRIDE; + void SetInputToImageDataPipeline(vtkAlgorithmOutput *imageDataConnection) override; /// /// To hold preset values for window and level, so can restore this display diff --git a/Libs/MRML/Core/vtkMRMLScalarVolumeNode.h b/Libs/MRML/Core/vtkMRMLScalarVolumeNode.h index 982fc57de414609038222571bf354a6bd4180813..c32acef6b4b0fa46d3b1b2dae7bb7f2be9845287 100644 --- a/Libs/MRML/Core/vtkMRMLScalarVolumeNode.h +++ b/Libs/MRML/Core/vtkMRMLScalarVolumeNode.h @@ -36,25 +36,25 @@ class VTK_MRML_EXPORT vtkMRMLScalarVolumeNode : public vtkMRMLVolumeNode public: static vtkMRMLScalarVolumeNode *New(); vtkTypeMacro(vtkMRMLScalarVolumeNode,vtkMRMLVolumeNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Set node attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "Volume";} + const char* GetNodeTagName() override {return "Volume";} /// /// Make a 'None' volume node with blank image data @@ -66,11 +66,11 @@ class VTK_MRML_EXPORT vtkMRMLScalarVolumeNode : public vtkMRMLVolumeNode /// /// Create default storage node or NULL if does not have one - virtual vtkMRMLStorageNode* CreateDefaultStorageNode() VTK_OVERRIDE; + vtkMRMLStorageNode* CreateDefaultStorageNode() override; /// /// Create and observe default display node - virtual void CreateDefaultDisplayNodes() VTK_OVERRIDE; + void CreateDefaultDisplayNodes() override; /// Measured quantity of voxel values, specified as a standard coded entry. /// For example: (DCM, 112031, "Attenuation Coefficient") @@ -86,7 +86,7 @@ class VTK_MRML_EXPORT vtkMRMLScalarVolumeNode : public vtkMRMLVolumeNode protected: vtkMRMLScalarVolumeNode(); - ~vtkMRMLScalarVolumeNode(); + ~vtkMRMLScalarVolumeNode() override; vtkMRMLScalarVolumeNode(const vtkMRMLScalarVolumeNode&); void operator=(const vtkMRMLScalarVolumeNode&); diff --git a/Libs/MRML/Core/vtkMRMLScene.h b/Libs/MRML/Core/vtkMRMLScene.h index 4ba731ec2f34f175c8a24decfe21705f20bfc2d5..68a79eb7f7ccf61efeb7033d097e70b6babead31 100644 --- a/Libs/MRML/Core/vtkMRMLScene.h +++ b/Libs/MRML/Core/vtkMRMLScene.h @@ -62,7 +62,7 @@ class VTK_MRML_EXPORT vtkMRMLScene : public vtkObject public: static vtkMRMLScene *New(); vtkTypeMacro(vtkMRMLScene, vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Set URL (file name) of the scene void SetURL(const char *url); @@ -709,7 +709,7 @@ protected: typedef std::map< std::string, std::set > NodeReferencesType; vtkMRMLScene(); - virtual ~vtkMRMLScene(); + ~vtkMRMLScene() override; void PushIntoUndoStack(); void PushIntoRedoStack(); diff --git a/Libs/MRML/Core/vtkMRMLSceneViewNode.h b/Libs/MRML/Core/vtkMRMLSceneViewNode.h index cd26f9d2fc0dfe7d7086db041dea0c0b6f1427b2..5729baf28971717fe8648b2dafb47cfa9f80ac5b 100644 --- a/Libs/MRML/Core/vtkMRMLSceneViewNode.h +++ b/Libs/MRML/Core/vtkMRMLSceneViewNode.h @@ -28,33 +28,33 @@ class VTK_MRML_EXPORT vtkMRMLSceneViewNode : public vtkMRMLStorableNode public: static vtkMRMLSceneViewNode *New(); vtkTypeMacro(vtkMRMLSceneViewNode,vtkMRMLStorableNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Write this node's body to a MRML file in XML format. - virtual void WriteNodeBodyXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteNodeBodyXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "SceneView";} + const char* GetNodeTagName() override {return "SceneView";} /// /// Updates scene nodes - virtual void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; /// /// Updates internal nodes @@ -63,7 +63,7 @@ class VTK_MRML_EXPORT vtkMRMLSceneViewNode : public vtkMRMLStorableNode /// /// Set dependencies between this node and a child node /// when parsing XML file - virtual void ProcessChildNode(vtkMRMLNode *node) VTK_OVERRIDE; + void ProcessChildNode(vtkMRMLNode *node) override; /// \sa StoreScene() RestoreScene() vtkMRMLScene* GetStoredScene(); @@ -109,7 +109,7 @@ class VTK_MRML_EXPORT vtkMRMLSceneViewNode : public vtkMRMLStorableNode /// /// Create default storage node or NULL if does not have one - virtual vtkMRMLStorageNode* CreateDefaultStorageNode() VTK_OVERRIDE; + vtkMRMLStorageNode* CreateDefaultStorageNode() override; /// Get vector of nodes of a specified class in the scene. /// Returns 0 on failure, number of nodes on success. @@ -130,7 +130,7 @@ class VTK_MRML_EXPORT vtkMRMLSceneViewNode : public vtkMRMLStorableNode protected: vtkMRMLSceneViewNode(); - ~vtkMRMLSceneViewNode(); + ~vtkMRMLSceneViewNode() override; vtkMRMLSceneViewNode(const vtkMRMLSceneViewNode&); void operator=(const vtkMRMLSceneViewNode&); diff --git a/Libs/MRML/Core/vtkMRMLSceneViewStorageNode.h b/Libs/MRML/Core/vtkMRMLSceneViewStorageNode.h index 0688d97005b0ed6a99ead2cccb59f39b302f3c52..53d7d8877467086e4172551a6cf19b7908601133 100644 --- a/Libs/MRML/Core/vtkMRMLSceneViewStorageNode.h +++ b/Libs/MRML/Core/vtkMRMLSceneViewStorageNode.h @@ -25,38 +25,38 @@ class VTK_MRML_EXPORT vtkMRMLSceneViewStorageNode : public vtkMRMLStorageNode public: static vtkMRMLSceneViewStorageNode *New(); vtkTypeMacro(vtkMRMLSceneViewStorageNode,vtkMRMLStorageNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Get node XML tag name (like Storage, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "SceneViewStorage";} + const char* GetNodeTagName() override {return "SceneViewStorage";} /// Initialize all the supported read file types - virtual void InitializeSupportedReadFileTypes() VTK_OVERRIDE; + void InitializeSupportedReadFileTypes() override; /// Initialize all the supported write file types - virtual void InitializeSupportedWriteFileTypes() VTK_OVERRIDE; + void InitializeSupportedWriteFileTypes() override; /// Return true if the node can be read in - virtual bool CanReadInReferenceNode(vtkMRMLNode *refNode) VTK_OVERRIDE; + bool CanReadInReferenceNode(vtkMRMLNode *refNode) override; protected: vtkMRMLSceneViewStorageNode(); - ~vtkMRMLSceneViewStorageNode(); + ~vtkMRMLSceneViewStorageNode() override; vtkMRMLSceneViewStorageNode(const vtkMRMLSceneViewStorageNode&); void operator=(const vtkMRMLSceneViewStorageNode&); /// /// Read data and set it in the referenced node /// NOTE: Subclasses should implement this method - virtual int ReadDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int ReadDataInternal(vtkMRMLNode *refNode) override; /// /// Write data from a referenced node /// NOTE: Subclasses should implement this method - virtual int WriteDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int WriteDataInternal(vtkMRMLNode *refNode) override; }; diff --git a/Libs/MRML/Core/vtkMRMLScriptedModuleNode.h b/Libs/MRML/Core/vtkMRMLScriptedModuleNode.h index 04cc9adae4e61d14e0a339be022ac4fa727d58b9..12f8dc7c786677597ec0e5659a89d9867f67127c 100644 --- a/Libs/MRML/Core/vtkMRMLScriptedModuleNode.h +++ b/Libs/MRML/Core/vtkMRMLScriptedModuleNode.h @@ -29,21 +29,21 @@ class VTK_MRML_EXPORT vtkMRMLScriptedModuleNode : public vtkMRMLNode public: static vtkMRMLScriptedModuleNode *New(); vtkTypeMacro(vtkMRMLScriptedModuleNode,vtkMRMLNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Set node attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE; + const char* GetNodeTagName() override; /// The name of the Module - this is used to /// customize the node selectors and other things @@ -75,7 +75,7 @@ public: protected: vtkMRMLScriptedModuleNode(); - ~vtkMRMLScriptedModuleNode(); + ~vtkMRMLScriptedModuleNode() override; vtkMRMLScriptedModuleNode(const vtkMRMLScriptedModuleNode&); void operator=(const vtkMRMLScriptedModuleNode&); diff --git a/Libs/MRML/Core/vtkMRMLSegmentationDisplayNode.h b/Libs/MRML/Core/vtkMRMLSegmentationDisplayNode.h index e154cc6919518d4f4190f64254916641c543c8af..d67818011a3a278c1b268b2b2bdde032de11ddfc 100644 --- a/Libs/MRML/Core/vtkMRMLSegmentationDisplayNode.h +++ b/Libs/MRML/Core/vtkMRMLSegmentationDisplayNode.h @@ -83,21 +83,21 @@ public: public: static vtkMRMLSegmentationDisplayNode *New(); vtkTypeMacro(vtkMRMLSegmentationDisplayNode,vtkMRMLDisplayNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Set node attributes from name/value pairs - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE { return "SegmentationDisplay"; } + const char* GetNodeTagName() override { return "SegmentationDisplay"; } public: /// Get name of representation that is displayed in the 2D view if exists @@ -278,7 +278,7 @@ protected: protected: vtkMRMLSegmentationDisplayNode(); - virtual ~vtkMRMLSegmentationDisplayNode(); + ~vtkMRMLSegmentationDisplayNode() override; vtkMRMLSegmentationDisplayNode(const vtkMRMLSegmentationDisplayNode&); void operator=(const vtkMRMLSegmentationDisplayNode&); diff --git a/Libs/MRML/Core/vtkMRMLSegmentationNode.h b/Libs/MRML/Core/vtkMRMLSegmentationNode.h index 2e5f1a565e50f3ef9013c107c027c6c63f10bf68..33daf113ac66d2f03e68830f6653a06a0cda0aeb 100644 --- a/Libs/MRML/Core/vtkMRMLSegmentationNode.h +++ b/Libs/MRML/Core/vtkMRMLSegmentationNode.h @@ -57,54 +57,54 @@ public: static vtkMRMLSegmentationNode *New(); vtkTypeMacro(vtkMRMLSegmentationNode, vtkMRMLDisplayableNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Create instance of a GAD node. - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Set node attributes from name/value pairs - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// Copy the entire contents of the node into this node virtual void DeepCopy(vtkMRMLNode* node); /// Get unique node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "Segmentation";}; + const char* GetNodeTagName() override {return "Segmentation";}; /// Get bounding box in global RAS form (xmin,xmax, ymin,ymax, zmin,zmax). /// This method returns the bounds of the object with any transforms that may /// be applied to it. /// \sa GetBounds() - virtual void GetRASBounds(double bounds[6]) VTK_OVERRIDE; + void GetRASBounds(double bounds[6]) override; /// Get bounding box in global RAS form (xmin,xmax, ymin,ymax, zmin,zmax). /// This method always returns the bounds of the untransformed object. /// \sa GetRASBounds() - virtual void GetBounds(double bounds[6]) VTK_OVERRIDE; + void GetBounds(double bounds[6]) override; /// Returns true if the transformable node can apply non linear transforms /// \sa ApplyTransform - virtual bool CanApplyNonLinearTransforms()const VTK_OVERRIDE; + bool CanApplyNonLinearTransforms()const override; /// Apply a transform matrix on the segmentation /// \sa SetAndObserveTransformNodeID, ApplyTransform, CanApplyNonLinearTransforms - virtual void ApplyTransformMatrix(vtkMatrix4x4* transformMatrix) VTK_OVERRIDE; + void ApplyTransformMatrix(vtkMatrix4x4* transformMatrix) override; /// Apply a transform on the segmentation /// \sa SetAndObserveTransformNodeID, CanApplyNonLinearTransforms - virtual void ApplyTransform(vtkAbstractTransform* transform) VTK_OVERRIDE; + void ApplyTransform(vtkAbstractTransform* transform) override; /// Create a segmentation storage node - virtual vtkMRMLStorageNode* CreateDefaultStorageNode() VTK_OVERRIDE; + vtkMRMLStorageNode* CreateDefaultStorageNode() override; /// Create and observe a segmentation display node - virtual void CreateDefaultDisplayNodes() VTK_OVERRIDE; + void CreateDefaultDisplayNodes() override; /// Function called from segmentation logic when UID is added in a subject hierarchy node. /// In case the newly added UID is a volume node referenced from this segmentation, @@ -268,7 +268,7 @@ protected: protected: vtkMRMLSegmentationNode(); - virtual ~vtkMRMLSegmentationNode(); + ~vtkMRMLSegmentationNode() override; vtkMRMLSegmentationNode(const vtkMRMLSegmentationNode&); void operator=(const vtkMRMLSegmentationNode&); diff --git a/Libs/MRML/Core/vtkMRMLSegmentationStorageNode.h b/Libs/MRML/Core/vtkMRMLSegmentationStorageNode.h index de05999785e520e699eea41d3d027c7b849474f3..07557dbafa315a306ae28e73e90f45b6d88b9d34 100644 --- a/Libs/MRML/Core/vtkMRMLSegmentationStorageNode.h +++ b/Libs/MRML/Core/vtkMRMLSegmentationStorageNode.h @@ -59,45 +59,45 @@ class VTK_MRML_EXPORT vtkMRMLSegmentationStorageNode : public vtkMRMLStorageNode public: static vtkMRMLSegmentationStorageNode *New(); vtkTypeMacro(vtkMRMLSegmentationStorageNode, vtkMRMLStorageNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// Get node XML tag name (like Storage, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "SegmentationStorage";} + const char* GetNodeTagName() override {return "SegmentationStorage";} /// Return a default file extension for writing /// File write extension is determined dynamically /// from master representation type. - virtual const char* GetDefaultWriteFileExtension() VTK_OVERRIDE; + const char* GetDefaultWriteFileExtension() override; /// Return true if the reference node can be read in - virtual bool CanReadInReferenceNode(vtkMRMLNode *refNode) VTK_OVERRIDE; + bool CanReadInReferenceNode(vtkMRMLNode *refNode) override; /// Reset supported write file types. Called when master representation is changed void ResetSupportedWriteFileTypes(); protected: /// Initialize all the supported read file types - virtual void InitializeSupportedReadFileTypes() VTK_OVERRIDE; + void InitializeSupportedReadFileTypes() override; /// Initialize all the supported write file types - virtual void InitializeSupportedWriteFileTypes() VTK_OVERRIDE; + void InitializeSupportedWriteFileTypes() override; /// Get data node that is associated with this storage node vtkMRMLSegmentationNode* GetAssociatedDataNode(); /// Write data from a referenced node - virtual int WriteDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int WriteDataInternal(vtkMRMLNode *refNode) override; /// Write binary labelmap representation to file virtual int WriteBinaryLabelmapRepresentation(vtkMRMLSegmentationNode* segmentationNode, std::string path); @@ -106,7 +106,7 @@ protected: virtual int WritePolyDataRepresentation(vtkMRMLSegmentationNode* segmentationNode, std::string path); /// Read data and set it in the referenced node - virtual int ReadDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int ReadDataInternal(vtkMRMLNode *refNode) override; /// Read binary labelmap representation from nrrd file (3D spatial + list) virtual int ReadBinaryLabelmapRepresentation(vtkMRMLSegmentationNode* segmentationNode, std::string path); @@ -145,7 +145,7 @@ protected: protected: vtkMRMLSegmentationStorageNode(); - ~vtkMRMLSegmentationStorageNode(); + ~vtkMRMLSegmentationStorageNode() override; private: vtkMRMLSegmentationStorageNode(const vtkMRMLSegmentationStorageNode&); /// Not implemented. diff --git a/Libs/MRML/Core/vtkMRMLSelectionNode.h b/Libs/MRML/Core/vtkMRMLSelectionNode.h index f5d88d91123c675077df22d629431fc1842cae90..4bb6aee5f157512e594b616b8f940b514272609a 100644 --- a/Libs/MRML/Core/vtkMRMLSelectionNode.h +++ b/Libs/MRML/Core/vtkMRMLSelectionNode.h @@ -36,31 +36,31 @@ class VTK_MRML_EXPORT vtkMRMLSelectionNode : public vtkMRMLNode public: static vtkMRMLSelectionNode *New(); vtkTypeMacro(vtkMRMLSelectionNode,vtkMRMLNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Set node attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "Selection";} + const char* GetNodeTagName() override {return "Selection";} /// Set the nodes as references to the current scene. - virtual void SetSceneReferences() VTK_OVERRIDE; + void SetSceneReferences() override; /// Update the stored reference to another node in the scene - virtual void UpdateReferenceID(const char *oldID, const char *newID) VTK_OVERRIDE; + void UpdateReferenceID(const char *oldID, const char *newID) override; /// Updates this node if it depends on other nodes /// when the node is deleted in the scene - virtual void UpdateReferences() VTK_OVERRIDE; + void UpdateReferences() override; /// the ID of a MRMLVolumeNode (typically background) vtkGetStringMacro (ActiveVolumeID); @@ -213,7 +213,7 @@ class VTK_MRML_EXPORT vtkMRMLSelectionNode : public vtkMRMLNode /// Method to propagate events generated in units nodes. /// \sa GetNodeReferenceID(), SetAndObserveNodeReferenceID() /// \sa UnitModifiedEvent - void ProcessMRMLEvents(vtkObject *caller, unsigned long event, void *callData) VTK_OVERRIDE; + void ProcessMRMLEvents(vtkObject *caller, unsigned long event, void *callData) override; /// Remove a placeNode class name from the list /// \sa PlaceNodeClassNameInList @@ -261,7 +261,7 @@ class VTK_MRML_EXPORT vtkMRMLSelectionNode : public vtkMRMLNode protected: vtkMRMLSelectionNode(); - ~vtkMRMLSelectionNode(); + ~vtkMRMLSelectionNode() override; vtkMRMLSelectionNode(const vtkMRMLSelectionNode&); void operator=(const vtkMRMLSelectionNode&); diff --git a/Libs/MRML/Core/vtkMRMLSliceCompositeNode.h b/Libs/MRML/Core/vtkMRMLSliceCompositeNode.h index c37ab938f4911f259824d58f638d68c64d86a587..4e51a03329399dcdd98f124664291149e9d4f4a3 100644 --- a/Libs/MRML/Core/vtkMRMLSliceCompositeNode.h +++ b/Libs/MRML/Core/vtkMRMLSliceCompositeNode.h @@ -26,37 +26,37 @@ class VTK_MRML_EXPORT vtkMRMLSliceCompositeNode : public vtkMRMLNode public: static vtkMRMLSliceCompositeNode *New(); vtkTypeMacro(vtkMRMLSliceCompositeNode,vtkMRMLNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Set node attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "SliceComposite";} + const char* GetNodeTagName() override {return "SliceComposite";} /// Set the volumes as reference in the scene - virtual void SetSceneReferences() VTK_OVERRIDE; + void SetSceneReferences() override; /// /// Updates this node if it depends on other nodes /// when the node is deleted in the scene - virtual void UpdateReferences() VTK_OVERRIDE; + void UpdateReferences() override; /// /// Update the stored reference to another node in the scene - virtual void UpdateReferenceID(const char *oldID, const char *newID) VTK_OVERRIDE; + void UpdateReferenceID(const char *oldID, const char *newID) override; /// /// the ID of a MRMLVolumeNode @@ -239,7 +239,7 @@ class VTK_MRML_EXPORT vtkMRMLSliceCompositeNode : public vtkMRMLNode protected: vtkMRMLSliceCompositeNode(); - ~vtkMRMLSliceCompositeNode(); + ~vtkMRMLSliceCompositeNode() override; vtkMRMLSliceCompositeNode(const vtkMRMLSliceCompositeNode&); void operator=(const vtkMRMLSliceCompositeNode&); diff --git a/Libs/MRML/Core/vtkMRMLSliceNode.h b/Libs/MRML/Core/vtkMRMLSliceNode.h index 466c75e1f77b82686cc9a7b9a03d33ad7dc16839..ff4523141a4aaecee9cd8ad1bdfa1dd0fb165c50 100644 --- a/Libs/MRML/Core/vtkMRMLSliceNode.h +++ b/Libs/MRML/Core/vtkMRMLSliceNode.h @@ -40,30 +40,30 @@ class VTK_MRML_EXPORT vtkMRMLSliceNode : public vtkMRMLAbstractViewNode /// vtkMRMLScene::CreateNodeByClass(const char*) static vtkMRMLSliceNode *New(); vtkTypeMacro(vtkMRMLSliceNode,vtkMRMLAbstractViewNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Set node attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// \brief Reimplemented to preserve orientation and layout color when reset. /// \sa GetOrientationString() /// \sa GetLayoutColor() - virtual void Reset(vtkMRMLNode* defaultNode) VTK_OVERRIDE; + void Reset(vtkMRMLNode* defaultNode) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "Slice";}; + const char* GetNodeTagName() override {return "Slice";}; /// /// Mapping from RAS space onto the slice plane @@ -498,7 +498,7 @@ public: protected: vtkMRMLSliceNode(); - ~vtkMRMLSliceNode(); + ~vtkMRMLSliceNode() override; vtkMRMLSliceNode(const vtkMRMLSliceNode&); void operator=(const vtkMRMLSliceNode&); diff --git a/Libs/MRML/Core/vtkMRMLSnapshotClipNode.h b/Libs/MRML/Core/vtkMRMLSnapshotClipNode.h index d4e35693d25a5788f34e27660f29597fd794d8a7..0e9ac675e9a2f8f8bf9d151961e424ed6019a9d9 100644 --- a/Libs/MRML/Core/vtkMRMLSnapshotClipNode.h +++ b/Libs/MRML/Core/vtkMRMLSnapshotClipNode.h @@ -31,30 +31,30 @@ class VTK_MRML_EXPORT vtkMRMLSnapshotClipNode : public vtkMRMLNode public: static vtkMRMLSnapshotClipNode *New(); vtkTypeMacro(vtkMRMLSnapshotClipNode,vtkMRMLNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "SnapshotClip";} + const char* GetNodeTagName() override {return "SnapshotClip";} /// /// Updates this node if it depends on other nodes /// when the node is deleted in the scene - virtual void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; /// /// Add SceneSnapshot node @@ -69,7 +69,7 @@ class VTK_MRML_EXPORT vtkMRMLSnapshotClipNode : public vtkMRMLNode protected: vtkMRMLSnapshotClipNode(); - ~vtkMRMLSnapshotClipNode(); + ~vtkMRMLSnapshotClipNode() override; vtkMRMLSnapshotClipNode(const vtkMRMLSnapshotClipNode&); void operator=(const vtkMRMLSnapshotClipNode&); diff --git a/Libs/MRML/Core/vtkMRMLStorableNode.h b/Libs/MRML/Core/vtkMRMLStorableNode.h index ba122ee6887b7381d6bb58bfd077ee310d19d1ed..6fa560f423e95ef546afb157ec27c2082d389df4 100644 --- a/Libs/MRML/Core/vtkMRMLStorableNode.h +++ b/Libs/MRML/Core/vtkMRMLStorableNode.h @@ -34,7 +34,7 @@ class VTK_MRML_EXPORT vtkMRMLStorableNode : public vtkMRMLNode { public: vtkTypeMacro(vtkMRMLStorableNode,vtkMRMLNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; //-------------------------------------------------------------------------- /// Methods for user-specified metadata @@ -45,31 +45,31 @@ public: /// MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE = 0; + vtkMRMLNode* CreateNodeInstance() override = 0; - virtual const char* GetNodeTagName() VTK_OVERRIDE = 0; + const char* GetNodeTagName() override = 0; /// /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Finds the storage node and read the data - virtual void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; /// /// alternative method to propagate events generated in Storage nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; /// /// String ID of the storage MRML node @@ -140,7 +140,7 @@ public: protected: vtkMRMLStorableNode(); - ~vtkMRMLStorableNode(); + ~vtkMRMLStorableNode() override; vtkMRMLStorableNode(const vtkMRMLStorableNode&); void operator=(const vtkMRMLStorableNode&); diff --git a/Libs/MRML/Core/vtkMRMLStorageNode.h b/Libs/MRML/Core/vtkMRMLStorageNode.h index 74a35353dc7d8822f1c9879e8eaa03dbf89220e6..99ca4aae4a44235048ddfb19b27903ace17217f1 100644 --- a/Libs/MRML/Core/vtkMRMLStorageNode.h +++ b/Libs/MRML/Core/vtkMRMLStorageNode.h @@ -34,9 +34,9 @@ class VTK_MRML_EXPORT vtkMRMLStorageNode : public vtkMRMLNode { public: vtkTypeMacro(vtkMRMLStorageNode,vtkMRMLNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE = 0; + vtkMRMLNode* CreateNodeInstance() override = 0; /// Returns the first storable node that is associated to this storage node /// \sa vtkMRMLStorableNode @@ -44,7 +44,7 @@ public: /// /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Read data from \a FileName and set it in the referenced node. @@ -65,15 +65,15 @@ public: /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Storage, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE = 0; + const char* GetNodeTagName() override = 0; /// A file name or the archetype file name for a series used for read or write /// \sa ReadData(), WriteData() @@ -107,7 +107,7 @@ public: /// /// Propagate Progress Event generated in ReadData - virtual void ProcessMRMLEvents ( vtkObject *caller, unsigned long event, void *callData ) VTK_OVERRIDE; + void ProcessMRMLEvents ( vtkObject *caller, unsigned long event, void *callData ) override; /// /// Possible Read and Write states @@ -347,7 +347,7 @@ public: protected: vtkMRMLStorageNode(); - ~vtkMRMLStorageNode(); + ~vtkMRMLStorageNode() override; vtkMRMLStorageNode(const vtkMRMLStorageNode&); void operator=(const vtkMRMLStorageNode&); diff --git a/Libs/MRML/Core/vtkMRMLStreamingVolumeNode.h b/Libs/MRML/Core/vtkMRMLStreamingVolumeNode.h index 21870ddea0785725eae0f93860a8764fd6780690..31d330ae65be983b9e4ff5d3f31904bbb8e8943c 100644 --- a/Libs/MRML/Core/vtkMRMLStreamingVolumeNode.h +++ b/Libs/MRML/Core/vtkMRMLStreamingVolumeNode.h @@ -47,30 +47,30 @@ class VTK_MRML_EXPORT vtkMRMLStreamingVolumeNode : public vtkMRMLVectorVolumeNo public: static vtkMRMLStreamingVolumeNode *New(); vtkTypeMacro(vtkMRMLStreamingVolumeNode,vtkMRMLVectorVolumeNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; - virtual void ProcessMRMLEvents(vtkObject *caller, unsigned long event, void *callData) VTK_OVERRIDE; + void ProcessMRMLEvents(vtkObject *caller, unsigned long event, void *callData) override; /// Set node attributes - virtual void ReadXMLAttributes(const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes(const char** atts) override; /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE + const char* GetNodeTagName() override {return "StreamingVolume";} /// Set/Get the observed image data object and and image data connections /// \sa vtkMRMLVolumeNode::SetAndObserveImageData(), vtkMRMLVolumeNode::GetImageData(), vtkMRMLVolumeNode::GetImageDataConnection() - virtual void SetAndObserveImageData(vtkImageData* imageData) VTK_OVERRIDE; - virtual vtkImageData* GetImageData() VTK_OVERRIDE; - virtual vtkAlgorithmOutput* GetImageDataConnection() VTK_OVERRIDE; + void SetAndObserveImageData(vtkImageData* imageData) override; + vtkImageData* GetImageData() override; + vtkAlgorithmOutput* GetImageDataConnection() override; /// Set and observe the frame object containing the compressed image data /// \param frame Object containing the compressed video frame info @@ -115,7 +115,7 @@ public: protected: vtkMRMLStreamingVolumeNode(); - ~vtkMRMLStreamingVolumeNode(); + ~vtkMRMLStreamingVolumeNode() override; vtkMRMLStreamingVolumeNode(const vtkMRMLStreamingVolumeNode&); void operator=(const vtkMRMLStreamingVolumeNode&); diff --git a/Libs/MRML/Core/vtkMRMLSubjectHierarchyLegacyNode.h b/Libs/MRML/Core/vtkMRMLSubjectHierarchyLegacyNode.h index e088790110b99c3425ca5069b683082d943a408b..006d07d61a489851bc4744f1fb49b7e4aa734a90 100644 --- a/Libs/MRML/Core/vtkMRMLSubjectHierarchyLegacyNode.h +++ b/Libs/MRML/Core/vtkMRMLSubjectHierarchyLegacyNode.h @@ -64,21 +64,21 @@ public: /// call \sa CreateSubjectHierarchyNode method. static vtkMRMLSubjectHierarchyLegacyNode *New(); vtkTypeMacro(vtkMRMLSubjectHierarchyLegacyNode,vtkMRMLHierarchyNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Read node attributes from XML file - virtual void ReadXMLAttributes(const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes(const char** atts) override; /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// Get node XML tag name (like Volume, Contour) - virtual const char* GetNodeTagName() VTK_OVERRIDE; + const char* GetNodeTagName() override; public: /// Find subject hierarchy node according to a UID (by exact match) @@ -137,7 +137,7 @@ protected: protected: vtkMRMLSubjectHierarchyLegacyNode(); - ~vtkMRMLSubjectHierarchyLegacyNode(); + ~vtkMRMLSubjectHierarchyLegacyNode() override; vtkMRMLSubjectHierarchyLegacyNode(const vtkMRMLSubjectHierarchyLegacyNode&); void operator=(const vtkMRMLSubjectHierarchyLegacyNode&); }; diff --git a/Libs/MRML/Core/vtkMRMLSubjectHierarchyNode.cxx b/Libs/MRML/Core/vtkMRMLSubjectHierarchyNode.cxx index 96fe99fad543a46d6b22de0ec67b925d23bfd195..1a3033440a6d525ebfcf486509836d5ea6d73558 100644 --- a/Libs/MRML/Core/vtkMRMLSubjectHierarchyNode.cxx +++ b/Libs/MRML/Core/vtkMRMLSubjectHierarchyNode.cxx @@ -58,7 +58,7 @@ class vtkSubjectHierarchyItem : public vtkObject public: static vtkSubjectHierarchyItem *New(); vtkTypeMacro(vtkSubjectHierarchyItem, vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; void ReadXMLAttributes(const char** atts); void WriteXML(ostream& of, int indent, vtkMRMLNode* xmlEncoderNode); void DeepCopy(vtkSubjectHierarchyItem* item, bool copyChildren=true); @@ -232,7 +232,7 @@ public: public: vtkSubjectHierarchyItem(); - ~vtkSubjectHierarchyItem(); + ~vtkSubjectHierarchyItem() override; private: /// Incremental ID used to uniquely identify subject hierarchy items diff --git a/Libs/MRML/Core/vtkMRMLSubjectHierarchyNode.h b/Libs/MRML/Core/vtkMRMLSubjectHierarchyNode.h index 1a929b609d4ff384b1f196f9f8ceb7a717b34edb..dbcd726abbb819d713183f08bcffa696bfb20e96 100644 --- a/Libs/MRML/Core/vtkMRMLSubjectHierarchyNode.h +++ b/Libs/MRML/Core/vtkMRMLSubjectHierarchyNode.h @@ -83,22 +83,22 @@ public: public: static vtkMRMLSubjectHierarchyNode *New(); vtkTypeMacro(vtkMRMLSubjectHierarchyNode,vtkMRMLNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Read item from XML virtual void ReadItemFromXML(const char** atts); /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// Write this node's body to a MRML file in XML format. - virtual void WriteNodeBodyXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteNodeBodyXML(ostream& of, int indent) override; /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// Get node XML tag name (like Volume, Contour) - virtual const char* GetNodeTagName() VTK_OVERRIDE; + const char* GetNodeTagName() override; // Get/Set methods public: @@ -361,7 +361,7 @@ protected: protected: vtkMRMLSubjectHierarchyNode(); - ~vtkMRMLSubjectHierarchyNode(); + ~vtkMRMLSubjectHierarchyNode() override; vtkMRMLSubjectHierarchyNode(const vtkMRMLSubjectHierarchyNode&); void operator=(const vtkMRMLSubjectHierarchyNode&); diff --git a/Libs/MRML/Core/vtkMRMLTableNode.h b/Libs/MRML/Core/vtkMRMLTableNode.h index 833e1b0e9c1a89f22b73b3c1af3a45fd623773a4..6b16e3b69bc1107e4acc26d2176481c9b37b6a1f 100644 --- a/Libs/MRML/Core/vtkMRMLTableNode.h +++ b/Libs/MRML/Core/vtkMRMLTableNode.h @@ -50,33 +50,33 @@ public: static vtkMRMLTableNode *New(); vtkTypeMacro(vtkMRMLTableNode,vtkMRMLStorableNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; //---------------------------------------------------------------- /// Standard methods for MRML nodes //---------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Set node attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE { return "Table"; } + const char* GetNodeTagName() override { return "Table"; } /// /// Method to propagate events generated in mrml - virtual void ProcessMRMLEvents(vtkObject *caller, unsigned long event, void *callData) VTK_OVERRIDE; + void ProcessMRMLEvents(vtkObject *caller, unsigned long event, void *callData) override; //---------------------------------------------------------------- /// Get and Set Macros @@ -119,7 +119,7 @@ public: /// /// Create default storage node or NULL if does not have one - virtual vtkMRMLStorageNode* CreateDefaultStorageNode() VTK_OVERRIDE; + vtkMRMLStorageNode* CreateDefaultStorageNode() override; /// /// Add an array to the table as a new column. @@ -296,7 +296,7 @@ public: //---------------------------------------------------------------- protected: vtkMRMLTableNode(); - ~vtkMRMLTableNode(); + ~vtkMRMLTableNode() override; vtkMRMLTableNode(const vtkMRMLTableNode&); void operator=(const vtkMRMLTableNode&); diff --git a/Libs/MRML/Core/vtkMRMLTableSQLiteStorageNode.h b/Libs/MRML/Core/vtkMRMLTableSQLiteStorageNode.h index ea24c560ad804d412303ba969d4bc9cc064e28f6..36fa41f46c0d7d8f4e23d73d00e9ab1064f63f02 100644 --- a/Libs/MRML/Core/vtkMRMLTableSQLiteStorageNode.h +++ b/Libs/MRML/Core/vtkMRMLTableSQLiteStorageNode.h @@ -39,15 +39,15 @@ class VTK_MRML_EXPORT vtkMRMLTableSQLiteStorageNode : public vtkMRMLStorageNode public: static vtkMRMLTableSQLiteStorageNode *New(); vtkTypeMacro(vtkMRMLTableSQLiteStorageNode,vtkMRMLStorageNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Get node XML tag name (like Storage, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "TableSQLightStorage";} + const char* GetNodeTagName() override {return "TableSQLightStorage";} /// Return true if the node can be read in - virtual bool CanReadInReferenceNode(vtkMRMLNode *refNode) VTK_OVERRIDE; + bool CanReadInReferenceNode(vtkMRMLNode *refNode) override; /// SQLight Database password vtkSetStringMacro(Password); @@ -62,21 +62,21 @@ public: protected: vtkMRMLTableSQLiteStorageNode(); - ~vtkMRMLTableSQLiteStorageNode(); + ~vtkMRMLTableSQLiteStorageNode() override; vtkMRMLTableSQLiteStorageNode(const vtkMRMLTableSQLiteStorageNode&); void operator=(const vtkMRMLTableSQLiteStorageNode&); /// Initialize all the supported write file types - virtual void InitializeSupportedReadFileTypes() VTK_OVERRIDE; + void InitializeSupportedReadFileTypes() override; /// Initialize all the supported write file types - virtual void InitializeSupportedWriteFileTypes() VTK_OVERRIDE; + void InitializeSupportedWriteFileTypes() override; /// Read data and set it in the referenced node. Returns 0 on failure. - virtual int ReadDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int ReadDataInternal(vtkMRMLNode *refNode) override; /// Write data from a referenced node. Returns 0 on failure. - virtual int WriteDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int WriteDataInternal(vtkMRMLNode *refNode) override; char *TableName; char *Password; diff --git a/Libs/MRML/Core/vtkMRMLTableStorageNode.h b/Libs/MRML/Core/vtkMRMLTableStorageNode.h index 68be4644879a8bd342e52f2a5455ab1b39578db1..1749ee0f4f42684f6c0dc90bbbaf71b7acad31cc 100644 --- a/Libs/MRML/Core/vtkMRMLTableStorageNode.h +++ b/Libs/MRML/Core/vtkMRMLTableStorageNode.h @@ -45,15 +45,15 @@ class VTK_MRML_EXPORT vtkMRMLTableStorageNode : public vtkMRMLStorageNode public: static vtkMRMLTableStorageNode *New(); vtkTypeMacro(vtkMRMLTableStorageNode,vtkMRMLStorageNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Get node XML tag name (like Storage, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "TableStorage";} + const char* GetNodeTagName() override {return "TableStorage";} /// Return true if the node can be read in - virtual bool CanReadInReferenceNode(vtkMRMLNode *refNode) VTK_OVERRIDE; + bool CanReadInReferenceNode(vtkMRMLNode *refNode) override; /// Get/Set schema file name, which contain description of data type of each column virtual void SetSchemaFileName(const char* schemaFileName); @@ -70,21 +70,21 @@ public: protected: vtkMRMLTableStorageNode(); - ~vtkMRMLTableStorageNode(); + ~vtkMRMLTableStorageNode() override; vtkMRMLTableStorageNode(const vtkMRMLTableStorageNode&); void operator=(const vtkMRMLTableStorageNode&); /// Initialize all the supported write file types - virtual void InitializeSupportedReadFileTypes() VTK_OVERRIDE; + void InitializeSupportedReadFileTypes() override; /// Initialize all the supported write file types - virtual void InitializeSupportedWriteFileTypes() VTK_OVERRIDE; + void InitializeSupportedWriteFileTypes() override; /// Read data and set it in the referenced node. Returns 0 on failure. - virtual int ReadDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int ReadDataInternal(vtkMRMLNode *refNode) override; /// Write data from a referenced node. Returns 0 on failure. - virtual int WriteDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int WriteDataInternal(vtkMRMLNode *refNode) override; std::string GenerateSchemaFileName(const char* fileName); diff --git a/Libs/MRML/Core/vtkMRMLTableViewNode.h b/Libs/MRML/Core/vtkMRMLTableViewNode.h index eaef78ab0b95cfb5a61f4f83ccf3ff3e145f4ba3..9566831d00cda0683626ea796280e7e6439cce92 100644 --- a/Libs/MRML/Core/vtkMRMLTableViewNode.h +++ b/Libs/MRML/Core/vtkMRMLTableViewNode.h @@ -35,29 +35,29 @@ class VTK_MRML_EXPORT vtkMRMLTableViewNode : public vtkMRMLAbstractViewNode public: static vtkMRMLTableViewNode *New(); vtkTypeMacro(vtkMRMLTableViewNode, vtkMRMLAbstractViewNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; //-------------------------------------------------------------------------- /// MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Set node attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE; + const char* GetNodeTagName() override; /// /// Set the Table node id displayed in this Table View @@ -83,7 +83,7 @@ public: protected: vtkMRMLTableViewNode(); - ~vtkMRMLTableViewNode(); + ~vtkMRMLTableViewNode() override; vtkMRMLTableViewNode(const vtkMRMLTableViewNode&); void operator=(const vtkMRMLTableViewNode&); diff --git a/Libs/MRML/Core/vtkMRMLTensorVolumeNode.h b/Libs/MRML/Core/vtkMRMLTensorVolumeNode.h index 98c34e099e1d18c80854821a55370f25c256a40c..67c9f8ff70312629d3bece17f807e4551a312b1c 100644 --- a/Libs/MRML/Core/vtkMRMLTensorVolumeNode.h +++ b/Libs/MRML/Core/vtkMRMLTensorVolumeNode.h @@ -36,35 +36,35 @@ class VTK_MRML_EXPORT vtkMRMLTensorVolumeNode : public vtkMRMLScalarVolumeNode public: static vtkMRMLTensorVolumeNode *New(); vtkTypeMacro(vtkMRMLTensorVolumeNode,vtkMRMLScalarVolumeNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Set node attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "TensorVolume";} + const char* GetNodeTagName() override {return "TensorVolume";} /// /// Updates this node if it depends on other nodes /// when the node is deleted in the scene - virtual void UpdateReferences() VTK_OVERRIDE + void UpdateReferences() override { Superclass::UpdateReferences(); } /// Description: /// Update the stored reference to another node in the scene - virtual void UpdateReferenceID(const char *oldID, const char *newID) VTK_OVERRIDE + void UpdateReferenceID(const char *oldID, const char *newID) override { Superclass::UpdateReferenceID(oldID, newID); } /// @@ -89,11 +89,11 @@ class VTK_MRML_EXPORT vtkMRMLTensorVolumeNode : public vtkMRMLScalarVolumeNode /// /// Create default storage node or NULL if does not have one - virtual vtkMRMLStorageNode* CreateDefaultStorageNode() VTK_OVERRIDE; + vtkMRMLStorageNode* CreateDefaultStorageNode() override; protected: vtkMRMLTensorVolumeNode(); - ~vtkMRMLTensorVolumeNode(); + ~vtkMRMLTensorVolumeNode() override; vtkMRMLTensorVolumeNode(const vtkMRMLTensorVolumeNode&); void operator=(const vtkMRMLTensorVolumeNode&); diff --git a/Libs/MRML/Core/vtkMRMLTransformDisplayNode.h b/Libs/MRML/Core/vtkMRMLTransformDisplayNode.h index 9e867676133ca59c5231896788ee46de4125a197..4a3679a7584460bf3a0dcab180ff99c3af328606 100644 --- a/Libs/MRML/Core/vtkMRMLTransformDisplayNode.h +++ b/Libs/MRML/Core/vtkMRMLTransformDisplayNode.h @@ -42,7 +42,7 @@ class VTK_MRML_EXPORT vtkMRMLTransformDisplayNode : public vtkMRMLDisplayNode public: static vtkMRMLTransformDisplayNode *New ( ); vtkTypeMacro ( vtkMRMLTransformDisplayNode,vtkMRMLDisplayNode ); - void PrintSelf ( ostream& os, vtkIndent indent ) VTK_OVERRIDE; + void PrintSelf ( ostream& os, vtkIndent indent ) override; enum VisualizationModes { @@ -64,30 +64,30 @@ class VTK_MRML_EXPORT vtkMRMLTransformDisplayNode : public vtkMRMLDisplayNode /// MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance () VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance () override; /// /// Read node attributes from XML (MRML) file - virtual void ReadXMLAttributes ( const char** atts ) VTK_OVERRIDE; + void ReadXMLAttributes ( const char** atts ) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML ( ostream& of, int indent ) VTK_OVERRIDE; + void WriteXML ( ostream& of, int indent ) override; /// /// Copy the node's attributes to this object - virtual void Copy ( vtkMRMLNode *node ) VTK_OVERRIDE; + void Copy ( vtkMRMLNode *node ) override; /// /// Get node XML tag name (like Volume, UnstructuredGrid) - virtual const char* GetNodeTagName ( ) VTK_OVERRIDE {return "TransformDisplayNode";} + const char* GetNodeTagName ( ) override {return "TransformDisplayNode";} /// /// alternative method to propagate events generated in Display nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; //-------------------------------------------------------------------------- /// Display options @@ -244,7 +244,7 @@ protected: protected: vtkMRMLTransformDisplayNode ( ); - ~vtkMRMLTransformDisplayNode ( ); + ~vtkMRMLTransformDisplayNode ( ) override; vtkMRMLTransformDisplayNode ( const vtkMRMLTransformDisplayNode& ); void operator= ( const vtkMRMLTransformDisplayNode& ); diff --git a/Libs/MRML/Core/vtkMRMLTransformNode.h b/Libs/MRML/Core/vtkMRMLTransformNode.h index 9d79028449852dfe1098f91dd65663db8fcf06e1..971cb013b4930240594cc03f4cf960bf95c6c20a 100644 --- a/Libs/MRML/Core/vtkMRMLTransformNode.h +++ b/Libs/MRML/Core/vtkMRMLTransformNode.h @@ -35,29 +35,29 @@ class VTK_MRML_EXPORT vtkMRMLTransformNode : public vtkMRMLDisplayableNode public: static vtkMRMLTransformNode *New(); vtkTypeMacro(vtkMRMLTransformNode,vtkMRMLDisplayableNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "Transform";}; + const char* GetNodeTagName() override {return "Transform";}; /// /// Finds the storage node and read the data - virtual void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE + void UpdateScene(vtkMRMLScene *scene) override { Superclass::UpdateScene(scene); }; @@ -222,7 +222,7 @@ public: /// linear transform. /// If the current transformation was non-linear then the method /// is equivalent to ApplyTransform (creates a composite transform). - virtual void ApplyTransformMatrix(vtkMatrix4x4* transformMatrix) VTK_OVERRIDE; + void ApplyTransformMatrix(vtkMatrix4x4* transformMatrix) override; /// /// Set a new matrix transform of this node to parent node. @@ -237,9 +237,9 @@ public: virtual int SetAndObserveMatrixTransformFromParent(vtkMatrix4x4 *matrix); /// Reimplemented from vtkMRMLTransformableNode - virtual bool CanApplyNonLinearTransforms()const VTK_OVERRIDE; + bool CanApplyNonLinearTransforms()const override; /// Reimplemented from vtkMRMLTransformableNode - virtual void ApplyTransform(vtkAbstractTransform* transform) VTK_OVERRIDE; + void ApplyTransform(vtkAbstractTransform* transform) override; /// Split a composite transform to its components. The components are inserted to the scene between this transform and its parent. /// A composite transform can be created by hardening different types of transforms on each other. @@ -248,11 +248,11 @@ public: /// /// Create default storage node or NULL if does not have one - virtual vtkMRMLStorageNode* CreateDefaultStorageNode() VTK_OVERRIDE; + vtkMRMLStorageNode* CreateDefaultStorageNode() override; /// /// Create and observe default display node - virtual void CreateDefaultDisplayNodes() VTK_OVERRIDE; + void CreateDefaultDisplayNodes() override; /// Get/Set for ReadAsTransformToParent /// Indicates that the transform in the storage node has to be interpreted as @@ -274,7 +274,7 @@ public: this->InvokeCustomModifiedEvent(vtkMRMLTransformableNode::TransformModifiedEvent); } - virtual bool GetModifiedSinceRead() VTK_OVERRIDE; + bool GetModifiedSinceRead() override; /// /// Retrieves the transform as the specified transform class. @@ -305,9 +305,9 @@ public: void SetAndObserveTransformFromParent(vtkAbstractTransform *transform); /// alternative method to propagate events generated in Transform nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; /// /// Creates a shallow copy of an input composite transform (that can contain a complex hierarchy of transforms) @@ -355,7 +355,7 @@ public: protected: vtkMRMLTransformNode(); - ~vtkMRMLTransformNode(); + ~vtkMRMLTransformNode() override; vtkMRMLTransformNode(const vtkMRMLTransformNode&); void operator=(const vtkMRMLTransformNode&); diff --git a/Libs/MRML/Core/vtkMRMLTransformStorageNode.h b/Libs/MRML/Core/vtkMRMLTransformStorageNode.h index dddcf382cb63b144cb22559258061b2d49988aa7..88f805852968b1eba43b3499e10357f9c0279cb3 100644 --- a/Libs/MRML/Core/vtkMRMLTransformStorageNode.h +++ b/Libs/MRML/Core/vtkMRMLTransformStorageNode.h @@ -28,32 +28,32 @@ class VTK_MRML_EXPORT vtkMRMLTransformStorageNode : public vtkMRMLStorageNode public: static vtkMRMLTransformStorageNode *New(); vtkTypeMacro(vtkMRMLTransformStorageNode,vtkMRMLStorageNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Set node attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Get node XML tag name (like Storage, Transform) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "TransformStorage";}; + const char* GetNodeTagName() override {return "TransformStorage";}; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Initialize all the supported write file types - virtual void InitializeSupportedWriteFileTypes() VTK_OVERRIDE; + void InitializeSupportedWriteFileTypes() override; /// Support only transform nodes - virtual bool CanReadInReferenceNode(vtkMRMLNode* refNode) VTK_OVERRIDE; + bool CanReadInReferenceNode(vtkMRMLNode* refNode) override; /// /// If true then BSpline transforms will be written as deprecated but ITKv3-compatible @@ -66,7 +66,7 @@ class VTK_MRML_EXPORT vtkMRMLTransformStorageNode : public vtkMRMLStorageNode protected: vtkMRMLTransformStorageNode(); - ~vtkMRMLTransformStorageNode(); + ~vtkMRMLTransformStorageNode() override; vtkMRMLTransformStorageNode(const vtkMRMLTransformStorageNode&); void operator=(const vtkMRMLTransformStorageNode&); @@ -84,7 +84,7 @@ protected: virtual void SetAndObserveTransformFromParentAutoInvert(vtkMRMLTransformNode* transformNode, vtkAbstractTransform *transform); /// Read data and set it in the referenced node - virtual int ReadDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int ReadDataInternal(vtkMRMLNode *refNode) override; /// This method is specialized for ITKv3 tfm files as generated /// by legacy versions of BRAINSFit (see slicer issue #3788). @@ -109,7 +109,7 @@ protected: virtual int ReadFromImageFile(vtkMRMLNode *refNode); /// Write data from a referenced node - virtual int WriteDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int WriteDataInternal(vtkMRMLNode *refNode) override; /// Writes simple or composite transform to an ITK transform file. /// Supports writing of legacy ITKv3 BSpline transform with additive bulk component. diff --git a/Libs/MRML/Core/vtkMRMLTransformableNode.h b/Libs/MRML/Core/vtkMRMLTransformableNode.h index b059e16992fbef4f1459955992235f031b9e520c..65b7c5527f9387c4fcc6e54bd4a3748c8947b419 100644 --- a/Libs/MRML/Core/vtkMRMLTransformableNode.h +++ b/Libs/MRML/Core/vtkMRMLTransformableNode.h @@ -32,21 +32,21 @@ class VTK_MRML_EXPORT vtkMRMLTransformableNode : public vtkMRMLStorableNode { public: vtkTypeMacro(vtkMRMLTransformableNode,vtkMRMLStorableNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE = 0; + vtkMRMLNode* CreateNodeInstance() override = 0; /// /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE = 0; + const char* GetNodeTagName() override = 0; /// /// Set a reference to transform node @@ -64,9 +64,9 @@ public: /// /// alternative method to propagate events generated in Transform nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; /// TransformModifiedEvent is send when the parent transform is modidied enum @@ -113,7 +113,7 @@ public: protected: vtkMRMLTransformableNode(); - ~vtkMRMLTransformableNode(); + ~vtkMRMLTransformableNode() override; vtkMRMLTransformableNode(const vtkMRMLTransformableNode&); void operator=(const vtkMRMLTransformableNode&); @@ -125,7 +125,7 @@ protected: /// /// Called when a node reference ID is added (list size increased). - virtual void OnNodeReferenceAdded(vtkMRMLNodeReference *reference) VTK_OVERRIDE + void OnNodeReferenceAdded(vtkMRMLNodeReference *reference) override { Superclass::OnNodeReferenceAdded(reference); if (std::string(reference->GetReferenceRole()) == this->TransformNodeReferenceRole) @@ -136,7 +136,7 @@ protected: /// /// Called when a node reference ID is modified. - virtual void OnNodeReferenceModified(vtkMRMLNodeReference *reference) VTK_OVERRIDE + void OnNodeReferenceModified(vtkMRMLNodeReference *reference) override { Superclass::OnNodeReferenceModified(reference); if (std::string(reference->GetReferenceRole()) == this->TransformNodeReferenceRole) @@ -147,7 +147,7 @@ protected: /// /// Called after a node reference ID is removed (list size decreased). - virtual void OnNodeReferenceRemoved(vtkMRMLNodeReference *reference) VTK_OVERRIDE + void OnNodeReferenceRemoved(vtkMRMLNodeReference *reference) override { Superclass::OnNodeReferenceRemoved(reference); if (std::string(reference->GetReferenceRole()) == this->TransformNodeReferenceRole) diff --git a/Libs/MRML/Core/vtkMRMLUnitNode.h b/Libs/MRML/Core/vtkMRMLUnitNode.h index 72adc77e841ab0a4bec05092cb79d73ad2ec2677..7aa424bea85d16a81ac906cc0a4b9e99d4a71380 100644 --- a/Libs/MRML/Core/vtkMRMLUnitNode.h +++ b/Libs/MRML/Core/vtkMRMLUnitNode.h @@ -35,31 +35,31 @@ class VTK_MRML_EXPORT vtkMRMLUnitNode : public vtkMRMLNode public: static vtkMRMLUnitNode *New(); vtkTypeMacro(vtkMRMLUnitNode,vtkMRMLNode); - virtual void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; //-------------------------------------------------------------------------- /// MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Set node attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "Unit";} + const char* GetNodeTagName() override {return "Unit";} /// Reimplemented to prevent reset if unit node is a singleton. - virtual void Reset(vtkMRMLNode* defaultNode) VTK_OVERRIDE; + void Reset(vtkMRMLNode* defaultNode) override; /// /// Set/Get the quantity the unit belongs to. A unit can only @@ -89,7 +89,7 @@ public: /// /// Set the name of the unit. Since unit nodes are singleton, /// this name must be unique throughout the scene. - virtual void SetName(const char* name) VTK_OVERRIDE; + void SetName(const char* name) override; /// /// Set/Get the unit prefix. @@ -140,7 +140,7 @@ public: protected: vtkMRMLUnitNode(); - virtual ~vtkMRMLUnitNode(); + ~vtkMRMLUnitNode() override; vtkMRMLUnitNode(const vtkMRMLUnitNode&); void operator=(const vtkMRMLUnitNode&); diff --git a/Libs/MRML/Core/vtkMRMLVectorVolumeDisplayNode.h b/Libs/MRML/Core/vtkMRMLVectorVolumeDisplayNode.h index fe0aa617f34bf5bdb63864f6aeac558f24fe0134..799d320801c02ced3319e257e5b989af857e3b67 100644 --- a/Libs/MRML/Core/vtkMRMLVectorVolumeDisplayNode.h +++ b/Libs/MRML/Core/vtkMRMLVectorVolumeDisplayNode.h @@ -37,25 +37,25 @@ class VTK_MRML_EXPORT vtkMRMLVectorVolumeDisplayNode : public vtkMRMLGlyphableVo public: static vtkMRMLVectorVolumeDisplayNode *New(); vtkTypeMacro(vtkMRMLVectorVolumeDisplayNode,vtkMRMLGlyphableVolumeDisplayNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Set node attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "VectorVolumeDisplay";} + const char* GetNodeTagName() override {return "VectorVolumeDisplay";} //-------------------------------------------------------------------------- /// Display Information @@ -89,24 +89,24 @@ class VTK_MRML_EXPORT vtkMRMLVectorVolumeDisplayNode : public vtkMRMLGlyphableVo //virtual vtkPolyData* ExecuteGlyphPipeLineAndGetPolyData( vtkImageData* ) {return NULL;}; - virtual void SetDefaultColorMap() VTK_OVERRIDE {} + void SetDefaultColorMap() override {} /// /// alternative method to propagate events generated in Display nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; /// Get the input of the pipeline - virtual vtkAlgorithmOutput* GetInputImageDataConnection() VTK_OVERRIDE; + vtkAlgorithmOutput* GetInputImageDataConnection() override; - virtual void UpdateImageDataPipeline() VTK_OVERRIDE; + void UpdateImageDataPipeline() override; /// /// get associated slice glyph display node /// TODO: return empty list for now, later add glyphs - virtual std::vector< vtkMRMLGlyphableVolumeSliceDisplayNode*> - GetSliceGlyphDisplayNodes( vtkMRMLVolumeNode* vtkNotUsed(node) ) VTK_OVERRIDE + std::vector< vtkMRMLGlyphableVolumeSliceDisplayNode*> + GetSliceGlyphDisplayNodes( vtkMRMLVolumeNode* vtkNotUsed(node) ) override { return std::vector< vtkMRMLGlyphableVolumeSliceDisplayNode*>(); } @@ -121,13 +121,13 @@ class VTK_MRML_EXPORT vtkMRMLVectorVolumeDisplayNode : public vtkMRMLGlyphableVo protected: vtkMRMLVectorVolumeDisplayNode(); - ~vtkMRMLVectorVolumeDisplayNode(); + ~vtkMRMLVectorVolumeDisplayNode() override; vtkMRMLVectorVolumeDisplayNode(const vtkMRMLVectorVolumeDisplayNode&); void operator=(const vtkMRMLVectorVolumeDisplayNode&); /// Set the input of the pipeline - virtual void SetInputToImageDataPipeline(vtkAlgorithmOutput *imageDataConnection) VTK_OVERRIDE; - virtual vtkAlgorithmOutput* GetScalarImageDataConnection() VTK_OVERRIDE; + void SetInputToImageDataPipeline(vtkAlgorithmOutput *imageDataConnection) override; + vtkAlgorithmOutput* GetScalarImageDataConnection() override; int ScalarMode; int GlyphMode; diff --git a/Libs/MRML/Core/vtkMRMLVectorVolumeNode.h b/Libs/MRML/Core/vtkMRMLVectorVolumeNode.h index f8a3911787be22dbf0ef8b49b79526f1413e8732..28b1073626917b373a30cdfdb8252a9f0b1fc7ec 100644 --- a/Libs/MRML/Core/vtkMRMLVectorVolumeNode.h +++ b/Libs/MRML/Core/vtkMRMLVectorVolumeNode.h @@ -27,25 +27,25 @@ class VTK_MRML_EXPORT vtkMRMLVectorVolumeNode : public vtkMRMLTensorVolumeNode public: static vtkMRMLVectorVolumeNode *New(); vtkTypeMacro(vtkMRMLVectorVolumeNode,vtkMRMLTensorVolumeNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Set node attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "VectorVolume";} + const char* GetNodeTagName() override {return "VectorVolume";} /// /// Associated display MRML node @@ -53,15 +53,15 @@ class VTK_MRML_EXPORT vtkMRMLVectorVolumeNode : public vtkMRMLTensorVolumeNode /// /// Create default storage node or NULL if does not have one - virtual vtkMRMLStorageNode* CreateDefaultStorageNode() VTK_OVERRIDE; + vtkMRMLStorageNode* CreateDefaultStorageNode() override; /// /// Create and observe default display node - virtual void CreateDefaultDisplayNodes() VTK_OVERRIDE; + void CreateDefaultDisplayNodes() override; protected: vtkMRMLVectorVolumeNode(); - ~vtkMRMLVectorVolumeNode(); + ~vtkMRMLVectorVolumeNode() override; vtkMRMLVectorVolumeNode(const vtkMRMLVectorVolumeNode&); void operator=(const vtkMRMLVectorVolumeNode&); diff --git a/Libs/MRML/Core/vtkMRMLViewNode.h b/Libs/MRML/Core/vtkMRMLViewNode.h index 9bcdd3945dbf1ab0b24b447e38f1d8dcac0cb73e..19e2fc044d35ce4bfe8c158e21c1f3377c46aa67 100644 --- a/Libs/MRML/Core/vtkMRMLViewNode.h +++ b/Libs/MRML/Core/vtkMRMLViewNode.h @@ -27,25 +27,25 @@ class VTK_MRML_EXPORT vtkMRMLViewNode public: static vtkMRMLViewNode *New(); vtkTypeMacro(vtkMRMLViewNode,vtkMRMLAbstractViewNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; //-------------------------------------------------------------------------- /// MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE; + const char* GetNodeTagName() override; /// Return the color the view nodes have for the background by default. static double* defaultBackgroundColor(); @@ -295,7 +295,7 @@ public: protected: vtkMRMLViewNode(); - ~vtkMRMLViewNode(); + ~vtkMRMLViewNode() override; vtkMRMLViewNode(const vtkMRMLViewNode&); void operator=(const vtkMRMLViewNode&); diff --git a/Libs/MRML/Core/vtkMRMLVolumeArchetypeStorageNode.h b/Libs/MRML/Core/vtkMRMLVolumeArchetypeStorageNode.h index 1ae8f206863a076f66a872fb60a9ae8215e1e6da..1a8c7515193fe0e245dbc9e4dffb8ebcd801d9a5 100644 --- a/Libs/MRML/Core/vtkMRMLVolumeArchetypeStorageNode.h +++ b/Libs/MRML/Core/vtkMRMLVolumeArchetypeStorageNode.h @@ -30,13 +30,13 @@ class VTK_MRML_EXPORT vtkMRMLVolumeArchetypeStorageNode : public vtkMRMLStorageN public: static vtkMRMLVolumeArchetypeStorageNode *New(); vtkTypeMacro(vtkMRMLVolumeArchetypeStorageNode,vtkMRMLStorageNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Do a temp write to update the file list in this storage node with all @@ -48,15 +48,15 @@ public: /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Storage, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "VolumeArchetypeStorage";} + const char* GetNodeTagName() override {return "VolumeArchetypeStorage";} /// /// Center image on read @@ -74,14 +74,14 @@ public: vtkGetMacro(UseOrientationFromFile, int); /// Return true if the reference node is supported by the storage node - virtual bool CanReadInReferenceNode(vtkMRMLNode* refNode) VTK_OVERRIDE; - virtual bool CanWriteFromReferenceNode(vtkMRMLNode* refNode) VTK_OVERRIDE; + bool CanReadInReferenceNode(vtkMRMLNode* refNode) override; + bool CanWriteFromReferenceNode(vtkMRMLNode* refNode) override; /// /// Configure the storage node for data exchange. This is an /// opportunity to optimize the storage node's settings, for /// instance to turn off compression. - virtual void ConfigureForDataExchange() VTK_OVERRIDE; + void ConfigureForDataExchange() override; /// /// Provide a uniform way to populate the volume nodes's itk @@ -92,20 +92,20 @@ public: protected: vtkMRMLVolumeArchetypeStorageNode(); - ~vtkMRMLVolumeArchetypeStorageNode(); + ~vtkMRMLVolumeArchetypeStorageNode() override; vtkMRMLVolumeArchetypeStorageNode(const vtkMRMLVolumeArchetypeStorageNode&); void operator=(const vtkMRMLVolumeArchetypeStorageNode&); /// Initialize all the supported write file types - virtual void InitializeSupportedWriteFileTypes() VTK_OVERRIDE; + void InitializeSupportedWriteFileTypes() override; vtkITKArchetypeImageSeriesReader* InstantiateVectorVolumeReader(const std::string &fullName); /// Read data and set it in the referenced node - virtual int ReadDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int ReadDataInternal(vtkMRMLNode *refNode) override; /// Write data from a referenced node - virtual int WriteDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int WriteDataInternal(vtkMRMLNode *refNode) override; int CenterImage; int SingleFile; diff --git a/Libs/MRML/Core/vtkMRMLVolumeDisplayNode.h b/Libs/MRML/Core/vtkMRMLVolumeDisplayNode.h index 5b3566b4f77c0e217bf7b641c610c3b8afa5628d..ae9b55d3ad4bbb27fa037e1c6c3e3cb3a7c9682d 100644 --- a/Libs/MRML/Core/vtkMRMLVolumeDisplayNode.h +++ b/Libs/MRML/Core/vtkMRMLVolumeDisplayNode.h @@ -32,32 +32,32 @@ class VTK_MRML_EXPORT vtkMRMLVolumeDisplayNode : public vtkMRMLDisplayNode { public: vtkTypeMacro(vtkMRMLVolumeDisplayNode,vtkMRMLDisplayNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE = 0; + const char* GetNodeTagName() override = 0; /// /// Updates this node if it depends on other nodes /// when the node is deleted in the scene - virtual void UpdateReferences() VTK_OVERRIDE; + void UpdateReferences() override; /// /// Finds the storage node and read the data - virtual void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; /// /// Sets ImageData for background mask @@ -101,9 +101,9 @@ public: /// /// alternative method to propagate events generated in Display nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; /// /// set gray colormap or override in subclass virtual void SetDefaultColorMap(); @@ -114,7 +114,7 @@ public: protected: vtkMRMLVolumeDisplayNode(); - ~vtkMRMLVolumeDisplayNode(); + ~vtkMRMLVolumeDisplayNode() override; vtkMRMLVolumeDisplayNode(const vtkMRMLVolumeDisplayNode&); void operator=(const vtkMRMLVolumeDisplayNode&); diff --git a/Libs/MRML/Core/vtkMRMLVolumeHeaderlessStorageNode.h b/Libs/MRML/Core/vtkMRMLVolumeHeaderlessStorageNode.h index 35d1d51deeec067e37e361148833b18bdf53d9f6..45cbe78591462966317ce9ff2e779561f571c079 100644 --- a/Libs/MRML/Core/vtkMRMLVolumeHeaderlessStorageNode.h +++ b/Libs/MRML/Core/vtkMRMLVolumeHeaderlessStorageNode.h @@ -28,25 +28,25 @@ class VTK_MRML_EXPORT vtkMRMLVolumeHeaderlessStorageNode public: static vtkMRMLVolumeHeaderlessStorageNode *New(); vtkTypeMacro(vtkMRMLVolumeHeaderlessStorageNode,vtkMRMLStorageNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Storage, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "VolumeHeaderlessStorage";} + const char* GetNodeTagName() override {return "VolumeHeaderlessStorage";} /// /// Scan order in the file @@ -114,24 +114,24 @@ public: vtkSetMacro(CenterImage, int); /// Return true if node can be read in - virtual bool CanReadInReferenceNode(vtkMRMLNode *refNode) VTK_OVERRIDE; - virtual bool CanWriteFromReferenceNode(vtkMRMLNode *refNode) VTK_OVERRIDE; + bool CanReadInReferenceNode(vtkMRMLNode *refNode) override; + bool CanWriteFromReferenceNode(vtkMRMLNode *refNode) override; protected: vtkMRMLVolumeHeaderlessStorageNode(); - ~vtkMRMLVolumeHeaderlessStorageNode(); + ~vtkMRMLVolumeHeaderlessStorageNode() override; vtkMRMLVolumeHeaderlessStorageNode(const vtkMRMLVolumeHeaderlessStorageNode&); void operator=(const vtkMRMLVolumeHeaderlessStorageNode&); /// Initialize all the supported write file types - virtual void InitializeSupportedWriteFileTypes() VTK_OVERRIDE; + void InitializeSupportedWriteFileTypes() override; /// Read data and set it in the referenced node - virtual int ReadDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int ReadDataInternal(vtkMRMLNode *refNode) override; /// Write data from a referenced node - virtual int WriteDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int WriteDataInternal(vtkMRMLNode *refNode) override; char *FileScanOrder; int FileScalarType; diff --git a/Libs/MRML/Core/vtkMRMLVolumeNode.h b/Libs/MRML/Core/vtkMRMLVolumeNode.h index 01a2fa62731457a659441dbf412f17488ce7a881..774a28639e7bf8592466d097ce81b03557e3d95a 100644 --- a/Libs/MRML/Core/vtkMRMLVolumeNode.h +++ b/Libs/MRML/Core/vtkMRMLVolumeNode.h @@ -41,21 +41,21 @@ class VTK_MRML_EXPORT vtkMRMLVolumeNode : public vtkMRMLDisplayableNode { public: vtkTypeMacro(vtkMRMLVolumeNode,vtkMRMLDisplayableNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE = 0; + vtkMRMLNode* CreateNodeInstance() override = 0; /// /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Copy the node's attributes to this object @@ -64,11 +64,11 @@ public: /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE = 0; + const char* GetNodeTagName() override = 0; /// /// Finds the storage node and read the data - virtual void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; //-------------------------------------------------------------------------- /// RAS->IJK Matrix Calculation @@ -143,12 +143,12 @@ public: /// be applied to it. /// \sa GetSliceBounds(), GetIJKToRASMatrix(), vtkMRMLSliceLogic::GetVolumeSliceBounds() /// \sa GetNodeBounds() - virtual void GetRASBounds(double bounds[6]) VTK_OVERRIDE; + void GetRASBounds(double bounds[6]) override; /// Get bounding box in global RAS form (xmin,xmax, ymin,ymax, zmin,zmax). /// This method always returns the bounds of the untransformed object. /// \sa GetRASBounds() - virtual void GetBounds(double bounds[6]) VTK_OVERRIDE; + void GetBounds(double bounds[6]) override; /// /// Get bounding box in slice form (xmin,xmax, ymin,ymax, zmin,zmax). @@ -187,9 +187,9 @@ public: /// /// alternative method to propagate events generated in Display nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; /// ImageDataModifiedEvent is generated when image data is changed enum @@ -202,15 +202,15 @@ public: void SetMetaDataDictionary( const itk::MetaDataDictionary& ); const itk::MetaDataDictionary& GetMetaDataDictionary() const; - virtual bool CanApplyNonLinearTransforms()const VTK_OVERRIDE; + bool CanApplyNonLinearTransforms()const override; - virtual void ApplyTransform(vtkAbstractTransform* transform) VTK_OVERRIDE; + void ApplyTransform(vtkAbstractTransform* transform) override; - virtual void ApplyTransformMatrix(vtkMatrix4x4* transformMatrix) VTK_OVERRIDE; + void ApplyTransformMatrix(vtkMatrix4x4* transformMatrix) override; virtual void ApplyNonLinearTransform(vtkAbstractTransform* transform); - virtual bool GetModifiedSinceRead() VTK_OVERRIDE; + bool GetModifiedSinceRead() override; /// /// Get background voxel value of the image. It can be used for assigning @@ -220,7 +220,7 @@ public: protected: vtkMRMLVolumeNode(); - ~vtkMRMLVolumeNode(); + ~vtkMRMLVolumeNode() override; vtkMRMLVolumeNode(const vtkMRMLVolumeNode&); void operator=(const vtkMRMLVolumeNode&); @@ -234,11 +234,11 @@ protected: /// /// Called when a node reference ID is added (list size increased). - virtual void OnNodeReferenceAdded(vtkMRMLNodeReference *reference) VTK_OVERRIDE; + void OnNodeReferenceAdded(vtkMRMLNodeReference *reference) override; /// /// Called when a node reference ID is modified. - virtual void OnNodeReferenceModified(vtkMRMLNodeReference *reference) VTK_OVERRIDE; + void OnNodeReferenceModified(vtkMRMLNodeReference *reference) override; /// /// Return the bounds of the node transformed or not depending on diff --git a/Libs/MRML/Core/vtkMRMLdGEMRICProceduralColorNode.h b/Libs/MRML/Core/vtkMRMLdGEMRICProceduralColorNode.h index 963f02b0652b7407526135403da3924f70e623df..43e4c7c2ac5e438bb97a1a1655dcc813054f56b1 100644 --- a/Libs/MRML/Core/vtkMRMLdGEMRICProceduralColorNode.h +++ b/Libs/MRML/Core/vtkMRMLdGEMRICProceduralColorNode.h @@ -27,40 +27,40 @@ class VTK_MRML_EXPORT vtkMRMLdGEMRICProceduralColorNode : public vtkMRMLProcedur public: static vtkMRMLdGEMRICProceduralColorNode *New(); vtkTypeMacro(vtkMRMLdGEMRICProceduralColorNode,vtkMRMLProceduralColorNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; //-------------------------------------------------------------------------- /// MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Set node attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "dGEMRICProceduralColor";} + const char* GetNodeTagName() override {return "dGEMRICProceduralColor";} /// /// - virtual void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; /// /// Get/Set for Type. In SetType, set up the custom colour options for this /// set of colours - virtual void SetType(int type) VTK_OVERRIDE; + void SetType(int type) override; - void ProcessMRMLEvents ( vtkObject *caller, unsigned long event, void *callData ) VTK_OVERRIDE; + void ProcessMRMLEvents ( vtkObject *caller, unsigned long event, void *callData ) override; /// The list of valid procedural types //enum @@ -76,7 +76,7 @@ public: /// /// Create default storage node or NULL if does not have one - virtual vtkMRMLStorageNode* CreateDefaultStorageNode() VTK_OVERRIDE + vtkMRMLStorageNode* CreateDefaultStorageNode() override { return Superclass::CreateDefaultStorageNode(); } @@ -91,16 +91,16 @@ public: }; /// Return the lowest and the highest integers, for use in looping - int GetFirstType() VTK_OVERRIDE { return this->dGEMRIC15T; } - int GetLastType() VTK_OVERRIDE { return this->dGEMRIC3T; } + int GetFirstType() override { return this->dGEMRIC15T; } + int GetLastType() override { return this->dGEMRIC3T; } - const char *GetTypeAsString() VTK_OVERRIDE; + const char *GetTypeAsString() override; void SetTypeTo15T(); void SetTypeTo3T(); protected: vtkMRMLdGEMRICProceduralColorNode(); - ~vtkMRMLdGEMRICProceduralColorNode(); + ~vtkMRMLdGEMRICProceduralColorNode() override; vtkMRMLdGEMRICProceduralColorNode(const vtkMRMLdGEMRICProceduralColorNode&); void operator=(const vtkMRMLdGEMRICProceduralColorNode&); }; diff --git a/Libs/MRML/Core/vtkObservation.h b/Libs/MRML/Core/vtkObservation.h index c8e0c982f664a8c819425480d21007abe000f00e..8849e4235cf6aa0a65a3514a164419807adf4cf3 100644 --- a/Libs/MRML/Core/vtkObservation.h +++ b/Libs/MRML/Core/vtkObservation.h @@ -47,7 +47,7 @@ class VTK_MRML_EXPORT vtkObservation : public vtkObject /// The Usual vtk class functions static vtkObservation *New(); vtkTypeMacro(vtkObservation,vtkObject); - virtual void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// /// Accessors @@ -100,7 +100,7 @@ class VTK_MRML_EXPORT vtkObservation : public vtkObject protected: vtkObservation(); - virtual ~vtkObservation(); + ~vtkObservation() override; vtkObservation(const vtkObservation&); void operator=(const vtkObservation&); diff --git a/Libs/MRML/Core/vtkObserverManager.h b/Libs/MRML/Core/vtkObserverManager.h index eb8dd9650c75f36cc0f62975e453ec483baa87d7..1c75086681c2330b421dcf7544f0258770fba4ae 100644 --- a/Libs/MRML/Core/vtkObserverManager.h +++ b/Libs/MRML/Core/vtkObserverManager.h @@ -45,7 +45,7 @@ class VTK_MRML_EXPORT vtkObserverManager : public vtkObject /// The Usual vtk class functions static vtkObserverManager *New(); vtkTypeMacro(vtkObserverManager,vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// set vtkObject to a specified pointer and remove all observers for all events void SetObject(vtkObject **nodePtr, vtkObject *node); @@ -85,7 +85,7 @@ class VTK_MRML_EXPORT vtkObserverManager : public vtkObject int GetObservationsCount(vtkObject* nodePtr, unsigned long event = 0); protected: vtkObserverManager(); - virtual ~vtkObserverManager(); + ~vtkObserverManager() override; vtkObserverManager(const vtkObserverManager&); void operator=(const vtkObserverManager&); diff --git a/Libs/MRML/Core/vtkPermissionPrompter.h b/Libs/MRML/Core/vtkPermissionPrompter.h index 18cd5a162714c82c39a766a8d5bd327536fb2d01..c06e6a548f9bd7dc119a9c0fdf47d498bd3ccf6d 100644 --- a/Libs/MRML/Core/vtkPermissionPrompter.h +++ b/Libs/MRML/Core/vtkPermissionPrompter.h @@ -14,7 +14,7 @@ class VTK_MRML_EXPORT vtkPermissionPrompter : public vtkObject /// The Usual vtk class functions static vtkPermissionPrompter *New(); vtkTypeMacro(vtkPermissionPrompter, vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// /// Member for storing a user name, if required @@ -58,7 +58,7 @@ class VTK_MRML_EXPORT vtkPermissionPrompter : public vtkObject protected: vtkPermissionPrompter(); - virtual ~vtkPermissionPrompter(); + ~vtkPermissionPrompter() override; vtkPermissionPrompter(const vtkPermissionPrompter&); void operator=(const vtkPermissionPrompter&); diff --git a/Libs/MRML/Core/vtkTagTable.h b/Libs/MRML/Core/vtkTagTable.h index 17fe3666d3d55f573a99b5dbbcf092df443f4dde..dc895e4362fe496c26ceb64862a636a19e5a5603 100644 --- a/Libs/MRML/Core/vtkTagTable.h +++ b/Libs/MRML/Core/vtkTagTable.h @@ -17,7 +17,7 @@ class VTK_MRML_EXPORT vtkTagTable : public vtkObject /// The Usual vtk class functions static vtkTagTable *New(); vtkTypeMacro(vtkTagTable, vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// /// Get the vtkTable that contains user-defined attribute/value pairs. @@ -98,7 +98,7 @@ class VTK_MRML_EXPORT vtkTagTable : public vtkObject protected: vtkTagTable(); - virtual ~vtkTagTable(); + ~vtkTagTable() override; vtkTagTable(const vtkTagTable&); void operator=(const vtkTagTable&); diff --git a/Libs/MRML/Core/vtkTagTableCollection.h b/Libs/MRML/Core/vtkTagTableCollection.h index 7e79dd3fd56ff21f132f6e45689e6b3189237f46..cea3f349cffc3578b793fdea2056801d4682ab14 100644 --- a/Libs/MRML/Core/vtkTagTableCollection.h +++ b/Libs/MRML/Core/vtkTagTableCollection.h @@ -13,7 +13,7 @@ class VTK_MRML_EXPORT vtkTagTableCollection : public vtkCollection public: static vtkTagTableCollection *New(); vtkTypeMacro(vtkTagTableCollection, vtkCollection); - virtual void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; vtkTagTable * FindTagTableByName ( const char *name ); void AddTableByName ( vtkTagTable *t, const char *name ); @@ -44,7 +44,7 @@ public: protected: vtkTagTableCollection(); - ~vtkTagTableCollection(); + ~vtkTagTableCollection() override; /// hide the standard AddItem from the user and compiler. void AddItem (vtkObject *o ) { this->vtkCollection::AddItem(o); } ; diff --git a/Libs/MRML/Core/vtkURIHandler.h b/Libs/MRML/Core/vtkURIHandler.h index 73d3c5e98de3d2838e6da78a0d7854f249db760d..6b88fea7b8ed6919f4f000d9889a950bc804b7ad 100644 --- a/Libs/MRML/Core/vtkURIHandler.h +++ b/Libs/MRML/Core/vtkURIHandler.h @@ -15,7 +15,7 @@ public: //static vtkURIHandler *New() { return NULL; }; static vtkURIHandler *New(); vtkTypeMacro(vtkURIHandler, vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; vtkGetStringMacro (HostName); vtkSetStringMacro (HostName); @@ -85,7 +85,7 @@ public: protected: vtkURIHandler(); - virtual ~vtkURIHandler(); + ~vtkURIHandler() override; vtkURIHandler(const vtkURIHandler&); void operator=(const vtkURIHandler&); diff --git a/Libs/MRML/DisplayableManager/Testing/Cxx/vtkMRMLCameraDisplayableManagerTest1.cxx b/Libs/MRML/DisplayableManager/Testing/Cxx/vtkMRMLCameraDisplayableManagerTest1.cxx index b65ec440fb4f19e4a766bc14d48613ac61f1e9c9..1f1052ec59e0343b59165f874d94d95c79b01b0e 100644 --- a/Libs/MRML/DisplayableManager/Testing/Cxx/vtkMRMLCameraDisplayableManagerTest1.cxx +++ b/Libs/MRML/DisplayableManager/Testing/Cxx/vtkMRMLCameraDisplayableManagerTest1.cxx @@ -477,7 +477,7 @@ public: { this->Renderer = renderer; } int GetRenderRequestCount() { return this->RenderRequestCount; } - virtual void Execute(vtkObject*, unsigned long , void* ) + void Execute(vtkObject*, unsigned long , void* ) override { this->Renderer->GetRenderWindow()->Render(); this->RenderRequestCount++; diff --git a/Libs/MRML/DisplayableManager/Testing/Cxx/vtkMRMLTestCustomDisplayableManager.h b/Libs/MRML/DisplayableManager/Testing/Cxx/vtkMRMLTestCustomDisplayableManager.h index 4d0d881aa109b83e2d08e3dfd87d1d59cc7c2cfb..84055256172a6ea68b6c4ebbbcb171311e6cdf63 100644 --- a/Libs/MRML/DisplayableManager/Testing/Cxx/vtkMRMLTestCustomDisplayableManager.h +++ b/Libs/MRML/DisplayableManager/Testing/Cxx/vtkMRMLTestCustomDisplayableManager.h @@ -33,7 +33,7 @@ class vtkMRMLTestCustomDisplayableManager : public: static vtkMRMLTestCustomDisplayableManager* New(); vtkTypeMacro(vtkMRMLTestCustomDisplayableManager,vtkMRMLAbstractDisplayableManager); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; // For testing static int NodeAddedCountThreeDView; @@ -42,14 +42,14 @@ public: protected: vtkMRMLTestCustomDisplayableManager(); - virtual ~vtkMRMLTestCustomDisplayableManager(); + ~vtkMRMLTestCustomDisplayableManager() override; virtual void AdditionnalInitializeStep(); - virtual void OnInteractorStyleEvent(int eventid) VTK_OVERRIDE; + void OnInteractorStyleEvent(int eventid) override; - virtual void Create() VTK_OVERRIDE; + void Create() override; - virtual void OnMRMLSceneNodeAdded(vtkMRMLNode* node) VTK_OVERRIDE; + void OnMRMLSceneNodeAdded(vtkMRMLNode* node) override; private: diff --git a/Libs/MRML/DisplayableManager/Testing/Cxx/vtkMRMLTestSliceViewDisplayableManager.h b/Libs/MRML/DisplayableManager/Testing/Cxx/vtkMRMLTestSliceViewDisplayableManager.h index b10a276e6ac8f4ca2b05c1641e52472aefd0f74e..193533ed40c651e703f599a696b340860b802848 100644 --- a/Libs/MRML/DisplayableManager/Testing/Cxx/vtkMRMLTestSliceViewDisplayableManager.h +++ b/Libs/MRML/DisplayableManager/Testing/Cxx/vtkMRMLTestSliceViewDisplayableManager.h @@ -33,7 +33,7 @@ class vtkMRMLTestSliceViewDisplayableManager : public: static vtkMRMLTestSliceViewDisplayableManager* New(); vtkTypeMacro(vtkMRMLTestSliceViewDisplayableManager,vtkMRMLAbstractSliceViewDisplayableManager); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; // For testing static int NodeAddedCount; @@ -41,18 +41,18 @@ public: protected: vtkMRMLTestSliceViewDisplayableManager(); - virtual ~vtkMRMLTestSliceViewDisplayableManager(); + ~vtkMRMLTestSliceViewDisplayableManager() override; virtual void AdditionnalInitializeStep(); - virtual void Create() VTK_OVERRIDE; + void Create() override; // virtual void OnMRMLSceneAboutToBeClosedEvent(){} // virtual void OnMRMLSceneClosedEvent(){} // virtual void OnMRMLSceneAboutToBeImportedEvent(){} // virtual void OnMRMLSceneImportedEvent(){} // virtual void OnMRMLSceneRestoredEvent(){} - virtual void OnMRMLSceneNodeAdded(vtkMRMLNode* node) VTK_OVERRIDE; + void OnMRMLSceneNodeAdded(vtkMRMLNode* node) override; // virtual void OnMRMLSceneNodeRemovedEvent(vtkMRMLNode* /*node*/){} private: diff --git a/Libs/MRML/DisplayableManager/Testing/Cxx/vtkMRMLTestThreeDViewDisplayableManager.h b/Libs/MRML/DisplayableManager/Testing/Cxx/vtkMRMLTestThreeDViewDisplayableManager.h index f33d02a31dc50ce40597fadf35d85d0a17fb308a..3e8b1bdf4b7484f621ca5b5668525391952a2a5d 100644 --- a/Libs/MRML/DisplayableManager/Testing/Cxx/vtkMRMLTestThreeDViewDisplayableManager.h +++ b/Libs/MRML/DisplayableManager/Testing/Cxx/vtkMRMLTestThreeDViewDisplayableManager.h @@ -33,7 +33,7 @@ class vtkMRMLTestThreeDViewDisplayableManager : public: static vtkMRMLTestThreeDViewDisplayableManager* New(); vtkTypeMacro(vtkMRMLTestThreeDViewDisplayableManager,vtkMRMLAbstractThreeDViewDisplayableManager); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; // For testing static int NodeAddedCount; @@ -41,18 +41,18 @@ public: protected: vtkMRMLTestThreeDViewDisplayableManager(); - virtual ~vtkMRMLTestThreeDViewDisplayableManager(); + ~vtkMRMLTestThreeDViewDisplayableManager() override; virtual void AdditionnalInitializeStep(); - virtual void Create() VTK_OVERRIDE; + void Create() override; // virtual void OnMRMLSceneAboutToBeClosedEvent(){} // virtual void OnMRMLSceneClosedEvent(){} // virtual void OnMRMLSceneAboutToBeImportedEvent(){} // virtual void OnMRMLSceneImportedEvent(){} // virtual void OnMRMLSceneRestoredEvent(){} - virtual void OnMRMLSceneNodeAdded(vtkMRMLNode* node) VTK_OVERRIDE; + void OnMRMLSceneNodeAdded(vtkMRMLNode* node) override; // virtual void OnMRMLSceneNodeRemovedEvent(vtkMRMLNode* /*node*/){} private: diff --git a/Libs/MRML/DisplayableManager/Testing/Cxx/vtkMRMLThreeDReformatDisplayableManagerTest1.cxx b/Libs/MRML/DisplayableManager/Testing/Cxx/vtkMRMLThreeDReformatDisplayableManagerTest1.cxx index 2534e913f252e3f1bcaae09d46abd6d3888fc1d2..f930f9febcf88c3bbc8fe073816a8a22a85cba40 100644 --- a/Libs/MRML/DisplayableManager/Testing/Cxx/vtkMRMLThreeDReformatDisplayableManagerTest1.cxx +++ b/Libs/MRML/DisplayableManager/Testing/Cxx/vtkMRMLThreeDReformatDisplayableManagerTest1.cxx @@ -874,9 +874,9 @@ class vtkAbortCommand: public vtkCommand { public: static vtkAbortCommand *New(){ return new vtkAbortCommand; } - virtual void Execute (vtkObject* vtkNotUsed(caller), + void Execute (vtkObject* vtkNotUsed(caller), unsigned long vtkNotUsed(eventId), - void* vtkNotUsed(callData)) + void* vtkNotUsed(callData)) override { this->SetAbortFlag(1); } diff --git a/Libs/MRML/DisplayableManager/vtkMRMLAbstractDisplayableManager.h b/Libs/MRML/DisplayableManager/vtkMRMLAbstractDisplayableManager.h index 027154378b83769e5920668f8b648ece8d3da9b2..47508e466ec754877be051c2b9aec7fe5f8dff2c 100644 --- a/Libs/MRML/DisplayableManager/vtkMRMLAbstractDisplayableManager.h +++ b/Libs/MRML/DisplayableManager/vtkMRMLAbstractDisplayableManager.h @@ -49,7 +49,7 @@ class VTK_MRML_DISPLAYABLEMANAGER_EXPORT vtkMRMLAbstractDisplayableManager { public: static vtkMRMLAbstractDisplayableManager *New(); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; vtkTypeMacro(vtkMRMLAbstractDisplayableManager, vtkMRMLAbstractLogic); /// Return True if Create() method has been invoked @@ -112,7 +112,7 @@ public: protected: vtkMRMLAbstractDisplayableManager(); - virtual ~vtkMRMLAbstractDisplayableManager(); + ~vtkMRMLAbstractDisplayableManager() override; /// Get MRML Displayable Node vtkMRMLNode * GetMRMLDisplayableNode(); @@ -137,9 +137,9 @@ protected: /// the mouse moves set this to include Place and ViewTransform virtual int ActiveInteractionModes(); - virtual void ProcessMRMLNodesEvents(vtkObject* caller, + void ProcessMRMLNodesEvents(vtkObject* caller, unsigned long event, - void * callData) VTK_OVERRIDE; + void * callData) override; /// Receives all the events fired by any graphical object interacted by the /// user (typically vtk widgets). @@ -170,7 +170,7 @@ protected: /// Called by SetMRMLScene - Used to initialize the Scene /// Observe all the events of the scene and call OnMRMLSceneEndClose() /// or OnMRMLSceneEndImport() if the new scene is valid - virtual void SetMRMLSceneInternal(vtkMRMLScene* newScene) VTK_OVERRIDE; + void SetMRMLSceneInternal(vtkMRMLScene* newScene) override; /// ProcessMRMLNodesEvents calls OnMRMLDisplayableNodeModifiedEvent when the /// displayable node (e.g. vtkMRMLSliceNode, vtkMRMLViewNode) is Modified. diff --git a/Libs/MRML/DisplayableManager/vtkMRMLAbstractSliceViewDisplayableManager.h b/Libs/MRML/DisplayableManager/vtkMRMLAbstractSliceViewDisplayableManager.h index 95bb7c8498057c5b0e3444223f1ffd9bb865e8bc..49da196c257bdad64b230f096848e0caaf93ef13 100644 --- a/Libs/MRML/DisplayableManager/vtkMRMLAbstractSliceViewDisplayableManager.h +++ b/Libs/MRML/DisplayableManager/vtkMRMLAbstractSliceViewDisplayableManager.h @@ -40,7 +40,7 @@ public: typedef vtkMRMLAbstractSliceViewDisplayableManager Self; static vtkMRMLAbstractSliceViewDisplayableManager *New(); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; vtkTypeMacro(vtkMRMLAbstractSliceViewDisplayableManager, vtkMRMLAbstractDisplayableManager); @@ -84,9 +84,9 @@ public: protected: vtkMRMLAbstractSliceViewDisplayableManager(); - virtual ~vtkMRMLAbstractSliceViewDisplayableManager(); + ~vtkMRMLAbstractSliceViewDisplayableManager() override; - virtual void OnMRMLDisplayableNodeModifiedEvent(vtkObject* caller) VTK_OVERRIDE; + void OnMRMLDisplayableNodeModifiedEvent(vtkObject* caller) override; /// Could be overloaded if DisplayableManager subclass virtual void OnMRMLSliceNodeModifiedEvent(){} diff --git a/Libs/MRML/DisplayableManager/vtkMRMLAbstractThreeDViewDisplayableManager.h b/Libs/MRML/DisplayableManager/vtkMRMLAbstractThreeDViewDisplayableManager.h index ea2477193b3992f43e03645721c8c1b35453144d..754dfe3b0a0e14f2e031d1d5d862edc2de6d9ae7 100644 --- a/Libs/MRML/DisplayableManager/vtkMRMLAbstractThreeDViewDisplayableManager.h +++ b/Libs/MRML/DisplayableManager/vtkMRMLAbstractThreeDViewDisplayableManager.h @@ -38,7 +38,7 @@ class VTK_MRML_DISPLAYABLEMANAGER_EXPORT vtkMRMLAbstractThreeDViewDisplayableMan public: static vtkMRMLAbstractThreeDViewDisplayableManager *New(); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; vtkTypeMacro(vtkMRMLAbstractThreeDViewDisplayableManager, vtkMRMLAbstractDisplayableManager); /// Get MRML ViewNode @@ -55,9 +55,9 @@ public: protected: vtkMRMLAbstractThreeDViewDisplayableManager(); - virtual ~vtkMRMLAbstractThreeDViewDisplayableManager(); + ~vtkMRMLAbstractThreeDViewDisplayableManager() override; - virtual void OnMRMLDisplayableNodeModifiedEvent(vtkObject* caller) VTK_OVERRIDE; + void OnMRMLDisplayableNodeModifiedEvent(vtkObject* caller) override; /// Could be overloaded in DisplayableManager subclass virtual void OnMRMLViewNodeModifiedEvent(){} diff --git a/Libs/MRML/DisplayableManager/vtkMRMLAbstractWidget.h b/Libs/MRML/DisplayableManager/vtkMRMLAbstractWidget.h index 3b8b39a7d3a717c0cbfb35be9673613ca02587c7..432deac71e9eaf43d9548fe089602022c612e200 100644 --- a/Libs/MRML/DisplayableManager/vtkMRMLAbstractWidget.h +++ b/Libs/MRML/DisplayableManager/vtkMRMLAbstractWidget.h @@ -61,7 +61,7 @@ class VTK_MRML_DISPLAYABLEMANAGER_EXPORT vtkMRMLAbstractWidget : public vtkObjec public: /// Standard methods for a VTK class. vtkTypeMacro(vtkMRMLAbstractWidget, vtkObject); - virtual void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; virtual void SetMRMLApplicationLogic(vtkMRMLApplicationLogic* applicationLogic); vtkMRMLApplicationLogic* GetMRMLApplicationLogic(); @@ -177,7 +177,7 @@ public: protected: vtkMRMLAbstractWidget(); - ~vtkMRMLAbstractWidget() VTK_OVERRIDE; + ~vtkMRMLAbstractWidget() override; /// Get ID of the node at the specified event position. /// Returns nullptr if nothing can be found. diff --git a/Libs/MRML/DisplayableManager/vtkMRMLAbstractWidgetRepresentation.h b/Libs/MRML/DisplayableManager/vtkMRMLAbstractWidgetRepresentation.h index 732011385f9320cea5c7f12c4a8dedab8c64f954..7ddd38658773f7beb9ca776d556f82c386a35207 100644 --- a/Libs/MRML/DisplayableManager/vtkMRMLAbstractWidgetRepresentation.h +++ b/Libs/MRML/DisplayableManager/vtkMRMLAbstractWidgetRepresentation.h @@ -57,7 +57,7 @@ class VTK_MRML_DISPLAYABLEMANAGER_EXPORT vtkMRMLAbstractWidgetRepresentation : p public: /// Standard methods for instances of this class. vtkTypeMacro(vtkMRMLAbstractWidgetRepresentation, vtkProp); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; //@{ /** @@ -136,7 +136,7 @@ public: protected: vtkMRMLAbstractWidgetRepresentation(); - ~vtkMRMLAbstractWidgetRepresentation() VTK_OVERRIDE; + ~vtkMRMLAbstractWidgetRepresentation() override; /// Helper function to add bounds of all listed actors to the supplied bounding box. /// additionalBounds is for convenience only, it allows defining additional bounds. diff --git a/Libs/MRML/DisplayableManager/vtkMRMLCameraDisplayableManager.h b/Libs/MRML/DisplayableManager/vtkMRMLCameraDisplayableManager.h index fff5d91494ee61bca8deb2b01aad844d17d38375..da24da0a3b82bdf10254a9206156c18f87c4c825 100644 --- a/Libs/MRML/DisplayableManager/vtkMRMLCameraDisplayableManager.h +++ b/Libs/MRML/DisplayableManager/vtkMRMLCameraDisplayableManager.h @@ -36,9 +36,9 @@ class VTK_MRML_DISPLAYABLEMANAGER_EXPORT vtkMRMLCameraDisplayableManager : public: static vtkMRMLCameraDisplayableManager* New(); vtkTypeMacro(vtkMRMLCameraDisplayableManager,vtkMRMLAbstractThreeDViewDisplayableManager); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual void RemoveMRMLObservers() VTK_OVERRIDE; + void RemoveMRMLObservers() override; void UpdateCameraNode(); @@ -56,24 +56,24 @@ public: protected: vtkMRMLCameraDisplayableManager(); - virtual ~vtkMRMLCameraDisplayableManager(); + ~vtkMRMLCameraDisplayableManager() override; - virtual void Create() VTK_OVERRIDE; + void Create() override; - virtual void OnMRMLSceneEndClose() VTK_OVERRIDE; - virtual void OnMRMLSceneStartImport() VTK_OVERRIDE; - virtual void OnMRMLSceneEndImport() VTK_OVERRIDE; - virtual void OnMRMLSceneEndRestore() VTK_OVERRIDE; - virtual void OnMRMLSceneNodeAdded(vtkMRMLNode* node) VTK_OVERRIDE; - virtual void OnMRMLSceneNodeRemoved(vtkMRMLNode* node) VTK_OVERRIDE; + void OnMRMLSceneEndClose() override; + void OnMRMLSceneStartImport() override; + void OnMRMLSceneEndImport() override; + void OnMRMLSceneEndRestore() override; + void OnMRMLSceneNodeAdded(vtkMRMLNode* node) override; + void OnMRMLSceneNodeRemoved(vtkMRMLNode* node) override; - virtual void ProcessMRMLNodesEvents(vtkObject *caller, + void ProcessMRMLNodesEvents(vtkObject *caller, unsigned long event, - void *callData) VTK_OVERRIDE; - virtual void OnMRMLNodeModified(vtkMRMLNode* node) VTK_OVERRIDE; + void *callData) override; + void OnMRMLNodeModified(vtkMRMLNode* node) override; void SetAndObserveCameraNode(vtkMRMLCameraNode * newCameraNode); - virtual void AdditionalInitializeStep() VTK_OVERRIDE; + void AdditionalInitializeStep() override; void SetCameraToRenderer(); void SetCameraToInteractor(); diff --git a/Libs/MRML/DisplayableManager/vtkMRMLCrosshairDisplayableManager.h b/Libs/MRML/DisplayableManager/vtkMRMLCrosshairDisplayableManager.h index 0dfeeb3aef00095310cba20e52dd789e329d000d..b7f062a89f81402db2fd5df15900ee865b7be705 100644 --- a/Libs/MRML/DisplayableManager/vtkMRMLCrosshairDisplayableManager.h +++ b/Libs/MRML/DisplayableManager/vtkMRMLCrosshairDisplayableManager.h @@ -38,39 +38,39 @@ public: static vtkMRMLCrosshairDisplayableManager* New(); vtkTypeMacro(vtkMRMLCrosshairDisplayableManager, vtkMRMLAbstractSliceViewDisplayableManager); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; // Utility functions (used by 2D and 3D crosshair displayable managers) static vtkMRMLCrosshairNode* FindCrosshairNode(vtkMRMLScene* scene); - bool CanProcessInteractionEvent(vtkMRMLInteractionEventData* eventData, double &closestDistance2) VTK_OVERRIDE; - bool ProcessInteractionEvent(vtkMRMLInteractionEventData* eventData) VTK_OVERRIDE; + bool CanProcessInteractionEvent(vtkMRMLInteractionEventData* eventData, double &closestDistance2) override; + bool ProcessInteractionEvent(vtkMRMLInteractionEventData* eventData) override; void SetActionsEnabled(int actions); int GetActionsEnabled(); protected: vtkMRMLCrosshairDisplayableManager(); - virtual ~vtkMRMLCrosshairDisplayableManager(); + ~vtkMRMLCrosshairDisplayableManager() override; /// Initialize the displayable manager based on its associated /// vtkMRMLSliceNode - virtual void Create() VTK_OVERRIDE; + void Create() override; /// Called when the SliceNode is modified. May cause Crosshair to remap its position on screen. - virtual void OnMRMLSliceNodeModifiedEvent() VTK_OVERRIDE; + void OnMRMLSliceNodeModifiedEvent() override; /// Method to perform additional initialization - virtual void AdditionalInitializeStep() VTK_OVERRIDE; + void AdditionalInitializeStep() override; private: vtkMRMLCrosshairDisplayableManager(const vtkMRMLCrosshairDisplayableManager&);// Not implemented void operator=(const vtkMRMLCrosshairDisplayableManager&); // Not Implemented - virtual void UnobserveMRMLScene() VTK_OVERRIDE; - virtual void ObserveMRMLScene() VTK_OVERRIDE; - virtual void UpdateFromMRMLScene() VTK_OVERRIDE; - virtual void OnMRMLNodeModified(vtkMRMLNode* node) VTK_OVERRIDE; + void UnobserveMRMLScene() override; + void ObserveMRMLScene() override; + void UpdateFromMRMLScene() override; + void OnMRMLNodeModified(vtkMRMLNode* node) override; class vtkInternal; vtkInternal * Internal; diff --git a/Libs/MRML/DisplayableManager/vtkMRMLCrosshairDisplayableManager3D.h b/Libs/MRML/DisplayableManager/vtkMRMLCrosshairDisplayableManager3D.h index 00f2039d9b11673d1dfcea3dfa3f3e0e29b7eadb..86aad813c6553df67bd8e38fd9fa9a7cbe19bf6b 100644 --- a/Libs/MRML/DisplayableManager/vtkMRMLCrosshairDisplayableManager3D.h +++ b/Libs/MRML/DisplayableManager/vtkMRMLCrosshairDisplayableManager3D.h @@ -34,27 +34,27 @@ public: static vtkMRMLCrosshairDisplayableManager3D* New(); vtkTypeMacro(vtkMRMLCrosshairDisplayableManager3D, vtkMRMLAbstractThreeDViewDisplayableManager); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; protected: vtkMRMLCrosshairDisplayableManager3D(); - virtual ~vtkMRMLCrosshairDisplayableManager3D(); + ~vtkMRMLCrosshairDisplayableManager3D() override; /// Initialize the displayable manager based on its associated /// vtkMRMLSliceNode - virtual void Create() VTK_OVERRIDE; + void Create() override; /// Method to perform additional initialization - virtual void AdditionalInitializeStep() VTK_OVERRIDE; + void AdditionalInitializeStep() override; private: vtkMRMLCrosshairDisplayableManager3D(const vtkMRMLCrosshairDisplayableManager3D&);// Not implemented void operator=(const vtkMRMLCrosshairDisplayableManager3D&); // Not Implemented - virtual void UnobserveMRMLScene() VTK_OVERRIDE; - virtual void ObserveMRMLScene() VTK_OVERRIDE; - virtual void UpdateFromMRMLScene() VTK_OVERRIDE; - virtual void OnMRMLNodeModified(vtkMRMLNode* node) VTK_OVERRIDE; + void UnobserveMRMLScene() override; + void ObserveMRMLScene() override; + void UpdateFromMRMLScene() override; + void OnMRMLNodeModified(vtkMRMLNode* node) override; class vtkInternal; vtkInternal * Internal; diff --git a/Libs/MRML/DisplayableManager/vtkMRMLDisplayableManagerFactory.h b/Libs/MRML/DisplayableManager/vtkMRMLDisplayableManagerFactory.h index caa242fdcabae167fc377300ff9c85306fde4e96..68edeb3584c5632cca01ebd2661cbb1171b0d92f 100644 --- a/Libs/MRML/DisplayableManager/vtkMRMLDisplayableManagerFactory.h +++ b/Libs/MRML/DisplayableManager/vtkMRMLDisplayableManagerFactory.h @@ -39,7 +39,7 @@ class VTK_MRML_DISPLAYABLEMANAGER_EXPORT vtkMRMLDisplayableManagerFactory : publ public: static vtkMRMLDisplayableManagerFactory* New(); vtkTypeMacro(vtkMRMLDisplayableManagerFactory,vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; enum { @@ -86,7 +86,7 @@ public: protected: vtkMRMLDisplayableManagerFactory(); - virtual ~vtkMRMLDisplayableManagerFactory(); + ~vtkMRMLDisplayableManagerFactory() override; class vtkInternal; vtkInternal* Internal; diff --git a/Libs/MRML/DisplayableManager/vtkMRMLDisplayableManagerGroup.h b/Libs/MRML/DisplayableManager/vtkMRMLDisplayableManagerGroup.h index dace60502a92dce009eae1d769c0a1bd3ab05131..b1b3443c460194130eb333bac2891f2d15487e3e 100644 --- a/Libs/MRML/DisplayableManager/vtkMRMLDisplayableManagerGroup.h +++ b/Libs/MRML/DisplayableManager/vtkMRMLDisplayableManagerGroup.h @@ -46,7 +46,7 @@ public: static vtkMRMLDisplayableManagerGroup *New(); vtkTypeMacro(vtkMRMLDisplayableManagerGroup,vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Convenient method equivalent to call SetAndObserveDisplayableManagerFactory, SetRenderer, /// then instantiate and add all displayable managers registered within the \a factory. @@ -120,7 +120,7 @@ public: protected: vtkMRMLDisplayableManagerGroup(); - virtual ~vtkMRMLDisplayableManagerGroup(); + ~vtkMRMLDisplayableManagerGroup() override; typedef vtkMRMLDisplayableManagerGroup Self; static void DoCallback(vtkObject* vtk_obj, unsigned long event, diff --git a/Libs/MRML/DisplayableManager/vtkMRMLLightBoxRendererManagerProxy.h b/Libs/MRML/DisplayableManager/vtkMRMLLightBoxRendererManagerProxy.h index 07d71142979ca880a681aaf9b1eba7c05153fbc7..5a2f416d7a3589bdebd7e363fb77d243dff5bf18 100644 --- a/Libs/MRML/DisplayableManager/vtkMRMLLightBoxRendererManagerProxy.h +++ b/Libs/MRML/DisplayableManager/vtkMRMLLightBoxRendererManagerProxy.h @@ -43,7 +43,7 @@ public: protected: vtkMRMLLightBoxRendererManagerProxy() ; - virtual ~vtkMRMLLightBoxRendererManagerProxy() ; + ~vtkMRMLLightBoxRendererManagerProxy() override ; private: vtkMRMLLightBoxRendererManagerProxy(const vtkMRMLLightBoxRendererManagerProxy&); // Not implemented diff --git a/Libs/MRML/DisplayableManager/vtkMRMLModelDisplayableManager.h b/Libs/MRML/DisplayableManager/vtkMRMLModelDisplayableManager.h index fd0ce238c0a4eb68fcc5f5c18489f73084da1edd..50aff0c3d3bf2732a0c91201fd9d2d6e13547aa8 100644 --- a/Libs/MRML/DisplayableManager/vtkMRMLModelDisplayableManager.h +++ b/Libs/MRML/DisplayableManager/vtkMRMLModelDisplayableManager.h @@ -68,7 +68,7 @@ class VTK_MRML_DISPLAYABLEMANAGER_EXPORT vtkMRMLModelDisplayableManager public: static vtkMRMLModelDisplayableManager* New(); vtkTypeMacro(vtkMRMLModelDisplayableManager,vtkMRMLAbstractThreeDViewDisplayableManager); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// /// Get/Set the ClipModels Node @@ -105,7 +105,7 @@ public: /// Convert a RAS location to a MRML node, point ID, cell ID, /// as appropriate depending what's found under the position. - virtual int Pick3D(double ras[3]) VTK_OVERRIDE; + int Pick3D(double ras[3]) override; /// Get/Set tolerance for Pick() method. /// it will call vtkCellPicker.Get/SetTolerance() @@ -114,7 +114,7 @@ public: /// /// Get the MRML ID of the picked node, returns empty string if no pick - virtual const char* GetPickedNodeID() VTK_OVERRIDE; + const char* GetPickedNodeID() override; /// /// Get/Set the picked RAS point, returns 0,0,0 if no pick @@ -157,30 +157,30 @@ public: protected: vtkMRMLModelDisplayableManager(); - virtual ~vtkMRMLModelDisplayableManager(); + ~vtkMRMLModelDisplayableManager() override; - virtual void AdditionalInitializeStep() VTK_OVERRIDE; - virtual int ActiveInteractionModes() VTK_OVERRIDE; + void AdditionalInitializeStep() override; + int ActiveInteractionModes() override; - virtual void UnobserveMRMLScene() VTK_OVERRIDE; + void UnobserveMRMLScene() override; - virtual void OnMRMLSceneStartClose() VTK_OVERRIDE; - virtual void OnMRMLSceneEndClose() VTK_OVERRIDE; - virtual void UpdateFromMRMLScene() VTK_OVERRIDE; - virtual void OnMRMLSceneNodeAdded(vtkMRMLNode* node) VTK_OVERRIDE; - virtual void OnMRMLSceneNodeRemoved(vtkMRMLNode* node) VTK_OVERRIDE; + void OnMRMLSceneStartClose() override; + void OnMRMLSceneEndClose() override; + void UpdateFromMRMLScene() override; + void OnMRMLSceneNodeAdded(vtkMRMLNode* node) override; + void OnMRMLSceneNodeRemoved(vtkMRMLNode* node) override; - virtual void OnInteractorStyleEvent(int eventId) VTK_OVERRIDE; - virtual void ProcessMRMLNodesEvents(vtkObject *caller, unsigned long event, void *callData) VTK_OVERRIDE; + void OnInteractorStyleEvent(int eventId) override; + void ProcessMRMLNodesEvents(vtkObject *caller, unsigned long event, void *callData) override; /// Returns true if something visible in modelNode has changed and would /// require a refresh. bool OnMRMLDisplayableModelNodeModifiedEvent(vtkMRMLDisplayableNode * modelNode); /// Updates Actors based on models in the scene - virtual void UpdateFromMRML() VTK_OVERRIDE; + void UpdateFromMRML() override; - virtual void RemoveMRMLObservers() VTK_OVERRIDE; + void RemoveMRMLObservers() override; friend class vtkThreeDViewInteractorStyle; // Access to RequestRender(); diff --git a/Libs/MRML/DisplayableManager/vtkMRMLModelSliceDisplayableManager.h b/Libs/MRML/DisplayableManager/vtkMRMLModelSliceDisplayableManager.h index 86cfc1369fc975218510597576739a5e4e62cee6..2fdbf7d3e8e1ca0d1418cfd4a3f27ac72b977c7c 100644 --- a/Libs/MRML/DisplayableManager/vtkMRMLModelSliceDisplayableManager.h +++ b/Libs/MRML/DisplayableManager/vtkMRMLModelSliceDisplayableManager.h @@ -40,7 +40,7 @@ public: static vtkMRMLModelSliceDisplayableManager* New(); vtkTypeMacro(vtkMRMLModelSliceDisplayableManager, vtkMRMLAbstractSliceViewDisplayableManager); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; // DisplayableNode handling customizations void AddDisplayableNode(vtkMRMLDisplayableNode* displayableNode); @@ -49,21 +49,21 @@ public: protected: vtkMRMLModelSliceDisplayableManager(); - virtual ~vtkMRMLModelSliceDisplayableManager(); + ~vtkMRMLModelSliceDisplayableManager() override; - virtual void UnobserveMRMLScene() VTK_OVERRIDE; - virtual void OnMRMLSceneNodeAdded(vtkMRMLNode* node) VTK_OVERRIDE; - virtual void OnMRMLSceneNodeRemoved(vtkMRMLNode* node) VTK_OVERRIDE; - virtual void ProcessMRMLNodesEvents(vtkObject* caller, unsigned long event, void* callData) VTK_OVERRIDE; + void UnobserveMRMLScene() override; + void OnMRMLSceneNodeAdded(vtkMRMLNode* node) override; + void OnMRMLSceneNodeRemoved(vtkMRMLNode* node) override; + void ProcessMRMLNodesEvents(vtkObject* caller, unsigned long event, void* callData) override; - virtual void UpdateFromMRML() VTK_OVERRIDE; - virtual void OnMRMLSceneStartClose() VTK_OVERRIDE; - virtual void OnMRMLSceneEndClose() VTK_OVERRIDE; - virtual void OnMRMLSceneEndBatchProcess() VTK_OVERRIDE; + void UpdateFromMRML() override; + void OnMRMLSceneStartClose() override; + void OnMRMLSceneEndClose() override; + void OnMRMLSceneEndBatchProcess() override; /// Initialize the displayable manager based on its associated /// vtkMRMLSliceNode - virtual void Create() VTK_OVERRIDE; + void Create() override; int AddingDisplayableNode; private: diff --git a/Libs/MRML/DisplayableManager/vtkMRMLOrientationMarkerDisplayableManager.cxx b/Libs/MRML/DisplayableManager/vtkMRMLOrientationMarkerDisplayableManager.cxx index d702e1fb9316b33af7104cb7bd764343298a067f..97903066dbe9e932a8175c22b88775361c1d4154 100644 --- a/Libs/MRML/DisplayableManager/vtkMRMLOrientationMarkerDisplayableManager.cxx +++ b/Libs/MRML/DisplayableManager/vtkMRMLOrientationMarkerDisplayableManager.cxx @@ -69,7 +69,7 @@ public: // Get the actual bounds for this Actor. // vtkAxesActor's implementation keeps the origin in the middle of the bounds // which wastes a lot of space. - double* GetBounds() VTK_OVERRIDE + double* GetBounds() override { vtkBoundingBox totalBoundingBox(this->XAxisShaft->GetBounds()); totalBoundingBox.AddBounds(this->YAxisShaft->GetBounds()); @@ -83,7 +83,7 @@ public: protected: vtkCenteredAxesActor() {}; - ~vtkCenteredAxesActor() {}; + ~vtkCenteredAxesActor() override {}; }; vtkStandardNewMacro(vtkCenteredAxesActor); @@ -100,7 +100,7 @@ public: { this->DisplayableManager = 0; } - virtual void Execute(vtkObject* vtkNotUsed(wdg), unsigned long vtkNotUsed(event), void* vtkNotUsed(calldata)) + void Execute(vtkObject* vtkNotUsed(wdg), unsigned long vtkNotUsed(event), void* vtkNotUsed(calldata)) override { if (this->DisplayableManager) { diff --git a/Libs/MRML/DisplayableManager/vtkMRMLOrientationMarkerDisplayableManager.h b/Libs/MRML/DisplayableManager/vtkMRMLOrientationMarkerDisplayableManager.h index 016fe50367bdcaec2231e21a284be298781de8df..da5bfcd5b336972ebe2666146e8c687a050873a9 100644 --- a/Libs/MRML/DisplayableManager/vtkMRMLOrientationMarkerDisplayableManager.h +++ b/Libs/MRML/DisplayableManager/vtkMRMLOrientationMarkerDisplayableManager.h @@ -36,20 +36,20 @@ class VTK_MRML_DISPLAYABLEMANAGER_EXPORT vtkMRMLOrientationMarkerDisplayableMana public: static vtkMRMLOrientationMarkerDisplayableManager* New(); vtkTypeMacro(vtkMRMLOrientationMarkerDisplayableManager,vtkMRMLAbstractDisplayableManager); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; protected: vtkMRMLOrientationMarkerDisplayableManager(); - virtual ~vtkMRMLOrientationMarkerDisplayableManager(); + ~vtkMRMLOrientationMarkerDisplayableManager() override; /// Observe the View node and initialize the renderer accordingly. - virtual void Create() VTK_OVERRIDE; + void Create() override; /// Called each time the view node is modified. /// Internally update the renderer from the view node. /// \sa UpdateFromMRMLViewNode() - virtual void OnMRMLDisplayableNodeModifiedEvent(vtkObject* caller) VTK_OVERRIDE; + void OnMRMLDisplayableNodeModifiedEvent(vtkObject* caller) override; /// Update the renderer from the view node properties. void UpdateFromViewNode(); diff --git a/Libs/MRML/DisplayableManager/vtkMRMLRulerDisplayableManager.cxx b/Libs/MRML/DisplayableManager/vtkMRMLRulerDisplayableManager.cxx index e42b317a6278e544384b887d58aa3e643fb61225..1dbf730312144ff7f028a17a34c02d8227781ce2 100644 --- a/Libs/MRML/DisplayableManager/vtkMRMLRulerDisplayableManager.cxx +++ b/Libs/MRML/DisplayableManager/vtkMRMLRulerDisplayableManager.cxx @@ -67,7 +67,7 @@ public: { this->DisplayableManager = 0; } - virtual void Execute(vtkObject* vtkNotUsed(wdg), unsigned long vtkNotUsed(event), void* vtkNotUsed(calldata)) + void Execute(vtkObject* vtkNotUsed(wdg), unsigned long vtkNotUsed(event), void* vtkNotUsed(calldata)) override { if (this->DisplayableManager) { diff --git a/Libs/MRML/DisplayableManager/vtkMRMLRulerDisplayableManager.h b/Libs/MRML/DisplayableManager/vtkMRMLRulerDisplayableManager.h index 241e3355f6d0d95dc454d8515689de3c2e705f2f..26f0e8e3e1f4b9888d0789383de67b54b5aa40c9 100644 --- a/Libs/MRML/DisplayableManager/vtkMRMLRulerDisplayableManager.h +++ b/Libs/MRML/DisplayableManager/vtkMRMLRulerDisplayableManager.h @@ -36,7 +36,7 @@ class VTK_MRML_DISPLAYABLEMANAGER_EXPORT vtkMRMLRulerDisplayableManager public: static vtkMRMLRulerDisplayableManager* New(); vtkTypeMacro(vtkMRMLRulerDisplayableManager,vtkMRMLAbstractDisplayableManager); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Adds a scale preset to the list of possible scales. /// Length: The preset with Length closest to the actual length of the ruler will be used. @@ -56,15 +56,15 @@ public: protected: vtkMRMLRulerDisplayableManager(); - virtual ~vtkMRMLRulerDisplayableManager(); + ~vtkMRMLRulerDisplayableManager() override; /// Observe the View node and initialize the renderer accordingly. - virtual void Create() VTK_OVERRIDE; + void Create() override; /// Called each time the view node is modified. /// Internally update the renderer from the view node. /// \sa UpdateFromMRMLViewNode() - virtual void OnMRMLDisplayableNodeModifiedEvent(vtkObject* caller) VTK_OVERRIDE; + void OnMRMLDisplayableNodeModifiedEvent(vtkObject* caller) override; /// Update the renderer from the view node properties. void UpdateFromViewNode(); diff --git a/Libs/MRML/DisplayableManager/vtkMRMLScriptedDisplayableManager.h b/Libs/MRML/DisplayableManager/vtkMRMLScriptedDisplayableManager.h index 3115034a5b7c282b69e9cf143f4d7403fca1b414..7880b2c118b70249f107ba2db8cbf3aa88f185a0 100644 --- a/Libs/MRML/DisplayableManager/vtkMRMLScriptedDisplayableManager.h +++ b/Libs/MRML/DisplayableManager/vtkMRMLScriptedDisplayableManager.h @@ -33,28 +33,28 @@ class VTK_MRML_DISPLAYABLEMANAGER_EXPORT vtkMRMLScriptedDisplayableManager : public: static vtkMRMLScriptedDisplayableManager* New(); vtkTypeMacro(vtkMRMLScriptedDisplayableManager,vtkMRMLAbstractDisplayableManager); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; void SetPythonSource(const std::string& pythonSource); protected: vtkMRMLScriptedDisplayableManager(); - virtual ~vtkMRMLScriptedDisplayableManager(); + ~vtkMRMLScriptedDisplayableManager() override; - virtual void SetMRMLSceneInternal(vtkMRMLScene* newScene) VTK_OVERRIDE; + void SetMRMLSceneInternal(vtkMRMLScene* newScene) override; - virtual void ProcessMRMLSceneEvents(vtkObject *caller, unsigned long event, void *callData) VTK_OVERRIDE; - virtual void ProcessMRMLNodesEvents(vtkObject *caller, unsigned long event, void *callData) VTK_OVERRIDE; + void ProcessMRMLSceneEvents(vtkObject *caller, unsigned long event, void *callData) override; + void ProcessMRMLNodesEvents(vtkObject *caller, unsigned long event, void *callData) override; - virtual void Create() VTK_OVERRIDE; + void Create() override; - virtual void RemoveMRMLObservers() VTK_OVERRIDE; + void RemoveMRMLObservers() override; - virtual void UpdateFromMRML() VTK_OVERRIDE; + void UpdateFromMRML() override; - virtual void OnInteractorStyleEvent(int eventid) VTK_OVERRIDE; + void OnInteractorStyleEvent(int eventid) override; - virtual void OnMRMLDisplayableNodeModifiedEvent(vtkObject* caller) VTK_OVERRIDE; + void OnMRMLDisplayableNodeModifiedEvent(vtkObject* caller) override; private: vtkMRMLScriptedDisplayableManager(const vtkMRMLScriptedDisplayableManager&);// Not implemented diff --git a/Libs/MRML/DisplayableManager/vtkMRMLSliceViewDisplayableManagerFactory.h b/Libs/MRML/DisplayableManager/vtkMRMLSliceViewDisplayableManagerFactory.h index 01202aef126f9d4c7181f87042b3243e3f83129a..9ac5970e2b21e52393014c075e9b1edd4a416f8f 100644 --- a/Libs/MRML/DisplayableManager/vtkMRMLSliceViewDisplayableManagerFactory.h +++ b/Libs/MRML/DisplayableManager/vtkMRMLSliceViewDisplayableManagerFactory.h @@ -42,7 +42,7 @@ public: vtkTypeMacro(vtkMRMLSliceViewDisplayableManagerFactory, vtkMRMLDisplayableManagerFactory); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// This is a singleton pattern New. There will only be ONE /// reference to a vtkMRMLSliceViewDisplayableManagerFactory object per process. Clients that @@ -56,7 +56,7 @@ public: protected: vtkMRMLSliceViewDisplayableManagerFactory(); - virtual ~vtkMRMLSliceViewDisplayableManagerFactory(); + ~vtkMRMLSliceViewDisplayableManagerFactory() override; VTK_SINGLETON_DECLARE(vtkMRMLSliceViewDisplayableManagerFactory); diff --git a/Libs/MRML/DisplayableManager/vtkMRMLThreeDReformatDisplayableManager.h b/Libs/MRML/DisplayableManager/vtkMRMLThreeDReformatDisplayableManager.h index 3af3f3d6b01f59cb167d17c9cb230b8d418ce21d..821e2f29f70420c0a722f88fb9582d24795ce3d8 100644 --- a/Libs/MRML/DisplayableManager/vtkMRMLThreeDReformatDisplayableManager.h +++ b/Libs/MRML/DisplayableManager/vtkMRMLThreeDReformatDisplayableManager.h @@ -36,24 +36,24 @@ public: static vtkMRMLThreeDReformatDisplayableManager* New(); vtkTypeMacro(vtkMRMLThreeDReformatDisplayableManager, vtkMRMLAbstractThreeDViewDisplayableManager); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; protected: vtkMRMLThreeDReformatDisplayableManager(); - virtual ~vtkMRMLThreeDReformatDisplayableManager(); + ~vtkMRMLThreeDReformatDisplayableManager() override; /// Initialize the displayable manager based on its associated /// vtkMRMLSliceNode - virtual void Create() VTK_OVERRIDE; + void Create() override; /// WidgetCallback is a static function to relay modified events from the Logic - virtual void ProcessWidgetsEvents(vtkObject *caller, unsigned long event, void *callData) VTK_OVERRIDE; + void ProcessWidgetsEvents(vtkObject *caller, unsigned long event, void *callData) override; - virtual void UnobserveMRMLScene() VTK_OVERRIDE; - virtual void UpdateFromMRMLScene() VTK_OVERRIDE; - virtual void OnMRMLSceneNodeAdded(vtkMRMLNode* node) VTK_OVERRIDE; - virtual void OnMRMLSceneNodeRemoved(vtkMRMLNode* node) VTK_OVERRIDE; - virtual void OnMRMLNodeModified(vtkMRMLNode* node) VTK_OVERRIDE; + void UnobserveMRMLScene() override; + void UpdateFromMRMLScene() override; + void OnMRMLSceneNodeAdded(vtkMRMLNode* node) override; + void OnMRMLSceneNodeRemoved(vtkMRMLNode* node) override; + void OnMRMLNodeModified(vtkMRMLNode* node) override; private: vtkMRMLThreeDReformatDisplayableManager(const vtkMRMLThreeDReformatDisplayableManager&);// Not implemented diff --git a/Libs/MRML/DisplayableManager/vtkMRMLThreeDViewDisplayableManagerFactory.h b/Libs/MRML/DisplayableManager/vtkMRMLThreeDViewDisplayableManagerFactory.h index 1fc5553ed862fbafaaef54e1956be479c5ba843d..e6c475b13fadcb8e0f43e616df10290980add1c5 100644 --- a/Libs/MRML/DisplayableManager/vtkMRMLThreeDViewDisplayableManagerFactory.h +++ b/Libs/MRML/DisplayableManager/vtkMRMLThreeDViewDisplayableManagerFactory.h @@ -42,7 +42,7 @@ public: vtkTypeMacro(vtkMRMLThreeDViewDisplayableManagerFactory, vtkMRMLDisplayableManagerFactory); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// This is a singleton pattern New. There will only be ONE /// reference to a vtkMRMLThreeDViewDisplayableManagerFactory object per process. Clients that @@ -56,7 +56,7 @@ public: protected: vtkMRMLThreeDViewDisplayableManagerFactory(); - virtual ~vtkMRMLThreeDViewDisplayableManagerFactory(); + ~vtkMRMLThreeDViewDisplayableManagerFactory() override; VTK_SINGLETON_DECLARE(vtkMRMLThreeDViewDisplayableManagerFactory); diff --git a/Libs/MRML/DisplayableManager/vtkMRMLViewDisplayableManager.h b/Libs/MRML/DisplayableManager/vtkMRMLViewDisplayableManager.h index 66ff6e8f21eb9bf189bd3326d655a9fba54e8012..9d359869b278d05afc9f0217ebd01fac21c95d91 100644 --- a/Libs/MRML/DisplayableManager/vtkMRMLViewDisplayableManager.h +++ b/Libs/MRML/DisplayableManager/vtkMRMLViewDisplayableManager.h @@ -42,26 +42,26 @@ class VTK_MRML_DISPLAYABLEMANAGER_EXPORT vtkMRMLViewDisplayableManager public: static vtkMRMLViewDisplayableManager* New(); vtkTypeMacro(vtkMRMLViewDisplayableManager,vtkMRMLAbstractThreeDViewDisplayableManager); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; protected: vtkMRMLViewDisplayableManager(); - virtual ~vtkMRMLViewDisplayableManager(); + ~vtkMRMLViewDisplayableManager() override; /// Receives events from the view and the camera nodes. - virtual void ProcessMRMLNodesEvents(vtkObject *caller, unsigned long event, void *callData) VTK_OVERRIDE; - virtual void ProcessWidgetsEvents(vtkObject *caller, unsigned long event, void *callData) VTK_OVERRIDE; + void ProcessMRMLNodesEvents(vtkObject *caller, unsigned long event, void *callData) override; + void ProcessWidgetsEvents(vtkObject *caller, unsigned long event, void *callData) override; - virtual void AdditionalInitializeStep() VTK_OVERRIDE; + void AdditionalInitializeStep() override; /// Observe the View node and initialize the renderer accordingly. - virtual void Create() VTK_OVERRIDE; + void Create() override; /// Called each time the view node is modified. /// Internally update the renderer from the view node. /// \sa UpdateFromMRMLViewNode() - virtual void OnMRMLDisplayableNodeModifiedEvent(vtkObject* caller) VTK_OVERRIDE; + void OnMRMLDisplayableNodeModifiedEvent(vtkObject* caller) override; /// Update the renderer from the view node properties. /// \sa UpdateFromCameraNode diff --git a/Libs/MRML/DisplayableManager/vtkMRMLVolumeGlyphSliceDisplayableManager.h b/Libs/MRML/DisplayableManager/vtkMRMLVolumeGlyphSliceDisplayableManager.h index d2d34e7f2d0078505a2df2015e327384d9009ee5..a256fc9f75735ca39581ccaacffe41f91e6fb341 100644 --- a/Libs/MRML/DisplayableManager/vtkMRMLVolumeGlyphSliceDisplayableManager.h +++ b/Libs/MRML/DisplayableManager/vtkMRMLVolumeGlyphSliceDisplayableManager.h @@ -37,21 +37,21 @@ public: static vtkMRMLVolumeGlyphSliceDisplayableManager* New(); vtkTypeMacro(vtkMRMLVolumeGlyphSliceDisplayableManager, vtkMRMLAbstractSliceViewDisplayableManager); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; protected: vtkMRMLVolumeGlyphSliceDisplayableManager(); - virtual ~vtkMRMLVolumeGlyphSliceDisplayableManager(); + ~vtkMRMLVolumeGlyphSliceDisplayableManager() override; - virtual void UnobserveMRMLScene() VTK_OVERRIDE; - virtual void UpdateFromMRMLScene() VTK_OVERRIDE; - virtual void ProcessMRMLNodesEvents(vtkObject* caller, unsigned long event, void* callData) VTK_OVERRIDE; - virtual void OnMRMLSceneStartClose() VTK_OVERRIDE; + void UnobserveMRMLScene() override; + void UpdateFromMRMLScene() override; + void ProcessMRMLNodesEvents(vtkObject* caller, unsigned long event, void* callData) override; + void OnMRMLSceneStartClose() override; /// Initialize the displayable manager based on its associated /// vtkMRMLSliceNode - virtual void Create() VTK_OVERRIDE; + void Create() override; private: diff --git a/Libs/MRML/DisplayableManager/vtkSliceIntersectionWidget.h b/Libs/MRML/DisplayableManager/vtkSliceIntersectionWidget.h index fb8bde4c8130439f6d01192cb9686d4e1e790fc0..7903388648b7ae855f978bd7d6fadb89e59f570d 100644 --- a/Libs/MRML/DisplayableManager/vtkSliceIntersectionWidget.h +++ b/Libs/MRML/DisplayableManager/vtkSliceIntersectionWidget.h @@ -64,16 +64,16 @@ public: void SetSliceNode(vtkMRMLSliceNode* sliceNode); vtkMRMLSliceNode* GetSliceNode(); - void SetMRMLApplicationLogic(vtkMRMLApplicationLogic* applicationLogic) VTK_OVERRIDE; + void SetMRMLApplicationLogic(vtkMRMLApplicationLogic* applicationLogic) override; /// Return true if the widget can process the event. - bool CanProcessInteractionEvent(vtkMRMLInteractionEventData* eventData, double &distance2) VTK_OVERRIDE; + bool CanProcessInteractionEvent(vtkMRMLInteractionEventData* eventData, double &distance2) override; /// Process interaction event. - bool ProcessInteractionEvent(vtkMRMLInteractionEventData* eventData) VTK_OVERRIDE; + bool ProcessInteractionEvent(vtkMRMLInteractionEventData* eventData) override; /// Called when the the widget loses the focus. - void Leave() VTK_OVERRIDE; + void Leave() override; /// Widget states enum diff --git a/Libs/MRML/DisplayableManager/vtkSliceViewInteractorStyle.h b/Libs/MRML/DisplayableManager/vtkSliceViewInteractorStyle.h index 0f826d0fc9e4325244af6734044fc97e55341747..67babc8bc32edd1710b08e918bb9a35283dff71e 100644 --- a/Libs/MRML/DisplayableManager/vtkSliceViewInteractorStyle.h +++ b/Libs/MRML/DisplayableManager/vtkSliceViewInteractorStyle.h @@ -44,33 +44,33 @@ class VTK_MRML_DISPLAYABLEMANAGER_EXPORT vtkSliceViewInteractorStyle : public: static vtkSliceViewInteractorStyle *New(); vtkTypeMacro(vtkSliceViewInteractorStyle,vtkInteractorStyleUser); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// /// Events are either handled here by changing the slice node /// and composite node (sometimes using the logic's methods) or /// they are passed to the vtkInteractorStyleUser, which conditionally /// passes them to observers if there are any. - virtual void OnMouseMove() VTK_OVERRIDE; - virtual void OnEnter() VTK_OVERRIDE; - virtual void OnLeave() VTK_OVERRIDE; - virtual void OnLeftButtonDown() VTK_OVERRIDE; - virtual void OnLeftButtonUp() VTK_OVERRIDE; - virtual void OnMiddleButtonDown() VTK_OVERRIDE; - virtual void OnMiddleButtonUp() VTK_OVERRIDE; - virtual void OnRightButtonDown() VTK_OVERRIDE; - virtual void OnRightButtonUp() VTK_OVERRIDE; - virtual void OnMouseWheelForward() VTK_OVERRIDE; - virtual void OnMouseWheelBackward() VTK_OVERRIDE; + void OnMouseMove() override; + void OnEnter() override; + void OnLeave() override; + void OnLeftButtonDown() override; + void OnLeftButtonUp() override; + void OnMiddleButtonDown() override; + void OnMiddleButtonUp() override; + void OnRightButtonDown() override; + void OnRightButtonUp() override; + void OnMouseWheelForward() override; + void OnMouseWheelBackward() override; /// Keyboard functions - virtual void OnChar() VTK_OVERRIDE; - virtual void OnKeyPress() VTK_OVERRIDE; - virtual void OnKeyRelease() VTK_OVERRIDE; + void OnChar() override; + void OnKeyPress() override; + void OnKeyRelease() override; /// These are more esoteric events, but are useful in some cases. - virtual void OnExpose() VTK_OVERRIDE; - virtual void OnConfigure() VTK_OVERRIDE; + void OnExpose() override; + void OnConfigure() override; void SetDisplayableManagers(vtkMRMLDisplayableManagerGroup* displayableManagers); @@ -121,7 +121,7 @@ public: protected: vtkSliceViewInteractorStyle(); - ~vtkSliceViewInteractorStyle(); + ~vtkSliceViewInteractorStyle() override; vtkMRMLSliceLogic *SliceLogic; diff --git a/Libs/MRML/DisplayableManager/vtkThreeDViewInteractorStyle.h b/Libs/MRML/DisplayableManager/vtkThreeDViewInteractorStyle.h index f62e3306a2f6708afffc3bbb51597a913e0fad63..b012d2090fd98eb7ee64b6cbcd31a72ab8762d14 100644 --- a/Libs/MRML/DisplayableManager/vtkThreeDViewInteractorStyle.h +++ b/Libs/MRML/DisplayableManager/vtkThreeDViewInteractorStyle.h @@ -56,31 +56,31 @@ class VTK_MRML_DISPLAYABLEMANAGER_EXPORT vtkThreeDViewInteractorStyle : public: static vtkThreeDViewInteractorStyle *New(); vtkTypeMacro(vtkThreeDViewInteractorStyle,vtkInteractorStyle); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// /// Event bindings controlling the effects of pressing mouse buttons /// or moving the mouse. - virtual void OnMouseMove() VTK_OVERRIDE; - virtual void OnEnter() VTK_OVERRIDE; - virtual void OnLeave() VTK_OVERRIDE; - virtual void OnLeftButtonDown() VTK_OVERRIDE; - virtual void OnLeftButtonUp() VTK_OVERRIDE; - virtual void OnMiddleButtonDown() VTK_OVERRIDE; - virtual void OnMiddleButtonUp() VTK_OVERRIDE; - virtual void OnRightButtonDown() VTK_OVERRIDE; - virtual void OnRightButtonUp() VTK_OVERRIDE; - virtual void OnMouseWheelForward() VTK_OVERRIDE; - virtual void OnMouseWheelBackward() VTK_OVERRIDE; + void OnMouseMove() override; + void OnEnter() override; + void OnLeave() override; + void OnLeftButtonDown() override; + void OnLeftButtonUp() override; + void OnMiddleButtonDown() override; + void OnMiddleButtonUp() override; + void OnRightButtonDown() override; + void OnRightButtonUp() override; + void OnMouseWheelForward() override; + void OnMouseWheelBackward() override; /// Keyboard functions - virtual void OnChar() VTK_OVERRIDE; - virtual void OnKeyPress() VTK_OVERRIDE; - virtual void OnKeyRelease() VTK_OVERRIDE; + void OnChar() override; + void OnKeyPress() override; + void OnKeyRelease() override; /// These are more esoteric events, but are useful in some cases. - virtual void OnExpose() VTK_OVERRIDE; - virtual void OnConfigure() VTK_OVERRIDE; + void OnExpose() override; + void OnConfigure() override; void SetDisplayableManagers(vtkMRMLDisplayableManagerGroup* displayableManagers); @@ -95,7 +95,7 @@ public: /// /// Reimplemented to set the default interactive update rate - virtual void SetInteractor(vtkRenderWindowInteractor *interactor) VTK_OVERRIDE; + void SetInteractor(vtkRenderWindowInteractor *interactor) override; /// /// Get/Set the ModelDisplayableManager, for picking @@ -105,16 +105,16 @@ public: /// are overridden in subclasses to perform the correct motion. Since /// they are called by OnTimer, they do not have mouse coord parameters /// (use interactor's GetEventPosition and GetLastEventPosition) - virtual void Rotate() VTK_OVERRIDE; - virtual void Spin() VTK_OVERRIDE; - virtual void Pan() VTK_OVERRIDE; - virtual void Dolly() VTK_OVERRIDE; + void Rotate() override; + void Spin() override; + void Pan() override; + void Dolly() override; virtual void Dolly(double factor); protected: vtkThreeDViewInteractorStyle(); - ~vtkThreeDViewInteractorStyle(); + ~vtkThreeDViewInteractorStyle() override; static void ThreeDViewProcessEvents(vtkObject* object, unsigned long event, void* clientdata, void* calldata); diff --git a/Libs/MRML/IDImageIO/itkMRMLIDImageIO.h b/Libs/MRML/IDImageIO/itkMRMLIDImageIO.h index 5ba6a5372759226a1a17b292f9acd55145cf928f..282d132805c565a6c18e15e8c336f1c1843400c1 100644 --- a/Libs/MRML/IDImageIO/itkMRMLIDImageIO.h +++ b/Libs/MRML/IDImageIO/itkMRMLIDImageIO.h @@ -66,36 +66,36 @@ public: /** Determine the file type. Returns true if this ImageIO can read the * file specified. */ - virtual bool CanReadFile(const char*) ITK_OVERRIDE; + bool CanReadFile(const char*) override; virtual bool CanUseOwnBuffer(); virtual void ReadUsingOwnBuffer(); virtual void * GetOwnBuffer(); /** Set the spacing and dimension information for the set filename. */ - virtual void ReadImageInformation() ITK_OVERRIDE; + void ReadImageInformation() override; /** Reads the data from disk into the memory buffer provided. */ - virtual void Read(void* buffer) ITK_OVERRIDE; + void Read(void* buffer) override; /*-------- This part of the interfaces deals with writing data. ----- */ /** Determine the file type. Returns true if this ImageIO can read the * file specified. */ - virtual bool CanWriteFile(const char*) ITK_OVERRIDE; + bool CanWriteFile(const char*) override; /** Writes the header of the image. * Assumes SetFileName has been called with a valid file name. */ - virtual void WriteImageInformation() ITK_OVERRIDE; + void WriteImageInformation() override; /** Writes the data to disk from the memory buffer provided. Make sure * that the IORegion has been set properly. */ - virtual void Write(const void* buffer) ITK_OVERRIDE; + void Write(const void* buffer) override; protected: MRMLIDImageIO(); - ~MRMLIDImageIO(); - void PrintSelf(std::ostream& os, Indent indent) const ITK_OVERRIDE; + ~MRMLIDImageIO() override; + void PrintSelf(std::ostream& os, Indent indent) const override; /** Write the image information to the node and specified image */ virtual void WriteImageInformation(vtkMRMLVolumeNode *, vtkImageData*, diff --git a/Libs/MRML/IDImageIO/itkMRMLIDImageIOFactory.h b/Libs/MRML/IDImageIO/itkMRMLIDImageIOFactory.h index ef93ee4faa24935477a54b6e8ecc4ed5c20ae9d8..e57c91e67e2afd6c7426999ecb676f72f219a43d 100644 --- a/Libs/MRML/IDImageIO/itkMRMLIDImageIOFactory.h +++ b/Libs/MRML/IDImageIO/itkMRMLIDImageIOFactory.h @@ -39,8 +39,8 @@ public: typedef SmartPointer ConstPointer; /** Class methods used to interface with the registered factories. */ - virtual const char* GetITKSourceVersion(void) const ITK_OVERRIDE; - virtual const char* GetDescription(void) const ITK_OVERRIDE; + const char* GetITKSourceVersion(void) const override; + const char* GetDescription(void) const override; /** Method for class instantiation. */ itkFactorylessNewMacro(Self); @@ -58,7 +58,7 @@ public: protected: MRMLIDImageIOFactory(); - ~MRMLIDImageIOFactory(); + ~MRMLIDImageIOFactory() override; private: MRMLIDImageIOFactory(const Self&); //purposely not implemented diff --git a/Libs/MRML/Logic/Testing/Cxx/vtkMRMLAbstractLogicSceneEventsTest.cxx b/Libs/MRML/Logic/Testing/Cxx/vtkMRMLAbstractLogicSceneEventsTest.cxx index 9ac81baecb8a87dc37c68ff9f4da6c1d759cb3d3..70275d917963284d6395eb511cec06b10304a38b 100644 --- a/Libs/MRML/Logic/Testing/Cxx/vtkMRMLAbstractLogicSceneEventsTest.cxx +++ b/Libs/MRML/Logic/Testing/Cxx/vtkMRMLAbstractLogicSceneEventsTest.cxx @@ -42,23 +42,23 @@ public: vtkTypeMacro(vtkMRMLTestLogic, vtkMRMLAbstractLogic); static vtkMRMLTestLogic *New(); - virtual void SetMRMLSceneInternal(vtkMRMLScene* scene) VTK_OVERRIDE; - virtual void UnobserveMRMLScene() VTK_OVERRIDE; - virtual void ObserveMRMLScene() VTK_OVERRIDE; - virtual void RegisterNodes() VTK_OVERRIDE; - virtual void UpdateFromMRMLScene() VTK_OVERRIDE; - - virtual void OnMRMLSceneStartBatchProcess() VTK_OVERRIDE; - virtual void OnMRMLSceneEndBatchProcess() VTK_OVERRIDE; - virtual void OnMRMLSceneStartClose() VTK_OVERRIDE; - virtual void OnMRMLSceneEndClose() VTK_OVERRIDE; - virtual void OnMRMLSceneStartImport() VTK_OVERRIDE; - virtual void OnMRMLSceneEndImport() VTK_OVERRIDE; - virtual void OnMRMLSceneStartRestore() VTK_OVERRIDE; - virtual void OnMRMLSceneEndRestore() VTK_OVERRIDE; - virtual void OnMRMLSceneNew() VTK_OVERRIDE; - virtual void OnMRMLSceneNodeAdded(vtkMRMLNode* nodeAdded) VTK_OVERRIDE; - virtual void OnMRMLSceneNodeRemoved(vtkMRMLNode* nodeRemoved) VTK_OVERRIDE; + void SetMRMLSceneInternal(vtkMRMLScene* scene) override; + void UnobserveMRMLScene() override; + void ObserveMRMLScene() override; + void RegisterNodes() override; + void UpdateFromMRMLScene() override; + + void OnMRMLSceneStartBatchProcess() override; + void OnMRMLSceneEndBatchProcess() override; + void OnMRMLSceneStartClose() override; + void OnMRMLSceneEndClose() override; + void OnMRMLSceneStartImport() override; + void OnMRMLSceneEndImport() override; + void OnMRMLSceneStartRestore() override; + void OnMRMLSceneEndRestore() override; + void OnMRMLSceneNew() override; + void OnMRMLSceneNodeAdded(vtkMRMLNode* nodeAdded) override; + void OnMRMLSceneNodeRemoved(vtkMRMLNode* nodeRemoved) override; enum MethodType{ Set = 0, @@ -73,7 +73,7 @@ public: std::map CalledMethods; protected: vtkMRMLTestLogic(){} - virtual ~vtkMRMLTestLogic(){} + ~vtkMRMLTestLogic() override{} }; vtkStandardNewMacro(vtkMRMLTestLogic); diff --git a/Libs/MRML/Logic/vtkImageLabelOutline.h b/Libs/MRML/Logic/vtkImageLabelOutline.h index d35f9859f9c35a2c3b454e34cdee2804b837187c..f0676d276b689d8a86f7ab3fe98eff5194f9a912 100644 --- a/Libs/MRML/Logic/vtkImageLabelOutline.h +++ b/Libs/MRML/Logic/vtkImageLabelOutline.h @@ -30,7 +30,7 @@ class VTK_MRML_LOGIC_EXPORT vtkImageLabelOutline : public vtkImageNeighborhoodFi public: static vtkImageLabelOutline *New(); vtkTypeMacro(vtkImageLabelOutline,vtkImageNeighborhoodFilter); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// /// background pixel value in the image (usually 0) @@ -44,13 +44,13 @@ public: protected: vtkImageLabelOutline(); - ~vtkImageLabelOutline(); + ~vtkImageLabelOutline() override; float Background; int Outline; void ThreadedExecute(vtkImageData *inData, vtkImageData *outData, - int extent[6], int id) VTK_OVERRIDE; + int extent[6], int id) override; }; #endif diff --git a/Libs/MRML/Logic/vtkImageNeighborhoodFilter.h b/Libs/MRML/Logic/vtkImageNeighborhoodFilter.h index 2987b2d9f53aa7a8b45f0364159597687109da31..9242765b5b0bbb275c1794ad687c959fb4b5b954 100644 --- a/Libs/MRML/Logic/vtkImageNeighborhoodFilter.h +++ b/Libs/MRML/Logic/vtkImageNeighborhoodFilter.h @@ -55,7 +55,7 @@ public: protected: vtkImageNeighborhoodFilter(); - ~vtkImageNeighborhoodFilter(); + ~vtkImageNeighborhoodFilter() override; /// /// set size of neighborhood of each pixel diff --git a/Libs/MRML/Logic/vtkMRMLAbstractLogic.h b/Libs/MRML/Logic/vtkMRMLAbstractLogic.h index 09ca9fad436380d221ce75746c9f234e0e8e2ca9..01dd10d1b401a29cbb27158835e71d010fd833b2 100644 --- a/Libs/MRML/Logic/vtkMRMLAbstractLogic.h +++ b/Libs/MRML/Logic/vtkMRMLAbstractLogic.h @@ -138,7 +138,7 @@ public: typedef void (vtkMRMLAbstractLogic::*TaskFunctionPointer)(void *clientdata); static vtkMRMLAbstractLogic *New(); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; vtkTypeMacro(vtkMRMLAbstractLogic, vtkObject); /// Get access to overall application state @@ -166,7 +166,7 @@ public: protected: vtkMRMLAbstractLogic(); - virtual ~vtkMRMLAbstractLogic(); + ~vtkMRMLAbstractLogic() override; /// Receives all the events fired by the scene. /// By default, it calls OnMRMLScene*Event based on the event passed. @@ -427,7 +427,7 @@ protected: /// would be to disable modified events, call a series of Set* operations, and then re-enable /// modified events and call InvokePendingModifiedEvent to invoke the event (if any of the Set* /// calls actually changed the values of the instance variables). - virtual void Modified() VTK_OVERRIDE; + void Modified() override; /// Invokes any modified events that are 'pending', meaning they were generated /// while the DisableModifiedEvent flag was nonzero. diff --git a/Libs/MRML/Logic/vtkMRMLApplicationLogic.h b/Libs/MRML/Logic/vtkMRMLApplicationLogic.h index d031d3ad9e898e77c6bc70b0e71383964c3463a2..8f22aadb6482c2449b64cb12ddf86f05686bb6e3 100644 --- a/Libs/MRML/Logic/vtkMRMLApplicationLogic.h +++ b/Libs/MRML/Logic/vtkMRMLApplicationLogic.h @@ -51,7 +51,7 @@ class VTK_MRML_LOGIC_EXPORT vtkMRMLApplicationLogic public: static vtkMRMLApplicationLogic *New(); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; vtkTypeMacro(vtkMRMLApplicationLogic, vtkMRMLAbstractLogic); /// Get default Selection node @@ -222,9 +222,9 @@ public: protected: vtkMRMLApplicationLogic(); - virtual ~vtkMRMLApplicationLogic(); + ~vtkMRMLApplicationLogic() override; - virtual void SetMRMLSceneInternal(vtkMRMLScene *newScene) VTK_OVERRIDE; + void SetMRMLSceneInternal(vtkMRMLScene *newScene) override; void SetSelectionNode(vtkMRMLSelectionNode* ); void SetInteractionNode(vtkMRMLInteractionNode* ); diff --git a/Libs/MRML/Logic/vtkMRMLColorLogic.h b/Libs/MRML/Logic/vtkMRMLColorLogic.h index fdf020335bb073d09be3fdd67c3690b8e7764d93..09c86a96f3dfd4f2e63d939f1ee173f180ca5dc1 100644 --- a/Libs/MRML/Logic/vtkMRMLColorLogic.h +++ b/Libs/MRML/Logic/vtkMRMLColorLogic.h @@ -38,7 +38,7 @@ public: /// The Usual vtk class functions static vtkMRMLColorLogic *New(); vtkTypeMacro(vtkMRMLColorLogic,vtkMRMLAbstractLogic); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// \brief Add default color nodes. /// @@ -221,13 +221,13 @@ public: protected: vtkMRMLColorLogic(); - virtual ~vtkMRMLColorLogic(); + ~vtkMRMLColorLogic() override; // disable copy constructor and operator vtkMRMLColorLogic(const vtkMRMLColorLogic&); void operator=(const vtkMRMLColorLogic&); /// Reimplemented to listen to specific scene events - virtual void SetMRMLSceneInternal(vtkMRMLScene* newScene) VTK_OVERRIDE; + void SetMRMLSceneInternal(vtkMRMLScene* newScene) override; /// Called when the scene fires vtkMRMLScene::NewSceneEvent. /// We add the default LUTs. diff --git a/Libs/MRML/Logic/vtkMRMLDisplayableHierarchyLogic.h b/Libs/MRML/Logic/vtkMRMLDisplayableHierarchyLogic.h index 67ed87469b5cab5286da6a495c44362b4f76b090..5a8174699dc969f3f48211d779c2e4cc144dccab 100644 --- a/Libs/MRML/Logic/vtkMRMLDisplayableHierarchyLogic.h +++ b/Libs/MRML/Logic/vtkMRMLDisplayableHierarchyLogic.h @@ -53,15 +53,15 @@ class VTK_MRML_LOGIC_EXPORT vtkMRMLDisplayableHierarchyLogic : public vtkMRMLAbs protected: vtkMRMLDisplayableHierarchyLogic(); - ~vtkMRMLDisplayableHierarchyLogic(); + ~vtkMRMLDisplayableHierarchyLogic() override; vtkMRMLDisplayableHierarchyLogic(const vtkMRMLDisplayableHierarchyLogic&); void operator=(const vtkMRMLDisplayableHierarchyLogic&); /// Reimplemented to observe the scene - virtual void SetMRMLSceneInternal(vtkMRMLScene* newScene) VTK_OVERRIDE; + void SetMRMLSceneInternal(vtkMRMLScene* newScene) override; /// Delete the hierarchy node when a node is removed from the scene - virtual void OnMRMLSceneNodeRemoved(vtkMRMLNode* removedNode) VTK_OVERRIDE; + void OnMRMLSceneNodeRemoved(vtkMRMLNode* removedNode) override; }; diff --git a/Libs/MRML/Logic/vtkMRMLLayoutLogic.h b/Libs/MRML/Logic/vtkMRMLLayoutLogic.h index 2d1427208b612e51ddb18eace53c90c7d937c326..15eca83a5d8aa7fb9ebaf87bb027e588ef532c42 100644 --- a/Libs/MRML/Logic/vtkMRMLLayoutLogic.h +++ b/Libs/MRML/Logic/vtkMRMLLayoutLogic.h @@ -75,7 +75,7 @@ public: /// The Usual vtk class functions static vtkMRMLLayoutLogic *New(); vtkTypeMacro(vtkMRMLLayoutLogic,vtkMRMLAbstractLogic); - virtual void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; typedef std::map ViewAttributes; typedef ViewAttributes ViewProperty; @@ -124,20 +124,20 @@ protected: /// Logic constructor vtkMRMLLayoutLogic(); /// Logic destructor - virtual ~vtkMRMLLayoutLogic(); + ~vtkMRMLLayoutLogic() override; // disable copy constructor and operator vtkMRMLLayoutLogic(const vtkMRMLLayoutLogic&); void operator=(const vtkMRMLLayoutLogic&); /// Reimplemented to listen to specific scene events - virtual void SetMRMLSceneInternal(vtkMRMLScene* newScene) VTK_OVERRIDE; + void SetMRMLSceneInternal(vtkMRMLScene* newScene) override; - virtual void OnMRMLNodeModified(vtkMRMLNode* node) VTK_OVERRIDE; - virtual void OnMRMLSceneStartRestore() VTK_OVERRIDE; - virtual void OnMRMLSceneEndRestore() VTK_OVERRIDE; + void OnMRMLNodeModified(vtkMRMLNode* node) override; + void OnMRMLSceneStartRestore() override; + void OnMRMLSceneEndRestore() override; - virtual void UnobserveMRMLScene() VTK_OVERRIDE; - virtual void UpdateFromMRMLScene() VTK_OVERRIDE; + void UnobserveMRMLScene() override; + void UpdateFromMRMLScene() override; /// Makes sure there is at least one 3D view node and three slice nodes (red, /// yellow and green) diff --git a/Libs/MRML/Logic/vtkMRMLModelHierarchyLogic.h b/Libs/MRML/Logic/vtkMRMLModelHierarchyLogic.h index b9ef3ca72f752681faf647cafeb65e5a20dbfce0..6c3adf2133de91c51ad04b1815db61fe955a539a 100644 --- a/Libs/MRML/Logic/vtkMRMLModelHierarchyLogic.h +++ b/Libs/MRML/Logic/vtkMRMLModelHierarchyLogic.h @@ -88,15 +88,15 @@ public: protected: vtkMRMLModelHierarchyLogic(); - ~vtkMRMLModelHierarchyLogic(); + ~vtkMRMLModelHierarchyLogic() override; vtkMRMLModelHierarchyLogic(const vtkMRMLModelHierarchyLogic&); void operator=(const vtkMRMLModelHierarchyLogic&); /// Reimplemented to observe the scene - virtual void SetMRMLSceneInternal(vtkMRMLScene* newScene) VTK_OVERRIDE; + void SetMRMLSceneInternal(vtkMRMLScene* newScene) override; /// Delete the hierarchy node when a model is removed from the scene - virtual void OnMRMLSceneNodeRemoved(vtkMRMLNode* removedNode) VTK_OVERRIDE; + void OnMRMLSceneNodeRemoved(vtkMRMLNode* removedNode) override; /// /// Create model to hierarchy map, diff --git a/Libs/MRML/Logic/vtkMRMLRemoteIOLogic.h b/Libs/MRML/Logic/vtkMRMLRemoteIOLogic.h index a2dec7ac8cd516f087b1814176e2b57ddcf62dfe..56c1b0792fe21b897f76423d313d0dc147b204df 100644 --- a/Libs/MRML/Logic/vtkMRMLRemoteIOLogic.h +++ b/Libs/MRML/Logic/vtkMRMLRemoteIOLogic.h @@ -36,7 +36,7 @@ public: /// The Usual vtk class functions static vtkMRMLRemoteIOLogic *New(); vtkTypeMacro(vtkMRMLRemoteIOLogic,vtkMRMLAbstractLogic); - virtual void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; void AddDataIOToScene(); void RemoveDataIOFromScene(); @@ -55,7 +55,7 @@ public: protected: vtkMRMLRemoteIOLogic(); - virtual ~vtkMRMLRemoteIOLogic(); + ~vtkMRMLRemoteIOLogic() override; // disable copy constructor and operator vtkMRMLRemoteIOLogic(const vtkMRMLRemoteIOLogic&); void operator=(const vtkMRMLRemoteIOLogic&); diff --git a/Libs/MRML/Logic/vtkMRMLSliceLayerLogic.h b/Libs/MRML/Logic/vtkMRMLSliceLayerLogic.h index a7a9e3dde7314229c64cef0209ad9ba083a89678..46d5bb6a8b95470c70d71f18b6720296825cde84 100644 --- a/Libs/MRML/Logic/vtkMRMLSliceLayerLogic.h +++ b/Libs/MRML/Logic/vtkMRMLSliceLayerLogic.h @@ -65,7 +65,7 @@ public: /// The Usual vtk class functions static vtkMRMLSliceLayerLogic *New(); vtkTypeMacro(vtkMRMLSliceLayerLogic,vtkMRMLAbstractLogic); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// /// The volume node to operate on @@ -132,24 +132,24 @@ public: protected: vtkMRMLSliceLayerLogic(); - virtual ~vtkMRMLSliceLayerLogic(); + ~vtkMRMLSliceLayerLogic() override; vtkMRMLSliceLayerLogic(const vtkMRMLSliceLayerLogic&); void operator=(const vtkMRMLSliceLayerLogic&); // Initialize listening to MRML events - virtual void SetMRMLSceneInternal(vtkMRMLScene * newScene) VTK_OVERRIDE; + void SetMRMLSceneInternal(vtkMRMLScene * newScene) override; /// /// provide the virtual method that updates this Logic based /// on mrml changes - virtual void ProcessMRMLSceneEvents(vtkObject* caller, + void ProcessMRMLSceneEvents(vtkObject* caller, unsigned long event, - void* callData) VTK_OVERRIDE; - virtual void ProcessMRMLNodesEvents(vtkObject* caller, + void* callData) override; + void ProcessMRMLNodesEvents(vtkObject* caller, unsigned long event, - void* callData) VTK_OVERRIDE; + void* callData) override; void UpdateLogic(); - virtual void OnMRMLNodeModified(vtkMRMLNode* node) VTK_OVERRIDE; + void OnMRMLNodeModified(vtkMRMLNode* node) override; vtkAlgorithmOutput* GetSliceImageDataConnection(); vtkAlgorithmOutput* GetSliceImageDataConnectionUVW(); diff --git a/Libs/MRML/Logic/vtkMRMLSliceLinkLogic.h b/Libs/MRML/Logic/vtkMRMLSliceLinkLogic.h index 8980e2b4d5965f411554866424b440f0fdd6fe27..5f2d2ab07a0870d423146900e2fa5b7e6284b35b 100644 --- a/Libs/MRML/Logic/vtkMRMLSliceLinkLogic.h +++ b/Libs/MRML/Logic/vtkMRMLSliceLinkLogic.h @@ -43,25 +43,25 @@ public: /// The Usual VTK class functions static vtkMRMLSliceLinkLogic *New(); vtkTypeMacro(vtkMRMLSliceLinkLogic,vtkMRMLAbstractLogic); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; protected: vtkMRMLSliceLinkLogic(); - virtual ~vtkMRMLSliceLinkLogic(); + ~vtkMRMLSliceLinkLogic() override; // On a change in scene, we need to manage the observations. - virtual void SetMRMLSceneInternal(vtkMRMLScene * newScene) VTK_OVERRIDE; - - virtual void OnMRMLSceneNodeAdded(vtkMRMLNode* node) VTK_OVERRIDE; - virtual void OnMRMLSceneNodeRemoved(vtkMRMLNode* node) VTK_OVERRIDE; - virtual void OnMRMLNodeModified(vtkMRMLNode* node) VTK_OVERRIDE; - virtual void OnMRMLSceneStartBatchProcess() VTK_OVERRIDE; - virtual void OnMRMLSceneEndBatchProcess() VTK_OVERRIDE; - virtual void OnMRMLSceneStartImport() VTK_OVERRIDE; - virtual void OnMRMLSceneEndImport() VTK_OVERRIDE; - virtual void OnMRMLSceneStartRestore() VTK_OVERRIDE; - virtual void OnMRMLSceneEndRestore() VTK_OVERRIDE; + void SetMRMLSceneInternal(vtkMRMLScene * newScene) override; + + void OnMRMLSceneNodeAdded(vtkMRMLNode* node) override; + void OnMRMLSceneNodeRemoved(vtkMRMLNode* node) override; + void OnMRMLNodeModified(vtkMRMLNode* node) override; + void OnMRMLSceneStartBatchProcess() override; + void OnMRMLSceneEndBatchProcess() override; + void OnMRMLSceneStartImport() override; + void OnMRMLSceneEndImport() override; + void OnMRMLSceneStartRestore() override; + void OnMRMLSceneEndRestore() override; // Used internally to control whether we are in the process of // broadcasting events. PIMPL it? diff --git a/Libs/MRML/Logic/vtkMRMLSliceLogic.h b/Libs/MRML/Logic/vtkMRMLSliceLogic.h index 32c98272dfdf807383d80c2f9e5e66f95e1f41bb..fbf59877c91a93e037adb375ca238e1bad5418c7 100644 --- a/Libs/MRML/Logic/vtkMRMLSliceLogic.h +++ b/Libs/MRML/Logic/vtkMRMLSliceLogic.h @@ -60,7 +60,7 @@ public: /// The Usual VTK class functions static vtkMRMLSliceLogic *New(); vtkTypeMacro(vtkMRMLSliceLogic,vtkMRMLAbstractLogic); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// CompositeModifiedEvent is generated when slice composite node is modified enum @@ -348,28 +348,28 @@ public: protected: vtkMRMLSliceLogic(); - virtual ~vtkMRMLSliceLogic(); + ~vtkMRMLSliceLogic() override; - virtual void SetMRMLSceneInternal(vtkMRMLScene * newScene) VTK_OVERRIDE; + void SetMRMLSceneInternal(vtkMRMLScene * newScene) override; /// /// process logic events - virtual void ProcessMRMLLogicsEvents(vtkObject * caller, + void ProcessMRMLLogicsEvents(vtkObject * caller, unsigned long event, - void * callData) VTK_OVERRIDE; + void * callData) override; void ProcessMRMLLogicsEvents(); - virtual void OnMRMLSceneNodeAdded(vtkMRMLNode* node) VTK_OVERRIDE; - virtual void OnMRMLSceneNodeRemoved(vtkMRMLNode* node) VTK_OVERRIDE; - virtual void UpdateFromMRMLScene() VTK_OVERRIDE; - virtual void OnMRMLSceneStartClose() VTK_OVERRIDE; - virtual void OnMRMLSceneEndImport() VTK_OVERRIDE; - virtual void OnMRMLSceneEndRestore() VTK_OVERRIDE; + void OnMRMLSceneNodeAdded(vtkMRMLNode* node) override; + void OnMRMLSceneNodeRemoved(vtkMRMLNode* node) override; + void UpdateFromMRMLScene() override; + void OnMRMLSceneStartClose() override; + void OnMRMLSceneEndImport() override; + void OnMRMLSceneEndRestore() override; void UpdateSliceNodes(); void SetupCrosshairNode(); - virtual void OnMRMLNodeModified(vtkMRMLNode* node) VTK_OVERRIDE; + void OnMRMLNodeModified(vtkMRMLNode* node) override; static vtkMRMLSliceCompositeNode* GetSliceCompositeNode(vtkMRMLScene* scene, const char* layoutName); static vtkMRMLSliceNode* GetSliceNode(vtkMRMLScene* scene, diff --git a/Libs/MRML/Logic/vtkMRMLViewLinkLogic.h b/Libs/MRML/Logic/vtkMRMLViewLinkLogic.h index 24886c3aa6cd33947761de57bcc52ec8379177a7..187a4ab6a90d601f9fda6404c359c6827853b310 100644 --- a/Libs/MRML/Logic/vtkMRMLViewLinkLogic.h +++ b/Libs/MRML/Logic/vtkMRMLViewLinkLogic.h @@ -47,18 +47,18 @@ public: /// The Usual VTK class functions static vtkMRMLViewLinkLogic *New(); vtkTypeMacro(vtkMRMLViewLinkLogic,vtkMRMLAbstractLogic); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; protected: vtkMRMLViewLinkLogic(); - virtual ~vtkMRMLViewLinkLogic(); + ~vtkMRMLViewLinkLogic() override; // On a change in scene, we need to manage the observations. - virtual void SetMRMLSceneInternal(vtkMRMLScene* newScene) VTK_OVERRIDE; + void SetMRMLSceneInternal(vtkMRMLScene* newScene) override; - virtual void OnMRMLSceneNodeAdded(vtkMRMLNode* node) VTK_OVERRIDE; - virtual void OnMRMLSceneNodeRemoved(vtkMRMLNode* node) VTK_OVERRIDE; - virtual void OnMRMLNodeModified(vtkMRMLNode* node) VTK_OVERRIDE; + void OnMRMLSceneNodeAdded(vtkMRMLNode* node) override; + void OnMRMLSceneNodeRemoved(vtkMRMLNode* node) override; + void OnMRMLNodeModified(vtkMRMLNode* node) override; /// Broadcast a view node to other view nodes. void BroadcastViewNodeEvent(vtkMRMLViewNode* viewNode); diff --git a/Libs/MRML/Logic/vtkMRMLViewLogic.h b/Libs/MRML/Logic/vtkMRMLViewLogic.h index c3ad9e4ea80b5ab32a7273ff860b63a00167a6c4..44619896a49d482b028ec9add271c764af0828b3 100644 --- a/Libs/MRML/Logic/vtkMRMLViewLogic.h +++ b/Libs/MRML/Logic/vtkMRMLViewLogic.h @@ -58,7 +58,7 @@ public: /// The Usual VTK class functions static vtkMRMLViewLogic *New(); vtkTypeMacro(vtkMRMLViewLogic,vtkMRMLAbstractLogic); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Set / Get SliceLogic name vtkSetStringMacro(Name); @@ -106,13 +106,13 @@ public: protected: vtkMRMLViewLogic(); - virtual ~vtkMRMLViewLogic(); + ~vtkMRMLViewLogic() override; - virtual void SetMRMLSceneInternal(vtkMRMLScene* newScene) VTK_OVERRIDE; + void SetMRMLSceneInternal(vtkMRMLScene* newScene) override; - virtual void OnMRMLSceneNodeAdded(vtkMRMLNode* node) VTK_OVERRIDE; - virtual void OnMRMLSceneNodeRemoved(vtkMRMLNode* node) VTK_OVERRIDE; - virtual void UpdateFromMRMLScene() VTK_OVERRIDE; + void OnMRMLSceneNodeAdded(vtkMRMLNode* node) override; + void OnMRMLSceneNodeRemoved(vtkMRMLNode* node) override; + void UpdateFromMRMLScene() override; void UpdateMRMLNodes(); diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLCaptureToolBarPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLCaptureToolBarPlugin.h index 9861fc78e7a228be7c2889d51f74c8db0b694099..2f48b3ef816937dfd8470616fdb1e0c82970ddfd 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLCaptureToolBarPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLCaptureToolBarPlugin.h @@ -31,12 +31,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLCaptureToolBarPlugin : public QObject, public: qMRMLCaptureToolBarPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLCheckableNodeComboBoxPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLCheckableNodeComboBoxPlugin.h index 94e03b9f74eee0ad055b5196856c34fd1e2a2af2..5f1ec268e69994705f9efb9f1099633a02fd2351 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLCheckableNodeComboBoxPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLCheckableNodeComboBoxPlugin.h @@ -31,12 +31,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLCheckableNodeComboBoxPlugin public: qMRMLCheckableNodeComboBoxPlugin(QObject* parent = 0); - QWidget *createWidget(QWidget* parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget* parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; #endif diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLClipNodeWidgetPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLClipNodeWidgetPlugin.h index 0209ee943a015ead5a1aa27161686daa612a8407..10a40965720d55197048d4e53613c3056090ce57 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLClipNodeWidgetPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLClipNodeWidgetPlugin.h @@ -31,12 +31,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLClipNodeWidgetPlugin : public QObject, public: qMRMLClipNodeWidgetPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLCollapsibleButtonPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLCollapsibleButtonPlugin.h index ee5b9f99ed956a6800332e4952df2379a05654c1..82a63158c3e39443fbeb229794efa64487b7db79 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLCollapsibleButtonPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLCollapsibleButtonPlugin.h @@ -32,12 +32,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLCollapsibleButtonPlugin : public: qMRMLCollapsibleButtonPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; // QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLColorListViewPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLColorListViewPlugin.h index 08d41c20a338f7953d5fbd1af8a0b1df3893cad8..bcc630692b683e822a7bd52690a82d745e914123 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLColorListViewPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLColorListViewPlugin.h @@ -31,12 +31,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLColorListViewPlugin : public QObject, public: qMRMLColorListViewPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLColorTableComboBoxPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLColorTableComboBoxPlugin.h index 34045adffbc930b45b0e32f6cc57f27d9bc77105..d901635ed20da14cea76f3b8b0a8907cbaa9c504 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLColorTableComboBoxPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLColorTableComboBoxPlugin.h @@ -31,12 +31,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLColorTableComboBoxPlugin public: qMRMLColorTableComboBoxPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; #endif diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLColorTableViewPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLColorTableViewPlugin.h index 5c84652501e6a9eaa682f636ed861d056fe31314..49da259d457619f4c746163fd959920bb7cff96b 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLColorTableViewPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLColorTableViewPlugin.h @@ -31,12 +31,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLColorTableViewPlugin : public QObject, public: qMRMLColorTableViewPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLCoordinatesWidgetPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLCoordinatesWidgetPlugin.h index 691ffc283bf57bbbc3ad45f260de6b84234049c9..d8bb82a6b5058d56d6538efc1fbfe0723cfaf6bf 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLCoordinatesWidgetPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLCoordinatesWidgetPlugin.h @@ -31,12 +31,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLCoordinatesWidgetPlugin public: qMRMLCoordinatesWidgetPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; #endif diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLDisplayNodeViewComboBoxPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLDisplayNodeViewComboBoxPlugin.h index 897add3c438c396ada0fa996a5126b2222d4752a..83afd3cc4320aeae77d1b4c6ba97217ec4398572 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLDisplayNodeViewComboBoxPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLDisplayNodeViewComboBoxPlugin.h @@ -31,12 +31,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLDisplayNodeViewComboBoxPlugin public: qMRMLDisplayNodeViewComboBoxPlugin(QObject* parent = 0); - QWidget *createWidget(QWidget* parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget* parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; #endif diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLDisplayNodeWidgetPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLDisplayNodeWidgetPlugin.h index c798688a05293850d78b21573a012ce934398337..b5cdd15eb71c0e963f2d1d33ce3345be135b2ad6 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLDisplayNodeWidgetPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLDisplayNodeWidgetPlugin.h @@ -31,12 +31,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLDisplayNodeWidgetPlugin : public QObject public: qMRMLDisplayNodeWidgetPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLEventBrokerWidgetPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLEventBrokerWidgetPlugin.h index 02ddc440206e992b28a63e52312652c212b9af2c..7beef81fccde71f8f562117451cfc4177aca0642 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLEventBrokerWidgetPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLEventBrokerWidgetPlugin.h @@ -31,12 +31,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLEventBrokerWidgetPlugin public: qMRMLEventBrokerWidgetPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLExpandingWebViewPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLExpandingWebViewPlugin.h index 42cda19af7fdee9917c340228da4ada44b48af53..b3bea0ea460e91da4afc8793ed0f519242f3cc1d 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLExpandingWebViewPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLExpandingWebViewPlugin.h @@ -30,11 +30,11 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLExpandingWebViewPlugin public: qMRMLExpandingWebViewPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLLabelComboBoxPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLLabelComboBoxPlugin.h index 0692a6843dc99485b682dcfc0a9fab7f277bc260..0a8a577abaa0db762909fdab7d2a0d22b9aa041f 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLLabelComboBoxPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLLabelComboBoxPlugin.h @@ -12,12 +12,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLLabelComboBoxPlugin : public: qMRMLLabelComboBoxPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLLayoutWidgetPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLLayoutWidgetPlugin.h index d7756b74bc9ddafc084397daf0d5789f1cf49b4d..f996eae06a7926d35b67da77db3ebc086fcef99e 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLLayoutWidgetPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLLayoutWidgetPlugin.h @@ -11,12 +11,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLLayoutWidgetPlugin : public QObject, public: qMRMLLayoutWidgetPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLLinearTransformSliderPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLLinearTransformSliderPlugin.h index ec5a6be97fffb12ec0be73a8b835a5558475bc9a..31dae716ffe2379b5b06de3c4bba6cb215a32fe7 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLLinearTransformSliderPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLLinearTransformSliderPlugin.h @@ -11,12 +11,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLLinearTransformSliderPlugin : public QOb public: qMRMLLinearTransformSliderPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLListWidgetPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLListWidgetPlugin.h index de1c0fdc1e4b55ff02ad70f2ae92a481085eda7d..65abb3ed6c6be6616d6bd798c16d92c9145c4275 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLListWidgetPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLListWidgetPlugin.h @@ -31,12 +31,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLListWidgetPlugin : public QObject, public: qMRMLListWidgetPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLMatrixWidgetPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLMatrixWidgetPlugin.h index eea0c45d66afcb7f8ac80221b74f5132c0d3e9c0..2c06dc566dc7730f9c5557571c8571f2bacb1485 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLMatrixWidgetPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLMatrixWidgetPlugin.h @@ -31,12 +31,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLMatrixWidgetPlugin public: qMRMLMatrixWidgetPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLModelInfoWidgetPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLModelInfoWidgetPlugin.h index 1ee51efb9857fac075676b34318c359f22bb8838..f107c2613b5e6bd933c5a796e5881efa5c2fa67c 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLModelInfoWidgetPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLModelInfoWidgetPlugin.h @@ -32,12 +32,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLModelInfoWidgetPlugin public: qMRMLModelInfoWidgetPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLNavigationViewPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLNavigationViewPlugin.h index 52a8417c9975311f845ba05879a9578f5a253e9f..b90e73c6114345f1884a6d99a95410cd0230ac6f 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLNavigationViewPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLNavigationViewPlugin.h @@ -32,11 +32,11 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLNavigationViewPlugin : public: qMRMLNavigationViewPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLNodeAttributeTableViewPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLNodeAttributeTableViewPlugin.h index e9ea71c5907e16c72b62a6f39ab453dde0e2e0a9..e795770a3833374d6982c17cda179741926544c0 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLNodeAttributeTableViewPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLNodeAttributeTableViewPlugin.h @@ -32,11 +32,11 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLNodeAttributeTableViewPlugin public: qMRMLNodeAttributeTableViewPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLNodeAttributeTableWidgetPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLNodeAttributeTableWidgetPlugin.h index b965e79583cdd25e22fdd0eaaa3751cbabcece57..c0fd7f3b1293004b847d0359c8baeae40e55108d 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLNodeAttributeTableWidgetPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLNodeAttributeTableWidgetPlugin.h @@ -32,11 +32,11 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLNodeAttributeTableWidgetPlugin public: qMRMLNodeAttributeTableWidgetPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLNodeComboBoxPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLNodeComboBoxPlugin.h index bc924dacee0a2f8bf9c548120fa43b6b4568247e..574d66b33135cacfb895935dd8dc9c2af3b4b132 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLNodeComboBoxPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLNodeComboBoxPlugin.h @@ -31,12 +31,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLNodeComboBoxPlugin : public QObject, public: qMRMLNodeComboBoxPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLPlotViewControllerWidgetPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLPlotViewControllerWidgetPlugin.h index 25cfab887f5aebf6df00b78d71640f92073f1b49..5eddb0a5011622c79d82784e3756499d3f3a8f19 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLPlotViewControllerWidgetPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLPlotViewControllerWidgetPlugin.h @@ -30,12 +30,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLPlotViewControllerWidgetPlugin : public public: qMRMLPlotViewControllerWidgetPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLPlotWidgetPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLPlotWidgetPlugin.h index 3b2011cb27e48476b0a94e9875003bd016be0d41..c4807d674dd3c801ec4d993c7d9e07c5e44f4fa2 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLPlotWidgetPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLPlotWidgetPlugin.h @@ -31,12 +31,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLPlotWidgetPlugin : public: qMRMLPlotWidgetPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; // QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLROIWidgetPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLROIWidgetPlugin.h index 07621b436851e8dc1df1ec6bc7144911d0a10657..db8b8b4f22708354f3dcee23610c96d7cb0c6926 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLROIWidgetPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLROIWidgetPlugin.h @@ -31,12 +31,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLROIWidgetPlugin : public QObject, public: qMRMLROIWidgetPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; #endif diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLRangeWidgetPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLRangeWidgetPlugin.h index 94596643139ba956349ecbb8bf395df9519f790c..687dfd3c8b6da5c60f76e4c198cecf657838c4c5 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLRangeWidgetPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLRangeWidgetPlugin.h @@ -31,12 +31,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLRangeWidgetPlugin : public QObject, public: qMRMLRangeWidgetPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; #endif diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLScalarInvariantComboBoxPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLScalarInvariantComboBoxPlugin.h index dfb1de9919f39e0e301a797718c2529e844b6dee..9a128f77a5e5e4df70ea28c560984ae8af6370c7 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLScalarInvariantComboBoxPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLScalarInvariantComboBoxPlugin.h @@ -32,12 +32,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLScalarInvariantComboBoxPlugin public: qMRMLScalarInvariantComboBoxPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; #endif diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLSceneFactoryWidgetPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLSceneFactoryWidgetPlugin.h index 8cf755707aa0b3cd86a55f87d456987ae0a291df..98fbd98ee59ef90904d891b81fc83ecc9a458d2f 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLSceneFactoryWidgetPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLSceneFactoryWidgetPlugin.h @@ -31,11 +31,11 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLSceneFactoryWidgetPlugin : public QObjec public: qMRMLSceneFactoryWidgetPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; #endif diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLSliceControllerWidgetPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLSliceControllerWidgetPlugin.h index b29e3ab78e8c54960a75fcbf36b19de412dd1118..55ca18bc8d013cbf513e670845707e5a0607ed19 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLSliceControllerWidgetPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLSliceControllerWidgetPlugin.h @@ -11,12 +11,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLSliceControllerWidgetPlugin : public QOb public: qMRMLSliceControllerWidgetPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLSliceInformationWidgetPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLSliceInformationWidgetPlugin.h index 485edb6eaa7e3e2ac20cce53bcff5bd03e12a5a1..32defd3f8af6bf5f15f784630b3ed9c223451c8e 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLSliceInformationWidgetPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLSliceInformationWidgetPlugin.h @@ -11,12 +11,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLSliceInformationWidgetPlugin : public QO public: qMRMLSliceInformationWidgetPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLSliceWidgetPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLSliceWidgetPlugin.h index 1756c42147386225fff8aaa2f0a8def4e825d70e..8953d3a64da1e80adedf6e9f95ebc9d94971fb6f 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLSliceWidgetPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLSliceWidgetPlugin.h @@ -12,12 +12,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLSliceWidgetPlugin : public: qMRMLSliceWidgetPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; // QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLSliderWidgetPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLSliderWidgetPlugin.h index 632b1b8dd4b4dcc917f1371689d91e7a6d4f3b0f..837a744e585843cbf3d5e3b12eba5aa11a410b3d 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLSliderWidgetPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLSliderWidgetPlugin.h @@ -31,12 +31,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLSliderWidgetPlugin public: qMRMLSliderWidgetPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; #endif diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLSpinBoxPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLSpinBoxPlugin.h index 33b0e4fbc41928587c80bd06b9c92691ee4fb72c..87ba8c5818bcb0316fb5581a099c19591b14d6e4 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLSpinBoxPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLSpinBoxPlugin.h @@ -31,12 +31,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLSpinBoxPlugin public: qMRMLSpinBoxPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; #endif diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLTableViewPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLTableViewPlugin.h index 8020e168d7c1fd4e20348b20f3262d6a56c31358..6c01add5045270de25201ffd4cb89a8a46ae2dcb 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLTableViewPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLTableViewPlugin.h @@ -33,11 +33,11 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLTableViewPlugin public: qMRMLTableViewPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLThreeDViewInformationWidgetPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLThreeDViewInformationWidgetPlugin.h index 29c414728dc0dd1d81ad0b95a032231b6f10503d..69d58ebb3735065f3e7e2679ab52281cbf692909 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLThreeDViewInformationWidgetPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLThreeDViewInformationWidgetPlugin.h @@ -11,12 +11,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLThreeDViewInformationWidgetPlugin : publ public: qMRMLThreeDViewInformationWidgetPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLThreeDViewPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLThreeDViewPlugin.h index 71a0728312448ced513a85ff01effb981a5c37e4..b55fcd2c7f311ff38315f7c364bbd482cee29348 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLThreeDViewPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLThreeDViewPlugin.h @@ -12,12 +12,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLThreeDViewPlugin : public: qMRMLThreeDViewPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; // QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLTransformSlidersPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLTransformSlidersPlugin.h index b1cf51c498d534f108e78236fbdf81d306301a56..a4095e9ab02246fb5b7021aed75a583ba9f61f0e 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLTransformSlidersPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLTransformSlidersPlugin.h @@ -11,12 +11,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLTransformSlidersPlugin : public QObject, public: qMRMLTransformSlidersPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; #endif diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLTreeViewPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLTreeViewPlugin.h index d2cb8ae970675fb5e766cd326ea8abd8874171ab..5007a2da51a16241cf1116390453db18f0fc8ef9 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLTreeViewPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLTreeViewPlugin.h @@ -32,12 +32,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLTreeViewPlugin : public: qMRMLTreeViewPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLVolumeInfoWidgetPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLVolumeInfoWidgetPlugin.h index ef003d53caa61f6955ddd9b43ca363362d334d5a..f30eab4d41210dbd2636336f5532ecb4b535dc50 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLVolumeInfoWidgetPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLVolumeInfoWidgetPlugin.h @@ -32,12 +32,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLVolumeInfoWidgetPlugin public: qMRMLVolumeInfoWidgetPlugin(QObject *parent = 0); - QWidget *createWidget(QWidget *parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; #endif diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLVolumeThresholdWidgetPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLVolumeThresholdWidgetPlugin.h index 29e428e42890b8a3c76e51755cb35646fdf3887e..e5a8655ea0ce1f23c13d353ac0ea538ebe01d045 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLVolumeThresholdWidgetPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLVolumeThresholdWidgetPlugin.h @@ -11,12 +11,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLVolumeThresholdWidgetPlugin : public QOb public: qMRMLVolumeThresholdWidgetPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLWidgetPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLWidgetPlugin.h index bdb8fae782cc4df30303d2554bf43a6ef6f038ff..1a2d06efd9b907a0e30bb9cec6e8c3c1bc30043d 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLWidgetPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLWidgetPlugin.h @@ -32,12 +32,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLWidgetPlugin : public: qMRMLWidgetPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLWidgetsAbstractPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLWidgetsAbstractPlugin.h index db4c09bedf3a31842f8a279ff9f1b8b18fe0244b..6d52fd2caf7d7639b1320db155fb8233827d4c45 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLWidgetsAbstractPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLWidgetsAbstractPlugin.h @@ -42,11 +42,11 @@ public: qMRMLWidgetsAbstractPlugin(); // Don't reimplement this method. - QString group() const; + QString group() const override; // You can reimplement these methods - virtual QIcon icon() const; - virtual QString toolTip() const; - virtual QString whatsThis() const; + QIcon icon() const override; + QString toolTip() const override; + QString whatsThis() const override; }; diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLWidgetsPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLWidgetsPlugin.h index 042404c21c80c7c7a91cee22a73ac6d11a7da047..9d2fbf47dd0d1337f37643ada81ab177f65f5d5f 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLWidgetsPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLWidgetsPlugin.h @@ -85,7 +85,7 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLWidgetsPlugin Q_INTERFACES(QDesignerCustomWidgetCollectionInterface); public: - QList customWidgets() const + QList customWidgets() const override { QList plugins; plugins << new qMRMLCheckableNodeComboBoxPlugin diff --git a/Libs/MRML/Widgets/DesignerPlugins/qMRMLWindowLevelWidgetPlugin.h b/Libs/MRML/Widgets/DesignerPlugins/qMRMLWindowLevelWidgetPlugin.h index df10a7fd69a6b7b731031269200de59ed6e4aecd..87b74291eaee2841ad263b413b7df3ad171c17c1 100644 --- a/Libs/MRML/Widgets/DesignerPlugins/qMRMLWindowLevelWidgetPlugin.h +++ b/Libs/MRML/Widgets/DesignerPlugins/qMRMLWindowLevelWidgetPlugin.h @@ -11,12 +11,12 @@ class QMRML_WIDGETS_PLUGINS_EXPORT qMRMLWindowLevelWidgetPlugin : public QObject public: qMRMLWindowLevelWidgetPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Libs/MRML/Widgets/Testing/qMRMLLayoutManagerWithCustomFactoryTest.cxx b/Libs/MRML/Widgets/Testing/qMRMLLayoutManagerWithCustomFactoryTest.cxx index b2c5a78e9a823c2295db4feb904730ef7cfa6e87..a319e3fa1c9b5baf9c842b47f28b7f22c8bf91fe 100644 --- a/Libs/MRML/Widgets/Testing/qMRMLLayoutManagerWithCustomFactoryTest.cxx +++ b/Libs/MRML/Widgets/Testing/qMRMLLayoutManagerWithCustomFactoryTest.cxx @@ -131,10 +131,10 @@ public: /// MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE + const char* GetNodeTagName() override { return "CustomView"; } diff --git a/Libs/MRML/Widgets/qMRMLChartView.h b/Libs/MRML/Widgets/qMRMLChartView.h index 525d5e57ffa5168455cba517d786bab09698f493..147a135d23a57d3c50ad922c6a74fead66a7ed33 100644 --- a/Libs/MRML/Widgets/qMRMLChartView.h +++ b/Libs/MRML/Widgets/qMRMLChartView.h @@ -47,7 +47,7 @@ public: /// Constructors explicit qMRMLChartView(QWidget* parent = 0); - virtual ~qMRMLChartView(); + ~qMRMLChartView() override; /// Return a pointer on the current MRML scene vtkMRMLScene* mrmlScene() const; @@ -63,7 +63,7 @@ public: vtkMRMLColorLogic* colorLogic()const; /// Redefine the sizeHint so layouts work properly. - virtual QSize sizeHint() const; + QSize sizeHint() const override; public slots: diff --git a/Libs/MRML/Widgets/qMRMLChartView_p.h b/Libs/MRML/Widgets/qMRMLChartView_p.h index 909862ec4db01c8638c55b3de65ecc11faee6490..c65536cb07d58f3c207aa313c720e032f59e9d44 100644 --- a/Libs/MRML/Widgets/qMRMLChartView_p.h +++ b/Libs/MRML/Widgets/qMRMLChartView_p.h @@ -44,7 +44,7 @@ protected: qMRMLChartView* const q_ptr; public: qMRMLChartViewPrivate(qMRMLChartView& object); - ~qMRMLChartViewPrivate(); + ~qMRMLChartViewPrivate() override; virtual void init(); diff --git a/Libs/MRML/Widgets/qMRMLChartWidget.cxx b/Libs/MRML/Widgets/qMRMLChartWidget.cxx index d9a84efc7a0f8efeef04c0ea6960122449de6c14..3442dbd06b263b591c31d199586f75777903364e 100644 --- a/Libs/MRML/Widgets/qMRMLChartWidget.cxx +++ b/Libs/MRML/Widgets/qMRMLChartWidget.cxx @@ -47,7 +47,7 @@ protected: qMRMLChartWidget* const q_ptr; public: qMRMLChartWidgetPrivate(qMRMLChartWidget& object); - ~qMRMLChartWidgetPrivate(); + ~qMRMLChartWidgetPrivate() override; void init(); diff --git a/Libs/MRML/Widgets/qMRMLChartWidget.h b/Libs/MRML/Widgets/qMRMLChartWidget.h index 21cde5dd29d567cc742dd9dae306b86412dd2aad..e68ea1ebf025939a8250f87bac028f0a86552f4f 100644 --- a/Libs/MRML/Widgets/qMRMLChartWidget.h +++ b/Libs/MRML/Widgets/qMRMLChartWidget.h @@ -48,7 +48,7 @@ public: /// Constructors explicit qMRMLChartWidget(QWidget* parent = 0); - virtual ~qMRMLChartWidget(); + ~qMRMLChartWidget() override; /// Get the chart node observed by view. vtkMRMLChartViewNode* mrmlChartViewNode()const; diff --git a/Libs/MRML/Widgets/qMRMLCheckableNodeComboBoxEventPlayer.h b/Libs/MRML/Widgets/qMRMLCheckableNodeComboBoxEventPlayer.h index d7ac578e81cadd3bd558ba22e6b32087936515a0..ca9014766f4e496cfc7fdee1aaa083ee1b9bbc29 100644 --- a/Libs/MRML/Widgets/qMRMLCheckableNodeComboBoxEventPlayer.h +++ b/Libs/MRML/Widgets/qMRMLCheckableNodeComboBoxEventPlayer.h @@ -39,7 +39,7 @@ public: qMRMLCheckableNodeComboBoxEventPlayer(QObject* parent = 0); using Superclass::playEvent; - bool playEvent(QObject *Object, const QString &Command, const QString &Arguments, bool &Error); + bool playEvent(QObject *Object, const QString &Command, const QString &Arguments, bool &Error) override; private: qMRMLCheckableNodeComboBoxEventPlayer(const qMRMLCheckableNodeComboBoxEventPlayer&); // NOT implemented diff --git a/Libs/MRML/Widgets/qMRMLColorListView.h b/Libs/MRML/Widgets/qMRMLColorListView.h index 2e2a3e04113b9682f033768152e7c79e5fc95bb1..b3e1a9c2257004c62a570620fe0c031febf589dd 100644 --- a/Libs/MRML/Widgets/qMRMLColorListView.h +++ b/Libs/MRML/Widgets/qMRMLColorListView.h @@ -39,7 +39,7 @@ class QMRML_WIDGETS_EXPORT qMRMLColorListView : public QListView Q_PROPERTY(bool showOnlyNamedColors READ showOnlyNamedColors WRITE setShowOnlyNamedColors) public: qMRMLColorListView(QWidget *parent=0); - virtual ~qMRMLColorListView(); + ~qMRMLColorListView() override; vtkMRMLColorNode* mrmlColorNode()const; qMRMLColorModel* colorModel()const; @@ -62,7 +62,7 @@ signals: void colorSelected(const QString& name); protected slots: - virtual void currentChanged(const QModelIndex&, const QModelIndex&); + void currentChanged(const QModelIndex&, const QModelIndex&) override; protected: QScopedPointer d_ptr; diff --git a/Libs/MRML/Widgets/qMRMLColorModel.h b/Libs/MRML/Widgets/qMRMLColorModel.h index 01860dea21e5aa8e590f8d039dd04c817ee7d63a..14cbad2c73c4893f87f52afeff539f8ac99fae63 100644 --- a/Libs/MRML/Widgets/qMRMLColorModel.h +++ b/Libs/MRML/Widgets/qMRMLColorModel.h @@ -72,7 +72,7 @@ class QMRML_WIDGETS_EXPORT qMRMLColorModel : public QStandardItemModel public: typedef QAbstractItemModel Superclass; qMRMLColorModel(QObject *parent=0); - virtual ~qMRMLColorModel(); + ~qMRMLColorModel() override; /// ColorRole is an invivisble role that contains the true color (QColor) when /// Qt::DecorationRole contains a pixmap of the color. @@ -128,7 +128,7 @@ public: /// Overload the header data method for the vertical header /// so that can return the color index rather than the row - virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; protected slots: void onMRMLColorNodeModified(vtkObject* node); diff --git a/Libs/MRML/Widgets/qMRMLColorPickerWidget.h b/Libs/MRML/Widgets/qMRMLColorPickerWidget.h index fac5ccd9d4dd554955e61f884c659bac0e7414b1..69da8e0413670a31329816ea01ac4f881c57b612 100644 --- a/Libs/MRML/Widgets/qMRMLColorPickerWidget.h +++ b/Libs/MRML/Widgets/qMRMLColorPickerWidget.h @@ -44,7 +44,7 @@ class QMRML_WIDGETS_EXPORT qMRMLColorPickerWidget : public qMRMLWidget QVTK_OBJECT public: qMRMLColorPickerWidget(QWidget *parent=0); - virtual ~qMRMLColorPickerWidget(); + ~qMRMLColorPickerWidget() override; /// A color logic is needed to select the color default nodes. /// A default color logic is created. @@ -53,8 +53,8 @@ public: Q_INVOKABLE vtkMRMLColorNode* currentColorNode()const; - virtual void setMRMLScene(vtkMRMLScene* scene); - virtual bool eventFilter(QObject* target, QEvent* event); + void setMRMLScene(vtkMRMLScene* scene) override; + bool eventFilter(QObject* target, QEvent* event) override; public slots: void setCurrentColorNode(vtkMRMLNode* node); diff --git a/Libs/MRML/Widgets/qMRMLColorTableView.h b/Libs/MRML/Widgets/qMRMLColorTableView.h index 909fa335a2516bbb39f86a827edb1bf83daa47f4..ae8f609493f92d6442f3b50723b9426f34970a27 100644 --- a/Libs/MRML/Widgets/qMRMLColorTableView.h +++ b/Libs/MRML/Widgets/qMRMLColorTableView.h @@ -46,7 +46,7 @@ class QMRML_WIDGETS_EXPORT qMRMLColorTableView : public QTableView Q_PROPERTY(bool showOnlyNamedColors READ showOnlyNamedColors WRITE setShowOnlyNamedColors) public: qMRMLColorTableView(QWidget *parent=0); - virtual ~qMRMLColorTableView(); + ~qMRMLColorTableView() override; Q_INVOKABLE vtkMRMLColorNode* mrmlColorNode()const; Q_INVOKABLE qMRMLColorModel* colorModel()const; diff --git a/Libs/MRML/Widgets/qMRMLEventBrokerWidget.h b/Libs/MRML/Widgets/qMRMLEventBrokerWidget.h index d21209f276ade6d674369e9c1bff85955792ab4b..62fcb61652d3653e14bd4f497f824c35500c8f21 100644 --- a/Libs/MRML/Widgets/qMRMLEventBrokerWidget.h +++ b/Libs/MRML/Widgets/qMRMLEventBrokerWidget.h @@ -42,7 +42,7 @@ class QMRML_WIDGETS_EXPORT qMRMLEventBrokerWidget: public QWidget public: typedef QWidget Superclass; explicit qMRMLEventBrokerWidget(QWidget *parent = 0); - virtual ~qMRMLEventBrokerWidget(); + ~qMRMLEventBrokerWidget() override; public slots: void refresh(); diff --git a/Libs/MRML/Widgets/qMRMLEventLogger.h b/Libs/MRML/Widgets/qMRMLEventLogger.h index 9de65bf61b34e81d05a78c44872637b69cab060e..a88d6ffabed6f54551502d691763be6d60f9077e 100644 --- a/Libs/MRML/Widgets/qMRMLEventLogger.h +++ b/Libs/MRML/Widgets/qMRMLEventLogger.h @@ -39,7 +39,7 @@ class QMRML_WIDGETS_EXPORT qMRMLEventLogger: public QObject public: typedef QObject Superclass; explicit qMRMLEventLogger(QObject* parent = 0); - virtual ~qMRMLEventLogger(); + ~qMRMLEventLogger() override; /// /// Set the MRML \a scene that should be listened for events diff --git a/Libs/MRML/Widgets/qMRMLEventLoggerWidget.h b/Libs/MRML/Widgets/qMRMLEventLoggerWidget.h index 552bfdfcc6be14f577073797f2adc23727e52a20..087aa56ffa1ac46fd842986cc007abd404a0f9a3 100644 --- a/Libs/MRML/Widgets/qMRMLEventLoggerWidget.h +++ b/Libs/MRML/Widgets/qMRMLEventLoggerWidget.h @@ -39,7 +39,7 @@ class QMRML_WIDGETS_EXPORT qMRMLEventLoggerWidget: public QWidget public: typedef QWidget Superclass; explicit qMRMLEventLoggerWidget(QWidget *parent = 0); - virtual ~qMRMLEventLoggerWidget(); + ~qMRMLEventLoggerWidget() override; public slots: diff --git a/Libs/MRML/Widgets/qMRMLExpandingWebView.h b/Libs/MRML/Widgets/qMRMLExpandingWebView.h index bb246a05f674cb031deb96a4c795a1d5b3054081..f1415821133ee973db12c1c5fe00e7b86a9507a6 100644 --- a/Libs/MRML/Widgets/qMRMLExpandingWebView.h +++ b/Libs/MRML/Widgets/qMRMLExpandingWebView.h @@ -41,13 +41,13 @@ public: /// Constructors explicit qMRMLExpandingWebView(QWidget* parent = 0); - virtual ~qMRMLExpandingWebView(); + ~qMRMLExpandingWebView() override; /// Return a pointer on the current MRML scene vtkMRMLScene* mrmlScene() const; // Redefine the sizeHint so layouts work properly. - virtual QSize sizeHint() const; + QSize sizeHint() const override; public slots: diff --git a/Libs/MRML/Widgets/qMRMLExpandingWebView_p.h b/Libs/MRML/Widgets/qMRMLExpandingWebView_p.h index 5c7ee0fa1125bfdada9315189466ace42e8480d0..7510a8b04a9b9230c2f98f0e2c5a2c0fe276684a 100644 --- a/Libs/MRML/Widgets/qMRMLExpandingWebView_p.h +++ b/Libs/MRML/Widgets/qMRMLExpandingWebView_p.h @@ -34,7 +34,7 @@ protected: qMRMLExpandingWebView* const q_ptr; public: qMRMLExpandingWebViewPrivate(qMRMLExpandingWebView& object); - ~qMRMLExpandingWebViewPrivate(); + ~qMRMLExpandingWebViewPrivate() override; virtual void init(); diff --git a/Libs/MRML/Widgets/qMRMLItemDelegate.h b/Libs/MRML/Widgets/qMRMLItemDelegate.h index d98e21b8bde4cbc707a497ed804ab016438a95e7..3850db8c1f42d2b7838b9f1c1d5994b974ed672e 100644 --- a/Libs/MRML/Widgets/qMRMLItemDelegate.h +++ b/Libs/MRML/Widgets/qMRMLItemDelegate.h @@ -42,7 +42,7 @@ class QMRML_WIDGETS_EXPORT qMRMLItemDelegate: public QStyledItemDelegate Q_OBJECT public: qMRMLItemDelegate(QObject *parent = 0); - virtual ~qMRMLItemDelegate(); + ~qMRMLItemDelegate() override; typedef QStyledItemDelegate Superclass; bool isColor(const QModelIndex& index)const; @@ -50,19 +50,19 @@ public: bool is0To1Value(const QModelIndex& index)const; QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, - const QModelIndex &index) const; + const QModelIndex &index) const override; - void setEditorData(QWidget *editor, const QModelIndex &index) const; + void setEditorData(QWidget *editor, const QModelIndex &index) const override; void setModelData(QWidget *editor, QAbstractItemModel *model, - const QModelIndex &index) const; + const QModelIndex &index) const override; - virtual QSize sizeHint(const QStyleOptionViewItem &option, - const QModelIndex &index) const; + QSize sizeHint(const QStyleOptionViewItem &option, + const QModelIndex &index) const override; void updateEditorGeometry(QWidget *editor, - const QStyleOptionViewItem &option, const QModelIndex &index) const; + const QStyleOptionViewItem &option, const QModelIndex &index) const override; - virtual bool eventFilter(QObject *object, QEvent *event); + bool eventFilter(QObject *object, QEvent *event) override; // We make initStyleOption public so it can be used by qMRMLTreeView using QStyledItemDelegate::initStyleOption; diff --git a/Libs/MRML/Widgets/qMRMLLayoutManager.h b/Libs/MRML/Widgets/qMRMLLayoutManager.h index f75e485bfdc311d2a49ef44499bc2983231bb165..1797fc637de2848eeeffbb62e187cd42510dae04 100644 --- a/Libs/MRML/Widgets/qMRMLLayoutManager.h +++ b/Libs/MRML/Widgets/qMRMLLayoutManager.h @@ -97,7 +97,7 @@ public: /// Constructors explicit qMRMLLayoutManager(QObject* parent=0); explicit qMRMLLayoutManager(QWidget* viewport, QObject* parent); - virtual ~qMRMLLayoutManager(); + ~qMRMLLayoutManager() override; /// Return the enabled property value. /// \sa enabled @@ -275,7 +275,7 @@ protected: QScopedPointer d_ptr; qMRMLLayoutManager(qMRMLLayoutManagerPrivate* obj, QWidget* viewport, QObject* parent); - virtual void onViewportChanged(); + void onViewportChanged() override; using ctkLayoutManager::setLayout; private: diff --git a/Libs/MRML/Widgets/qMRMLLayoutWidget.h b/Libs/MRML/Widgets/qMRMLLayoutWidget.h index 0cbece5ee7c320c8c45f5e83532a79ade7ab5fe9..cdc62639220f6850c9b85e7404e958249aa78e3e 100644 --- a/Libs/MRML/Widgets/qMRMLLayoutWidget.h +++ b/Libs/MRML/Widgets/qMRMLLayoutWidget.h @@ -43,7 +43,7 @@ public: /// Constructors explicit qMRMLLayoutWidget(QWidget* widget); - virtual ~qMRMLLayoutWidget(); + ~qMRMLLayoutWidget() override; /// Layout manager Q_INVOKABLE qMRMLLayoutManager* layoutManager()const; diff --git a/Libs/MRML/Widgets/qMRMLListWidget.h b/Libs/MRML/Widgets/qMRMLListWidget.h index baabe5e3c9a7a4dec615312da7d5c31a0aa214e5..273a135664e1686ce4a2a2f88edd62d5489d3b4f 100644 --- a/Libs/MRML/Widgets/qMRMLListWidget.h +++ b/Libs/MRML/Widgets/qMRMLListWidget.h @@ -37,7 +37,7 @@ class QMRML_WIDGETS_EXPORT qMRMLListWidget : public QListView Q_OBJECT public: qMRMLListWidget(QWidget *parent=0); - virtual ~qMRMLListWidget(); + ~qMRMLListWidget() override; vtkMRMLScene* mrmlScene()const; diff --git a/Libs/MRML/Widgets/qMRMLNodeAttributeTableView.h b/Libs/MRML/Widgets/qMRMLNodeAttributeTableView.h index 91e7a74a29f1ff4d695ec315a2c38b40a6144086..7fa2e1bc22b03a3fc455443579508572481f6227 100644 --- a/Libs/MRML/Widgets/qMRMLNodeAttributeTableView.h +++ b/Libs/MRML/Widgets/qMRMLNodeAttributeTableView.h @@ -46,7 +46,7 @@ public: /// Constructor explicit qMRMLNodeAttributeTableView(QWidget* parent = 0); /// Destructor - virtual ~qMRMLNodeAttributeTableView(); + ~qMRMLNodeAttributeTableView() override; /// Set the inspected MRML node void setInspectedNode(vtkMRMLNode* node); diff --git a/Libs/MRML/Widgets/qMRMLNodeAttributeTableWidget.h b/Libs/MRML/Widgets/qMRMLNodeAttributeTableWidget.h index b869d7d04cbc30575fc65413c13b6bb2d6f879e5..b44d3c32ce656d1fc7d586625e647cccacd51c25 100644 --- a/Libs/MRML/Widgets/qMRMLNodeAttributeTableWidget.h +++ b/Libs/MRML/Widgets/qMRMLNodeAttributeTableWidget.h @@ -44,7 +44,7 @@ class QMRML_WIDGETS_EXPORT qMRMLNodeAttributeTableWidget : public QWidget public: /// Constructors explicit qMRMLNodeAttributeTableWidget(QWidget* parent = 0); - virtual ~qMRMLNodeAttributeTableWidget(); + ~qMRMLNodeAttributeTableWidget() override; /// Get node attribute table view qMRMLNodeAttributeTableView* tableView(); @@ -60,7 +60,7 @@ public slots: void updateWidgetFromMRML(); protected: - virtual void showEvent(QShowEvent *); + void showEvent(QShowEvent *) override; QScopedPointer d_ptr; diff --git a/Libs/MRML/Widgets/qMRMLNodeComboBoxDelegate.h b/Libs/MRML/Widgets/qMRMLNodeComboBoxDelegate.h index b025470b7a85ec726f14d06ef636945ace74e015..5c10248d18933d97c01ecf87b0bf8acf34721940 100644 --- a/Libs/MRML/Widgets/qMRMLNodeComboBoxDelegate.h +++ b/Libs/MRML/Widgets/qMRMLNodeComboBoxDelegate.h @@ -53,21 +53,21 @@ protected: /// Reimplemented to force the highlight in case the item is not selectable /// but current. The highlight color used is then slightly different from /// the default color - virtual void paint(QPainter *painter, + void paint(QPainter *painter, const QStyleOptionViewItem &option, - const QModelIndex &index) const; + const QModelIndex &index) const override; - virtual QSize sizeHint(const QStyleOptionViewItem &option, - const QModelIndex &index) const; + QSize sizeHint(const QStyleOptionViewItem &option, + const QModelIndex &index) const override; - virtual void drawDisplay(QPainter *painter, + void drawDisplay(QPainter *painter, const QStyleOptionViewItem &option, const QRect &rect, - const QString &text) const; + const QString &text) const override; - virtual void drawFocus(QPainter *painter, + void drawFocus(QPainter *painter, const QStyleOptionViewItem &option, - const QRect &rect) const; + const QRect &rect) const override; private: QComboBox* mCombo; diff --git a/Libs/MRML/Widgets/qMRMLNodeComboBoxEventPlayer.h b/Libs/MRML/Widgets/qMRMLNodeComboBoxEventPlayer.h index 866ac5bf92135ca317c07c8147790ff49cbf9b87..f0e9b28bf85d5793b9ae779c38e0e9de0efa50a4 100644 --- a/Libs/MRML/Widgets/qMRMLNodeComboBoxEventPlayer.h +++ b/Libs/MRML/Widgets/qMRMLNodeComboBoxEventPlayer.h @@ -39,7 +39,7 @@ public: qMRMLNodeComboBoxEventPlayer(QObject* parent = 0); using Superclass::playEvent; - bool playEvent(QObject *Object, const QString &Command, const QString &Arguments, bool &Error); + bool playEvent(QObject *Object, const QString &Command, const QString &Arguments, bool &Error) override; private: qMRMLNodeComboBoxEventPlayer(const qMRMLNodeComboBoxEventPlayer&); // NOT implemented diff --git a/Libs/MRML/Widgets/qMRMLNodeComboBoxEventTranslator.h b/Libs/MRML/Widgets/qMRMLNodeComboBoxEventTranslator.h index 9f3a2b3c746674e0d7451a8fd0e74f04a88bc02d..64aa12fe90a10a1d5c368b31a9f7b4b540e9c233 100644 --- a/Libs/MRML/Widgets/qMRMLNodeComboBoxEventTranslator.h +++ b/Libs/MRML/Widgets/qMRMLNodeComboBoxEventTranslator.h @@ -42,7 +42,7 @@ public: qMRMLNodeComboBoxEventTranslator(QObject* parent = 0); using Superclass::translateEvent; - virtual bool translateEvent(QObject *Object, QEvent *Event, bool &Error); + bool translateEvent(QObject *Object, QEvent *Event, bool &Error) override; private: qMRMLNodeComboBoxEventTranslator(const qMRMLNodeComboBoxEventTranslator&); // NOT implemented diff --git a/Libs/MRML/Widgets/qMRMLNodeComboBoxMenuDelegate.h b/Libs/MRML/Widgets/qMRMLNodeComboBoxMenuDelegate.h index a60d312ef235b6b1b16469682e6f310c0e325d29..f88144a9451c062b2a93cdd28e1d9bfea5aa85b2 100644 --- a/Libs/MRML/Widgets/qMRMLNodeComboBoxMenuDelegate.h +++ b/Libs/MRML/Widgets/qMRMLNodeComboBoxMenuDelegate.h @@ -47,11 +47,11 @@ public: qMRMLNodeComboBoxMenuDelegate(QObject *parent, QComboBox *cmb); protected: - virtual void paint(QPainter *painter, + void paint(QPainter *painter, const QStyleOptionViewItem &option, - const QModelIndex &index) const; - virtual QSize sizeHint(const QStyleOptionViewItem &option, - const QModelIndex &index) const; + const QModelIndex &index) const override; + QSize sizeHint(const QStyleOptionViewItem &option, + const QModelIndex &index) const override; private: /// Reimplemented to force the highlight in case the item is not selectable diff --git a/Libs/MRML/Widgets/qMRMLNodeFactory.h b/Libs/MRML/Widgets/qMRMLNodeFactory.h index 10c169880da5d7122afef592bb68ad1d9a3eb35b..2f08605eb9befb58968496a703e8198bdf4dc7bf 100644 --- a/Libs/MRML/Widgets/qMRMLNodeFactory.h +++ b/Libs/MRML/Widgets/qMRMLNodeFactory.h @@ -48,7 +48,7 @@ public: /// Constructors typedef QObject Superclass; explicit qMRMLNodeFactory(QObject* parent = 0); - virtual ~qMRMLNodeFactory(); + ~qMRMLNodeFactory() override; /// Get MRML scene. /// By default, there is no scene. diff --git a/Libs/MRML/Widgets/qMRMLPlotView_p.h b/Libs/MRML/Widgets/qMRMLPlotView_p.h index e9f1fdea05464ca1ff3947f4412ba2c28f3aaa82..3d8572316790ba661ad2a99821323bb9ea873363 100644 --- a/Libs/MRML/Widgets/qMRMLPlotView_p.h +++ b/Libs/MRML/Widgets/qMRMLPlotView_p.h @@ -67,7 +67,7 @@ protected: qMRMLPlotView* const q_ptr; public: qMRMLPlotViewPrivate(qMRMLPlotView& object); - ~qMRMLPlotViewPrivate(); + ~qMRMLPlotViewPrivate() override; virtual void init(); diff --git a/Libs/MRML/Widgets/qMRMLPlotWidget.cxx b/Libs/MRML/Widgets/qMRMLPlotWidget.cxx index 45e78185c52b9dc1d3e6c97a5fce0875f837f2f5..c2a3155083eea1235f279ba0415978821ae45efa 100644 --- a/Libs/MRML/Widgets/qMRMLPlotWidget.cxx +++ b/Libs/MRML/Widgets/qMRMLPlotWidget.cxx @@ -48,7 +48,7 @@ protected: qMRMLPlotWidget* const q_ptr; public: qMRMLPlotWidgetPrivate(qMRMLPlotWidget& object); - ~qMRMLPlotWidgetPrivate(); + ~qMRMLPlotWidgetPrivate() override; void init(); diff --git a/Libs/MRML/Widgets/qMRMLPlotWidget.h b/Libs/MRML/Widgets/qMRMLPlotWidget.h index 5d46dbabfb059a2a74cc0a44e9ced58e630ce4bb..00a3d8d6629e2f410fe0177770ca3b209242fb00 100644 --- a/Libs/MRML/Widgets/qMRMLPlotWidget.h +++ b/Libs/MRML/Widgets/qMRMLPlotWidget.h @@ -50,7 +50,7 @@ public: /// Constructors explicit qMRMLPlotWidget(QWidget* parent = 0); - virtual ~qMRMLPlotWidget(); + ~qMRMLPlotWidget() override; /// Get the Plot node observed by view. Q_INVOKABLE vtkMRMLPlotViewNode* mrmlPlotViewNode()const; diff --git a/Libs/MRML/Widgets/qMRMLSceneCategoryModel.h b/Libs/MRML/Widgets/qMRMLSceneCategoryModel.h index 0ad81734cc66ca3a094d6b02a0857eaf0325d84a..6d474d48d9ad9505f9860c500fa8dbc462ad19f3 100644 --- a/Libs/MRML/Widgets/qMRMLSceneCategoryModel.h +++ b/Libs/MRML/Widgets/qMRMLSceneCategoryModel.h @@ -31,17 +31,17 @@ class QMRML_WIDGETS_EXPORT qMRMLSceneCategoryModel : public qMRMLSceneModel public: qMRMLSceneCategoryModel(QObject *parent=0); - virtual ~qMRMLSceneCategoryModel(); + ~qMRMLSceneCategoryModel() override; QStandardItem* itemFromCategory(const QString& category)const; int categoryCount()const; protected: - virtual QStandardItem* insertNode(vtkMRMLNode* node); + QStandardItem* insertNode(vtkMRMLNode* node) override; using qMRMLSceneModel::insertNode; - virtual bool isANode(const QStandardItem * item)const; - virtual void updateItemFromNode(QStandardItem* item, vtkMRMLNode* node, int column); - virtual void updateNodeFromItem(vtkMRMLNode* node, QStandardItem* item); + bool isANode(const QStandardItem * item)const override; + void updateItemFromNode(QStandardItem* item, vtkMRMLNode* node, int column) override; + void updateNodeFromItem(vtkMRMLNode* node, QStandardItem* item) override; virtual void updateItemFromCategory(QStandardItem* item, const QString& category); virtual QStandardItem* insertCategory(const QString& category, int row); diff --git a/Libs/MRML/Widgets/qMRMLSceneColorTableModel.h b/Libs/MRML/Widgets/qMRMLSceneColorTableModel.h index 93e65020336840d81eb38b0f0480ffcad64b4c0e..cc2310aa3ba4197b80874ea04117a8c9541f1036 100644 --- a/Libs/MRML/Widgets/qMRMLSceneColorTableModel.h +++ b/Libs/MRML/Widgets/qMRMLSceneColorTableModel.h @@ -35,12 +35,12 @@ class QMRML_WIDGETS_EXPORT qMRMLSceneColorTableModel : public qMRMLSceneCategory public: qMRMLSceneColorTableModel(QObject *parent=0); - virtual ~qMRMLSceneColorTableModel(); + ~qMRMLSceneColorTableModel() override; protected: QScopedPointer d_ptr; - virtual void updateItemFromNode(QStandardItem* item, vtkMRMLNode* node, int column); + void updateItemFromNode(QStandardItem* item, vtkMRMLNode* node, int column) override; bool updateGradientFromNode(vtkMRMLColorNode* node)const; private: diff --git a/Libs/MRML/Widgets/qMRMLSceneDisplayableModel.h b/Libs/MRML/Widgets/qMRMLSceneDisplayableModel.h index b1b53f5768ad19e505c34e08ce7cbeff8ea348b9..823613e48bd3d2e66bbb6d3eb3ad6bab1ba9f25d 100644 --- a/Libs/MRML/Widgets/qMRMLSceneDisplayableModel.h +++ b/Libs/MRML/Widgets/qMRMLSceneDisplayableModel.h @@ -44,7 +44,7 @@ class QMRML_WIDGETS_EXPORT qMRMLSceneDisplayableModel : public qMRMLSceneHierarc public: typedef qMRMLSceneHierarchyModel Superclass; qMRMLSceneDisplayableModel(QObject *parent=0); - virtual ~qMRMLSceneDisplayableModel(); + ~qMRMLSceneDisplayableModel() override; int colorColumn()const; void setColorColumn(int column); @@ -53,12 +53,12 @@ public: void setOpacityColumn(int column); /// - virtual vtkMRMLNode* parentNode(vtkMRMLNode* node)const; + vtkMRMLNode* parentNode(vtkMRMLNode* node)const override; //virtual int nodeIndex(vtkMRMLNode* node)const; /// fast function that only check the type of the node to know if it can be a child. - virtual bool canBeAChild(vtkMRMLNode* node)const; + bool canBeAChild(vtkMRMLNode* node)const override; /// fast function that only check the type of the node to know if it can be a parent. - virtual bool canBeAParent(vtkMRMLNode* node)const; + bool canBeAParent(vtkMRMLNode* node)const override; protected: qMRMLSceneDisplayableModel(qMRMLSceneDisplayableModelPrivate* pimpl, @@ -66,12 +66,12 @@ protected: /// Reimplemented to listen to the displayable DisplayModifiedEvent event for /// visibility check state changes. - virtual void observeNode(vtkMRMLNode* node); - virtual QFlags nodeFlags(vtkMRMLNode* node, int column)const; - virtual void updateItemDataFromNode(QStandardItem* item, vtkMRMLNode* node, int column); - virtual void updateNodeFromItemData(vtkMRMLNode* node, QStandardItem* item); + void observeNode(vtkMRMLNode* node) override; + QFlags nodeFlags(vtkMRMLNode* node, int column)const override; + void updateItemDataFromNode(QStandardItem* item, vtkMRMLNode* node, int column) override; + void updateNodeFromItemData(vtkMRMLNode* node, QStandardItem* item) override; - virtual int maxColumnId()const; + int maxColumnId()const override; private: Q_DECLARE_PRIVATE(qMRMLSceneDisplayableModel); Q_DISABLE_COPY(qMRMLSceneDisplayableModel); diff --git a/Libs/MRML/Widgets/qMRMLSceneFactoryWidget.h b/Libs/MRML/Widgets/qMRMLSceneFactoryWidget.h index 4bb031570d567fca97fd599d3547556ffc50ed0a..0ef1c68f31553ef281df3a17ce506074ae436702 100644 --- a/Libs/MRML/Widgets/qMRMLSceneFactoryWidget.h +++ b/Libs/MRML/Widgets/qMRMLSceneFactoryWidget.h @@ -39,7 +39,7 @@ class QMRML_WIDGETS_EXPORT qMRMLSceneFactoryWidget : public QWidget Q_OBJECT public: qMRMLSceneFactoryWidget(QWidget* parent = 0); - ~qMRMLSceneFactoryWidget(); + ~qMRMLSceneFactoryWidget() override; vtkMRMLScene* mrmlScene()const; diff --git a/Libs/MRML/Widgets/qMRMLSceneHierarchyModel.h b/Libs/MRML/Widgets/qMRMLSceneHierarchyModel.h index 5938fee7097a45f2a1883bea30f628ab93fdc1b6..669275470b12b8f702d6c3f68bd89255c11fccba 100644 --- a/Libs/MRML/Widgets/qMRMLSceneHierarchyModel.h +++ b/Libs/MRML/Widgets/qMRMLSceneHierarchyModel.h @@ -40,38 +40,38 @@ class QMRML_WIDGETS_EXPORT qMRMLSceneHierarchyModel : public qMRMLSceneModel public: typedef qMRMLSceneModel Superclass; qMRMLSceneHierarchyModel(QObject *parent=0); - virtual ~qMRMLSceneHierarchyModel(); + ~qMRMLSceneHierarchyModel() override; int expandColumn()const; void setExpandColumn(int column); - virtual Qt::DropActions supportedDropActions()const; + Qt::DropActions supportedDropActions()const override; /// - virtual vtkMRMLNode* parentNode(vtkMRMLNode* node)const; - virtual int nodeIndex(vtkMRMLNode* node)const; + vtkMRMLNode* parentNode(vtkMRMLNode* node)const override; + int nodeIndex(vtkMRMLNode* node)const override; /// fast function that only check the type of the node to know if it can be a child. - virtual bool canBeAChild(vtkMRMLNode* node)const; + bool canBeAChild(vtkMRMLNode* node)const override; /// fast function that only check the type of the node to know if it can be a parent. - virtual bool canBeAParent(vtkMRMLNode* node)const; + bool canBeAParent(vtkMRMLNode* node)const override; /// if newParent == 0, set the node into the vtkMRMLScene - virtual bool reparent(vtkMRMLNode* node, vtkMRMLNode* newParent); + bool reparent(vtkMRMLNode* node, vtkMRMLNode* newParent) override; protected: qMRMLSceneHierarchyModel(qMRMLSceneHierarchyModelPrivate* pimpl, QObject *parent=0); - virtual QFlags nodeFlags(vtkMRMLNode* node, int column)const; + QFlags nodeFlags(vtkMRMLNode* node, int column)const override; - virtual void observeNode(vtkMRMLNode* node); + void observeNode(vtkMRMLNode* node) override; /// Reimplemented to add expandColumn support - void updateItemDataFromNode(QStandardItem* item, vtkMRMLNode* node, int column); + void updateItemDataFromNode(QStandardItem* item, vtkMRMLNode* node, int column) override; /// Reimplemented to add expandColumn support - void updateNodeFromItemData(vtkMRMLNode* node, QStandardItem* item); + void updateNodeFromItemData(vtkMRMLNode* node, QStandardItem* item) override; /// Must be reimplemented in subclasses that add new column types - virtual int maxColumnId()const; + int maxColumnId()const override; private: Q_DECLARE_PRIVATE(qMRMLSceneHierarchyModel); diff --git a/Libs/MRML/Widgets/qMRMLSceneModel.h b/Libs/MRML/Widgets/qMRMLSceneModel.h index 6b6d98a9b2c98d7ce0bbc37da9b4d6ceb52fc5a9..eb40f520161964c20a08a935326d7c01bfd2ecb0 100644 --- a/Libs/MRML/Widgets/qMRMLSceneModel.h +++ b/Libs/MRML/Widgets/qMRMLSceneModel.h @@ -96,7 +96,7 @@ class QMRML_WIDGETS_EXPORT qMRMLSceneModel : public QStandardItemModel public: typedef QStandardItemModel Superclass; qMRMLSceneModel(QObject *parent=0); - virtual ~qMRMLSceneModel(); + ~qMRMLSceneModel() override; enum NodeTypes { @@ -181,10 +181,10 @@ public: /// Doesn't support drop actions, scene model subclasses can support drop /// actions though. - virtual Qt::DropActions supportedDropActions()const; - virtual QMimeData* mimeData(const QModelIndexList& indexes)const; - virtual bool dropMimeData(const QMimeData *data, Qt::DropAction action, - int row, int column, const QModelIndex &parent); + Qt::DropActions supportedDropActions()const override; + QMimeData* mimeData(const QModelIndexList& indexes)const override; + bool dropMimeData(const QMimeData *data, Qt::DropAction action, + int row, int column, const QModelIndex &parent) override; /// Returns the parent node of the node, 0 otherwise (the parent is the scene). /// Must be reimplemented in derived classes. If reimplemented, you might diff --git a/Libs/MRML/Widgets/qMRMLSceneModelHierarchyModel.h b/Libs/MRML/Widgets/qMRMLSceneModelHierarchyModel.h index 1a7ed1e1f57cfb80ad1ac42d806de33b5ae17c73..58d3c46b5a79c7c9fff8c2df766cb75aa521c8ab 100644 --- a/Libs/MRML/Widgets/qMRMLSceneModelHierarchyModel.h +++ b/Libs/MRML/Widgets/qMRMLSceneModelHierarchyModel.h @@ -32,18 +32,18 @@ class QMRML_WIDGETS_EXPORT qMRMLSceneModelHierarchyModel : public qMRMLSceneDisp public: typedef qMRMLSceneDisplayableModel Superclass; qMRMLSceneModelHierarchyModel(QObject *parent=0); - virtual ~qMRMLSceneModelHierarchyModel(); + ~qMRMLSceneModelHierarchyModel() override; /// - virtual vtkMRMLNode* parentNode(vtkMRMLNode* node)const; + vtkMRMLNode* parentNode(vtkMRMLNode* node)const override; //virtual int nodeIndex(vtkMRMLNode* node)const; /// Fast function that only check the type of the node to know if it can be a child. - virtual bool canBeAChild(vtkMRMLNode* node)const; + bool canBeAChild(vtkMRMLNode* node)const override; /// Fast function that only check the type of the node to know if it can be a parent. - virtual bool canBeAParent(vtkMRMLNode* node)const; + bool canBeAParent(vtkMRMLNode* node)const override; /// If newParent == 0, set the node into the vtkMRMLScene // virtual bool reparent(vtkMRMLNode* node, vtkMRMLNode* newParent); diff --git a/Libs/MRML/Widgets/qMRMLSceneTransformModel.h b/Libs/MRML/Widgets/qMRMLSceneTransformModel.h index 8e99fc0939789b4848f7e4cb91f86e0e81460428..f12007182786e116d6c80f3daa03ba769cd421ac 100644 --- a/Libs/MRML/Widgets/qMRMLSceneTransformModel.h +++ b/Libs/MRML/Widgets/qMRMLSceneTransformModel.h @@ -31,20 +31,20 @@ class QMRML_WIDGETS_EXPORT qMRMLSceneTransformModel : public qMRMLSceneModel public: qMRMLSceneTransformModel(QObject *parent=0); - virtual ~qMRMLSceneTransformModel(); + ~qMRMLSceneTransformModel() override; /// - virtual vtkMRMLNode* parentNode(vtkMRMLNode* node)const; + vtkMRMLNode* parentNode(vtkMRMLNode* node)const override; //virtual int nodeIndex(vtkMRMLNode* node)const; /// fast function that only check the type of the node to know if it can be a child. - virtual bool canBeAChild(vtkMRMLNode* node)const; + bool canBeAChild(vtkMRMLNode* node)const override; /// fast function that only check the type of the node to know if it can be a parent. - virtual bool canBeAParent(vtkMRMLNode* node)const; + bool canBeAParent(vtkMRMLNode* node)const override; /// if newParent == 0, set the node into the vtkMRMLScene - virtual bool reparent(vtkMRMLNode* node, vtkMRMLNode* newParent); + bool reparent(vtkMRMLNode* node, vtkMRMLNode* newParent) override; - virtual Qt::DropActions supportedDropActions()const; + Qt::DropActions supportedDropActions()const override; private: Q_DECLARE_PRIVATE(qMRMLSceneTransformModel); diff --git a/Libs/MRML/Widgets/qMRMLScreenShotDialog.h b/Libs/MRML/Widgets/qMRMLScreenShotDialog.h index 287b9ace9e0c43a5574b8db2ec0324e30c6a6297..55c3dde8deceb8244de0dba63dd2abcea8c853aa 100644 --- a/Libs/MRML/Widgets/qMRMLScreenShotDialog.h +++ b/Libs/MRML/Widgets/qMRMLScreenShotDialog.h @@ -51,7 +51,7 @@ public: }; qMRMLScreenShotDialog(QWidget *parent = 0); - ~qMRMLScreenShotDialog(); + ~qMRMLScreenShotDialog() override; void setLayoutManager(qMRMLLayoutManager* newlayoutManager); qMRMLLayoutManager* layoutManager()const; diff --git a/Libs/MRML/Widgets/qMRMLSegmentSelectorWidget.h b/Libs/MRML/Widgets/qMRMLSegmentSelectorWidget.h index 0388404146a0030521bc52dd255588dfa3fbfa63..614343c63634ad7de35c689add2ac584a1557969 100644 --- a/Libs/MRML/Widgets/qMRMLSegmentSelectorWidget.h +++ b/Libs/MRML/Widgets/qMRMLSegmentSelectorWidget.h @@ -60,7 +60,7 @@ public: /// Constructor explicit qMRMLSegmentSelectorWidget(QWidget* parent = 0); /// Destructor - virtual ~qMRMLSegmentSelectorWidget(); + ~qMRMLSegmentSelectorWidget() override; /// Get currently selected segmentation MRML node Q_INVOKABLE vtkMRMLNode* currentNode(); diff --git a/Libs/MRML/Widgets/qMRMLSliceControllerWidget.h b/Libs/MRML/Widgets/qMRMLSliceControllerWidget.h index 43607f7be1a4d287d04adf6b162fe61a32998513..d0c1c8b4400b6871bd161c095ea20ab1a2d9283e 100644 --- a/Libs/MRML/Widgets/qMRMLSliceControllerWidget.h +++ b/Libs/MRML/Widgets/qMRMLSliceControllerWidget.h @@ -67,7 +67,7 @@ public: /// Constructors explicit qMRMLSliceControllerWidget(QWidget* parent = 0); - virtual ~qMRMLSliceControllerWidget(); + ~qMRMLSliceControllerWidget() override; /// Are the slices linked to each other bool isLinked()const; @@ -155,7 +155,7 @@ public: public slots: - virtual void setMRMLScene(vtkMRMLScene* newScene); + void setMRMLScene(vtkMRMLScene* newScene) override; /// Set a new SliceNode. void setMRMLSliceNode(vtkMRMLSliceNode* newSliceNode); diff --git a/Libs/MRML/Widgets/qMRMLSliceInformationWidget.h b/Libs/MRML/Widgets/qMRMLSliceInformationWidget.h index 31aa43354592ff79027f6555e3f6e50baf7f9ca9..a798ffbd6f73b0ae22609b08c8a6a03f6a1d7ff5 100644 --- a/Libs/MRML/Widgets/qMRMLSliceInformationWidget.h +++ b/Libs/MRML/Widgets/qMRMLSliceInformationWidget.h @@ -47,7 +47,7 @@ public: /// Constructors explicit qMRMLSliceInformationWidget(QWidget* parent = 0); - virtual ~qMRMLSliceInformationWidget(); + ~qMRMLSliceInformationWidget() override; /// Get \a sliceNode /// \sa setMRMLSliceCompositeNode(); diff --git a/Libs/MRML/Widgets/qMRMLSliceInformationWidget_p.h b/Libs/MRML/Widgets/qMRMLSliceInformationWidget_p.h index 374c820e0c42d17f97759fbca769cd890266ba19..d065bac770ad17ebee9e83c9aed356253a4aa66c 100644 --- a/Libs/MRML/Widgets/qMRMLSliceInformationWidget_p.h +++ b/Libs/MRML/Widgets/qMRMLSliceInformationWidget_p.h @@ -64,7 +64,7 @@ protected: qMRMLSliceInformationWidget* const q_ptr; public: qMRMLSliceInformationWidgetPrivate(qMRMLSliceInformationWidget& object); - ~qMRMLSliceInformationWidgetPrivate(); + ~qMRMLSliceInformationWidgetPrivate() override; void setupUi(qMRMLWidget* widget); diff --git a/Libs/MRML/Widgets/qMRMLSliceView.h b/Libs/MRML/Widgets/qMRMLSliceView.h index 993b05b8e2ed4729513153ea1bb9dd430934df4d..9feadda701fef02bab7fc865fbd9dd261b1e4fb6 100644 --- a/Libs/MRML/Widgets/qMRMLSliceView.h +++ b/Libs/MRML/Widgets/qMRMLSliceView.h @@ -47,7 +47,7 @@ public: /// Constructors explicit qMRMLSliceView(QWidget* parent = 0); - virtual ~qMRMLSliceView(); + ~qMRMLSliceView() override; /// Add a displayable manager to the view, /// the displayable manager is proper to the 2D view and is not shared diff --git a/Libs/MRML/Widgets/qMRMLSliceView_p.h b/Libs/MRML/Widgets/qMRMLSliceView_p.h index 721d500b3e56240bd07f6440e9a81eb3307b9279..f875705fc74df44f172d90894429996ce8e858f6 100644 --- a/Libs/MRML/Widgets/qMRMLSliceView_p.h +++ b/Libs/MRML/Widgets/qMRMLSliceView_p.h @@ -61,7 +61,7 @@ protected: qMRMLSliceView* const q_ptr; public: qMRMLSliceViewPrivate(qMRMLSliceView& object); - ~qMRMLSliceViewPrivate(); + ~qMRMLSliceViewPrivate() override; virtual void init(); @@ -101,7 +101,7 @@ public: /// Method to query the mapping from an id of a LightBox frame to /// the Renderer for that frame - virtual vtkRenderer *GetRenderer(int id) VTK_OVERRIDE; + virtual vtkRenderer *GetRenderer(int id) override; /// Method to set the real LightBoxManager virtual void SetLightBoxRendererManager(vtkLightBoxRendererManager *mgr); diff --git a/Libs/MRML/Widgets/qMRMLSliceWidget.h b/Libs/MRML/Widgets/qMRMLSliceWidget.h index 95e1479fe860b6600a9386670994a2bb30bac680..394f73af076fe89660764d33cc83a38d1efee154 100644 --- a/Libs/MRML/Widgets/qMRMLSliceWidget.h +++ b/Libs/MRML/Widgets/qMRMLSliceWidget.h @@ -60,7 +60,7 @@ public: /// Constructors explicit qMRMLSliceWidget(QWidget* parent = 0); - virtual ~qMRMLSliceWidget(); + ~qMRMLSliceWidget() override; /// Get slice controller Q_INVOKABLE qMRMLSliceControllerWidget* sliceController()const; @@ -125,7 +125,7 @@ public: Q_INVOKABLE qMRMLSliceView* sliceView()const; public slots: - void setMRMLScene(vtkMRMLScene * newScene); + void setMRMLScene(vtkMRMLScene * newScene) override; /// \sa qMRMLSliceControllerWidget::setMRMLSliceNode() /// \sa mrmlSliceNode() @@ -147,7 +147,7 @@ signals: void nodeAboutToBeEdited(vtkMRMLNode* node); protected: - virtual void showEvent(QShowEvent *); + void showEvent(QShowEvent *) override; QScopedPointer d_ptr; diff --git a/Libs/MRML/Widgets/qMRMLSortFilterHierarchyProxyModel.h b/Libs/MRML/Widgets/qMRMLSortFilterHierarchyProxyModel.h index e476758e33b223b69bfd1abfca739119ed1b8dbf..46a676b59107fe640fa3ad148cd5859cca9f891f 100644 --- a/Libs/MRML/Widgets/qMRMLSortFilterHierarchyProxyModel.h +++ b/Libs/MRML/Widgets/qMRMLSortFilterHierarchyProxyModel.h @@ -34,13 +34,13 @@ class QMRML_WIDGETS_EXPORT qMRMLSortFilterHierarchyProxyModel public: typedef qMRMLSortFilterProxyModel Superclass; qMRMLSortFilterHierarchyProxyModel(QObject *parent=0); - virtual ~qMRMLSortFilterHierarchyProxyModel(); + ~qMRMLSortFilterHierarchyProxyModel() override; protected: // Don't show vtkMRMLHierarchyNode if they are tied to a vtkMRMLModelNode // The only vtkMRMLHierarchyNode to display are the ones who reference other // vtkMRMLHierarchyNode (tree parent) or empty (tree parent to be) - virtual AcceptType filterAcceptsNode(vtkMRMLNode* node)const; + AcceptType filterAcceptsNode(vtkMRMLNode* node)const override; protected: QScopedPointer d_ptr; diff --git a/Libs/MRML/Widgets/qMRMLSortFilterProxyModel.h b/Libs/MRML/Widgets/qMRMLSortFilterProxyModel.h index 77c7536e5e2ebd8356e886548cfda6e7f8732408..b39f4a7e9c638af8257487945c91c21fc87692a5 100644 --- a/Libs/MRML/Widgets/qMRMLSortFilterProxyModel.h +++ b/Libs/MRML/Widgets/qMRMLSortFilterProxyModel.h @@ -120,7 +120,7 @@ public: typedef QSortFilterProxyModel Superclass; qMRMLSortFilterProxyModel(QObject *parent=0); - virtual ~qMRMLSortFilterProxyModel(); + ~qMRMLSortFilterProxyModel() override; /// Retrieve the associated MRML scene vtkMRMLScene* mrmlScene()const; @@ -259,8 +259,8 @@ protected: /// If for some reason a node has not been observed but its visibility has /// changed, the filter can be refresh by calling a\ invalidate() /// \sa filterAcceptsNode(), AcceptType, invalidate() - virtual bool filterAcceptsRow(int source_row, - const QModelIndex &source_parent)const; + bool filterAcceptsRow(int source_row, + const QModelIndex &source_parent)const override; /// This method returns whether the \a node should be visible or hidden /// from the view. /// It returns the behavior of the node with regard to the filters. diff --git a/Libs/MRML/Widgets/qMRMLTableModel.h b/Libs/MRML/Widgets/qMRMLTableModel.h index 93a4a6a4749808ceb615dad532b9807aded86d4f..043ea48e0e7a5c0fc01e2206528255f4803d7213 100644 --- a/Libs/MRML/Widgets/qMRMLTableModel.h +++ b/Libs/MRML/Widgets/qMRMLTableModel.h @@ -50,7 +50,7 @@ class QMRML_WIDGETS_EXPORT qMRMLTableModel : public QStandardItemModel public: typedef QAbstractItemModel Superclass; qMRMLTableModel(QObject *parent=0); - virtual ~qMRMLTableModel(); + ~qMRMLTableModel() override; enum ItemDataRole{ SortRole = Qt::UserRole + 1 diff --git a/Libs/MRML/Widgets/qMRMLTableView.h b/Libs/MRML/Widgets/qMRMLTableView.h index 594f960f24b9c7e47135e070fca657c75075c0db..175db6b09c71495ef69c9a9723cc7b65512d2225 100644 --- a/Libs/MRML/Widgets/qMRMLTableView.h +++ b/Libs/MRML/Widgets/qMRMLTableView.h @@ -47,7 +47,7 @@ class QMRML_WIDGETS_EXPORT qMRMLTableView : public QTableView Q_PROPERTY(bool firstColumnLocked READ firstColumnLocked WRITE setFirstColumnLocked) public: qMRMLTableView(QWidget *parent=0); - virtual ~qMRMLTableView(); + ~qMRMLTableView() override; /// Return a pointer on the current MRML scene Q_INVOKABLE vtkMRMLScene* mrmlScene() const; @@ -108,11 +108,11 @@ signals: void selectionChanged(); protected: - virtual void keyPressEvent(QKeyEvent* event); + void keyPressEvent(QKeyEvent* event) override; QScopedPointer d_ptr; - virtual void selectionChanged(const QItemSelection & selected, const QItemSelection & deselected); + void selectionChanged(const QItemSelection & selected, const QItemSelection & deselected) override; private: Q_DECLARE_PRIVATE(qMRMLTableView); diff --git a/Libs/MRML/Widgets/qMRMLTableView_p.h b/Libs/MRML/Widgets/qMRMLTableView_p.h index d4e8023480baa5829ef169f4e0bfee825be5a37e..79fb991f80ff6aa14ade7e638e3d9230a745fb51 100644 --- a/Libs/MRML/Widgets/qMRMLTableView_p.h +++ b/Libs/MRML/Widgets/qMRMLTableView_p.h @@ -66,7 +66,7 @@ protected: qMRMLTableView* const q_ptr; public: qMRMLTableViewPrivate(qMRMLTableView& object); - ~qMRMLTableViewPrivate(); + ~qMRMLTableViewPrivate() override; virtual void init(); diff --git a/Libs/MRML/Widgets/qMRMLTableWidget.cxx b/Libs/MRML/Widgets/qMRMLTableWidget.cxx index feedff40a118b6876b71567ec112ad144ca73e0e..2656883141ee4af17b705a902dd3ea5f5a4e9e71 100644 --- a/Libs/MRML/Widgets/qMRMLTableWidget.cxx +++ b/Libs/MRML/Widgets/qMRMLTableWidget.cxx @@ -51,7 +51,7 @@ protected: qMRMLTableWidget* const q_ptr; public: qMRMLTableWidgetPrivate(qMRMLTableWidget& object); - ~qMRMLTableWidgetPrivate(); + ~qMRMLTableWidgetPrivate() override; void init(); diff --git a/Libs/MRML/Widgets/qMRMLTableWidget.h b/Libs/MRML/Widgets/qMRMLTableWidget.h index 5f69b75a7dfc0751544c9455fc447f73e3ed2612..15c3a15de70ef95ee53d1050de45471c38d4fa9e 100644 --- a/Libs/MRML/Widgets/qMRMLTableWidget.h +++ b/Libs/MRML/Widgets/qMRMLTableWidget.h @@ -52,7 +52,7 @@ public: /// Constructors explicit qMRMLTableWidget(QWidget* parent = 0); - virtual ~qMRMLTableWidget(); + ~qMRMLTableWidget() override; /// Get the tabl node observed by view. vtkMRMLTableViewNode* mrmlTableViewNode()const; diff --git a/Libs/MRML/Widgets/qMRMLThreeDViewControllerWidget.h b/Libs/MRML/Widgets/qMRMLThreeDViewControllerWidget.h index ff58a77d0eecc60f4b94dfbcf0ad203937bf2e90..692b88051bfa32d59216652327b711d57476d3a6 100644 --- a/Libs/MRML/Widgets/qMRMLThreeDViewControllerWidget.h +++ b/Libs/MRML/Widgets/qMRMLThreeDViewControllerWidget.h @@ -50,7 +50,7 @@ public: /// Constructors explicit qMRMLThreeDViewControllerWidget(QWidget* parent = 0); - virtual ~qMRMLThreeDViewControllerWidget(); + ~qMRMLThreeDViewControllerWidget() override; /// Set the label for the 3D view (abbreviation for the view /// name) @@ -81,7 +81,7 @@ public: public slots: - virtual void setMRMLScene(vtkMRMLScene* newScene); + void setMRMLScene(vtkMRMLScene* newScene) override; void setThreeDView(qMRMLThreeDView* threeDView); void setMRMLViewNode(vtkMRMLViewNode* viewNode); diff --git a/Libs/MRML/Widgets/qMRMLThreeDViewInformationWidget.h b/Libs/MRML/Widgets/qMRMLThreeDViewInformationWidget.h index 00f5fd7c48a64951855f70654a2addb862d1a18a..815f65a5fd4486fcf4a991c093f540b657aa4925 100644 --- a/Libs/MRML/Widgets/qMRMLThreeDViewInformationWidget.h +++ b/Libs/MRML/Widgets/qMRMLThreeDViewInformationWidget.h @@ -45,7 +45,7 @@ public: /// Constructors explicit qMRMLThreeDViewInformationWidget(QWidget* parent = 0); - virtual ~qMRMLThreeDViewInformationWidget(); + ~qMRMLThreeDViewInformationWidget() override; /// Get \a viewNode vtkMRMLViewNode* mrmlViewNode()const; diff --git a/Libs/MRML/Widgets/qMRMLThreeDViewInformationWidget_p.h b/Libs/MRML/Widgets/qMRMLThreeDViewInformationWidget_p.h index 4a13583053010d6b792395c51d8b7d0aba70c30f..66e6a4dcefdbac4b4ca92265388cf3bfbd65d546 100644 --- a/Libs/MRML/Widgets/qMRMLThreeDViewInformationWidget_p.h +++ b/Libs/MRML/Widgets/qMRMLThreeDViewInformationWidget_p.h @@ -60,7 +60,7 @@ protected: qMRMLThreeDViewInformationWidget* const q_ptr; public: qMRMLThreeDViewInformationWidgetPrivate(qMRMLThreeDViewInformationWidget& object); - ~qMRMLThreeDViewInformationWidgetPrivate(); + ~qMRMLThreeDViewInformationWidgetPrivate() override; void setupUi(qMRMLWidget* widget); diff --git a/Libs/MRML/Widgets/qMRMLThreeDView_p.h b/Libs/MRML/Widgets/qMRMLThreeDView_p.h index a414c8173e8c53425f51073f46e1d93ef7733ab1..8a8583a8a68fafd453fdede649c245a39377c35c 100644 --- a/Libs/MRML/Widgets/qMRMLThreeDView_p.h +++ b/Libs/MRML/Widgets/qMRMLThreeDView_p.h @@ -54,7 +54,7 @@ protected: qMRMLThreeDView* const q_ptr; public: qMRMLThreeDViewPrivate(qMRMLThreeDView& object); - ~qMRMLThreeDViewPrivate(); + ~qMRMLThreeDViewPrivate() override; virtual void init(); diff --git a/Libs/MRML/Widgets/qMRMLThreeDWidget.cxx b/Libs/MRML/Widgets/qMRMLThreeDWidget.cxx index 2f1d99ce1a673b928e1cc9f32d8b4253f5623af6..70dfb18a12421a487cecfb3acbdd6ce75ce9166b 100644 --- a/Libs/MRML/Widgets/qMRMLThreeDWidget.cxx +++ b/Libs/MRML/Widgets/qMRMLThreeDWidget.cxx @@ -50,7 +50,7 @@ protected: qMRMLThreeDWidget* const q_ptr; public: qMRMLThreeDWidgetPrivate(qMRMLThreeDWidget& object); - ~qMRMLThreeDWidgetPrivate(); + ~qMRMLThreeDWidgetPrivate() override; void init(); diff --git a/Libs/MRML/Widgets/qMRMLThreeDWidget.h b/Libs/MRML/Widgets/qMRMLThreeDWidget.h index e1775d25950b349b3f05817f12244dc87f584d9d..44dae05c5934f0dfba647b69b27df515012b4518 100644 --- a/Libs/MRML/Widgets/qMRMLThreeDWidget.h +++ b/Libs/MRML/Widgets/qMRMLThreeDWidget.h @@ -53,7 +53,7 @@ public: /// Constructors explicit qMRMLThreeDWidget(QWidget* parent = 0); - virtual ~qMRMLThreeDWidget(); + ~qMRMLThreeDWidget() override; /// Get slice controller Q_INVOKABLE qMRMLThreeDViewControllerWidget* threeDController()const; @@ -96,7 +96,7 @@ public: Q_INVOKABLE void setViewLogics(vtkCollection* logics); public slots: - void setMRMLScene(vtkMRMLScene* newScene); + void setMRMLScene(vtkMRMLScene* newScene) override; /// Set the current \a viewNode to observe void setMRMLViewNode(vtkMRMLViewNode* newViewNode); diff --git a/Libs/MRML/Widgets/qMRMLTreeViewEventPlayer.h b/Libs/MRML/Widgets/qMRMLTreeViewEventPlayer.h index 7f690b5311d2b94cb01af1a04dead8020a8091eb..fec355193427a62bb8dd68deb74452b6a6c2e2cb 100644 --- a/Libs/MRML/Widgets/qMRMLTreeViewEventPlayer.h +++ b/Libs/MRML/Widgets/qMRMLTreeViewEventPlayer.h @@ -40,7 +40,7 @@ public: qMRMLTreeViewEventPlayer(QObject* parent = 0); using Superclass::playEvent; - virtual bool playEvent(QObject *Object, const QString &Command, const QString &Arguments, int EventType, bool &Error); + bool playEvent(QObject *Object, const QString &Command, const QString &Arguments, int EventType, bool &Error) override; private: qMRMLTreeViewEventPlayer(const qMRMLTreeViewEventPlayer&); // NOT implemented diff --git a/Libs/MRML/Widgets/qMRMLTreeViewEventTranslator.h b/Libs/MRML/Widgets/qMRMLTreeViewEventTranslator.h index c8db305db928d691e86f9491513a1dd47ce28c90..ba9297afb38b5e97ed7344c67ce72ff6ebed26c1 100644 --- a/Libs/MRML/Widgets/qMRMLTreeViewEventTranslator.h +++ b/Libs/MRML/Widgets/qMRMLTreeViewEventTranslator.h @@ -42,7 +42,7 @@ public: qMRMLTreeViewEventTranslator(QObject* parent = 0); using Superclass::translateEvent; - virtual bool translateEvent(QObject *Object, QEvent *Event, int EventType, bool &Error); + bool translateEvent(QObject *Object, QEvent *Event, int EventType, bool &Error) override; private: qMRMLTreeViewEventTranslator(const qMRMLTreeViewEventTranslator&); // NOT implemented diff --git a/Libs/MRML/Widgets/qMRMLUtils.h b/Libs/MRML/Widgets/qMRMLUtils.h index 4287e04f0810f3426938a64c230b2901bff1f0d1..2732f1342660527650a757d199465d593cd55bfc 100644 --- a/Libs/MRML/Widgets/qMRMLUtils.h +++ b/Libs/MRML/Widgets/qMRMLUtils.h @@ -45,7 +45,7 @@ class QMRML_WIDGETS_EXPORT qMRMLUtils : public QObject public: typedef qMRMLUtils Self; qMRMLUtils(QObject* parent = 0); - virtual ~qMRMLUtils(); + ~qMRMLUtils() override; /// /// Convert a vtkMatrix to a QVector diff --git a/Libs/MRML/Widgets/qMRMLViewControllerBar.h b/Libs/MRML/Widgets/qMRMLViewControllerBar.h index c1021aad48d24cf49213942d2ee798f73a4459ec..b5083055ffc8893bc091cacce8b119f8577019e5 100644 --- a/Libs/MRML/Widgets/qMRMLViewControllerBar.h +++ b/Libs/MRML/Widgets/qMRMLViewControllerBar.h @@ -58,7 +58,7 @@ public: /// Constructors explicit qMRMLViewControllerBar(QWidget* parent = 0); - virtual ~qMRMLViewControllerBar(); + ~qMRMLViewControllerBar() override; enum LayoutBehavior { Popup=0, diff --git a/Libs/MRML/Widgets/qMRMLViewControllerBar_p.h b/Libs/MRML/Widgets/qMRMLViewControllerBar_p.h index f723f793e9619abb3c6831599db38b850e251401..77afbcae008c2f2aba9805a81163d80f820ca4a6 100644 --- a/Libs/MRML/Widgets/qMRMLViewControllerBar_p.h +++ b/Libs/MRML/Widgets/qMRMLViewControllerBar_p.h @@ -57,7 +57,7 @@ protected: public: typedef QObject Superclass; qMRMLViewControllerBarPrivate(qMRMLViewControllerBar& object); - virtual ~qMRMLViewControllerBarPrivate(); + ~qMRMLViewControllerBarPrivate() override; virtual void init(); virtual void setColor(QColor color); @@ -72,7 +72,7 @@ public: qMRMLViewControllerBar::LayoutBehavior LayoutBehavior; QColor BarColor; - virtual bool eventFilter(QObject* object, QEvent* event); + bool eventFilter(QObject* object, QEvent* event) override; protected: virtual void setupPopupUi(); diff --git a/Libs/MRML/Widgets/qMRMLVolumeThresholdWidget.h b/Libs/MRML/Widgets/qMRMLVolumeThresholdWidget.h index 3f6b466b88b515af3c59dae45d82d95f84991e70..4bab4e168504bb74e50862b964bdcf97eae7c0a8 100644 --- a/Libs/MRML/Widgets/qMRMLVolumeThresholdWidget.h +++ b/Libs/MRML/Widgets/qMRMLVolumeThresholdWidget.h @@ -34,7 +34,7 @@ public: /// Constructors typedef qMRMLVolumeWidget Superclass; explicit qMRMLVolumeThresholdWidget(QWidget* parent=0); - virtual ~qMRMLVolumeThresholdWidget(); + ~qMRMLVolumeThresholdWidget() override; enum ControlMode { @@ -83,7 +83,7 @@ public slots: protected: /// Update the widget from volume display node properties. - virtual void updateWidgetFromMRMLDisplayNode(); + void updateWidgetFromMRMLDisplayNode() override; /// /// Set sliders range diff --git a/Libs/MRML/Widgets/qMRMLVolumeWidget.h b/Libs/MRML/Widgets/qMRMLVolumeWidget.h index 90204a34c390415fe683fe444e59f7b5ecfc05fe..78a25bfd2a378d3a5a3cfe5e0a0be462787b163a 100644 --- a/Libs/MRML/Widgets/qMRMLVolumeWidget.h +++ b/Libs/MRML/Widgets/qMRMLVolumeWidget.h @@ -44,7 +44,7 @@ public: /// Constructors typedef QWidget Superclass; explicit qMRMLVolumeWidget(QWidget* parentWidget = 0); - virtual ~qMRMLVolumeWidget(); + ~qMRMLVolumeWidget() override; /// /// Return the current MRML node of interest diff --git a/Libs/MRML/Widgets/qMRMLVolumeWidget_p.h b/Libs/MRML/Widgets/qMRMLVolumeWidget_p.h index a4b44cbdc71b753c33b48cc45ad7100e05feb858..da420c14c8f6e6a798398b430a2a0d4f91ff582d 100644 --- a/Libs/MRML/Widgets/qMRMLVolumeWidget_p.h +++ b/Libs/MRML/Widgets/qMRMLVolumeWidget_p.h @@ -51,7 +51,7 @@ protected: public: qMRMLVolumeWidgetPrivate(qMRMLVolumeWidget& object); - virtual ~qMRMLVolumeWidgetPrivate(); + ~qMRMLVolumeWidgetPrivate() override; virtual void init(); diff --git a/Libs/MRML/Widgets/qMRMLWidget.h b/Libs/MRML/Widgets/qMRMLWidget.h index d6ba2d4a32873eba7a59a1fe8a2d9f1adb17a789..2a9efecef4261f6526d67676465f84f124ea5d57 100644 --- a/Libs/MRML/Widgets/qMRMLWidget.h +++ b/Libs/MRML/Widgets/qMRMLWidget.h @@ -39,7 +39,7 @@ class QMRML_WIDGETS_EXPORT qMRMLWidget : public QWidget public: typedef QWidget Superclass; explicit qMRMLWidget(QWidget *parent=0, Qt::WindowFlags f=0); - virtual ~qMRMLWidget(); + ~qMRMLWidget() override; /// Return a pointer on the current MRML scene Q_INVOKABLE vtkMRMLScene* mrmlScene() const; diff --git a/Libs/RemoteIO/vtkHTTPHandler.h b/Libs/RemoteIO/vtkHTTPHandler.h index fad0bc2dcc7abf26f8a07867d5c3742142e3e15b..556ac20a448dea5471af6eaa3002d9f1f8e96e20 100644 --- a/Libs/RemoteIO/vtkHTTPHandler.h +++ b/Libs/RemoteIO/vtkHTTPHandler.h @@ -19,11 +19,11 @@ public: /// The Usual vtk class functions static vtkHTTPHandler *New(); vtkTypeMacro(vtkHTTPHandler, vtkURIHandler); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// This methods returns 1 if the handler matches the uri's required /// protocol and returns 0 if it's not appropriate for the uri. - virtual int CanHandleURI ( const char *uri ) VTK_OVERRIDE; + int CanHandleURI ( const char *uri ) override; /// Some web servers don't handle 'keep alive' socket transactions /// in a way that's compatible with curl on windows. When this flag is set @@ -33,16 +33,16 @@ public: int GetForbidReuse(); /// This function wraps curl functionality to download a specified URL to a specified dir - virtual void StageFileRead(const char * source, const char * destination) VTK_OVERRIDE; + void StageFileRead(const char * source, const char * destination) override; using vtkURIHandler::StageFileRead; - virtual void StageFileWrite(const char * source, const char * destination) VTK_OVERRIDE; + void StageFileWrite(const char * source, const char * destination) override; using vtkURIHandler::StageFileWrite; - virtual void InitTransfer () VTK_OVERRIDE; - virtual int CloseTransfer () VTK_OVERRIDE; + void InitTransfer () override; + int CloseTransfer () override; protected: vtkHTTPHandler(); - virtual ~vtkHTTPHandler(); + ~vtkHTTPHandler() override; vtkHTTPHandler(const vtkHTTPHandler&); void operator=(const vtkHTTPHandler&); diff --git a/Libs/vtkAddon/Testing/vtkLoggingMacrosTest1.cxx b/Libs/vtkAddon/Testing/vtkLoggingMacrosTest1.cxx index be53756438558ecade0ab48479b0318b5dfc3e9a..677092b5ceb420a099d94d99824a77bb3842c210 100644 --- a/Libs/vtkAddon/Testing/vtkLoggingMacrosTest1.cxx +++ b/Libs/vtkAddon/Testing/vtkLoggingMacrosTest1.cxx @@ -43,7 +43,7 @@ public: } protected: vtkLoggingMacroTester() {}; - ~vtkLoggingMacroTester() {}; + ~vtkLoggingMacroTester() override {}; vtkLoggingMacroTester(const vtkLoggingMacroTester&); void operator=(const vtkLoggingMacroTester&); }; diff --git a/Libs/vtkAddon/vtkAddonMathUtilities.h b/Libs/vtkAddon/vtkAddonMathUtilities.h index d89906565f6908261155715f6b4d849e48ba1e07..cbe461d56e618a97a960b03847274b22851f4fec 100644 --- a/Libs/vtkAddon/vtkAddonMathUtilities.h +++ b/Libs/vtkAddon/vtkAddonMathUtilities.h @@ -31,7 +31,7 @@ class VTK_ADDON_EXPORT vtkAddonMathUtilities : public vtkObject public: static vtkAddonMathUtilities *New(); vtkTypeMacro(vtkAddonMathUtilities,vtkObject); - virtual void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; static bool MatrixAreEqual(const vtkMatrix4x4* m1, const vtkMatrix4x4* m2, @@ -77,7 +77,7 @@ public: protected: vtkAddonMathUtilities(); - ~vtkAddonMathUtilities(); + ~vtkAddonMathUtilities() override; private: vtkAddonMathUtilities(const vtkAddonMathUtilities&); // Not implemented. diff --git a/Libs/vtkAddon/vtkOpenGLShaderComputation.h b/Libs/vtkAddon/vtkOpenGLShaderComputation.h index 36baa67906474fcb93cd462918203df7e9ede9c1..3213811ef047ae84619d2c701d5a665f8512325c 100644 --- a/Libs/vtkAddon/vtkOpenGLShaderComputation.h +++ b/Libs/vtkAddon/vtkOpenGLShaderComputation.h @@ -37,7 +37,7 @@ protected: public: static vtkOpenGLShaderComputation *New(); vtkTypeMacro(vtkOpenGLShaderComputation,vtkObject); - virtual void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; // Description: // Loads the required extensions @@ -110,7 +110,7 @@ public: protected: vtkOpenGLShaderComputation(); - ~vtkOpenGLShaderComputation(); + ~vtkOpenGLShaderComputation() override; private: vtkOpenGLShaderComputation(const vtkOpenGLShaderComputation&); // Not implemented. diff --git a/Libs/vtkAddon/vtkOpenGLTextureImage.h b/Libs/vtkAddon/vtkOpenGLTextureImage.h index 206fcc3659f93b4b2916ac17629dbbda893b3ad1..fa77422e7004bdd36314502eb9d42b8678d0b25b 100644 --- a/Libs/vtkAddon/vtkOpenGLTextureImage.h +++ b/Libs/vtkAddon/vtkOpenGLTextureImage.h @@ -62,7 +62,7 @@ protected: public: static vtkOpenGLTextureImage *New(); vtkTypeMacro(vtkOpenGLTextureImage,vtkObject); - virtual void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; // Description: // The ShaderComputation used to manage the OpenGL context and shaders @@ -149,7 +149,7 @@ public: protected: vtkOpenGLTextureImage(); - ~vtkOpenGLTextureImage(); + ~vtkOpenGLTextureImage() override; private: vtkOpenGLTextureImage(const vtkOpenGLTextureImage&); // Not implemented. diff --git a/Libs/vtkAddon/vtkOrientedBSplineTransform.h b/Libs/vtkAddon/vtkOrientedBSplineTransform.h index 263fafd786e2487ecf663d72e9aaab977832f73a..dd104a8e9206538457a049b5aaf71a74e99d9bb4 100644 --- a/Libs/vtkAddon/vtkOrientedBSplineTransform.h +++ b/Libs/vtkAddon/vtkOrientedBSplineTransform.h @@ -36,11 +36,11 @@ class VTK_ADDON_EXPORT vtkOrientedBSplineTransform : public vtkBSplineTransform public: static vtkOrientedBSplineTransform *New(); vtkTypeMacro(vtkOrientedBSplineTransform,vtkBSplineTransform); - virtual void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; // Description: // Make another transform of the same type. - vtkAbstractTransform *MakeTransform() VTK_OVERRIDE; + vtkAbstractTransform *MakeTransform() override; // Description: // Set/Get the b-spline grid axis directions. @@ -58,27 +58,27 @@ public: protected: vtkOrientedBSplineTransform(); - ~vtkOrientedBSplineTransform(); + ~vtkOrientedBSplineTransform() override; // Description: // Update the displacement grid. - void InternalUpdate() VTK_OVERRIDE; + void InternalUpdate() override; // Description: // Copy this transform from another of the same type. - void InternalDeepCopy(vtkAbstractTransform *transform) VTK_OVERRIDE; + void InternalDeepCopy(vtkAbstractTransform *transform) override; // Description: // Internal functions for calculating the transformation. - void ForwardTransformPoint(const double in[3], double out[3]) VTK_OVERRIDE; + void ForwardTransformPoint(const double in[3], double out[3]) override; using Superclass::ForwardTransformPoint; // Inherit the float version from parent void ForwardTransformDerivative(const double in[3], double out[3], - double derivative[3][3]) VTK_OVERRIDE; + double derivative[3][3]) override; using Superclass::ForwardTransformDerivative; // Inherit the float version from parent void InverseTransformDerivative(const double in[3], double out[3], - double derivative[3][3]) VTK_OVERRIDE; + double derivative[3][3]) override; using Superclass::InverseTransformDerivative; // Inherit the float version from parent // Description: diff --git a/Libs/vtkAddon/vtkOrientedGridTransform.h b/Libs/vtkAddon/vtkOrientedGridTransform.h index f4612cb1f483882a2b309758c427c31d5b5098a2..42e5ceeb33704cde0ad81f5eaee3b1a6370a218f 100644 --- a/Libs/vtkAddon/vtkOrientedGridTransform.h +++ b/Libs/vtkAddon/vtkOrientedGridTransform.h @@ -26,7 +26,7 @@ class VTK_ADDON_EXPORT vtkOrientedGridTransform : public vtkGridTransform public: static vtkOrientedGridTransform *New(); vtkTypeMacro(vtkOrientedGridTransform,vtkGridTransform); - virtual void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; // Description: // Set/Get the b-spline grid axis directions. @@ -38,7 +38,7 @@ public: // Description: // Make another transform of the same type. - vtkAbstractTransform *MakeTransform() VTK_OVERRIDE; + vtkAbstractTransform *MakeTransform() override; /// List of custom events fired by the class. // ConvergenceFailureEvent is invoked when the gradient cannot be @@ -50,15 +50,15 @@ public: protected: vtkOrientedGridTransform(); - ~vtkOrientedGridTransform(); + ~vtkOrientedGridTransform() override; // Description: // Update the displacement grid. - void InternalUpdate() VTK_OVERRIDE; + void InternalUpdate() override; // Description: // Copy this transform from another of the same type. - void InternalDeepCopy(vtkAbstractTransform *transform) VTK_OVERRIDE; + void InternalDeepCopy(vtkAbstractTransform *transform) override; // Avoid hiding overloads from base class... these will include the float // overloads that forward to the double overloads (hence no need to override @@ -69,13 +69,13 @@ protected: // Description: // Internal functions for calculating the transformation. - void ForwardTransformPoint(const double in[3], double out[3]) VTK_OVERRIDE; + void ForwardTransformPoint(const double in[3], double out[3]) override; void ForwardTransformDerivative(const double in[3], double out[3], - double derivative[3][3]) VTK_OVERRIDE; + double derivative[3][3]) override; void InverseTransformDerivative(const double in[3], double out[3], - double derivative[3][3]) VTK_OVERRIDE; + double derivative[3][3]) override; // Description: // Grid axis direction vectors (i, j, k) in the output space diff --git a/Libs/vtkAddon/vtkPersonInformation.h b/Libs/vtkAddon/vtkPersonInformation.h index ccd9237c3b8cb13a79a0dcb796ba12c6e3925a0f..2be86ab27422c8b178f30554111de82711bbad46 100644 --- a/Libs/vtkAddon/vtkPersonInformation.h +++ b/Libs/vtkAddon/vtkPersonInformation.h @@ -26,7 +26,7 @@ class VTK_ADDON_EXPORT vtkPersonInformation : public vtkObject public: static vtkPersonInformation *New(); vtkTypeMacro(vtkPersonInformation,vtkObject); - virtual void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; // Description: // Set/Get username. @@ -92,7 +92,7 @@ public: protected: vtkPersonInformation(); - ~vtkPersonInformation(); + ~vtkPersonInformation() override; std::string EncodeString(const std::string& value); std::string DecodeString(const std::string& value); diff --git a/Libs/vtkAddon/vtkRawRGBVolumeCodec.h b/Libs/vtkAddon/vtkRawRGBVolumeCodec.h index 415d9c145c7018de08838b6ec3586274901e6f8e..50ec8bc7d3a7d1d686b37ccfdfeb86cb11346cb7 100644 --- a/Libs/vtkAddon/vtkRawRGBVolumeCodec.h +++ b/Libs/vtkAddon/vtkRawRGBVolumeCodec.h @@ -29,31 +29,31 @@ class VTK_ADDON_EXPORT vtkRawRGBVolumeCodec : public vtkStreamingVolumeCodec { public: static vtkRawRGBVolumeCodec *New(); - virtual vtkStreamingVolumeCodec* CreateCodecInstance() VTK_OVERRIDE; + vtkStreamingVolumeCodec* CreateCodecInstance() override; vtkTypeMacro(vtkRawRGBVolumeCodec, vtkStreamingVolumeCodec); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; // FourCC code representing 24-bit RGB using 8 bits per color - virtual std::string GetFourCC() VTK_OVERRIDE { return "RV24"; }; + std::string GetFourCC() override { return "RV24"; }; protected: vtkRawRGBVolumeCodec(); - ~vtkRawRGBVolumeCodec(); + ~vtkRawRGBVolumeCodec() override; /// Decode the compressed frame to an image - virtual bool DecodeFrameInternal(vtkStreamingVolumeFrame* inputFrame, vtkImageData* outputImageData, bool saveDecodedImage = true) VTK_OVERRIDE; + bool DecodeFrameInternal(vtkStreamingVolumeFrame* inputFrame, vtkImageData* outputImageData, bool saveDecodedImage = true) override; /// Encode the image to a compressed frame - virtual bool EncodeImageDataInternal(vtkImageData* outputImageData, vtkStreamingVolumeFrame* inputFrame, bool forceKeyFrame) VTK_OVERRIDE; + bool EncodeImageDataInternal(vtkImageData* outputImageData, vtkStreamingVolumeFrame* inputFrame, bool forceKeyFrame) override; /// Update the codec parameters /// There are no parameters to update within this codec - virtual bool UpdateParameterInternal(std::string vtkNotUsed(parameterValue), std::string vtkNotUsed(parameterName)) VTK_OVERRIDE { return false; }; + bool UpdateParameterInternal(std::string vtkNotUsed(parameterValue), std::string vtkNotUsed(parameterName)) override { return false; }; /// Return the codec parameter description /// There are no parameters to update within this codec - virtual std::string GetParameterDescription(std::string vtkNotUsed(parameterName)) { return ""; }; + std::string GetParameterDescription(std::string vtkNotUsed(parameterName)) override { return ""; }; private: vtkRawRGBVolumeCodec(const vtkRawRGBVolumeCodec&); diff --git a/Libs/vtkAddon/vtkStreamingVolumeCodec.h b/Libs/vtkAddon/vtkStreamingVolumeCodec.h index b5226ad46440221d50ca9ccf02ad8c88f2a1c6a3..cf18ea6d18f4219d2467285ef9a44fd831867543 100644 --- a/Libs/vtkAddon/vtkStreamingVolumeCodec.h +++ b/Libs/vtkAddon/vtkStreamingVolumeCodec.h @@ -48,7 +48,7 @@ class VTK_ADDON_EXPORT vtkStreamingVolumeCodec : public vtkObject { public: vtkTypeMacro(vtkStreamingVolumeCodec, vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Returns the FourCC code representing the codec /// See https://www.fourcc.org/codecs.php for an incomplete list @@ -176,7 +176,7 @@ protected: protected: vtkStreamingVolumeCodec(); - ~vtkStreamingVolumeCodec(); + ~vtkStreamingVolumeCodec() override; private: vtkStreamingVolumeCodec(const vtkStreamingVolumeCodec&); diff --git a/Libs/vtkAddon/vtkStreamingVolumeCodecFactory.h b/Libs/vtkAddon/vtkStreamingVolumeCodecFactory.h index bfbbacfced7dc9b38f4a0d1115b5d5ef6e4ec294..de5bde1d2df3a252aec7374bb5b5928a7ee2dd9e 100644 --- a/Libs/vtkAddon/vtkStreamingVolumeCodecFactory.h +++ b/Libs/vtkAddon/vtkStreamingVolumeCodecFactory.h @@ -42,7 +42,7 @@ class VTK_ADDON_EXPORT vtkStreamingVolumeCodecFactory : public vtkObject public: vtkTypeMacro(vtkStreamingVolumeCodecFactory, vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Registers a new video compression codec /// \param newCodecPointer Function pointer to the codec type new function (e.g. (PointerToCodecBaseNew)&vtkStreamingVolumeCodec::New ) @@ -84,7 +84,7 @@ public: protected: vtkStreamingVolumeCodecFactory(); - ~vtkStreamingVolumeCodecFactory(); + ~vtkStreamingVolumeCodecFactory() override; vtkStreamingVolumeCodecFactory(const vtkStreamingVolumeCodecFactory&); void operator=(const vtkStreamingVolumeCodecFactory&); diff --git a/Libs/vtkAddon/vtkStreamingVolumeFrame.h b/Libs/vtkAddon/vtkStreamingVolumeFrame.h index 68c86e449b4e0716a74e36d3a283114cb8383f48..6d1e62e80c024c6df06f648ec8b4684c4d7d9116 100644 --- a/Libs/vtkAddon/vtkStreamingVolumeFrame.h +++ b/Libs/vtkAddon/vtkStreamingVolumeFrame.h @@ -35,7 +35,7 @@ public: static vtkStreamingVolumeFrame* New(); vtkTypeMacro(vtkStreamingVolumeFrame, vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Enum for frame type /// For more information on frame types see: https://en.wikipedia.org/wiki/Video_compression_picture_types @@ -92,7 +92,7 @@ protected: protected: vtkStreamingVolumeFrame(); - ~vtkStreamingVolumeFrame(); + ~vtkStreamingVolumeFrame() override; private: vtkStreamingVolumeFrame(const vtkStreamingVolumeFrame&); diff --git a/Libs/vtkAddon/vtkTestingOutputWindow.h b/Libs/vtkAddon/vtkTestingOutputWindow.h index ae65cd89615c7d946578ffaa7228ff8f4a4acb6a..74ab7dd89580d5a34fd9f028b546e38c98cb9493 100644 --- a/Libs/vtkAddon/vtkTestingOutputWindow.h +++ b/Libs/vtkAddon/vtkTestingOutputWindow.h @@ -53,13 +53,13 @@ public: // it changes the output window to that. static vtkTestingOutputWindow* GetInstance(); - virtual void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual void DisplayText(const char* text) VTK_OVERRIDE; - virtual void DisplayErrorText(const char* text) VTK_OVERRIDE; - virtual void DisplayWarningText(const char* text) VTK_OVERRIDE; - virtual void DisplayGenericWarningText(const char* text) VTK_OVERRIDE; - virtual void DisplayDebugText(const char* text) VTK_OVERRIDE; + void DisplayText(const char* text) override; + void DisplayErrorText(const char* text) override; + void DisplayWarningText(const char* text) override; + void DisplayGenericWarningText(const char* text) override; + void DisplayDebugText(const char* text) override; // Sets number of warning and error messages to zero virtual void ResetNumberOfLoggedMessages(); @@ -81,7 +81,7 @@ public: protected: vtkTestingOutputWindow(); - virtual ~vtkTestingOutputWindow(); + ~vtkTestingOutputWindow() override; int NumberOfLoggedWarningMessages; int NumberOfLoggedErrorMessages; diff --git a/Libs/vtkITK/itkGrowCutSegmentationImageFilter.h b/Libs/vtkITK/itkGrowCutSegmentationImageFilter.h index da488862412be113a4b1f10a4fe8b79c2d569831..ca761d58a1b6e905111aafffcd94a0ff3a653cad 100644 --- a/Libs/vtkITK/itkGrowCutSegmentationImageFilter.h +++ b/Libs/vtkITK/itkGrowCutSegmentationImageFilter.h @@ -266,21 +266,21 @@ templateConvertPointToNearestIndex( point, index ); @@ -78,8 +78,8 @@ public: * * ImageFunction::IsInsideBuffer() can be used to check bounds before * calling the method. */ - virtual bool EvaluateAtContinuousIndex( - const ContinuousIndexType & index ) const ITK_OVERRIDE + bool EvaluateAtContinuousIndex( + const ContinuousIndexType & index ) const override { IndexType nindex; @@ -95,7 +95,7 @@ public: * * ImageFunction::IsInsideBuffer() can be used to check bounds before * calling the method. */ - virtual bool EvaluateAtIndex( const IndexType & index ) const ITK_OVERRIDE + bool EvaluateAtIndex( const IndexType & index ) const override { // Create an N-d neighborhood kernel, using a zeroflux boundary condition ConstNeighborhoodIterator @@ -151,7 +151,7 @@ protected: m_Threshold = NumericTraits::min(); m_Radius.Fill(1); } - ~LevelTracingImageFunction(){} + ~LevelTracingImageFunction() override{} private: LevelTracingImageFunction( const Self& ); //purposely not implemented diff --git a/Libs/vtkITK/itkMorphologicalContourInterpolator.h b/Libs/vtkITK/itkMorphologicalContourInterpolator.h index 14944f09c17603fcfddd41b8353b3f2c99f4e46b..e983eff736b5724502c247a06cbc7e3656337d15 100644 --- a/Libs/vtkITK/itkMorphologicalContourInterpolator.h +++ b/Libs/vtkITK/itkMorphologicalContourInterpolator.h @@ -237,8 +237,8 @@ protected: ImagesEqual( typename BoolSliceType::Pointer& a, typename BoolSliceType::Pointer& b ); /** Does the real work. */ - virtual void - GenerateData() ITK_OVERRIDE; + void + GenerateData() override; /** Determines correspondances between two slices and calls appropriate methods. */ void @@ -338,8 +338,8 @@ protected: CardSymDifference( typename BoolSliceType::Pointer& shape1, typename BoolSliceType::Pointer& shape2 ); /** Copied from ImageSource and changed to allocate a cleared buffer. */ - virtual void - AllocateOutputs() ITK_OVERRIDE; + void + AllocateOutputs() override; /** Returns the centroid of given regions */ typename SliceType::IndexType diff --git a/Libs/vtkITK/itkMorphologicalContourInterpolator.hxx b/Libs/vtkITK/itkMorphologicalContourInterpolator.hxx index 9ab0dc653e7b01562afdcd7ee74b863bca58be88..2f397628bfded2780c4feffd2368077af98d6926 100644 --- a/Libs/vtkITK/itkMorphologicalContourInterpolator.hxx +++ b/Libs/vtkITK/itkMorphologicalContourInterpolator.hxx @@ -90,7 +90,7 @@ protected: private: virtual void - ThreadedExecution( const DomainType& subDomain, const ThreadIdType threadId ) ITK_OVERRIDE + ThreadedExecution( const DomainType& subDomain, const ThreadIdType threadId ) override { // Look only at the range of cells by the set of indices in the subDomain. for ( itk::IndexValueType ii = subDomain[0]; ii <= subDomain[1] && ii < IndexValueType( m_WorkArray.size() ); ++ii ) diff --git a/Libs/vtkITK/itkNewOtsuThresholdImageCalculator.h b/Libs/vtkITK/itkNewOtsuThresholdImageCalculator.h index ebbdcd38ce4497f817f43bac383e847a2445c6d8..d1f4f665a98702cca853d5736d7cf40427ea72eb 100644 --- a/Libs/vtkITK/itkNewOtsuThresholdImageCalculator.h +++ b/Libs/vtkITK/itkNewOtsuThresholdImageCalculator.h @@ -71,8 +71,8 @@ public: protected: NewOtsuThresholdImageCalculator(); - virtual ~NewOtsuThresholdImageCalculator() {}; - void PrintSelf(std::ostream& os, Indent indent) const ITK_OVERRIDE; + ~NewOtsuThresholdImageCalculator() override {}; + void PrintSelf(std::ostream& os, Indent indent) const override; private: NewOtsuThresholdImageCalculator(const Self&); //purposely not implemented diff --git a/Libs/vtkITK/itkNewOtsuThresholdImageFilter.h b/Libs/vtkITK/itkNewOtsuThresholdImageFilter.h index 127f603aa1d25ecb38d8a02539c9d58d81cfb841..16bf714ff8c5c0b9518f7c3245bd270f14e27f67 100644 --- a/Libs/vtkITK/itkNewOtsuThresholdImageFilter.h +++ b/Libs/vtkITK/itkNewOtsuThresholdImageFilter.h @@ -105,11 +105,11 @@ public: protected: NewOtsuThresholdImageFilter(); - ~NewOtsuThresholdImageFilter(){} - void PrintSelf(std::ostream& os, Indent indent) const ITK_OVERRIDE; + ~NewOtsuThresholdImageFilter() override{} + void PrintSelf(std::ostream& os, Indent indent) const override; - void GenerateInputRequestedRegion() ITK_OVERRIDE; - void GenerateData () ITK_OVERRIDE; + void GenerateInputRequestedRegion() override; + void GenerateData () override; private: NewOtsuThresholdImageFilter(const Self&); //purposely not implemented diff --git a/Libs/vtkITK/itkTimeSeriesDatabase.h b/Libs/vtkITK/itkTimeSeriesDatabase.h index 099912a13bb34e6f3e75fdd8afdaafb45f1fdfb5..f40dcc0178e4f96a6e9b86384b575699ea669c73 100644 --- a/Libs/vtkITK/itkTimeSeriesDatabase.h +++ b/Libs/vtkITK/itkTimeSeriesDatabase.h @@ -85,8 +85,8 @@ public: itkGetMacro ( OutputDirection, typename OutputImageType::DirectionType ); /** Standard method for a ImageSource object */ - virtual void GenerateOutputInformation(void) ITK_OVERRIDE; - virtual void GenerateData(void) ITK_OVERRIDE; + void GenerateOutputInformation(void) override; + void GenerateData(void) override; /** A convenience method for reading a voxel's time course * Subsequent calls to voxels in the immediate region of this will be @@ -104,8 +104,8 @@ public: protected: TimeSeriesDatabase(); - ~TimeSeriesDatabase(); - virtual void PrintSelf(std::ostream& os, Indent indent) const ITK_OVERRIDE; + ~TimeSeriesDatabase() override; + void PrintSelf(std::ostream& os, Indent indent) const override; Array m_Dimensions; Array m_BlocksPerImage; diff --git a/Libs/vtkITK/vtkITKArchetypeDiffusionTensorImageReaderFile.h b/Libs/vtkITK/vtkITKArchetypeDiffusionTensorImageReaderFile.h index 490ba576dea50eb419f94b9fbb2c63a439753517..b113dcaf831c96696cd8de54689a5007bb0e3981 100644 --- a/Libs/vtkITK/vtkITKArchetypeDiffusionTensorImageReaderFile.h +++ b/Libs/vtkITK/vtkITKArchetypeDiffusionTensorImageReaderFile.h @@ -26,13 +26,13 @@ class VTK_ITK_EXPORT vtkITKArchetypeDiffusionTensorImageReaderFile public: static vtkITKArchetypeDiffusionTensorImageReaderFile *New(); vtkTypeMacro(vtkITKArchetypeDiffusionTensorImageReaderFile,vtkITKArchetypeImageSeriesReader); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; protected: vtkITKArchetypeDiffusionTensorImageReaderFile(); - ~vtkITKArchetypeDiffusionTensorImageReaderFile(); + ~vtkITKArchetypeDiffusionTensorImageReaderFile() override; - virtual int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE; + int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override; static void ReadProgressCallback(itk::ProcessObject* obj,const itk::ProgressEvent&, void* data); /// private: }; diff --git a/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h b/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h index dfab8613057ad7d9e61a6287b3825892fcb2b92d..993de2e4072da11b2c48673d2f1fd8d518d195f5 100644 --- a/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h +++ b/Libs/vtkITK/vtkITKArchetypeImageSeriesReader.h @@ -47,7 +47,7 @@ class VTK_ITK_EXPORT vtkITKArchetypeImageSeriesReader : public vtkImageAlgorithm public: static vtkITKArchetypeImageSeriesReader *New(); vtkTypeMacro(vtkITKArchetypeImageSeriesReader,vtkImageAlgorithm); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; typedef itk::SpatialOrientation::ValidCoordinateOrientationFlags CoordinateOrientationCode; @@ -801,7 +801,7 @@ public: protected: vtkITKArchetypeImageSeriesReader(); - ~vtkITKArchetypeImageSeriesReader(); + ~vtkITKArchetypeImageSeriesReader() override; /// Get MetaData from dictionary, removing all whitespaces from the string. static std::string GetMetaDataWithoutSpaces(const itk::MetaDataDictionary &dict, const std::string& tag); @@ -852,7 +852,7 @@ protected: std::vector FileNames; std::vector > FileNameSliceKey; CoordinateOrientationCode DesiredCoordinateOrientation; - virtual int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE; + int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override; itk::MetaDataDictionary Dictionary; diff --git a/Libs/vtkITK/vtkITKArchetypeImageSeriesScalarReader.h b/Libs/vtkITK/vtkITKArchetypeImageSeriesScalarReader.h index 7351fdc343dfc56950313d9505e2e6a3db9decd6..c6231f51c57585ea25230c9e8e2fad9ddcd820fa 100644 --- a/Libs/vtkITK/vtkITKArchetypeImageSeriesScalarReader.h +++ b/Libs/vtkITK/vtkITKArchetypeImageSeriesScalarReader.h @@ -25,13 +25,13 @@ class VTK_ITK_EXPORT vtkITKArchetypeImageSeriesScalarReader : public vtkITKArche static vtkITKArchetypeImageSeriesScalarReader *New(); vtkTypeMacro(vtkITKArchetypeImageSeriesScalarReader,vtkITKArchetypeImageSeriesReader); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; protected: vtkITKArchetypeImageSeriesScalarReader(); - ~vtkITKArchetypeImageSeriesScalarReader(); + ~vtkITKArchetypeImageSeriesScalarReader() override; - int RequestData(vtkInformation* request, vtkInformationVector** inputVector, vtkInformationVector* outputVector) VTK_OVERRIDE; + int RequestData(vtkInformation* request, vtkInformationVector** inputVector, vtkInformationVector* outputVector) override; static void ReadProgressCallback(itk::ProcessObject* obj,const itk::ProgressEvent&, void* data); /// private: }; diff --git a/Libs/vtkITK/vtkITKArchetypeImageSeriesVectorReaderFile.h b/Libs/vtkITK/vtkITKArchetypeImageSeriesVectorReaderFile.h index 1cc26d9d185c40e21b8fe72a24d962fa38e85984..bab2972c7f48847fcb492aea98bab8567189e8e2 100644 --- a/Libs/vtkITK/vtkITKArchetypeImageSeriesVectorReaderFile.h +++ b/Libs/vtkITK/vtkITKArchetypeImageSeriesVectorReaderFile.h @@ -25,13 +25,13 @@ class VTK_ITK_EXPORT vtkITKArchetypeImageSeriesVectorReaderFile : public vtkITKA public: static vtkITKArchetypeImageSeriesVectorReaderFile *New(); vtkTypeMacro(vtkITKArchetypeImageSeriesVectorReaderFile,vtkITKArchetypeImageSeriesReader); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; protected: vtkITKArchetypeImageSeriesVectorReaderFile(); - ~vtkITKArchetypeImageSeriesVectorReaderFile(); + ~vtkITKArchetypeImageSeriesVectorReaderFile() override; - void ExecuteDataWithInformation(vtkDataObject *output, vtkInformation *outInfo) VTK_OVERRIDE; + void ExecuteDataWithInformation(vtkDataObject *output, vtkInformation *outInfo) override; static void ReadProgressCallback(itk::ProcessObject* obj,const itk::ProgressEvent&, void* data); /// private: }; diff --git a/Libs/vtkITK/vtkITKArchetypeImageSeriesVectorReaderSeries.h b/Libs/vtkITK/vtkITKArchetypeImageSeriesVectorReaderSeries.h index 254f0687f741f8ece2d60ea38fcb9fcc09c02278..ec85aeacf38c79b50be8fa2391173dec919fa716 100644 --- a/Libs/vtkITK/vtkITKArchetypeImageSeriesVectorReaderSeries.h +++ b/Libs/vtkITK/vtkITKArchetypeImageSeriesVectorReaderSeries.h @@ -28,16 +28,16 @@ class VTK_ITK_EXPORT vtkITKArchetypeImageSeriesVectorReaderSeries : public vtkIT public: static vtkITKArchetypeImageSeriesVectorReaderSeries *New(); vtkTypeMacro(vtkITKArchetypeImageSeriesVectorReaderSeries,vtkITKArchetypeImageSeriesReader); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; static void ReadProgressCallback(itk::ProcessObject* obj, const itk::ProgressEvent&, void* data); protected: vtkITKArchetypeImageSeriesVectorReaderSeries(); - ~vtkITKArchetypeImageSeriesVectorReaderSeries(); + ~vtkITKArchetypeImageSeriesVectorReaderSeries() override; - void ExecuteDataWithInformation(vtkDataObject *output, vtkInformation *outInfo) VTK_OVERRIDE; + void ExecuteDataWithInformation(vtkDataObject *output, vtkInformation *outInfo) override; }; #endif diff --git a/Libs/vtkITK/vtkITKDistanceTransform.h b/Libs/vtkITK/vtkITKDistanceTransform.h index e4c28afd9f36df27d698b29c4a8494b13bfb5f6c..2d42f6d7786962afc83122a4d885e8e8f4c23937 100644 --- a/Libs/vtkITK/vtkITKDistanceTransform.h +++ b/Libs/vtkITK/vtkITKDistanceTransform.h @@ -19,7 +19,7 @@ class VTK_ITK_EXPORT vtkITKDistanceTransform : public vtkSimpleImageToImageFilte public: static vtkITKDistanceTransform *New(); vtkTypeMacro(vtkITKDistanceTransform, vtkSimpleImageToImageFilter); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Output volume contains square of distance or actual distance vtkGetMacro(SquaredDistance, int); @@ -40,9 +40,9 @@ public: protected: vtkITKDistanceTransform(); - ~vtkITKDistanceTransform(); + ~vtkITKDistanceTransform() override; - virtual void SimpleExecute(vtkImageData* input, vtkImageData* output) VTK_OVERRIDE; + void SimpleExecute(vtkImageData* input, vtkImageData* output) override; int SquaredDistance; int InsideIsPositive; diff --git a/Libs/vtkITK/vtkITKGradientAnisotropicDiffusionImageFilter.h b/Libs/vtkITK/vtkITKGradientAnisotropicDiffusionImageFilter.h index 18c84f16c3448ad43238553052d1add4daae3a4d..0d9b17356035cbcb3bcefa4774a74b992ac56fc0 100644 --- a/Libs/vtkITK/vtkITKGradientAnisotropicDiffusionImageFilter.h +++ b/Libs/vtkITK/vtkITKGradientAnisotropicDiffusionImageFilter.h @@ -60,7 +60,7 @@ class VTK_ITK_EXPORT vtkITKGradientAnisotropicDiffusionImageFilter : public vtkI protected: typedef itk::GradientAnisotropicDiffusionImageFilter ImageFilterType; vtkITKGradientAnisotropicDiffusionImageFilter() : Superclass ( ImageFilterType::New() ){}; - ~vtkITKGradientAnisotropicDiffusionImageFilter() {}; + ~vtkITKGradientAnisotropicDiffusionImageFilter() override {}; ImageFilterType* GetImageFilterPointer() { return dynamic_cast ( m_Filter.GetPointer() ); } diff --git a/Libs/vtkITK/vtkITKGrowCutSegmentationImageFilter.h b/Libs/vtkITK/vtkITKGrowCutSegmentationImageFilter.h index db8e3868295208e9ceb2861af165cb1844e2d192..49704f66a5a813f920860bf854d936eb5fdfdd17 100644 --- a/Libs/vtkITK/vtkITKGrowCutSegmentationImageFilter.h +++ b/Libs/vtkITK/vtkITKGrowCutSegmentationImageFilter.h @@ -30,7 +30,7 @@ public: static vtkITKGrowCutSegmentationImageFilter *New(); vtkTypeMacro(vtkITKGrowCutSegmentationImageFilter,vtkImageAlgorithm ); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Methods to set/get objectSize vtkSetMacro(ObjectSize, double); @@ -52,10 +52,10 @@ public: protected: vtkITKGrowCutSegmentationImageFilter(); - ~vtkITKGrowCutSegmentationImageFilter(){} + ~vtkITKGrowCutSegmentationImageFilter() override{} - virtual void ExecuteDataWithInformation(vtkDataObject *outData, vtkInformation *outInfo) VTK_OVERRIDE; - virtual int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE; + void ExecuteDataWithInformation(vtkDataObject *outData, vtkInformation *outInfo) override; + int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override; private: vtkITKGrowCutSegmentationImageFilter(const vtkITKGrowCutSegmentationImageFilter&); // Not implemented. diff --git a/Libs/vtkITK/vtkITKImageThresholdCalculator.h b/Libs/vtkITK/vtkITKImageThresholdCalculator.h index 01dc1abe5955a52aa00e07bf59e212f09b600473..9c3405655816ab7cff45bb8034e659d471f79c45 100644 --- a/Libs/vtkITK/vtkITKImageThresholdCalculator.h +++ b/Libs/vtkITK/vtkITKImageThresholdCalculator.h @@ -30,7 +30,7 @@ class VTK_ITK_EXPORT vtkITKImageThresholdCalculator : public vtkImageAlgorithm public: static vtkITKImageThresholdCalculator *New(); vtkTypeMacro(vtkITKImageThresholdCalculator,vtkImageAlgorithm); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; vtkGetMacro(Threshold, double); @@ -79,11 +79,11 @@ public: /// to avoid hiding Update override. using vtkAlgorithm::Update; /// The main interface which triggers the writer to start. - virtual void Update() VTK_OVERRIDE; + void Update() override; protected: vtkITKImageThresholdCalculator(); - ~vtkITKImageThresholdCalculator(); + ~vtkITKImageThresholdCalculator() override; int Method; double Threshold; diff --git a/Libs/vtkITK/vtkITKImageToImageFilter.h b/Libs/vtkITK/vtkITKImageToImageFilter.h index 2f4a223cafaf389a881d5a50f2a1418e890b719b..faee94974cb4a5d6ec79077bada3e7985e54c8c8 100644 --- a/Libs/vtkITK/vtkITKImageToImageFilter.h +++ b/Libs/vtkITK/vtkITKImageToImageFilter.h @@ -65,7 +65,7 @@ public: vtkTypeMacro(vtkITKImageToImageFilter, vtkImageAlgorithm); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE + void PrintSelf(ostream& os, vtkIndent indent) override { Superclass::PrintSelf ( os, indent ); this->vtkExporter->PrintSelf ( os, indent ); @@ -75,7 +75,7 @@ public: /// /// This method considers the sub filters MTimes when computing this objects /// modified time. - vtkMTimeType GetMTime() VTK_OVERRIDE + vtkMTimeType GetMTime() override { vtkMTimeType t1, t2; @@ -95,7 +95,7 @@ public: /// /// Pass modified message to itk filter - void Modified() VTK_OVERRIDE + void Modified() override { this->Superclass::Modified(); if (this->m_Process) @@ -106,14 +106,14 @@ public: /// /// Pass DebugOn. - void DebugOn() VTK_OVERRIDE + void DebugOn() override { this->m_Process->DebugOn(); }; /// /// Pass DebugOff. - void DebugOff() VTK_OVERRIDE + void DebugOff() override { this->m_Process->DebugOff(); }; @@ -135,7 +135,7 @@ public: /// /// This method returns the cache to make a connection /// It justs feeds the request to the sub filter. - virtual void SetOutput ( vtkDataObject* d ) VTK_OVERRIDE { this->vtkImporter->SetOutput ( d ); }; + void SetOutput ( vtkDataObject* d ) override { this->vtkImporter->SetOutput ( d ); }; virtual vtkImageData *GetOutput() { return this->vtkImporter->GetOutput(); }; virtual vtkImageData *GetOutput(int idx) { @@ -149,12 +149,12 @@ public: this->vtkCast->SetInputData(Input); }; - virtual void SetInputConnection(vtkAlgorithmOutput* input) VTK_OVERRIDE + void SetInputConnection(vtkAlgorithmOutput* input) override { this->vtkCast->SetInputConnection(input); }; - virtual void SetInputConnection(int port, vtkAlgorithmOutput* input) VTK_OVERRIDE + void SetInputConnection(int port, vtkAlgorithmOutput* input) override { this->vtkCast->SetInputConnection(port, input); }; @@ -169,12 +169,12 @@ public: /// Override vtkSource's Update so that we can access /// this class's GetOutput(). vtkSource's GetOutput is not virtual. using vtkAlgorithm::Update; - virtual void Update() VTK_OVERRIDE + void Update() override { this->vtkCast->Update(); this->vtkImporter->Update(); } - virtual void Update(int port) VTK_OVERRIDE + void Update(int port) override { this->vtkCast->Update(); this->vtkImporter->Update(port); @@ -200,7 +200,7 @@ public: /// BTX /// Dummy ExecuteData - void ExecuteData (vtkDataObject *) VTK_OVERRIDE + void ExecuteData (vtkDataObject *) override { vtkWarningMacro(<< "This filter does not respond to Update(). Doing a GetOutput->Update() instead."); } @@ -221,7 +221,7 @@ public: this->m_EndEventCommand = MemberCommand::New(); this->m_EndEventCommand->SetCallbackFunction ( this, &vtkITKImageToImageFilter::HandleEndEvent ); }; - ~vtkITKImageToImageFilter() + ~vtkITKImageToImageFilter() override { vtkDebugMacro ("Destructing vtkITKImageToImageFilter"); this->vtkExporter->Delete(); diff --git a/Libs/vtkITK/vtkITKImageToImageFilterFF.h b/Libs/vtkITK/vtkITKImageToImageFilterFF.h index b03f514240bb1d8537adc0326db1248899fd8a77..c1105f913b9d275b37637de610a5e292ff2b528e 100644 --- a/Libs/vtkITK/vtkITKImageToImageFilterFF.h +++ b/Libs/vtkITK/vtkITKImageToImageFilterFF.h @@ -27,7 +27,7 @@ class VTK_ITK_EXPORT vtkITKImageToImageFilterFF : public vtkITKImageToImageFilte public: vtkTypeMacro(vtkITKImageToImageFilterFF,vtkITKImageToImageFilter); static vtkITKImageToImageFilterFF* New() { return 0; }; - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE + void PrintSelf(ostream& os, vtkIndent indent) override { Superclass::PrintSelf ( os, indent ); os << m_Filter; @@ -65,7 +65,7 @@ protected: this->vtkCast->SetOutputScalarTypeToFloat(); }; - ~vtkITKImageToImageFilterFF() + ~vtkITKImageToImageFilterFF() override { }; diff --git a/Libs/vtkITK/vtkITKImageToImageFilterSS.h b/Libs/vtkITK/vtkITKImageToImageFilterSS.h index 7d0da5f7abc2b1cf7ad67e59348ac3306f672496..07fe5e624e21f7f5fe6026f28c17b4c4e0cf148e 100644 --- a/Libs/vtkITK/vtkITKImageToImageFilterSS.h +++ b/Libs/vtkITK/vtkITKImageToImageFilterSS.h @@ -27,7 +27,7 @@ class VTK_ITK_EXPORT vtkITKImageToImageFilterSS : public vtkITKImageToImageFilte public: vtkTypeMacro(vtkITKImageToImageFilterSS,vtkITKImageToImageFilter); static vtkITKImageToImageFilterSS* New() { return 0; } - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE + void PrintSelf(ostream& os, vtkIndent indent) override { Superclass::PrintSelf ( os, indent ); os << m_Filter; @@ -36,7 +36,7 @@ public: /// /// Portion of the SetReleaseDataFlag implementation can be /// implemented at this level of the hierarchy. - virtual void SetReleaseDataFlag(int f) VTK_OVERRIDE + void SetReleaseDataFlag(int f) override { Superclass::SetReleaseDataFlag(f); m_Filter->SetReleaseDataFlag(f); @@ -74,7 +74,7 @@ protected: this->vtkCast->SetOutputScalarTypeToShort(); }; - ~vtkITKImageToImageFilterSS() + ~vtkITKImageToImageFilterSS() override { }; diff --git a/Libs/vtkITK/vtkITKImageWriter.h b/Libs/vtkITK/vtkITKImageWriter.h index f32ed9921917b7c3d840522e7dfa468ff96a22bf..4f980088e999e334218bf1f10cf1ce2731c6be4e 100644 --- a/Libs/vtkITK/vtkITKImageWriter.h +++ b/Libs/vtkITK/vtkITKImageWriter.h @@ -30,7 +30,7 @@ class VTK_ITK_EXPORT vtkITKImageWriter : public vtkImageAlgorithm public: static vtkITKImageWriter *New(); vtkTypeMacro(vtkITKImageWriter,vtkImageAlgorithm); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// /// Specify file name for the image file. You should specify either @@ -69,7 +69,7 @@ public: protected: vtkITKImageWriter(); - ~vtkITKImageWriter(); + ~vtkITKImageWriter() override; char *FileName; vtkMatrix4x4* RasToIJKMatrix; diff --git a/Libs/vtkITK/vtkITKIslandMath.h b/Libs/vtkITK/vtkITKIslandMath.h index bc371aea654533bdeea9f16adaf916faf5593423..45ff0a48d3cb88af4873c1721aee0f9752cdb194 100644 --- a/Libs/vtkITK/vtkITKIslandMath.h +++ b/Libs/vtkITK/vtkITKIslandMath.h @@ -22,7 +22,7 @@ class VTK_ITK_EXPORT vtkITKIslandMath : public vtkSimpleImageToImageFilter public: static vtkITKIslandMath *New(); vtkTypeMacro(vtkITKIslandMath, vtkSimpleImageToImageFilter); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// /// If non-zero, islands are defined by pixels that touch on edges and/or vertices. @@ -61,9 +61,9 @@ class VTK_ITK_EXPORT vtkITKIslandMath : public vtkSimpleImageToImageFilter protected: vtkITKIslandMath(); - ~vtkITKIslandMath(); + ~vtkITKIslandMath() override; - virtual void SimpleExecute(vtkImageData* input, vtkImageData* output) VTK_OVERRIDE; + void SimpleExecute(vtkImageData* input, vtkImageData* output) override; int FullyConnected; int SliceBySlice; diff --git a/Libs/vtkITK/vtkITKLevelTracing3DImageFilter.h b/Libs/vtkITK/vtkITKLevelTracing3DImageFilter.h index a50fd6e73ac27850388a928a02c4f78bc9367d9d..2694677713f85e2e8804430d059e8a1b6ccff85f 100644 --- a/Libs/vtkITK/vtkITKLevelTracing3DImageFilter.h +++ b/Libs/vtkITK/vtkITKLevelTracing3DImageFilter.h @@ -21,7 +21,7 @@ class VTK_ITK_EXPORT vtkITKLevelTracing3DImageFilter : public vtkImageAlgorithm public: static vtkITKLevelTracing3DImageFilter *New(); vtkTypeMacro(vtkITKLevelTracing3DImageFilter, vtkImageAlgorithm); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Methods to set/get seeds. Seeds are specified in IJK (not XYZ). vtkSetVector3Macro(Seed, int); @@ -29,11 +29,11 @@ public: protected: vtkITKLevelTracing3DImageFilter(); - ~vtkITKLevelTracing3DImageFilter(); + ~vtkITKLevelTracing3DImageFilter() override; - virtual int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE; - virtual int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE; - virtual int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE; + int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override; + int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override; + int FillInputPortInformation(int port, vtkInformation *info) override; int Seed[3]; diff --git a/Libs/vtkITK/vtkITKLevelTracingImageFilter.h b/Libs/vtkITK/vtkITKLevelTracingImageFilter.h index 224822462dd94c60b5aa456816d95d91fe0a2693..e4ffd986b11c3d65ad826eb5ba5cf73d3b03a718 100644 --- a/Libs/vtkITK/vtkITKLevelTracingImageFilter.h +++ b/Libs/vtkITK/vtkITKLevelTracingImageFilter.h @@ -21,7 +21,7 @@ class VTK_ITK_EXPORT vtkITKLevelTracingImageFilter : public vtkPolyDataAlgorithm public: static vtkITKLevelTracingImageFilter *New(); vtkTypeMacro(vtkITKLevelTracingImageFilter, vtkPolyDataAlgorithm); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Methods to set/get seeds. Seeds are specified in IJK (not XYZ). vtkSetVector3Macro(Seed, int); @@ -37,10 +37,10 @@ public: protected: vtkITKLevelTracingImageFilter(); - ~vtkITKLevelTracingImageFilter(); + ~vtkITKLevelTracingImageFilter() override; - virtual int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE; - virtual int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE; + int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override; + int FillInputPortInformation(int port, vtkInformation *info) override; int Seed[3]; int Plane; diff --git a/Libs/vtkITK/vtkITKMorphologicalContourInterpolator.h b/Libs/vtkITK/vtkITKMorphologicalContourInterpolator.h index c8d910df08544574fd3189962193cc755c2d2d25..7a393077f153db91ec990fda5138c380aebafece 100644 --- a/Libs/vtkITK/vtkITKMorphologicalContourInterpolator.h +++ b/Libs/vtkITK/vtkITKMorphologicalContourInterpolator.h @@ -19,7 +19,7 @@ class VTK_ITK_EXPORT vtkITKMorphologicalContourInterpolator : public vtkSimpleIm public: static vtkITKMorphologicalContourInterpolator *New(); vtkTypeMacro(vtkITKMorphologicalContourInterpolator, vtkSimpleImageToImageFilter); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Interpolate only this label. Interpolates all labels if set to 0 (default). vtkGetMacro(Label, long); @@ -46,9 +46,9 @@ public: protected: vtkITKMorphologicalContourInterpolator(); - ~vtkITKMorphologicalContourInterpolator(); + ~vtkITKMorphologicalContourInterpolator() override; - virtual void SimpleExecute(vtkImageData* input, vtkImageData* output) VTK_OVERRIDE; + void SimpleExecute(vtkImageData* input, vtkImageData* output) override; long Label; int Axis; diff --git a/Libs/vtkITK/vtkITKNewOtsuThresholdImageFilter.h b/Libs/vtkITK/vtkITKNewOtsuThresholdImageFilter.h index c5a4e041565771af5cf97aa669fea24197add0f5..ab41f3b99a910c239a0146d136922c96d5827520 100644 --- a/Libs/vtkITK/vtkITKNewOtsuThresholdImageFilter.h +++ b/Libs/vtkITK/vtkITKNewOtsuThresholdImageFilter.h @@ -70,7 +70,7 @@ public: protected: typedef itk::NewOtsuThresholdImageFilter ImageFilterType; vtkITKNewOtsuThresholdImageFilter() : Superclass ( ImageFilterType::New() ){}; - ~vtkITKNewOtsuThresholdImageFilter() {}; + ~vtkITKNewOtsuThresholdImageFilter() override {}; ImageFilterType* GetImageFilterPointer() { return dynamic_cast ( m_Filter.GetPointer() ); } private: diff --git a/Libs/vtkITK/vtkITKTimeSeriesDatabase.h b/Libs/vtkITK/vtkITKTimeSeriesDatabase.h index bff79db489cb93e36b2d54bca8e70a6f61f5834a..68bab07dc6f84f2019fba640f2f9277d24e880b3 100644 --- a/Libs/vtkITK/vtkITKTimeSeriesDatabase.h +++ b/Libs/vtkITK/vtkITKTimeSeriesDatabase.h @@ -43,7 +43,7 @@ class VTK_ITK_EXPORT vtkITKTimeSeriesDatabase : public vtkImageAlgorithm public: /// vtkStandardNewMacro ( vtkITKTimeSeriesDatabase ); static vtkITKTimeSeriesDatabase *New(); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE{ Superclass::PrintSelf(os, indent);} + void PrintSelf(ostream& os, vtkIndent indent) override{ Superclass::PrintSelf(os, indent);} vtkTypeMacro(vtkITKTimeSeriesDatabase,vtkImageAlgorithm); public: @@ -75,7 +75,7 @@ protected: ConnectPipelines ( this->itkExporter, this->vtkImporter ); this->itkExporter->SetInput ( m_Filter->GetOutput() ); }; - ~vtkITKTimeSeriesDatabase() + ~vtkITKTimeSeriesDatabase() override { this->vtkImporter->Delete(); } @@ -90,9 +90,9 @@ protected: ImageExportType::Pointer itkExporter; vtkImageImport* vtkImporter; - virtual int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE; + int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override; /// defined in the subclasses - virtual void ExecuteDataWithInformation(vtkDataObject *output, vtkInformation *outInfo) VTK_OVERRIDE; + void ExecuteDataWithInformation(vtkDataObject *output, vtkInformation *outInfo) override; private: vtkITKTimeSeriesDatabase(const vtkITKTimeSeriesDatabase&); /// Not implemented. diff --git a/Libs/vtkITK/vtkITKWandImageFilter.h b/Libs/vtkITK/vtkITKWandImageFilter.h index a19c4b10ad8cc4dca39683a2cf8fb89be0bcb9e5..c3f5e7f9d4f9effdbb2b7472455d889bb2a5c415 100644 --- a/Libs/vtkITK/vtkITKWandImageFilter.h +++ b/Libs/vtkITK/vtkITKWandImageFilter.h @@ -15,7 +15,7 @@ class VTK_ITK_EXPORT vtkITKWandImageFilter : public vtkSimpleImageToImageFilter public: static vtkITKWandImageFilter *New(); vtkTypeMacro(vtkITKWandImageFilter, vtkSimpleImageToImageFilter); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Methods to set/get seeds. Seeds are specified in IJK (not XYZ). vtkSetVector3Macro(Seed, int); @@ -28,9 +28,9 @@ public: protected: vtkITKWandImageFilter(); - ~vtkITKWandImageFilter(); + ~vtkITKWandImageFilter() override; - virtual void SimpleExecute(vtkImageData* input, vtkImageData* output) VTK_OVERRIDE; + void SimpleExecute(vtkImageData* input, vtkImageData* output) override; int Seed[3]; double DynamicRangePercentage; diff --git a/Libs/vtkSegmentationCore/Testing/vtkSegmentationConverterTest1.cxx b/Libs/vtkSegmentationCore/Testing/vtkSegmentationConverterTest1.cxx index 1897c92963cc7ae25f2d84cc4f81abaab5747556..e93c3c8d600fca382bbf73f28672589c9db59638 100644 --- a/Libs/vtkSegmentationCore/Testing/vtkSegmentationConverterTest1.cxx +++ b/Libs/vtkSegmentationCore/Testing/vtkSegmentationConverterTest1.cxx @@ -52,25 +52,25 @@ class vtkRep##from##ToRep##to##Rule: public vtkSegmentationConverterRule \ public: \ static vtkRep##from##ToRep##to##Rule* New(); \ vtkTypeMacro(vtkRep##from##ToRep##to##Rule, vtkSegmentationConverterRule); \ - virtual vtkSegmentationConverterRule* CreateRuleInstance() VTK_OVERRIDE; \ + virtual vtkSegmentationConverterRule* CreateRuleInstance() override; \ virtual vtkDataObject* ConstructRepresentationObjectByRepresentation( \ - std::string vtkNotUsed(representationName)) VTK_OVERRIDE { return NULL; }; \ + std::string vtkNotUsed(representationName)) override { return NULL; }; \ virtual vtkDataObject* ConstructRepresentationObjectByClass( \ - std::string vtkNotUsed(className)) VTK_OVERRIDE { return NULL; }; \ + std::string vtkNotUsed(className)) override { return NULL; }; \ virtual bool Convert( \ vtkDataObject* vtkNotUsed(sourceRepresentation),\ - vtkDataObject* vtkNotUsed(targetRepresentation)) VTK_OVERRIDE { return true; } \ + vtkDataObject* vtkNotUsed(targetRepresentation)) override { return true; } \ virtual unsigned int GetConversionCost( \ vtkDataObject* sourceRepresentation=NULL, \ - vtkDataObject* targetRepresentation=NULL) VTK_OVERRIDE \ + vtkDataObject* targetRepresentation=NULL) override \ { \ (void)sourceRepresentation; \ (void)targetRepresentation; \ return weight; \ }; \ - virtual const char* GetName() VTK_OVERRIDE { return "Rep " #from " to Rep " #to; } \ - virtual const char* GetSourceRepresentationName() VTK_OVERRIDE { return "Rep" #from ; } \ - virtual const char* GetTargetRepresentationName() VTK_OVERRIDE { return "Rep" #to ; } \ + virtual const char* GetName() override { return "Rep " #from " to Rep " #to; } \ + virtual const char* GetSourceRepresentationName() override { return "Rep" #from ; } \ + virtual const char* GetTargetRepresentationName() override { return "Rep" #to ; } \ }; \ vtkSegmentationConverterRuleNewMacro(vtkRep##from##ToRep##to##Rule); diff --git a/Libs/vtkSegmentationCore/vtkBinaryLabelmapToClosedSurfaceConversionRule.h b/Libs/vtkSegmentationCore/vtkBinaryLabelmapToClosedSurfaceConversionRule.h index 23ab6db333deb80f006c47d4e533ccb56460d074..133ad49fbafd421a60c372d2760ce20f6537d767 100644 --- a/Libs/vtkSegmentationCore/vtkBinaryLabelmapToClosedSurfaceConversionRule.h +++ b/Libs/vtkSegmentationCore/vtkBinaryLabelmapToClosedSurfaceConversionRule.h @@ -46,32 +46,32 @@ public: public: static vtkBinaryLabelmapToClosedSurfaceConversionRule* New(); vtkTypeMacro(vtkBinaryLabelmapToClosedSurfaceConversionRule, vtkSegmentationConverterRule); - virtual vtkSegmentationConverterRule* CreateRuleInstance() VTK_OVERRIDE; + vtkSegmentationConverterRule* CreateRuleInstance() override; /// Constructs representation object from representation name for the supported representation classes /// (typically source and target representation VTK classes, subclasses of vtkDataObject) /// Note: Need to take ownership of the created object! For example using vtkSmartPointer::Take - virtual vtkDataObject* ConstructRepresentationObjectByRepresentation(std::string representationName) VTK_OVERRIDE; + vtkDataObject* ConstructRepresentationObjectByRepresentation(std::string representationName) override; /// Constructs representation object from class name for the supported representation classes /// (typically source and target representation VTK classes, subclasses of vtkDataObject) /// Note: Need to take ownership of the created object! For example using vtkSmartPointer::Take - virtual vtkDataObject* ConstructRepresentationObjectByClass(std::string className) VTK_OVERRIDE; + vtkDataObject* ConstructRepresentationObjectByClass(std::string className) override; /// Update the target representation based on the source representation - virtual bool Convert(vtkDataObject* sourceRepresentation, vtkDataObject* targetRepresentation) VTK_OVERRIDE; + bool Convert(vtkDataObject* sourceRepresentation, vtkDataObject* targetRepresentation) override; /// Get the cost of the conversion. - virtual unsigned int GetConversionCost(vtkDataObject* sourceRepresentation=NULL, vtkDataObject* targetRepresentation=NULL) VTK_OVERRIDE; + unsigned int GetConversionCost(vtkDataObject* sourceRepresentation=NULL, vtkDataObject* targetRepresentation=NULL) override; /// Human-readable name of the converter rule - virtual const char* GetName() VTK_OVERRIDE { return "Binary labelmap to closed surface"; }; + const char* GetName() override { return "Binary labelmap to closed surface"; }; /// Human-readable name of the source representation - virtual const char* GetSourceRepresentationName() VTK_OVERRIDE { return vtkSegmentationConverter::GetSegmentationBinaryLabelmapRepresentationName(); }; + const char* GetSourceRepresentationName() override { return vtkSegmentationConverter::GetSegmentationBinaryLabelmapRepresentationName(); }; /// Human-readable name of the target representation - virtual const char* GetTargetRepresentationName() VTK_OVERRIDE { return vtkSegmentationConverter::GetSegmentationClosedSurfaceRepresentationName(); }; + const char* GetTargetRepresentationName() override { return vtkSegmentationConverter::GetSegmentationClosedSurfaceRepresentationName(); }; protected: /// If input labelmap has non-background border voxels, then those regions remain open in the output closed surface. @@ -80,7 +80,7 @@ protected: protected: vtkBinaryLabelmapToClosedSurfaceConversionRule(); - ~vtkBinaryLabelmapToClosedSurfaceConversionRule(); + ~vtkBinaryLabelmapToClosedSurfaceConversionRule() override; void operator=(const vtkBinaryLabelmapToClosedSurfaceConversionRule&); }; diff --git a/Libs/vtkSegmentationCore/vtkCalculateOversamplingFactor.h b/Libs/vtkSegmentationCore/vtkCalculateOversamplingFactor.h index a20b01b719fc99c65351f3d93efbb592e5f335e1..60a66bde1fd8573cffb89372c9e71b0a9e18be2d 100644 --- a/Libs/vtkSegmentationCore/vtkCalculateOversamplingFactor.h +++ b/Libs/vtkSegmentationCore/vtkCalculateOversamplingFactor.h @@ -43,7 +43,7 @@ class vtkSegmentationCore_EXPORT vtkCalculateOversamplingFactor : public vtkObje public: static vtkCalculateOversamplingFactor *New(); vtkTypeMacro(vtkCalculateOversamplingFactor, vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; public: /// Calculate oversampling factor for the input model and its rasterization reference volume @@ -123,7 +123,7 @@ protected: protected: vtkCalculateOversamplingFactor(); - virtual ~vtkCalculateOversamplingFactor(); + ~vtkCalculateOversamplingFactor() override; private: vtkCalculateOversamplingFactor(const vtkCalculateOversamplingFactor&); // Not implemented diff --git a/Libs/vtkSegmentationCore/vtkClosedSurfaceToBinaryLabelmapConversionRule.h b/Libs/vtkSegmentationCore/vtkClosedSurfaceToBinaryLabelmapConversionRule.h index a9d57bc1cafaa87735eebfba92c493f004190e8d..a5b13c7f4180eafc7444f8d839c04dcf6139e851 100644 --- a/Libs/vtkSegmentationCore/vtkClosedSurfaceToBinaryLabelmapConversionRule.h +++ b/Libs/vtkSegmentationCore/vtkClosedSurfaceToBinaryLabelmapConversionRule.h @@ -47,32 +47,32 @@ public: public: static vtkClosedSurfaceToBinaryLabelmapConversionRule* New(); vtkTypeMacro(vtkClosedSurfaceToBinaryLabelmapConversionRule, vtkSegmentationConverterRule); - virtual vtkSegmentationConverterRule* CreateRuleInstance() VTK_OVERRIDE; + vtkSegmentationConverterRule* CreateRuleInstance() override; /// Constructs representation object from representation name for the supported representation classes /// (typically source and target representation VTK classes, subclasses of vtkDataObject) /// Note: Need to take ownership of the created object! For example using vtkSmartPointer::Take - virtual vtkDataObject* ConstructRepresentationObjectByRepresentation(std::string representationName) VTK_OVERRIDE; + vtkDataObject* ConstructRepresentationObjectByRepresentation(std::string representationName) override; /// Constructs representation object from class name for the supported representation classes /// (typically source and target representation VTK classes, subclasses of vtkDataObject) /// Note: Need to take ownership of the created object! For example using vtkSmartPointer::Take - virtual vtkDataObject* ConstructRepresentationObjectByClass(std::string className) VTK_OVERRIDE; + vtkDataObject* ConstructRepresentationObjectByClass(std::string className) override; /// Update the target representation based on the source representation - virtual bool Convert(vtkDataObject* sourceRepresentation, vtkDataObject* targetRepresentation) VTK_OVERRIDE; + bool Convert(vtkDataObject* sourceRepresentation, vtkDataObject* targetRepresentation) override; /// Get the cost of the conversion. - virtual unsigned int GetConversionCost(vtkDataObject* sourceRepresentation=NULL, vtkDataObject* targetRepresentation=NULL) VTK_OVERRIDE; + unsigned int GetConversionCost(vtkDataObject* sourceRepresentation=NULL, vtkDataObject* targetRepresentation=NULL) override; /// Human-readable name of the converter rule - virtual const char* GetName() VTK_OVERRIDE { return "Closed surface to binary labelmap (simple image stencil)"; }; + const char* GetName() override { return "Closed surface to binary labelmap (simple image stencil)"; }; /// Human-readable name of the source representation - virtual const char* GetSourceRepresentationName() VTK_OVERRIDE { return vtkSegmentationConverter::GetSegmentationClosedSurfaceRepresentationName(); }; + const char* GetSourceRepresentationName() override { return vtkSegmentationConverter::GetSegmentationClosedSurfaceRepresentationName(); }; /// Human-readable name of the target representation - virtual const char* GetTargetRepresentationName() VTK_OVERRIDE { return vtkSegmentationConverter::GetSegmentationBinaryLabelmapRepresentationName(); }; + const char* GetTargetRepresentationName() override { return vtkSegmentationConverter::GetSegmentationBinaryLabelmapRepresentationName(); }; vtkSetMacro(UseOutputImageDataGeometry, bool); @@ -101,7 +101,7 @@ protected: protected: vtkClosedSurfaceToBinaryLabelmapConversionRule(); - ~vtkClosedSurfaceToBinaryLabelmapConversionRule(); + ~vtkClosedSurfaceToBinaryLabelmapConversionRule() override; void operator=(const vtkClosedSurfaceToBinaryLabelmapConversionRule&); }; diff --git a/Libs/vtkSegmentationCore/vtkClosedSurfaceToFractionalLabelmapConversionRule.h b/Libs/vtkSegmentationCore/vtkClosedSurfaceToFractionalLabelmapConversionRule.h index 1b378c2f6ba96dcd41e65bb41bb366c95d944600..5e1f9077a1b8702d84cf9ad07aa036217fc82aa3 100644 --- a/Libs/vtkSegmentationCore/vtkClosedSurfaceToFractionalLabelmapConversionRule.h +++ b/Libs/vtkSegmentationCore/vtkClosedSurfaceToFractionalLabelmapConversionRule.h @@ -46,32 +46,32 @@ class vtkSegmentationCore_EXPORT vtkClosedSurfaceToFractionalLabelmapConversionR public: static vtkClosedSurfaceToFractionalLabelmapConversionRule* New(); vtkTypeMacro(vtkClosedSurfaceToFractionalLabelmapConversionRule, vtkClosedSurfaceToBinaryLabelmapConversionRule); - virtual vtkSegmentationConverterRule* CreateRuleInstance() VTK_OVERRIDE; + vtkSegmentationConverterRule* CreateRuleInstance() override; /// Constructs representation object from representation name for the supported representation classes /// (typically source and target representation VTK classes, subclasses of vtkDataObject) /// Note: Need to take ownership of the created object! For example using vtkSmartPointer::Take - virtual vtkDataObject* ConstructRepresentationObjectByRepresentation(std::string representationName) VTK_OVERRIDE; + vtkDataObject* ConstructRepresentationObjectByRepresentation(std::string representationName) override; /// Constructs representation object from class name for the supported representation classes /// (typically source and target representation VTK classes, subclasses of vtkDataObject) /// Note: Need to take ownership of the created object! For example using vtkSmartPointer::Take - virtual vtkDataObject* ConstructRepresentationObjectByClass(std::string className) VTK_OVERRIDE; + vtkDataObject* ConstructRepresentationObjectByClass(std::string className) override; /// Update the target representation based on the source representation - virtual bool Convert(vtkDataObject* sourceRepresentation, vtkDataObject* targetRepresentation) VTK_OVERRIDE; + bool Convert(vtkDataObject* sourceRepresentation, vtkDataObject* targetRepresentation) override; /// Get the cost of the conversion. - virtual unsigned int GetConversionCost(vtkDataObject* sourceRepresentation=NULL, vtkDataObject* targetRepresentation=NULL) VTK_OVERRIDE; + unsigned int GetConversionCost(vtkDataObject* sourceRepresentation=NULL, vtkDataObject* targetRepresentation=NULL) override; /// Human-readable name of the converter rule - virtual const char* GetName() VTK_OVERRIDE { return "Closed surface to fractional labelmap (simple image stencil)"; }; + const char* GetName() override { return "Closed surface to fractional labelmap (simple image stencil)"; }; /// Human-readable name of the source representation - virtual const char* GetSourceRepresentationName() VTK_OVERRIDE { return vtkSegmentationConverter::GetSegmentationClosedSurfaceRepresentationName(); }; + const char* GetSourceRepresentationName() override { return vtkSegmentationConverter::GetSegmentationClosedSurfaceRepresentationName(); }; /// Human-readable name of the target representation - virtual const char* GetTargetRepresentationName() VTK_OVERRIDE { return vtkSegmentationConverter::GetSegmentationFractionalLabelmapRepresentationName(); }; + const char* GetTargetRepresentationName() override { return vtkSegmentationConverter::GetSegmentationFractionalLabelmapRepresentationName(); }; protected: // Oversampling factor that will be used to calculate the size of the binary labelmap @@ -79,7 +79,7 @@ protected: protected: vtkClosedSurfaceToFractionalLabelmapConversionRule(); - ~vtkClosedSurfaceToFractionalLabelmapConversionRule(); + ~vtkClosedSurfaceToFractionalLabelmapConversionRule() override; void operator=(const vtkClosedSurfaceToFractionalLabelmapConversionRule&); }; diff --git a/Libs/vtkSegmentationCore/vtkFractionalLabelmapToClosedSurfaceConversionRule.h b/Libs/vtkSegmentationCore/vtkFractionalLabelmapToClosedSurfaceConversionRule.h index 2a99c73c3c4acd9ee91dc39cb9a750e2af7ecbc1..9535a2797b9f604cff5997036aa4fa88eb186534 100644 --- a/Libs/vtkSegmentationCore/vtkFractionalLabelmapToClosedSurfaceConversionRule.h +++ b/Libs/vtkSegmentationCore/vtkFractionalLabelmapToClosedSurfaceConversionRule.h @@ -42,32 +42,32 @@ public: public: static vtkFractionalLabelmapToClosedSurfaceConversionRule* New(); vtkTypeMacro(vtkFractionalLabelmapToClosedSurfaceConversionRule, vtkBinaryLabelmapToClosedSurfaceConversionRule); - virtual vtkSegmentationConverterRule* CreateRuleInstance() VTK_OVERRIDE; + vtkSegmentationConverterRule* CreateRuleInstance() override; /// Constructs representation object from representation name for the supported representation classes /// (typically source and target representation VTK classes, subclasses of vtkDataObject) /// Note: Need to take ownership of the created object! For example using vtkSmartPointer::Take - virtual vtkDataObject* ConstructRepresentationObjectByRepresentation(std::string representationName) VTK_OVERRIDE; + vtkDataObject* ConstructRepresentationObjectByRepresentation(std::string representationName) override; /// Constructs representation object from class name for the supported representation classes /// (typically source and target representation VTK classes, subclasses of vtkDataObject) /// Note: Need to take ownership of the created object! For example using vtkSmartPointer::Take - virtual vtkDataObject* ConstructRepresentationObjectByClass(std::string className) VTK_OVERRIDE; + vtkDataObject* ConstructRepresentationObjectByClass(std::string className) override; /// Update the target representation based on the source representation - virtual bool Convert(vtkDataObject* sourceRepresentation, vtkDataObject* targetRepresentation) VTK_OVERRIDE; + bool Convert(vtkDataObject* sourceRepresentation, vtkDataObject* targetRepresentation) override; /// Get the cost of the conversion. - virtual unsigned int GetConversionCost(vtkDataObject* sourceRepresentation=NULL, vtkDataObject* targetRepresentation=NULL) VTK_OVERRIDE; + unsigned int GetConversionCost(vtkDataObject* sourceRepresentation=NULL, vtkDataObject* targetRepresentation=NULL) override; /// Human-readable name of the converter rule - virtual const char* GetName() VTK_OVERRIDE { return "Fractional labelmap to closed surface"; }; + const char* GetName() override { return "Fractional labelmap to closed surface"; }; /// Human-readable name of the source representation - virtual const char* GetSourceRepresentationName() VTK_OVERRIDE { return vtkSegmentationConverter::GetSegmentationFractionalLabelmapRepresentationName(); }; + const char* GetSourceRepresentationName() override { return vtkSegmentationConverter::GetSegmentationFractionalLabelmapRepresentationName(); }; /// Human-readable name of the target representation - virtual const char* GetTargetRepresentationName() VTK_OVERRIDE { return vtkSegmentationConverter::GetSegmentationClosedSurfaceRepresentationName(); }; + const char* GetTargetRepresentationName() override { return vtkSegmentationConverter::GetSegmentationClosedSurfaceRepresentationName(); }; protected: /// This function adds a border around the image that contains the paddingConstant value @@ -77,7 +77,7 @@ protected: protected: vtkFractionalLabelmapToClosedSurfaceConversionRule(); - ~vtkFractionalLabelmapToClosedSurfaceConversionRule(); + ~vtkFractionalLabelmapToClosedSurfaceConversionRule() override; void operator=(const vtkFractionalLabelmapToClosedSurfaceConversionRule&); }; diff --git a/Libs/vtkSegmentationCore/vtkOrientedImageData.h b/Libs/vtkSegmentationCore/vtkOrientedImageData.h index d9943ab7f33d57dab114ba196a3b2a8548f05ffd..ad6e95f6ff05dde56ed2b7ee6af9aacfbf30585c 100644 --- a/Libs/vtkSegmentationCore/vtkOrientedImageData.h +++ b/Libs/vtkSegmentationCore/vtkOrientedImageData.h @@ -38,12 +38,12 @@ class vtkSegmentationCore_EXPORT vtkOrientedImageData : public vtkImageData public: static vtkOrientedImageData *New(); vtkTypeMacro(vtkOrientedImageData,vtkImageData); - virtual void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Shallow copy - virtual void ShallowCopy(vtkDataObject *src) VTK_OVERRIDE; + void ShallowCopy(vtkDataObject *src) override; /// Deep copy - virtual void DeepCopy(vtkDataObject *src) VTK_OVERRIDE; + void DeepCopy(vtkDataObject *src) override; /// Copy orientation information only virtual void CopyDirections(vtkDataObject *src); @@ -76,7 +76,7 @@ public: void SetGeometryFromImageToWorldMatrix(vtkMatrix4x4* mat); /// Compute image bounds (xmin,xmax, ymin,ymax, zmin,zmax). - virtual void ComputeBounds() VTK_OVERRIDE; + void ComputeBounds() override; /// Get the inverse of the geometry matrix void GetWorldToImageMatrix(vtkMatrix4x4* mat); @@ -86,7 +86,7 @@ public: protected: vtkOrientedImageData(); - ~vtkOrientedImageData(); + ~vtkOrientedImageData() override; protected: /// Direction matrix for the image data diff --git a/Libs/vtkSegmentationCore/vtkOrientedImageDataResample.h b/Libs/vtkSegmentationCore/vtkOrientedImageDataResample.h index a2f3d4f2b5b6c77a4890b3cd88fec6bc52e1f1b9..c9064048cc08b647874efc89b837ccfbb2a69d77 100644 --- a/Libs/vtkSegmentationCore/vtkOrientedImageDataResample.h +++ b/Libs/vtkSegmentationCore/vtkOrientedImageDataResample.h @@ -162,7 +162,7 @@ public: protected: vtkOrientedImageDataResample(); - ~vtkOrientedImageDataResample(); + ~vtkOrientedImageDataResample() override; private: vtkOrientedImageDataResample(const vtkOrientedImageDataResample&); // Not implemented. diff --git a/Libs/vtkSegmentationCore/vtkPolyDataToFractionalLabelmapFilter.h b/Libs/vtkSegmentationCore/vtkPolyDataToFractionalLabelmapFilter.h index 0f792d0ee10038deca0df2c909641f9cd41868bc..7e5b3cdf7f4ad8d164f5633de54b5516c811580c 100644 --- a/Libs/vtkSegmentationCore/vtkPolyDataToFractionalLabelmapFilter.h +++ b/Libs/vtkSegmentationCore/vtkPolyDataToFractionalLabelmapFilter.h @@ -86,18 +86,18 @@ public: void GetOutputImageToWorldMatrix(vtkMatrix4x4* imageToWorldMatrix); using Superclass::GetOutputOrigin; - double* GetOutputOrigin() VTK_OVERRIDE; - void GetOutputOrigin(double origin[3]) VTK_OVERRIDE; + double* GetOutputOrigin() override; + void GetOutputOrigin(double origin[3]) override; - void SetOutputOrigin(double origin[3]) VTK_OVERRIDE; - void SetOutputOrigin(double x, double y, double z) VTK_OVERRIDE; + void SetOutputOrigin(double origin[3]) override; + void SetOutputOrigin(double x, double y, double z) override; using Superclass::GetOutputSpacing; - double* GetOutputSpacing() VTK_OVERRIDE; - void GetOutputSpacing(double spacing[3]) VTK_OVERRIDE; + double* GetOutputSpacing() override; + void GetOutputSpacing(double spacing[3]) override; - void SetOutputSpacing(double spacing[3]) VTK_OVERRIDE; - void SetOutputSpacing(double x, double y, double z) VTK_OVERRIDE; + void SetOutputSpacing(double spacing[3]) override; + void SetOutputSpacing(double x, double y, double z) override; /// This method deletes the currently stored cache variables @@ -108,12 +108,12 @@ public: protected: vtkPolyDataToFractionalLabelmapFilter(); - ~vtkPolyDataToFractionalLabelmapFilter(); + ~vtkPolyDataToFractionalLabelmapFilter() override; - virtual int RequestData(vtkInformation *, vtkInformationVector **, - vtkInformationVector *) VTK_OVERRIDE; + int RequestData(vtkInformation *, vtkInformationVector **, + vtkInformationVector *) override; vtkOrientedImageData *AllocateOutputData(vtkDataObject *out, int* updateExt); - virtual int FillOutputPortInformation(int, vtkInformation*) VTK_OVERRIDE; + int FillOutputPortInformation(int, vtkInformation*) override; /// Create a binary image stencil for the closed surface within the current extent /// This method is a modified version of vtkPolyDataToImageStencil::ThreadedExecute diff --git a/Libs/vtkSegmentationCore/vtkSegment.h b/Libs/vtkSegmentationCore/vtkSegment.h index 40b5d9e084c2f3bb92ebed630118bc7b4cd4b01f..2d80c33166a991467aba6439561a98ca128d6dc5 100644 --- a/Libs/vtkSegmentationCore/vtkSegment.h +++ b/Libs/vtkSegmentationCore/vtkSegment.h @@ -53,7 +53,7 @@ public: static vtkSegment* New(); vtkTypeMacro(vtkSegment, vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Set attributes from name/value pairs virtual void ReadXMLAttributes(const char** atts); @@ -126,7 +126,7 @@ public: protected: vtkSegment(); - ~vtkSegment(); + ~vtkSegment() override; void operator=(const vtkSegment&); protected: diff --git a/Libs/vtkSegmentationCore/vtkSegmentation.h b/Libs/vtkSegmentationCore/vtkSegmentation.h index 2692f178911fb0dc93107643901496092b0714a3..6c3b34c837ad9250b416e3a63b7b9621c8bc9b9b 100644 --- a/Libs/vtkSegmentationCore/vtkSegmentation.h +++ b/Libs/vtkSegmentationCore/vtkSegmentation.h @@ -128,7 +128,7 @@ public: public: static vtkSegmentation* New(); vtkTypeMacro(vtkSegmentation, vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Set attributes from name/value pairs virtual void ReadXMLAttributes(const char** atts); @@ -411,7 +411,7 @@ protected: protected: vtkSegmentation(); - ~vtkSegmentation(); + ~vtkSegmentation() override; void operator=(const vtkSegmentation&); protected: diff --git a/Libs/vtkSegmentationCore/vtkSegmentationConverter.h b/Libs/vtkSegmentationCore/vtkSegmentationConverter.h index b534d6b0a91d1a9bea5b9553504a8b3a6910463e..d31d90cb48c7f65466eef46c138242f5dd7700f9 100644 --- a/Libs/vtkSegmentationCore/vtkSegmentationConverter.h +++ b/Libs/vtkSegmentationCore/vtkSegmentationConverter.h @@ -78,7 +78,7 @@ public: public: static vtkSegmentationConverter* New(); vtkTypeMacro(vtkSegmentationConverter, vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Deep copy one converter into another virtual void DeepCopy(vtkSegmentationConverter* aConverter); @@ -169,7 +169,7 @@ protected: protected: vtkSegmentationConverter(); - ~vtkSegmentationConverter(); + ~vtkSegmentationConverter() override; void operator=(const vtkSegmentationConverter&); protected: diff --git a/Libs/vtkSegmentationCore/vtkSegmentationConverterFactory.h b/Libs/vtkSegmentationCore/vtkSegmentationConverterFactory.h index 4b73fcbbd5c6788390446d87ab0b43f4d594781d..b4f9fb2e242b7327b89fea15258fba345e230403 100644 --- a/Libs/vtkSegmentationCore/vtkSegmentationConverterFactory.h +++ b/Libs/vtkSegmentationCore/vtkSegmentationConverterFactory.h @@ -44,7 +44,7 @@ public: typedef std::vector< vtkSmartPointer > RuleListType; vtkTypeMacro(vtkSegmentationConverterFactory, vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Create a copy of all registered converter rules. /// The rule argument is overwritten (any previous content is cleared) with rules @@ -95,7 +95,7 @@ public: protected: vtkSegmentationConverterFactory(); - ~vtkSegmentationConverterFactory(); + ~vtkSegmentationConverterFactory() override; vtkSegmentationConverterFactory(const vtkSegmentationConverterFactory&); void operator=(const vtkSegmentationConverterFactory&); diff --git a/Libs/vtkSegmentationCore/vtkSegmentationConverterRule.h b/Libs/vtkSegmentationCore/vtkSegmentationConverterRule.h index bee2eb7c5b9baa7cb7f5265d26cecb10563efe1b..2bf88a74b2a5d429525793e52e0be3302c005205 100644 --- a/Libs/vtkSegmentationCore/vtkSegmentationConverterRule.h +++ b/Libs/vtkSegmentationCore/vtkSegmentationConverterRule.h @@ -121,7 +121,7 @@ public: protected: vtkSegmentationConverterRule(); - ~vtkSegmentationConverterRule(); + ~vtkSegmentationConverterRule() override; void operator=(const vtkSegmentationConverterRule&); protected: diff --git a/Libs/vtkSegmentationCore/vtkSegmentationHistory.h b/Libs/vtkSegmentationCore/vtkSegmentationHistory.h index 3b04b7645e9a99a4bdae26a11a850f15727fa477..d88c8505a33e5c59cc2196d39e45dc994f35ef7e 100644 --- a/Libs/vtkSegmentationCore/vtkSegmentationHistory.h +++ b/Libs/vtkSegmentationCore/vtkSegmentationHistory.h @@ -42,7 +42,7 @@ class vtkSegmentationCore_EXPORT vtkSegmentationHistory : public vtkObject public: static vtkSegmentationHistory* New(); vtkTypeMacro(vtkSegmentationHistory, vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Selects a segmentation that the states will be stored of. Current state of the segmentation is not stored. /// \param segmentation Segmentation to store. Deletes all stored states of the previously set segmentation. @@ -98,7 +98,7 @@ protected: protected: vtkSegmentationHistory(); - ~vtkSegmentationHistory(); + ~vtkSegmentationHistory() override; void operator=(const vtkSegmentationHistory&); /// Deep copies source segment to destination segment. If the same representation is found in baseline diff --git a/Libs/vtkSegmentationCore/vtkTopologicalHierarchy.h b/Libs/vtkSegmentationCore/vtkTopologicalHierarchy.h index 349b0876ef4db6ecaf6bf40829af7fab06f72691..0ba1787929b29b1bd9456f746f7686c95ce9851e 100644 --- a/Libs/vtkSegmentationCore/vtkTopologicalHierarchy.h +++ b/Libs/vtkSegmentationCore/vtkTopologicalHierarchy.h @@ -46,7 +46,7 @@ public: static vtkTopologicalHierarchy *New(); vtkTypeMacro(vtkTopologicalHierarchy, vtkObject ); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Get output topological hierarchy levels virtual vtkIntArray* GetOutputLevels(); @@ -99,7 +99,7 @@ protected: protected: vtkTopologicalHierarchy(); - ~vtkTopologicalHierarchy(); + ~vtkTopologicalHierarchy() override; private: vtkTopologicalHierarchy(const vtkTopologicalHierarchy&); // Not implemented diff --git a/Libs/vtkTeem/vtkDiffusionTensorGlyph.h b/Libs/vtkTeem/vtkDiffusionTensorGlyph.h index 776ea928d39fad52d86db0950f56d39bbd19108f..911281cd42330c0f8caf6cc8e468043318b7e568 100644 --- a/Libs/vtkTeem/vtkDiffusionTensorGlyph.h +++ b/Libs/vtkTeem/vtkDiffusionTensorGlyph.h @@ -72,7 +72,7 @@ class VTK_Teem_EXPORT vtkDiffusionTensorGlyph : public vtkTensorGlyph { public: vtkTypeMacro(vtkDiffusionTensorGlyph,vtkTensorGlyph); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Description /// Construct object with defaults: @@ -165,13 +165,13 @@ public: /// When determining the modified time of the filter, /// this checks the modified time of the mask input, /// if it exists. - vtkMTimeType GetMTime() VTK_OVERRIDE; + vtkMTimeType GetMTime() override; protected: vtkDiffusionTensorGlyph(); - ~vtkDiffusionTensorGlyph(); + ~vtkDiffusionTensorGlyph() override; - virtual int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE; + int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override; void ColorGlyphsBy(int measure); diff --git a/Libs/vtkTeem/vtkDiffusionTensorMathematics.h b/Libs/vtkTeem/vtkDiffusionTensorMathematics.h index 549534d82b95a6137cb5d14ee67b425aaf8b5dce..47802a33d4d34ad8d06d7484911653bd1a85d126 100644 --- a/Libs/vtkTeem/vtkDiffusionTensorMathematics.h +++ b/Libs/vtkTeem/vtkDiffusionTensorMathematics.h @@ -39,7 +39,7 @@ class VTK_Teem_EXPORT vtkDiffusionTensorMathematics : public vtkThreadedImageAlg public: static vtkDiffusionTensorMathematics *New(); vtkTypeMacro(vtkDiffusionTensorMathematics,vtkThreadedImageAlgorithm); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Operation options. enum @@ -272,7 +272,7 @@ public: protected: vtkDiffusionTensorMathematics(); - ~vtkDiffusionTensorMathematics(); + ~vtkDiffusionTensorMathematics() override; int Operation; /// math operation to perform double ScaleFactor; /// Scale factor for output scalars @@ -285,23 +285,23 @@ protected: vtkMatrix4x4 *TensorRotationMatrix; int FixNegativeEigenvalues; - virtual int RequestInformation (vtkInformation*, + int RequestInformation (vtkInformation*, vtkInformationVector**, - vtkInformationVector*) VTK_OVERRIDE; + vtkInformationVector*) override; - virtual void ThreadedRequestData(vtkInformation *request, + void ThreadedRequestData(vtkInformation *request, vtkInformationVector **inputVector, vtkInformationVector *outputVector, vtkImageData ***inData, vtkImageData **outData, - int extent[6], int threadId) VTK_OVERRIDE; + int extent[6], int threadId) override; - int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE; + int FillInputPortInformation(int port, vtkInformation* info) override; // Reimplemented to delete the tensor array of the output. - virtual int RequestData(vtkInformation* request, + int RequestData(vtkInformation* request, vtkInformationVector** inputVector, - vtkInformationVector* outputVector) VTK_OVERRIDE; + vtkInformationVector* outputVector) override; private: vtkDiffusionTensorMathematics(const vtkDiffusionTensorMathematics&); void operator=(const vtkDiffusionTensorMathematics&); diff --git a/Libs/vtkTeem/vtkImageLabelCombine.h b/Libs/vtkTeem/vtkImageLabelCombine.h index de783128d8bdc480913d1c5b91729e7558c3d5aa..50330d9d783aca2cf1f908b3caab8b7f8f72dfc7 100644 --- a/Libs/vtkTeem/vtkImageLabelCombine.h +++ b/Libs/vtkTeem/vtkImageLabelCombine.h @@ -32,7 +32,7 @@ class VTK_Teem_EXPORT vtkImageLabelCombine : public vtkThreadedImageAlgorithm public: static vtkImageLabelCombine *New(); vtkTypeMacro(vtkImageLabelCombine,vtkThreadedImageAlgorithm); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// /// Set/Get the Operation to perform. @@ -52,22 +52,22 @@ public: protected: vtkImageLabelCombine(); - ~vtkImageLabelCombine() {}; + ~vtkImageLabelCombine() override {}; int OverwriteInput; - virtual int RequestInformation (vtkInformation *, + int RequestInformation (vtkInformation *, vtkInformationVector **, - vtkInformationVector *) VTK_OVERRIDE; + vtkInformationVector *) override; - virtual void ThreadedRequestData(vtkInformation *request, + void ThreadedRequestData(vtkInformation *request, vtkInformationVector **inputVector, vtkInformationVector *outputVector, vtkImageData ***inData, vtkImageData **outData, - int extent[6], int threadId) VTK_OVERRIDE; + int extent[6], int threadId) override; - virtual int FillInputPortInformation(int port, vtkInformation* info) VTK_OVERRIDE; + int FillInputPortInformation(int port, vtkInformation* info) override; private: vtkImageLabelCombine(const vtkImageLabelCombine&); /// Not implemented. diff --git a/Libs/vtkTeem/vtkTeemNRRDReader.h b/Libs/vtkTeem/vtkTeemNRRDReader.h index b870920071839351026b7d907147d6e1d8e0aa7f..5cf9547d2fcb5f77c3ad28b589c0e8b30de3f477 100644 --- a/Libs/vtkTeem/vtkTeemNRRDReader.h +++ b/Libs/vtkTeem/vtkTeemNRRDReader.h @@ -92,21 +92,21 @@ public: /// Get unit for specified axis const char* GetAxisUnit(unsigned int axis); - virtual void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// is the given file name a NRRD file? - virtual int CanReadFile(const char* filename) VTK_OVERRIDE; + int CanReadFile(const char* filename) override; /// /// Valid extentsions - virtual const char* GetFileExtensions() VTK_OVERRIDE + const char* GetFileExtensions() override { return ".nhdr .nrrd"; } /// /// A descriptive name for this format - virtual const char* GetDescriptiveName() VTK_OVERRIDE + const char* GetDescriptiveName() override { return "NRRD - Nearly Raw Raster Data"; } @@ -231,14 +231,14 @@ public: break; } } -virtual vtkImageData * AllocateOutputData(vtkDataObject *out, vtkInformation* outInfo) VTK_OVERRIDE; -virtual void AllocateOutputData(vtkImageData *out, vtkInformation* outInfo, int *uExtent) VTK_OVERRIDE +vtkImageData * AllocateOutputData(vtkDataObject *out, vtkInformation* outInfo) override; +void AllocateOutputData(vtkImageData *out, vtkInformation* outInfo, int *uExtent) override { Superclass::AllocateOutputData(out, outInfo, uExtent); } void AllocatePointData(vtkImageData *out, vtkInformation* outInfo); protected: vtkTeemNRRDReader(); - ~vtkTeemNRRDReader(); + ~vtkTeemNRRDReader() override; static bool GetPointType(Nrrd* nrrdTemp, int& pointDataType, int &numOfComponents); @@ -263,8 +263,8 @@ protected: std::map AxisLabels; std::map AxisUnits; - virtual void ExecuteInformation() VTK_OVERRIDE; - virtual void ExecuteDataWithInformation(vtkDataObject *output, vtkInformation* outInfo) VTK_OVERRIDE; + void ExecuteInformation() override; + void ExecuteDataWithInformation(vtkDataObject *output, vtkInformation* outInfo) override; int tenSpaceDirectionReduce(Nrrd *nout, const Nrrd *nin, double SD[9]); diff --git a/Libs/vtkTeem/vtkTeemNRRDWriter.h b/Libs/vtkTeem/vtkTeemNRRDWriter.h index b732c11ba65907270ae790cd6ab7051be942593b..11284fb29b6e4bec171b44883b66dffb7b125075 100644 --- a/Libs/vtkTeem/vtkTeemNRRDWriter.h +++ b/Libs/vtkTeem/vtkTeemNRRDWriter.h @@ -25,7 +25,7 @@ class VTK_Teem_EXPORT vtkTeemNRRDWriter : public vtkWriter public: vtkTypeMacro(vtkTeemNRRDWriter,vtkWriter); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; static vtkTeemNRRDWriter *New(); @@ -87,13 +87,13 @@ public: protected: vtkTeemNRRDWriter(); - ~vtkTeemNRRDWriter(); + ~vtkTeemNRRDWriter() override; - virtual int FillInputPortInformation(int port, vtkInformation *info) VTK_OVERRIDE; + int FillInputPortInformation(int port, vtkInformation *info) override; /// /// Write method. It is called by vtkWriter::Write(); - void WriteData() VTK_OVERRIDE; + void WriteData() override; /// /// Flag to set to on when a write error occurred diff --git a/Modules/CLI/ACPCTransform/vtkPrincipalAxesAlign.h b/Modules/CLI/ACPCTransform/vtkPrincipalAxesAlign.h index c004709adb9fef9ae9f6f5f3cf3e750d416e949e..b099c323fa747b036666322fddfa0ac08fd31540 100644 --- a/Modules/CLI/ACPCTransform/vtkPrincipalAxesAlign.h +++ b/Modules/CLI/ACPCTransform/vtkPrincipalAxesAlign.h @@ -34,13 +34,13 @@ public: vtkGetVector3Macro(XAxis, double); vtkGetVector3Macro(YAxis, double); vtkGetVector3Macro(ZAxis, double); - virtual int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE; + int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override; - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; protected: vtkPrincipalAxesAlign(); - ~vtkPrincipalAxesAlign(); + ~vtkPrincipalAxesAlign() override; private: vtkPrincipalAxesAlign(vtkPrincipalAxesAlign &); void operator=(const vtkPrincipalAxesAlign &); diff --git a/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkAffineImageToImageRegistrationMethod.h b/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkAffineImageToImageRegistrationMethod.h index 99140a2dffa3ca66d7111354f9248c5ceffb843d..7079454ab653e3d9ba0762f8405c2f5cd3dbc281 100644 --- a/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkAffineImageToImageRegistrationMethod.h +++ b/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkAffineImageToImageRegistrationMethod.h @@ -60,7 +60,7 @@ public: // Superclass Methods // - void GenerateData( void ) ITK_OVERRIDE; + void GenerateData( void ) override; // // Custom Methods @@ -100,7 +100,7 @@ protected: AffineImageToImageRegistrationMethod( void ); virtual ~AffineImageToImageRegistrationMethod( void ); - void PrintSelf( std::ostream & os, Indent indent ) const ITK_OVERRIDE; + void PrintSelf( std::ostream & os, Indent indent ) const override; private: diff --git a/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkAnisotropicSimilarity3DTransform.h b/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkAnisotropicSimilarity3DTransform.h index 3f02cea3aa49b69998c6d91255ac195aada9c86e..3e0f54fdb71c6db1e1f09a1606e52decea755c0c 100644 --- a/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkAnisotropicSimilarity3DTransform.h +++ b/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkAnisotropicSimilarity3DTransform.h @@ -107,15 +107,15 @@ public: * * \sa MatrixOffsetTransformBase::SetMatrix() */ using itk::Rigid3DTransform::SetMatrix; - virtual void SetMatrix(const MatrixType & matrix) ITK_OVERRIDE; + virtual void SetMatrix(const MatrixType & matrix) override; /** Set the transformation from a container of parameters This is typically * used by optimizers. There are 7 parameters. The first three represent the * versor, the next three represent the translation and the last one * represents the scaling factor. */ - void SetParameters( const ParametersType & parameters ) ITK_OVERRIDE; + void SetParameters( const ParametersType & parameters ) override; - virtual const ParametersType & GetParameters(void) const ITK_OVERRIDE; + virtual const ParametersType & GetParameters(void) const override; /** Set/Get the value of the isotropic scaling factor */ void SetScale( ScaleType scale ); @@ -128,7 +128,7 @@ public: * given point or vector, returning the transformed point or * vector. The rank of the Jacobian will also indicate if the * transform is invertible at this point. */ - virtual void ComputeJacobianWithRespectToParameters(const InputPointType & p, JacobianType & jacobian) const ITK_OVERRIDE; + virtual void ComputeJacobianWithRespectToParameters(const InputPointType & p, JacobianType & jacobian) const override; protected: AnisotropicSimilarity3DTransform(const MatrixType & matrix, const OutputVectorType & offset); @@ -138,14 +138,14 @@ protected: { }; - void PrintSelf(std::ostream & os, Indent indent) const ITK_OVERRIDE; + void PrintSelf(std::ostream & os, Indent indent) const override; /** Recomputes the matrix by calling the Superclass::ComputeMatrix() and then * applying the scale factor. */ - void ComputeMatrix() ITK_OVERRIDE; + void ComputeMatrix() override; /** Computes the parameters from an input matrix. */ - void ComputeMatrixParameters() ITK_OVERRIDE; + void ComputeMatrixParameters() override; private: AnisotropicSimilarity3DTransform(const Self &); // purposely not implemented diff --git a/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkAnisotropicSimilarityLandmarkBasedTransformInitializer.h b/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkAnisotropicSimilarityLandmarkBasedTransformInitializer.h index 3b2576a5e27015932346ca047afda4f0a770a20d..862394cb821df83ccac900da8e29ab9c23c247a0 100644 --- a/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkAnisotropicSimilarityLandmarkBasedTransformInitializer.h +++ b/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkAnisotropicSimilarityLandmarkBasedTransformInitializer.h @@ -154,7 +154,7 @@ protected: { } - void PrintSelf(std::ostream & os, Indent indent) const ITK_OVERRIDE; + void PrintSelf(std::ostream & os, Indent indent) const override; // Supported Transform types typedef enum diff --git a/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkBSplineImageToImageRegistrationMethod.h b/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkBSplineImageToImageRegistrationMethod.h index 4857c100c6d7b2b6afc11481d75bc967db91345c..abaf47971be94c70723011537dce101c5a528482 100644 --- a/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkBSplineImageToImageRegistrationMethod.h +++ b/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkBSplineImageToImageRegistrationMethod.h @@ -66,7 +66,7 @@ public: // Methods from Superclass // - virtual void GenerateData( void ) ITK_OVERRIDE; + virtual void GenerateData( void ) override; // // Custom Methods @@ -111,13 +111,13 @@ protected: typedef InterpolateImageFunction InterpolatorType; typedef ImageToImageMetric MetricType; - virtual void Optimize( MetricType * metric, InterpolatorType * interpolator ) ITK_OVERRIDE; + virtual void Optimize( MetricType * metric, InterpolatorType * interpolator ) override; virtual void GradientOptimize( MetricType * metric, InterpolatorType * interpolator ); virtual void MultiResolutionOptimize( MetricType * metric, InterpolatorType * interpolator ); - virtual void PrintSelf( std::ostream & os, Indent indent ) const ITK_OVERRIDE; + virtual void PrintSelf( std::ostream & os, Indent indent ) const override; private: diff --git a/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkBSplineImageToImageRegistrationMethod.txx b/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkBSplineImageToImageRegistrationMethod.txx index bffb59c80715bfb394dfec412cf751e95da9eed3..68a066d95f345e45f0df1d9f8a6b5f0d84b97e6d 100644 --- a/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkBSplineImageToImageRegistrationMethod.txx +++ b/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkBSplineImageToImageRegistrationMethod.txx @@ -53,12 +53,12 @@ public: itkSetMacro(DontShowParameters, bool); itkSetMacro(UpdateInterval, int); - void Execute( Object * caller, const EventObject & event ) ITK_OVERRIDE + void Execute( Object * caller, const EventObject & event ) override { Execute( (const Object *)caller, event ); } - void Execute( const Object * object, const EventObject & event ) ITK_OVERRIDE + void Execute( const Object * object, const EventObject & event ) override { if( typeid( event ) != typeid( IterationEvent ) || object == NULL ) { diff --git a/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkImageRegionMomentsCalculator.h b/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkImageRegionMomentsCalculator.h index c0ce3c10f0a8d6fb7ba78c48141021f6cedb6682..7bcdecbb334f0ea0ee646114f6ea4d93604674e3 100644 --- a/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkImageRegionMomentsCalculator.h +++ b/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkImageRegionMomentsCalculator.h @@ -222,7 +222,7 @@ public: protected: ImageRegionMomentsCalculator(); virtual ~ImageRegionMomentsCalculator(); - void PrintSelf(std::ostream& os, Indent indent) const ITK_OVERRIDE; + void PrintSelf(std::ostream& os, Indent indent) const override; private: ImageRegionMomentsCalculator(const Self &); // purposely not implemented diff --git a/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkImageToImageRegistrationHelper.h b/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkImageToImageRegistrationHelper.h index b960683a5d1fff5724c9b033d35ddf313609c79e..59a33a04fae4b776bec4a00239f67035b6bd2b72 100644 --- a/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkImageToImageRegistrationHelper.h +++ b/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkImageToImageRegistrationHelper.h @@ -428,7 +428,7 @@ protected: void PrintSelfHelper( std::ostream & os, Indent indent, const std::string basename, MetricMethodEnumType metric, InterpolationMethodEnumType interpolation ) const; - void PrintSelf( std::ostream & os, Indent indent ) const ITK_OVERRIDE; + void PrintSelf( std::ostream & os, Indent indent ) const override; private: diff --git a/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkImageToImageRegistrationMethod.h b/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkImageToImageRegistrationMethod.h index e745d579ac92fa8f142c09e095eafd018b3b801b..b62c888a0e06c6e5ee73a35c63ed285432070dfa 100644 --- a/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkImageToImageRegistrationMethod.h +++ b/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkImageToImageRegistrationMethod.h @@ -132,9 +132,9 @@ protected: /** Method that actually computes the registration. This method is intended * to be overloaded by derived classes. Those overload, however, must * invoke this method in the base class. */ - void GenerateData( void ) ITK_OVERRIDE; + void GenerateData( void ) override; - void PrintSelf( std::ostream & os, Indent indent ) const ITK_OVERRIDE; + void PrintSelf( std::ostream & os, Indent indent ) const override; /** Provide derived classes with access to the Transform member variable. */ itkSetObjectMacro( Transform, TransformType ); @@ -142,9 +142,9 @@ protected: itkGetConstObjectMacro( Transform, TransformType ); using Superclass::MakeOutput; - virtual DataObjectPointer MakeOutput( DataObjectPointerArraySizeType idx ) ITK_OVERRIDE; + virtual DataObjectPointer MakeOutput( DataObjectPointerArraySizeType idx ) override; - unsigned long GetMTime( void ) const ITK_OVERRIDE; + unsigned long GetMTime( void ) const override; protected: diff --git a/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkInitialImageToImageRegistrationMethod.h b/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkInitialImageToImageRegistrationMethod.h index bf1e4ca908328243074f1a5066e2fe53e53b63c6..4fee5d041638c14135587a718f3d7c481fe3ec5f 100644 --- a/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkInitialImageToImageRegistrationMethod.h +++ b/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkInitialImageToImageRegistrationMethod.h @@ -105,13 +105,13 @@ protected: InitialImageToImageRegistrationMethod( void ); virtual ~InitialImageToImageRegistrationMethod( void ); - void PrintSelf( std::ostream & os, Indent indent ) const ITK_OVERRIDE; + void PrintSelf( std::ostream & os, Indent indent ) const override; // // Methods from Superclass. Only the GenerateData() method should be // overloaded. The Update() method must not be overloaded. // - void GenerateData() ITK_OVERRIDE; + void GenerateData() override; private: diff --git a/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkOptimizedImageToImageRegistrationMethod.h b/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkOptimizedImageToImageRegistrationMethod.h index 10cc396e311dc83485d9a680e57f10fb05354842..76b08013cdb4ed119facf248c51eb40fa7cb4861 100644 --- a/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkOptimizedImageToImageRegistrationMethod.h +++ b/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkOptimizedImageToImageRegistrationMethod.h @@ -77,7 +77,7 @@ public: // // Methods from Superclass // - virtual void GenerateData( void ) ITK_OVERRIDE; + virtual void GenerateData( void ) override; // // Custom Methods @@ -144,7 +144,7 @@ protected: virtual void Optimize( MetricType * metric, InterpolatorType * interpolator ); - virtual void PrintSelf( std::ostream & os, Indent indent ) const ITK_OVERRIDE; + virtual void PrintSelf( std::ostream & os, Indent indent ) const override; private: diff --git a/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkOptimizedImageToImageRegistrationMethod.txx b/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkOptimizedImageToImageRegistrationMethod.txx index 6f9bc82cce5a5a249c7907c7cf9d39a180e1a2bf..755bab0bb48869d4eac42a7ce841a6b414228be6 100644 --- a/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkOptimizedImageToImageRegistrationMethod.txx +++ b/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkOptimizedImageToImageRegistrationMethod.txx @@ -68,12 +68,12 @@ public: itkSetMacro(DontShowParameters, bool); itkSetMacro(UpdateInterval, int); - void Execute( Object * caller, const EventObject & event ) ITK_OVERRIDE + void Execute( Object * caller, const EventObject & event ) override { Execute( (const Object *)caller, event ); } - void Execute( const Object * object, const EventObject & event ) ITK_OVERRIDE + void Execute( const Object * object, const EventObject & event ) override { if( typeid( event ) != typeid( IterationEvent ) || object == NULL ) { diff --git a/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkRigidImageToImageRegistrationMethod.h b/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkRigidImageToImageRegistrationMethod.h index a8b6fa2c78fab01c6a4a3c316fe1917841f628d1..4b3f9ae982d7053fc5d68846f0de24f0f119e019 100644 --- a/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkRigidImageToImageRegistrationMethod.h +++ b/Modules/CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkRigidImageToImageRegistrationMethod.h @@ -76,7 +76,7 @@ public: // // Superclass Methods // - void GenerateData( void ) ITK_OVERRIDE; + void GenerateData( void ) override; // // Custom Methods @@ -120,7 +120,7 @@ protected: RigidImageToImageRegistrationMethod( void ); virtual ~RigidImageToImageRegistrationMethod( void ); - void PrintSelf( std::ostream & os, Indent indent ) const ITK_OVERRIDE; + void PrintSelf( std::ostream & os, Indent indent ) const override; private: diff --git a/Modules/CLI/N4ITKBiasFieldCorrection/N4ITKBiasFieldCorrection.cxx b/Modules/CLI/N4ITKBiasFieldCorrection/N4ITKBiasFieldCorrection.cxx index 2fecd443fab947064ecbb12003f49f7272f2a54d..bd7ca1b43482752281f35337577d78e25151b274 100644 --- a/Modules/CLI/N4ITKBiasFieldCorrection/N4ITKBiasFieldCorrection.cxx +++ b/Modules/CLI/N4ITKBiasFieldCorrection/N4ITKBiasFieldCorrection.cxx @@ -29,12 +29,12 @@ protected: }; public: - void Execute(itk::Object *caller, const itk::EventObject & event) ITK_OVERRIDE + void Execute(itk::Object *caller, const itk::EventObject & event) override { Execute( (const itk::Object *) caller, event); } - void Execute(const itk::Object * object, const itk::EventObject & event) ITK_OVERRIDE + void Execute(const itk::Object * object, const itk::EventObject & event) override { const TFilter * filter = dynamic_cast( object ); diff --git a/Modules/CLI/ResampleDTIVolume/Testing/itkDifferenceDiffusionTensor3DImageFilter.h b/Modules/CLI/ResampleDTIVolume/Testing/itkDifferenceDiffusionTensor3DImageFilter.h index ecc6e8356dbc5d753188c45482be4d0e97ef97fc..153991ead252637d9c478c28e9f3730f5ede6f3d 100644 --- a/Modules/CLI/ResampleDTIVolume/Testing/itkDifferenceDiffusionTensor3DImageFilter.h +++ b/Modules/CLI/ResampleDTIVolume/Testing/itkDifferenceDiffusionTensor3DImageFilter.h @@ -103,7 +103,7 @@ protected: { } - void PrintSelf(std::ostream& os, Indent indent) const ITK_OVERRIDE; + void PrintSelf(std::ostream& os, Indent indent) const override; /** DifferenceImageFilter can be implemented as a multithreaded * filter. Therefore, this implementation provides a @@ -116,11 +116,11 @@ protected: * * \sa ImageToImageFilter::ThreadedGenerateData(), * ImageToImageFilter::GenerateData() */ - void ThreadedGenerateData(const OutputImageRegionType& threadRegion, ThreadIdType threadId) ITK_OVERRIDE; + void ThreadedGenerateData(const OutputImageRegionType& threadRegion, ThreadIdType threadId) override; - void BeforeThreadedGenerateData() ITK_OVERRIDE; + void BeforeThreadedGenerateData() override; - void AfterThreadedGenerateData() ITK_OVERRIDE; + void AfterThreadedGenerateData() override; InputPixelType ApplyMeasurementFrameToTensor( InputPixelType tensor, const MatrixType & measurementFrame ); diff --git a/Modules/CLI/ResampleDTIVolume/dtiprocessFiles/itkHFieldToDeformationFieldImageFilter.h b/Modules/CLI/ResampleDTIVolume/dtiprocessFiles/itkHFieldToDeformationFieldImageFilter.h index fd9a5e8758fdbc259ca88dc512c5d64bbf3078ce..a3a7842e49a844ed46f2584260818c7ef47d2074 100644 --- a/Modules/CLI/ResampleDTIVolume/dtiprocessFiles/itkHFieldToDeformationFieldImageFilter.h +++ b/Modules/CLI/ResampleDTIVolume/dtiprocessFiles/itkHFieldToDeformationFieldImageFilter.h @@ -68,13 +68,13 @@ public: itkNewMacro(Self); /** Print internal ivars */ - void PrintSelf(std::ostream& os, Indent indent) const ITK_OVERRIDE + void PrintSelf(std::ostream& os, Indent indent) const override { this->Superclass::PrintSelf( os, indent ); } // need to override GenerateData (This should be threaded) - void GenerateData() ITK_OVERRIDE; + void GenerateData() override; OutputPixelType ComputeDisplacement(typename InputImageType::ConstPointer input, typename InputImageType::IndexType ind, @@ -83,7 +83,7 @@ protected: HFieldToDeformationFieldImageFilter() { } - virtual ~HFieldToDeformationFieldImageFilter() + ~HFieldToDeformationFieldImageFilter() override { } private: diff --git a/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DBSplineInterpolateImageFunction.h b/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DBSplineInterpolateImageFunction.h index e3f2ea130018f06b843547df08dfb0b9ea0d1129..798608af100d2fe717fe3ec987c27258743fc428 100644 --- a/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DBSplineInterpolateImageFunction.h +++ b/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DBSplineInterpolateImageFunction.h @@ -48,7 +48,7 @@ public: // /Set the Spline Order, supports 0th - 5th order splines. The default is a 1st order spline. itkSetMacro( SplineOrder, unsigned int ); protected: - void AllocateInterpolator() ITK_OVERRIDE; + void AllocateInterpolator() override; DiffusionTensor3DBSplineInterpolateImageFunction(); unsigned int m_SplineOrder; diff --git a/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DFSAffineTransform.h b/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DFSAffineTransform.h index 89795789ad80bc39bcaccbe868486a878e5228fa..815229de1daa5b42d48a843bae55d0d3ee69ec72 100644 --- a/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DFSAffineTransform.h +++ b/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DFSAffineTransform.h @@ -57,7 +57,7 @@ public: itkTypeMacro(DiffusionTensor3DFSAffineTransform, DiffusionTensor3DAffineTransform); protected: - void PreCompute() ITK_OVERRIDE; + void PreCompute() override; private: MatrixTransformType ComputeMatrixSquareRoot( MatrixTransformType matrix ); diff --git a/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DInterpolateImageFunction.h b/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DInterpolateImageFunction.h index e1eb5b5be037c4600f02adb89b8dbc0296041fc9..64356030f5b3e1cbd65af3ca38971f8c54a23a4b 100644 --- a/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DInterpolateImageFunction.h +++ b/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DInterpolateImageFunction.h @@ -67,7 +67,7 @@ public: * * ImageFunction::IsInsideBuffer() can be used to check bounds before * calling the method. */ - virtual TensorDataType Evaluate( const PointType& point ) const ITK_OVERRIDE + TensorDataType Evaluate( const PointType& point ) const override { ContinuousIndexType index; @@ -85,7 +85,7 @@ public: * * ImageFunction::IsInsideBuffer() can be used to check bounds before * calling the method. */ - virtual TensorDataType EvaluateAtContinuousIndex( const ContinuousIndexType & index ) const ITK_OVERRIDE = 0; + TensorDataType EvaluateAtContinuousIndex( const ContinuousIndexType & index ) const override = 0; /** Interpolate the image at an index position. * @@ -96,7 +96,7 @@ public: * ImageFunction::IsInsideBuffer() can be used to check bounds before * calling the method. */ - virtual TensorDataType EvaluateAtIndex( const IndexType & index ) const ITK_OVERRIDE + TensorDataType EvaluateAtIndex( const IndexType & index ) const override { return this->GetInputImage()->GetPixel( index ); } diff --git a/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DInterpolateImageFunctionReimplementation.h b/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DInterpolateImageFunctionReimplementation.h index f7c0e4ca3ceef1d02103615c8f49b9c573541282..74e3d4e58d036a7d75fffb2a5c10f975838f1b59 100644 --- a/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DInterpolateImageFunctionReimplementation.h +++ b/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DInterpolateImageFunctionReimplementation.h @@ -67,9 +67,9 @@ public: /** Evaluate the interpolated tensor at a position */ // TensorDataType Evaluate( const PointType &point ) ; - TensorDataType EvaluateAtContinuousIndex( const ContinuousIndexType & index ) const ITK_OVERRIDE; + TensorDataType EvaluateAtContinuousIndex( const ContinuousIndexType & index ) const override; - virtual void SetInputImage( const DiffusionImageType *inputImage ) ITK_OVERRIDE; + void SetInputImage( const DiffusionImageType *inputImage ) override; itkSetMacro( NumberOfThreads, int ); protected: diff --git a/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DLinearInterpolateFunction.h b/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DLinearInterpolateFunction.h index 720bb2958f15ea6b220a7503842c3ae163773f02..b2ce5db73d431a1aff1bb0c09290e72eb029cad9 100644 --- a/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DLinearInterpolateFunction.h +++ b/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DLinearInterpolateFunction.h @@ -42,7 +42,7 @@ public: itkNewMacro(Self); protected: - void AllocateInterpolator() ITK_OVERRIDE; + void AllocateInterpolator() override; typename LinearInterpolateImageFunctionType::Pointer linearInterpolator[6]; }; diff --git a/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DMatrix3x3Transform.h b/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DMatrix3x3Transform.h index e4849247b47b158b497c3a0b175602ea6d415662..fcdfaa373d7e7f6c28942547ae89082e8177b499 100644 --- a/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DMatrix3x3Transform.h +++ b/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DMatrix3x3Transform.h @@ -61,7 +61,7 @@ public: void SetCenter( PointType center ); // /Evaluate the position of the transformed tensor in the output image - PointType EvaluateTensorPosition( const PointType & point ) ITK_OVERRIDE; + PointType EvaluateTensorPosition( const PointType & point ) override; // /Set the 3x3 transform matrix virtual void SetMatrix3x3( MatrixTransformType & matrix ); @@ -72,7 +72,7 @@ public: // /Evaluate the transformed tensor virtual TensorDataType EvaluateTransformedTensor( TensorDataType & tensor ); - virtual TensorDataType EvaluateTransformedTensor( TensorDataType & tensor, PointType & outputPosition ) ITK_OVERRIDE; // dummy + TensorDataType EvaluateTransformedTensor( TensorDataType & tensor, PointType & outputPosition ) override; // dummy // output // position; // to be @@ -81,7 +81,7 @@ public: // non-rigid // transforms - virtual typename Transform::Pointer GetTransform() ITK_OVERRIDE; + typename Transform::Pointer GetTransform() override; protected: void ComputeOffset(); diff --git a/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DNearestNeighborInterpolateFunction.h b/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DNearestNeighborInterpolateFunction.h index cbdf92774f54546a4353d78fc50abfbe40ab104c..0e3241aa3449193d1276c427be77e3741b9a23eb 100644 --- a/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DNearestNeighborInterpolateFunction.h +++ b/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DNearestNeighborInterpolateFunction.h @@ -46,7 +46,7 @@ public: itkNewMacro( Self ); // /Evaluate the value of a tensor at a given position // TensorDataType Evaluate( const PointType &point ) ; - TensorDataType EvaluateAtContinuousIndex( const ContinuousIndexType & index ) const ITK_OVERRIDE; + TensorDataType EvaluateAtContinuousIndex( const ContinuousIndexType & index ) const override; protected: }; diff --git a/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DNonRigidTransform.h b/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DNonRigidTransform.h index f3caca88a7dad452c1511074cca997c06b790fa3..4f7a6b0a73c51a3911b20b9e465443177f028f72 100644 --- a/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DNonRigidTransform.h +++ b/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DNonRigidTransform.h @@ -47,13 +47,13 @@ public: itkNewMacro( Self ); // /Set the transform itkSetObjectMacro( Transform, TransformType ); - TransformType::Pointer GetTransform() ITK_OVERRIDE; + TransformType::Pointer GetTransform() override; // /Evaluate the position of the transformed tensor in the output image - PointType EvaluateTensorPosition( const PointType & point ) ITK_OVERRIDE; + PointType EvaluateTensorPosition( const PointType & point ) override; // /Evaluate the transformed tensor - virtual TensorDataType EvaluateTransformedTensor( TensorDataType & tensor, PointType & outputPosition ) ITK_OVERRIDE; + TensorDataType EvaluateTransformedTensor( TensorDataType & tensor, PointType & outputPosition ) override; void SetAffineTransformType(typename AffineTransform::Pointer transform); protected: diff --git a/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DPPDAffineTransform.h b/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DPPDAffineTransform.h index d52c380dcbb44eac7f770bfa01dae98138012c2d..beddb35c9dd88edda17f00fb162911f888c32e63 100644 --- a/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DPPDAffineTransform.h +++ b/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DPPDAffineTransform.h @@ -56,12 +56,12 @@ public: itkNewMacro( Self ); using Superclass::EvaluateTransformedTensor; - virtual TensorDataType EvaluateTransformedTensor( TensorDataType & tensor ) ITK_OVERRIDE; + TensorDataType EvaluateTransformedTensor( TensorDataType & tensor ) override; void SetMatrix( MatrixTransformType & matrix ); protected: - void PreCompute() ITK_OVERRIDE; + void PreCompute() override; InternalMatrixTransformType ComputeMatrixFromAxisAndAngle( VectorType axis, double cosangle ); diff --git a/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DResample.h b/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DResample.h index d0301600cc395c37bdea2ddf2586e6342f041bd4..b3dc1762fdd209474166704156b704e91b831f2f 100644 --- a/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DResample.h +++ b/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DResample.h @@ -75,7 +75,7 @@ public: void SetOutputParametersFromImage( InputImagePointerType Image ); // /Get the time of the last modification of the object - unsigned long GetMTime() const ITK_OVERRIDE; + unsigned long GetMTime() const override; itkSetMacro( DefaultPixelValue, OutputDataType ); itkGetMacro( DefaultPixelValue, OutputDataType ); @@ -93,15 +93,15 @@ public: protected: DiffusionTensor3DResample(); - void ThreadedGenerateData( const OutputImageRegionType & outputRegionForThread, ThreadIdType threadId ) ITK_OVERRIDE; + void ThreadedGenerateData( const OutputImageRegionType & outputRegionForThread, ThreadIdType threadId ) override; - void BeforeThreadedGenerateData() ITK_OVERRIDE; + void BeforeThreadedGenerateData() override; - void GenerateOutputInformation() ITK_OVERRIDE; + void GenerateOutputInformation() override; - void AfterThreadedGenerateData() ITK_OVERRIDE; + void AfterThreadedGenerateData() override; - void GenerateInputRequestedRegion() ITK_OVERRIDE; + void GenerateInputRequestedRegion() override; private: typename InterpolatorType::Pointer m_Interpolator; diff --git a/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DRigidTransform.h b/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DRigidTransform.h index deff3156057af988048637375910ae7cbe535c61..f49864370d7628772d0b3ef0da3af110a44cf37f 100644 --- a/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DRigidTransform.h +++ b/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DRigidTransform.h @@ -52,7 +52,7 @@ public: itkNewMacro( Self ); // /Set the 3x3 rotation matrix - void SetMatrix3x3( MatrixTransformType & matrix ) ITK_OVERRIDE; + void SetMatrix3x3( MatrixTransformType & matrix ) override; void DisablePrecision(); @@ -62,7 +62,7 @@ protected: bool m_PrecisionChecking; double GetDet( MatrixTransformType & matrix ); - void PreCompute() ITK_OVERRIDE; + void PreCompute() override; }; diff --git a/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DWindowedSincInterpolateImageFunction.h b/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DWindowedSincInterpolateImageFunction.h index 1febd237d8be6b7b8969d4af60be9ef5bcaad691..40c8e27f3e0f468662b58b9f91f9d36c06cd9986 100644 --- a/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DWindowedSincInterpolateImageFunction.h +++ b/Modules/CLI/ResampleDTIVolume/itkDiffusionTensor3DWindowedSincInterpolateImageFunction.h @@ -51,7 +51,7 @@ public: itkNewMacro(Self); protected: - void AllocateInterpolator() ITK_OVERRIDE; + void AllocateInterpolator() override; typename WindowedSincInterpolateImageFunctionType::Pointer windowedSincInterpolator[6]; }; diff --git a/Modules/CLI/ResampleDTIVolume/itkSeparateComponentsOfADiffusionTensorImage.h b/Modules/CLI/ResampleDTIVolume/itkSeparateComponentsOfADiffusionTensorImage.h index 7e78a9bbbdf71e7833c2f56d859deb252659c74c..bed2265fc3933ef462c9eff60c0656ef0f28ac16 100644 --- a/Modules/CLI/ResampleDTIVolume/itkSeparateComponentsOfADiffusionTensorImage.h +++ b/Modules/CLI/ResampleDTIVolume/itkSeparateComponentsOfADiffusionTensorImage.h @@ -61,11 +61,11 @@ public: protected: SeparateComponentsOfADiffusionTensorImage(); - void ThreadedGenerateData( const OutputImageRegionType & outputRegionForThread, ThreadIdType threadId ) ITK_OVERRIDE; + void ThreadedGenerateData( const OutputImageRegionType & outputRegionForThread, ThreadIdType threadId ) override; - void GenerateOutputInformation() ITK_OVERRIDE; + void GenerateOutputInformation() override; - void GenerateInputRequestedRegion() ITK_OVERRIDE; + void GenerateInputRequestedRegion() override; private: diff --git a/Modules/CLI/ResampleDTIVolume/itkTransformDeformationFieldFilter.h b/Modules/CLI/ResampleDTIVolume/itkTransformDeformationFieldFilter.h index b267a7a11b98b3d636f8144a0685cdec41ee9d27..e58cc27ae4a6ae9a7219cd729a04f9cafba3a7ec 100644 --- a/Modules/CLI/ResampleDTIVolume/itkTransformDeformationFieldFilter.h +++ b/Modules/CLI/ResampleDTIVolume/itkTransformDeformationFieldFilter.h @@ -55,7 +55,7 @@ public: itkSetObjectMacro( Transform, TransformType ); // /Get the time of the last modification of the object - unsigned long GetMTime() const ITK_OVERRIDE; + unsigned long GetMTime() const override; #ifdef ITK_USE_CONCEPT_CHECKING /** Begin concept checking */ @@ -68,13 +68,13 @@ public: protected: TransformDeformationFieldFilter(); - void ThreadedGenerateData( const OutputImageRegionType & outputRegionForThread, ThreadIdType threadId ) ITK_OVERRIDE; + void ThreadedGenerateData( const OutputImageRegionType & outputRegionForThread, ThreadIdType threadId ) override; - void BeforeThreadedGenerateData() ITK_OVERRIDE; + void BeforeThreadedGenerateData() override; - void GenerateOutputInformation() ITK_OVERRIDE; + void GenerateOutputInformation() override; - void GenerateInputRequestedRegion() ITK_OVERRIDE; + void GenerateInputRequestedRegion() override; private: typename TransformType::Pointer m_Transform; diff --git a/Modules/CLI/ResampleDTIVolume/itkWarpTransform3D.h b/Modules/CLI/ResampleDTIVolume/itkWarpTransform3D.h index 6e2cd80b119cf137ab942f9160af65bad9058ebc..900a0e8e7805f6e19f01657e94086c7cfe98610d 100644 --- a/Modules/CLI/ResampleDTIVolume/itkWarpTransform3D.h +++ b/Modules/CLI/ResampleDTIVolume/itkWarpTransform3D.h @@ -43,26 +43,26 @@ public: /** CreateAnother method will clone the existing instance of this type, * including its internal member variables. */ - virtual::itk::LightObject::Pointer CreateAnother(void) const ITK_OVERRIDE; + virtual::itk::LightObject::Pointer CreateAnother(void) const override; /** Run-time type information (and related methods). */ itkTypeMacro(WarpTransform3D, Transform); - OutputPointType TransformPoint( const InputPointType & inputPoint ) const ITK_OVERRIDE; + OutputPointType TransformPoint( const InputPointType & inputPoint ) const override; virtual void ComputeJacobianWithRespectToParameters(const InputPointType & p, - JacobianType & jacobian ) const ITK_OVERRIDE; + JacobianType & jacobian ) const override; virtual void ComputeJacobianWithRespectToPosition( const InputPointType & itkNotUsed(x), - JacobianType & itkNotUsed(j) ) const ITK_OVERRIDE + JacobianType & itkNotUsed(j) ) const override { itkExceptionMacro("ComputeJacobianWithRespectToPosition is not implemented for WarpTransform3D"); } virtual void ComputeJacobianWithRespectToPosition( const InputPointType & itkNotUsed(x), - JacobianPositionType & itkNotUsed(j) ) const ITK_OVERRIDE + JacobianPositionType & itkNotUsed(j) ) const override { itkExceptionMacro("ComputeJacobianWithRespectToPosition is not implemented for WarpTransform3D"); } @@ -76,20 +76,20 @@ public: using Superclass::TransformVector; /** Method to transform a vector. */ - virtual OutputVectorType TransformVector(const InputVectorType &) const ITK_OVERRIDE + virtual OutputVectorType TransformVector(const InputVectorType &) const override { itkExceptionMacro("TransformVector(const InputVectorType &) is not implemented for WarpTransform3D"); } /** Method to transform a vnl_vector. */ - virtual OutputVnlVectorType TransformVector(const InputVnlVectorType &) const ITK_OVERRIDE + virtual OutputVnlVectorType TransformVector(const InputVnlVectorType &) const override { itkExceptionMacro("TransformVector(const InputVnlVectorType &) is not implemented for WarpTransform3D"); } using Superclass::TransformCovariantVector; /** Method to transform a CovariantVector. */ - virtual OutputCovariantVectorType TransformCovariantVector(const InputCovariantVectorType &) const ITK_OVERRIDE + virtual OutputCovariantVectorType TransformCovariantVector(const InputCovariantVectorType &) const override { itkExceptionMacro( "TransformCovariantVector(const InputCovariantVectorType & is not implemented for WarpTransform3D"); @@ -103,13 +103,13 @@ protected: /**This is a dummy function. This class does not allow to set the * transform parameters through this function. Use * SetDeformationField() to set the transform.*/ - virtual void SetParameters(const ParametersType &) ITK_OVERRIDE + virtual void SetParameters(const ParametersType &) override { } /**This is a dummy function. This class does not allow to set the * transform fixed parameters through this function. Use * SetDeformationField() to set the transform */ - virtual void SetFixedParameters(const ParametersType &) ITK_OVERRIDE + virtual void SetFixedParameters(const ParametersType &) override { } diff --git a/Modules/CLI/RobustStatisticsSegmenter/SFLSRobustStatSegmentor3DLabelMap_single.h b/Modules/CLI/RobustStatisticsSegmenter/SFLSRobustStatSegmentor3DLabelMap_single.h index 136f5990905f62be449abcd6d16fdbfe01e38830..bafe26e1326b2e2396249b9679267d2574198320 100644 --- a/Modules/CLI/RobustStatisticsSegmenter/SFLSRobustStatSegmentor3DLabelMap_single.h +++ b/Modules/CLI/RobustStatisticsSegmenter/SFLSRobustStatSegmentor3DLabelMap_single.h @@ -61,9 +61,9 @@ public: void setInputLabelImage(TLabelImagePointer l); - void doSegmenation(); + void doSegmenation() override; - void computeForce(); + void computeForce() override; void setKernelWidthFactor(double f); diff --git a/Modules/Core/EventBroker/qSlicerEventBrokerModule.h b/Modules/Core/EventBroker/qSlicerEventBrokerModule.h index 1b63f173b69b57252200642574272c28aacb0541..7a8f816cd4855814c5fb6aea266fb5c93a66a246 100644 --- a/Modules/Core/EventBroker/qSlicerEventBrokerModule.h +++ b/Modules/Core/EventBroker/qSlicerEventBrokerModule.h @@ -39,23 +39,23 @@ public: typedef qSlicerCoreModule Superclass; qSlicerEventBrokerModule(QObject *parent=0); - virtual ~qSlicerEventBrokerModule(); + ~qSlicerEventBrokerModule() override; - virtual QStringList categories()const; + QStringList categories()const override; /// Display name for the module qSlicerGetTitleMacro("Event Broker"); - virtual QString helpText()const; - virtual QString acknowledgementText()const; - virtual QStringList contributors()const; + QString helpText()const override; + QString acknowledgementText()const override; + QStringList contributors()const override; protected: /// Create and return the widget representation associated to this module - virtual qSlicerAbstractModuleRepresentation * createWidgetRepresentation(); + qSlicerAbstractModuleRepresentation * createWidgetRepresentation() override; /// Create and return the logic associated to this module - virtual vtkMRMLAbstractLogic* createLogic(); + vtkMRMLAbstractLogic* createLogic() override; QScopedPointer d_ptr; private: diff --git a/Modules/Core/EventBroker/qSlicerEventBrokerModuleWidget.h b/Modules/Core/EventBroker/qSlicerEventBrokerModuleWidget.h index cf51991441004473429a6c212d1d7ba77ec52ec6..b5b8a2022064028adbc3bb4858a493544771b317 100644 --- a/Modules/Core/EventBroker/qSlicerEventBrokerModuleWidget.h +++ b/Modules/Core/EventBroker/qSlicerEventBrokerModuleWidget.h @@ -40,14 +40,14 @@ public: typedef qSlicerAbstractModuleWidget Superclass; qSlicerEventBrokerModuleWidget(QWidget *parent=0); - virtual ~qSlicerEventBrokerModuleWidget(); + ~qSlicerEventBrokerModuleWidget() override; protected slots: void onCurrentObjectChanged(vtkObject* ); protected: QScopedPointer d_ptr; - virtual void setup(); + void setup() override; private: Q_DECLARE_PRIVATE(qSlicerEventBrokerModuleWidget); diff --git a/Modules/Core/Testing/qSlicerCoreModuleTest1.cxx b/Modules/Core/Testing/qSlicerCoreModuleTest1.cxx index 496ea2dc55488c323ec755ad9f83060b6de84a19..0cc655b6ec72fbc9ff8455f66eee4570cc699b57 100644 --- a/Modules/Core/Testing/qSlicerCoreModuleTest1.cxx +++ b/Modules/Core/Testing/qSlicerCoreModuleTest1.cxx @@ -24,15 +24,15 @@ class ACoreModule: public qSlicerCoreModule { public: - virtual QString title()const + QString title()const override { return "A title \n\t#$%^&*"; } - virtual qSlicerAbstractModuleRepresentation* createWidgetRepresentation() + qSlicerAbstractModuleRepresentation* createWidgetRepresentation() override { return 0; } - vtkMRMLAbstractLogic* createLogic() + vtkMRMLAbstractLogic* createLogic() override { return 0; } diff --git a/Modules/Core/qSlicerCoreModule.h b/Modules/Core/qSlicerCoreModule.h index 3a6eff6896a0762b30582aa5d371ff4216cfee3b..80b513d1801cbc8d1ec54d09ce307c88b1cb3f6a 100644 --- a/Modules/Core/qSlicerCoreModule.h +++ b/Modules/Core/qSlicerCoreModule.h @@ -39,10 +39,10 @@ public: typedef qSlicerAbstractModule Superclass; qSlicerCoreModule(QObject *parent=0); - virtual ~qSlicerCoreModule(); + ~qSlicerCoreModule() override; protected: - virtual void setup(); + void setup() override; protected: QScopedPointer d_ptr; diff --git a/Modules/Core/qSlicerCoreModuleFactory.h b/Modules/Core/qSlicerCoreModuleFactory.h index 226212cd94d3ff40c140c957a1ccd7682d997cf0..95ff987ac2599bb5c27d7b1f29a03552df6ccf57 100644 --- a/Modules/Core/qSlicerCoreModuleFactory.h +++ b/Modules/Core/qSlicerCoreModuleFactory.h @@ -38,13 +38,13 @@ public: typedef ctkAbstractQObjectFactory Superclass; qSlicerCoreModuleFactory(); - virtual ~qSlicerCoreModuleFactory(); + ~qSlicerCoreModuleFactory() override; /// - virtual void registerItems(); + void registerItems() override; /// - virtual QString objectNameToKey(const QString& objectName); + QString objectNameToKey(const QString& objectName) override; /// Extract module name given a core module \a className /// For example: diff --git a/Modules/Loadable/Annotations/GUI/qSlicerAnnotationModulePropertyDialog.h b/Modules/Loadable/Annotations/GUI/qSlicerAnnotationModulePropertyDialog.h index 082a52c7896232568394f7a74e6b78bdd12b8fd0..313ae15552ae31265ec3a6e59e4b53e0bacc5a64 100644 --- a/Modules/Loadable/Annotations/GUI/qSlicerAnnotationModulePropertyDialog.h +++ b/Modules/Loadable/Annotations/GUI/qSlicerAnnotationModulePropertyDialog.h @@ -27,7 +27,7 @@ class qSlicerAnnotationModulePropertyDialog : public QDialog public: qSlicerAnnotationModulePropertyDialog(const char * id, vtkSlicerAnnotationModuleLogic* logic); - ~qSlicerAnnotationModulePropertyDialog(); + ~qSlicerAnnotationModulePropertyDialog() override; const char * GetID() { return this->m_id; } diff --git a/Modules/Loadable/Annotations/GUI/qSlicerAnnotationModuleReportDialog.h b/Modules/Loadable/Annotations/GUI/qSlicerAnnotationModuleReportDialog.h index 6a23cc1221fae42d46fcfb7d12ce0297679aab78..04d47379024bb72f7cfc17e44181efbfa6a06f55 100644 --- a/Modules/Loadable/Annotations/GUI/qSlicerAnnotationModuleReportDialog.h +++ b/Modules/Loadable/Annotations/GUI/qSlicerAnnotationModuleReportDialog.h @@ -11,7 +11,7 @@ class qSlicerAnnotationModuleReportDialog : public QDialog Q_OBJECT public: qSlicerAnnotationModuleReportDialog(); - ~qSlicerAnnotationModuleReportDialog(); + ~qSlicerAnnotationModuleReportDialog() override; Ui::qSlicerAnnotationModuleReportDialog getReportDialogUi(); diff --git a/Modules/Loadable/Annotations/GUI/qSlicerAnnotationModuleSnapShotDialog.h b/Modules/Loadable/Annotations/GUI/qSlicerAnnotationModuleSnapShotDialog.h index 4a48eef76599b7ef65e18ac89e5b3fa50df2c7ae..3a4feb8d48946cd8f6afbb25a9e941a97fcb37d6 100644 --- a/Modules/Loadable/Annotations/GUI/qSlicerAnnotationModuleSnapShotDialog.h +++ b/Modules/Loadable/Annotations/GUI/qSlicerAnnotationModuleSnapShotDialog.h @@ -12,7 +12,7 @@ class qSlicerAnnotationModuleSnapShotDialog : public qMRMLScreenShotDialog public: typedef qMRMLScreenShotDialog Superclass; qSlicerAnnotationModuleSnapShotDialog(QWidget* parent = 0); - virtual ~qSlicerAnnotationModuleSnapShotDialog(); + ~qSlicerAnnotationModuleSnapShotDialog() override; /// Set the Annotation module logic. void setLogic(vtkSlicerAnnotationModuleLogic* logic); @@ -22,7 +22,7 @@ public: /// Reset the dialog and give it a unique name. void reset(); - virtual void accept(); + void accept() override; private: vtkSlicerAnnotationModuleLogic* m_Logic; diff --git a/Modules/Loadable/Annotations/Logic/vtkSlicerAnnotationModuleLogic.h b/Modules/Loadable/Annotations/Logic/vtkSlicerAnnotationModuleLogic.h index 9b8235c51337643974f215797f2e2b7f969502cf..ec1937232660c9b54fce16849e766006f10c69e1 100644 --- a/Modules/Loadable/Annotations/Logic/vtkSlicerAnnotationModuleLogic.h +++ b/Modules/Loadable/Annotations/Logic/vtkSlicerAnnotationModuleLogic.h @@ -26,7 +26,7 @@ public: }; static vtkSlicerAnnotationModuleLogic *New(); vtkTypeMacro(vtkSlicerAnnotationModuleLogic,vtkSlicerModuleLogic); - virtual void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Start the place mode for annotations. /// By default, the singleton interaction node is updated. @@ -53,7 +53,7 @@ public: // Annotation Properties (interface to MRML) // /// Register MRML Node classes to Scene. Gets called automatically when the MRMLScene is attached to this logic class. - virtual void RegisterNodes() VTK_OVERRIDE; + void RegisterNodes() override; /// Check if node id corresponds to an annotaton node bool IsAnnotationNode(const char* id); @@ -274,18 +274,18 @@ protected: vtkSlicerAnnotationModuleLogic(); - virtual ~vtkSlicerAnnotationModuleLogic(); + ~vtkSlicerAnnotationModuleLogic() override; // Initialize listening to MRML events - virtual void SetMRMLSceneInternal(vtkMRMLScene * newScene) VTK_OVERRIDE; - virtual void ObserveMRMLScene() VTK_OVERRIDE; + void SetMRMLSceneInternal(vtkMRMLScene * newScene) override; + void ObserveMRMLScene() override; // MRML events - virtual void OnMRMLSceneNodeAdded(vtkMRMLNode* node) VTK_OVERRIDE; - virtual void OnMRMLSceneEndClose() VTK_OVERRIDE; - virtual void ProcessMRMLNodesEvents(vtkObject *caller, + void OnMRMLSceneNodeAdded(vtkMRMLNode* node) override; + void OnMRMLSceneEndClose() override; + void ProcessMRMLNodesEvents(vtkObject *caller, unsigned long event, - void *callData ) VTK_OVERRIDE; + void *callData ) override; virtual void OnMRMLAnnotationNodeModifiedEvent(vtkMRMLNode* node); private: diff --git a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationAngleNode.h b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationAngleNode.h index 387160b6fd677d6607521aff77eddbe7f7cedd59..2deab43b784c2333a5f493c834ba9ae140a98357 100644 --- a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationAngleNode.h +++ b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationAngleNode.h @@ -16,37 +16,37 @@ public: vtkTypeMacro(vtkMRMLAnnotationAngleNode,vtkMRMLAnnotationLinesNode); // Description: // Just prints short summary - virtual void PrintAnnotationInfo(ostream& os, vtkIndent indent, int titleFlag = 1) VTK_OVERRIDE; + void PrintAnnotationInfo(ostream& os, vtkIndent indent, int titleFlag = 1) override; //-------------------------------------------------------------------------- // MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; // Description: // Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "AnnotationAngle";} + const char* GetNodeTagName() override {return "AnnotationAngle";} // Description: // Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; // Description: // Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; // Description: // Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; - void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; // Description: // alternative method to propagate events generated in Display nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; // Legacy code // Description: @@ -124,11 +124,11 @@ public: // Description: // transform utility functions - virtual void ApplyTransform(vtkAbstractTransform* transform) VTK_OVERRIDE; + void ApplyTransform(vtkAbstractTransform* transform) override; // Description: // Create default storage node or NULL if does not have one - virtual vtkMRMLStorageNode* CreateDefaultStorageNode() VTK_OVERRIDE; + vtkMRMLStorageNode* CreateDefaultStorageNode() override; // void Initialize(vtkMRMLScene* mrmlScene); @@ -152,7 +152,7 @@ public: protected: vtkMRMLAnnotationAngleNode(); - ~vtkMRMLAnnotationAngleNode(); + ~vtkMRMLAnnotationAngleNode() override; vtkMRMLAnnotationAngleNode(const vtkMRMLAnnotationAngleNode&); void operator=(const vtkMRMLAnnotationAngleNode&); diff --git a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationAngleStorageNode.h b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationAngleStorageNode.h index 7b9606374043c7d018d0a3d0f3073bdac899f2c4..321ca529e039ca6cee20acc8217dc878543e0d33 100644 --- a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationAngleStorageNode.h +++ b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationAngleStorageNode.h @@ -18,20 +18,20 @@ class VTK_SLICER_ANNOTATIONS_MODULE_MRML_EXPORT vtkMRMLAnnotationAngleStorageNo public: static vtkMRMLAnnotationAngleStorageNode *New(); vtkTypeMacro(vtkMRMLAnnotationAngleStorageNode,vtkMRMLAnnotationLinesStorageNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; // Description: // Get node XML tag name (like Storage, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "AnnotationAngleStorage";} + const char* GetNodeTagName() override {return "AnnotationAngleStorage";} /// Return true if the node can be read in - virtual bool CanReadInReferenceNode(vtkMRMLNode *refNode) VTK_OVERRIDE; + bool CanReadInReferenceNode(vtkMRMLNode *refNode) override; protected: vtkMRMLAnnotationAngleStorageNode(); - ~vtkMRMLAnnotationAngleStorageNode(); + ~vtkMRMLAnnotationAngleStorageNode() override; vtkMRMLAnnotationAngleStorageNode(const vtkMRMLAnnotationAngleStorageNode&); void operator=(const vtkMRMLAnnotationAngleStorageNode&); @@ -47,10 +47,10 @@ protected: int ReadAnnotationAngleProperties(vtkMRMLAnnotationAngleNode *refNode, char line[1024], int &typeColumn, int& line1IDColumn, int& line2Column, int& selColumn, int& visColumn, int& numColumns); /// Read data and set it in the referenced node - virtual int ReadDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int ReadDataInternal(vtkMRMLNode *refNode) override; /// Write data from a referenced node to the stream - virtual int WriteAnnotationDataInternal(vtkMRMLNode *refNode, fstream & of) VTK_OVERRIDE; + int WriteAnnotationDataInternal(vtkMRMLNode *refNode, fstream & of) override; }; #endif diff --git a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationBidimensionalNode.h b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationBidimensionalNode.h index 5e6ef58a1a7d4076ccd96a9d1d7945de49959b61..a954025b49b41bb5394c133d6ff21811f31502a3 100644 --- a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationBidimensionalNode.h +++ b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationBidimensionalNode.h @@ -16,39 +16,39 @@ public: vtkTypeMacro(vtkMRMLAnnotationBidimensionalNode, vtkMRMLAnnotationLinesNode); // Description: // Just prints short summary - void PrintAnnotationInfo(ostream& os, vtkIndent indent, int titleFlag = 1) VTK_OVERRIDE; + void PrintAnnotationInfo(ostream& os, vtkIndent indent, int titleFlag = 1) override; //-------------------------------------------------------------------------- // MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; // Description: // Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "AnnotationBidimensional";} + const char* GetNodeTagName() override {return "AnnotationBidimensional";} - virtual const char* GetIcon() VTK_OVERRIDE {return ":/Icons/AnnotationBidimensional.png";} + const char* GetIcon() override {return ":/Icons/AnnotationBidimensional.png";} // Description: // Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; // Description: // Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; // Description: // Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; - void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; // Description: // alternative method to propagate events generated in Display nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; // Description: @@ -63,7 +63,7 @@ public: // Description: // transform utility functions - void Initialize(vtkMRMLScene* mrmlScene) VTK_OVERRIDE; + void Initialize(vtkMRMLScene* mrmlScene) override; std::vector GetBidimensionalMeasurement(); void SetBidimensionalMeasurement(double val1, double val2); @@ -86,7 +86,7 @@ public: protected: vtkMRMLAnnotationBidimensionalNode(); - ~vtkMRMLAnnotationBidimensionalNode(); + ~vtkMRMLAnnotationBidimensionalNode() override; vtkMRMLAnnotationBidimensionalNode(const vtkMRMLAnnotationBidimensionalNode&); void operator=(const vtkMRMLAnnotationBidimensionalNode&); diff --git a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationControlPointsNode.h b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationControlPointsNode.h index 78424e25d60e76220db84bb3d7b6c608d7eba54b..bdcf5c423ace7ee867209faaa412b51de1381e45 100644 --- a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationControlPointsNode.h +++ b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationControlPointsNode.h @@ -24,44 +24,44 @@ public: // void PrintSelf(ostream& os, vtkIndent indent); // Description: // Just prints short summary - virtual void PrintAnnotationInfo(ostream& os, vtkIndent indent, int titleFlag = 1) VTK_OVERRIDE; + void PrintAnnotationInfo(ostream& os, vtkIndent indent, int titleFlag = 1) override; //-------------------------------------------------------------------------- // MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; // Description: // Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "AnnotationControlPoints";} + const char* GetNodeTagName() override {return "AnnotationControlPoints";} // Description: // Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; // Description: // Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// Write this node's information to a vector of strings for passing to a CLI, /// precede each datum with the prefix if not an empty string /// coordinateSystemFlag = 0 for RAS, 1 for LPS /// multipleFlag = 1 for the whole list, 1 for the first point - virtual void WriteCLI(std::vector& commandLine, + void WriteCLI(std::vector& commandLine, std::string prefix, int coordinateSystem = 0, - int multipleFlag = 1) VTK_OVERRIDE; + int multipleFlag = 1) override; // Description: // Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE {Superclass::Copy(node);} + void Copy(vtkMRMLNode *node) override {Superclass::Copy(node);} - void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; // Description: // alternative method to propagate events generated in Display nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; enum @@ -69,7 +69,7 @@ public: ControlPointModifiedEvent = 19010, }; - virtual void Modified() VTK_OVERRIDE + void Modified() override { Superclass::Modified(); @@ -83,7 +83,7 @@ public: /// Invokes any modified events that are 'pending', meaning they were generated /// while the DisableModifiedEvent flag was nonzero. /// Returns the old flag state. - virtual int InvokePendingModifiedEvent () VTK_OVERRIDE + int InvokePendingModifiedEvent () override { if ( this->GetModifiedEventPending() ) { @@ -98,7 +98,7 @@ public: // Description: // Create default storage node or NULL if does not have one - virtual vtkMRMLStorageNode* CreateDefaultStorageNode() VTK_OVERRIDE; + vtkMRMLStorageNode* CreateDefaultStorageNode() override; int AddControlPoint(double newControl[3],int selectedFlag, int visibleFlag); @@ -127,12 +127,12 @@ public: NUM_CP_ATTRIBUTE_TYPES }; - const char *GetAttributeTypesEnumAsString(int val) VTK_OVERRIDE; + const char *GetAttributeTypesEnumAsString(int val) override; // Description: // Initializes all variables associated with annotations - virtual void ResetAnnotations() VTK_OVERRIDE; + void ResetAnnotations() override; // Description: // add display node if not already present @@ -158,11 +158,11 @@ public: const char* GetNumberingSchemeAsString(int g); void SetNumberingSchemeFromString(const char *schemeString); - virtual void Initialize(vtkMRMLScene* mrmlScene) VTK_OVERRIDE; + void Initialize(vtkMRMLScene* mrmlScene) override; protected: vtkMRMLAnnotationControlPointsNode(); - ~vtkMRMLAnnotationControlPointsNode() { }; + ~vtkMRMLAnnotationControlPointsNode() override { }; vtkMRMLAnnotationControlPointsNode(const vtkMRMLAnnotationControlPointsNode&); void operator=(const vtkMRMLAnnotationControlPointsNode&); diff --git a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationControlPointsStorageNode.h b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationControlPointsStorageNode.h index 2fa9cecaee40502b4bf370a019d669f4452632e7..3430f2020309aa641f744254c6cedb9add176a14 100644 --- a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationControlPointsStorageNode.h +++ b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationControlPointsStorageNode.h @@ -18,20 +18,20 @@ class VTK_SLICER_ANNOTATIONS_MODULE_MRML_EXPORT vtkMRMLAnnotationControlPointsS public: static vtkMRMLAnnotationControlPointsStorageNode *New(); vtkTypeMacro(vtkMRMLAnnotationControlPointsStorageNode,vtkMRMLAnnotationStorageNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; // Description: // Get node XML tag name (like Storage, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "AnnotationControlPointsStorage";} + const char* GetNodeTagName() override {return "AnnotationControlPointsStorage";} // Initialize all the supported write file types - virtual bool CanReadInReferenceNode(vtkMRMLNode* refNode) VTK_OVERRIDE; + bool CanReadInReferenceNode(vtkMRMLNode* refNode) override; protected: vtkMRMLAnnotationControlPointsStorageNode(); - ~vtkMRMLAnnotationControlPointsStorageNode(); + ~vtkMRMLAnnotationControlPointsStorageNode() override; vtkMRMLAnnotationControlPointsStorageNode(const vtkMRMLAnnotationControlPointsStorageNode&); void operator=(const vtkMRMLAnnotationControlPointsStorageNode&); @@ -49,9 +49,9 @@ protected: int& xColumn, int& yColumn, int& zColumn, int& selColumn, int& visColumn, int& numColumns); /// Read data and set it in the referenced node - virtual int ReadDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int ReadDataInternal(vtkMRMLNode *refNode) override; - virtual int WriteAnnotationDataInternal(vtkMRMLNode *refNode, fstream &of) VTK_OVERRIDE; + int WriteAnnotationDataInternal(vtkMRMLNode *refNode, fstream &of) override; }; #endif diff --git a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationDisplayNode.h b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationDisplayNode.h index 2bd6c1f6d7eca00b94b072f178b37c27c670c17e..13821f73bcce31385e278b73327c50a41ddae849 100644 --- a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationDisplayNode.h +++ b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationDisplayNode.h @@ -82,40 +82,40 @@ class VTK_SLICER_ANNOTATIONS_MODULE_MRML_EXPORT vtkMRMLAnnotationDisplayNode : public: static vtkMRMLAnnotationDisplayNode *New ( ); vtkTypeMacro ( vtkMRMLAnnotationDisplayNode,vtkMRMLModelDisplayNode ); - void PrintSelf ( ostream& os, vtkIndent indent ) VTK_OVERRIDE; + void PrintSelf ( ostream& os, vtkIndent indent ) override; //-------------------------------------------------------------------------- // MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance () VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance () override; // Description: // Read node attributes from XML (MRML) file - virtual void ReadXMLAttributes ( const char** atts ) VTK_OVERRIDE; + void ReadXMLAttributes ( const char** atts ) override; // Description: // Write this node's information to a MRML file in XML format. - virtual void WriteXML ( ostream& of, int indent ) VTK_OVERRIDE; + void WriteXML ( ostream& of, int indent ) override; // Description: // Copy the node's attributes to this object - virtual void Copy ( vtkMRMLNode *node ) VTK_OVERRIDE; + void Copy ( vtkMRMLNode *node ) override; // Description: // Get node XML tag name (like Volume, Annotation) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "AnnotationDisplay";} + const char* GetNodeTagName() override {return "AnnotationDisplay";} // Description: // Finds the storage node and read the data - virtual void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; // Description: // alternative method to propagate events generated in Display nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; // Functionality for backups of this node /// Creates a backup of the current MRML state of this node and keeps a reference @@ -189,7 +189,7 @@ class VTK_SLICER_ANNOTATIONS_MODULE_MRML_EXPORT vtkMRMLAnnotationDisplayNode : protected: vtkMRMLAnnotationDisplayNode(); - ~vtkMRMLAnnotationDisplayNode(); + ~vtkMRMLAnnotationDisplayNode() override; vtkMRMLAnnotationDisplayNode( const vtkMRMLAnnotationDisplayNode& ); void operator= ( const vtkMRMLAnnotationDisplayNode& ); diff --git a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationFiducialNode.h b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationFiducialNode.h index ff392fe3b34ece58e7e7f615ba2b4173a0ba17df..61b76439f53960b399d4c9d855152123bcaa73d4 100644 --- a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationFiducialNode.h +++ b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationFiducialNode.h @@ -27,11 +27,11 @@ public: // MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "AnnotationFiducials";} + const char* GetNodeTagName() override {return "AnnotationFiducials";} - virtual const char* GetIcon() VTK_OVERRIDE {return ":/Icons/AnnotationPoint.png";} + const char* GetIcon() override {return ":/Icons/AnnotationPoint.png";} int SetFiducial(double newControl[3],int selectedFlag, int visibleFlag); @@ -99,7 +99,7 @@ protected: /// \deprecated Use vtkMRMLMarkupsFiducialNode /// \sa vtkMRMLMarkupsFiducialNode::vtkMRMLMarkupsFiducialNode() vtkMRMLAnnotationFiducialNode(); - virtual ~vtkMRMLAnnotationFiducialNode(); + ~vtkMRMLAnnotationFiducialNode() override; vtkMRMLAnnotationFiducialNode(const vtkMRMLAnnotationFiducialNode&); void operator=(const vtkMRMLAnnotationFiducialNode&); diff --git a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationFiducialsStorageNode.h b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationFiducialsStorageNode.h index 49d472f50f8b8bc863d61050614acb158ea972ef..c784596d3d31d37666f376747ec2d3a75f177b82 100644 --- a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationFiducialsStorageNode.h +++ b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationFiducialsStorageNode.h @@ -19,22 +19,22 @@ class VTK_SLICER_ANNOTATIONS_MODULE_MRML_EXPORT vtkMRMLAnnotationFiducialsStora static vtkMRMLAnnotationFiducialsStorageNode *New(); vtkTypeMacro(vtkMRMLAnnotationFiducialsStorageNode,vtkMRMLAnnotationControlPointsStorageNode); - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; // Description: // Get node XML tag name (like Storage, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "AnnotationFiducialsStorage";} + const char* GetNodeTagName() override {return "AnnotationFiducialsStorage";} /// utility method called by the annotation hierarchy node to let this /// storage node read a single fiducial's data from an already open file int ReadOneFiducial(fstream & fstr, vtkMRMLAnnotationFiducialNode *fiducialNode); /// Return true if the node can be read in - virtual bool CanReadInReferenceNode(vtkMRMLNode* refNode) VTK_OVERRIDE; + bool CanReadInReferenceNode(vtkMRMLNode* refNode) override; protected: vtkMRMLAnnotationFiducialsStorageNode() { } - ~vtkMRMLAnnotationFiducialsStorageNode() { } + ~vtkMRMLAnnotationFiducialsStorageNode() override { } vtkMRMLAnnotationFiducialsStorageNode(const vtkMRMLAnnotationFiducialsStorageNode&); void operator=(const vtkMRMLAnnotationFiducialsStorageNode&); @@ -46,10 +46,10 @@ protected: // Description: // Initialize all the supported write file types - virtual void InitializeSupportedWriteFileTypes() VTK_OVERRIDE; + void InitializeSupportedWriteFileTypes() override; // Read data and set it in the referenced node - virtual int ReadDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int ReadDataInternal(vtkMRMLNode *refNode) override; }; diff --git a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationHierarchyNode.h b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationHierarchyNode.h index e21da67a85798ed9c24d4d2bb1f87945320b49cb..1387e48167d68133a4614cf50ace931943fb283f 100644 --- a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationHierarchyNode.h +++ b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationHierarchyNode.h @@ -17,23 +17,23 @@ class VTK_SLICER_ANNOTATIONS_MODULE_MRML_EXPORT vtkMRMLAnnotationHierarchyNode public: static vtkMRMLAnnotationHierarchyNode *New(); vtkTypeMacro(vtkMRMLAnnotationHierarchyNode,vtkMRMLDisplayableHierarchyNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; virtual const char* GetIcon() {return ":/Icons/Medium/SlicerHierarchy.png";}; // Description: // Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; // Description: // Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; // Description: // Get node XML tag name (like Volume, Annotation) - virtual const char* GetNodeTagName() VTK_OVERRIDE; + const char* GetNodeTagName() override; // Description: // Get all top level children associated to this node. @@ -60,7 +60,7 @@ public: protected: vtkMRMLAnnotationHierarchyNode(); - ~vtkMRMLAnnotationHierarchyNode(); + ~vtkMRMLAnnotationHierarchyNode() override; vtkMRMLAnnotationHierarchyNode(const vtkMRMLAnnotationHierarchyNode&); void operator=(const vtkMRMLAnnotationHierarchyNode&); diff --git a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationLineDisplayNode.h b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationLineDisplayNode.h index f72ce0006ef44ce6dc9158e229e1da8820ac0ef6..1d45b39412b3acb432599e0d92e1006ebc220ad5 100644 --- a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationLineDisplayNode.h +++ b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationLineDisplayNode.h @@ -19,40 +19,40 @@ class VTK_SLICER_ANNOTATIONS_MODULE_MRML_EXPORT vtkMRMLAnnotationLineDisplayNod public: static vtkMRMLAnnotationLineDisplayNode *New ( ); vtkTypeMacro ( vtkMRMLAnnotationLineDisplayNode,vtkMRMLAnnotationDisplayNode ); - void PrintSelf ( ostream& os, vtkIndent indent ) VTK_OVERRIDE; + void PrintSelf ( ostream& os, vtkIndent indent ) override; //-------------------------------------------------------------------------- // MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance () VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance () override; // Description: // Read node attributes from XML (MRML) file - virtual void ReadXMLAttributes ( const char** atts ) VTK_OVERRIDE; + void ReadXMLAttributes ( const char** atts ) override; // Description: // Write this node's information to a MRML file in XML format. - virtual void WriteXML ( ostream& of, int indent ) VTK_OVERRIDE; + void WriteXML ( ostream& of, int indent ) override; // Description: // Copy the node's attributes to this object - virtual void Copy ( vtkMRMLNode *node ) VTK_OVERRIDE; + void Copy ( vtkMRMLNode *node ) override; // Description: // Get node XML tag name (like Volume, Annotation) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "AnnotationLineDisplay";} + const char* GetNodeTagName() override {return "AnnotationLineDisplay";} // Description: // Finds the storage node and read the data - virtual void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; // Description: // alternative method to propagate events generated in Display nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; /// Get/Set for Symbol scale /// vtkSetMacro(GlyphScale,double); @@ -129,13 +129,13 @@ class VTK_SLICER_ANNOTATIONS_MODULE_MRML_EXPORT vtkMRMLAnnotationLineDisplayNod vtkGetMacro(OverLineThickness, double); /// Create a backup of this node and attach it. - void CreateBackup() VTK_OVERRIDE; + void CreateBackup() override; /// Restore an attached backup of this node. - void RestoreBackup() VTK_OVERRIDE; + void RestoreBackup() override; protected: vtkMRMLAnnotationLineDisplayNode(); - ~vtkMRMLAnnotationLineDisplayNode() { }; + ~vtkMRMLAnnotationLineDisplayNode() override { }; vtkMRMLAnnotationLineDisplayNode( const vtkMRMLAnnotationLineDisplayNode& ); void operator= ( const vtkMRMLAnnotationLineDisplayNode& ); diff --git a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationLinesNode.h b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationLinesNode.h index 62a24d383709e82ec96d8483693747266228aeff..afc80e8810b0ed7fc15fad911a5f3338cbc8654b 100644 --- a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationLinesNode.h +++ b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationLinesNode.h @@ -23,37 +23,37 @@ public: // void PrintSelf(ostream& os, vtkIndent indent); // Description: // Just prints short summary - virtual void PrintAnnotationInfo(ostream& os, vtkIndent indent, int titleFlag = 1) VTK_OVERRIDE; + void PrintAnnotationInfo(ostream& os, vtkIndent indent, int titleFlag = 1) override; //-------------------------------------------------------------------------- // MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; // Description: // Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "AnnotationLines";} + const char* GetNodeTagName() override {return "AnnotationLines";} // Description: // Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; // Description: // Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; // Description: // Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; - void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; // Description: // alternative method to propagate events generated in Display nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; // Description: @@ -62,7 +62,7 @@ public: // Description: // Create default storage node or NULL if does not have one - virtual vtkMRMLStorageNode* CreateDefaultStorageNode() VTK_OVERRIDE; + vtkMRMLStorageNode* CreateDefaultStorageNode() override; // Define line between control points int AddLine(int ctrlPtIdStart, int ctrlPtIdEnd,int selectedFlag, int visibleFlag); @@ -92,17 +92,17 @@ public: NUM_LINE_ATTRIBUTE_TYPES }; - const char *GetAttributeTypesEnumAsString(int val) VTK_OVERRIDE; + const char *GetAttributeTypesEnumAsString(int val) override; // Description: // Initializes all variables associated with annotations - virtual void ResetAnnotations() VTK_OVERRIDE; + void ResetAnnotations() override; - void Initialize(vtkMRMLScene* mrmlScene) VTK_OVERRIDE; + void Initialize(vtkMRMLScene* mrmlScene) override; protected: vtkMRMLAnnotationLinesNode(); - ~vtkMRMLAnnotationLinesNode(); + ~vtkMRMLAnnotationLinesNode() override; vtkMRMLAnnotationLinesNode(const vtkMRMLAnnotationLinesNode&); void operator=(const vtkMRMLAnnotationLinesNode&); diff --git a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationLinesStorageNode.h b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationLinesStorageNode.h index d8bad01fdcbd84f6bb824650a8e380806e0f5ece..e178df37d411b9b7cbe9bf120a9f2618bb2fe921 100644 --- a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationLinesStorageNode.h +++ b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationLinesStorageNode.h @@ -19,32 +19,32 @@ class VTK_SLICER_ANNOTATIONS_MODULE_MRML_EXPORT vtkMRMLAnnotationLinesStorageNo public: static vtkMRMLAnnotationLinesStorageNode *New(); vtkTypeMacro(vtkMRMLAnnotationLinesStorageNode,vtkMRMLAnnotationControlPointsStorageNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; // Description: // Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; // Description: // Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; // Description: // Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; // Description: // Get node XML tag name (like Storage, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "AnnotationLinesStorage";} + const char* GetNodeTagName() override {return "AnnotationLinesStorage";} /// Return true if the node can be read in - virtual bool CanReadInReferenceNode(vtkMRMLNode* refNode) VTK_OVERRIDE; + bool CanReadInReferenceNode(vtkMRMLNode* refNode) override; protected: vtkMRMLAnnotationLinesStorageNode(); - ~vtkMRMLAnnotationLinesStorageNode(); + ~vtkMRMLAnnotationLinesStorageNode() override; vtkMRMLAnnotationLinesStorageNode(const vtkMRMLAnnotationLinesStorageNode&); void operator=(const vtkMRMLAnnotationLinesStorageNode&); @@ -60,10 +60,10 @@ protected: int ReadAnnotationLinesProperties(vtkMRMLAnnotationLinesNode *refNode, char line[1024], int &typeColumn, int& startIDColumn, int& endIDColumn, int& selColumn, int& visColumn, int& numColumns); /// Read data and set it in the referenced node - virtual int ReadDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int ReadDataInternal(vtkMRMLNode *refNode) override; // Description: - virtual int WriteAnnotationDataInternal(vtkMRMLNode *refNode, fstream & of) VTK_OVERRIDE; + int WriteAnnotationDataInternal(vtkMRMLNode *refNode, fstream & of) override; }; #endif diff --git a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationNode.h b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationNode.h index 2adf862d18f4fa06c0b351a7d5a6c3d072a7ade5..0ce76b728987caccdf35dcde0001c14f44e7b541 100644 --- a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationNode.h +++ b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationNode.h @@ -30,7 +30,7 @@ class VTK_SLICER_ANNOTATIONS_MODULE_MRML_EXPORT vtkMRMLAnnotationNode : public public: static vtkMRMLAnnotationNode *New(); vtkTypeMacro(vtkMRMLAnnotationNode,vtkMRMLModelNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; // Description: // Just prints short summary virtual void PrintAnnotationInfo(ostream& os, vtkIndent indent, int titleFlag = 1); @@ -41,45 +41,45 @@ public: // MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; // Description: // Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "Annotation";} + const char* GetNodeTagName() override {return "Annotation";} // Description: // Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; // Description: // Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; // Description: // Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; - void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; // Description: // alternative method to propagate events generated in Display nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; // vtkMRMLModelNode overrides it and it handles models only, while in annotations // we have all kinds of nodes (e.g., screenshot), so we need to revert to the generic // storable node implementation. - virtual std::string GetDefaultStorageNodeClassName(const char* filename /* =NULL */) VTK_OVERRIDE; + std::string GetDefaultStorageNodeClassName(const char* filename /* =NULL */) override; // Description: // Create default storage node or NULL if does not have one - virtual vtkMRMLStorageNode* CreateDefaultStorageNode() VTK_OVERRIDE; + vtkMRMLStorageNode* CreateDefaultStorageNode() override; /// Returns false since in general cannot apply non linear transforms /// \sa ApplyTransformMatrix, ApplyTransform - virtual bool CanApplyNonLinearTransforms()const VTK_OVERRIDE {return false;} + bool CanApplyNonLinearTransforms()const override {return false;} int AddText(const char *newText,int selectedFlag, int visibleFlag); void SetText(int id, const char *newText,int selectedFlag, int visibleFlag); @@ -147,7 +147,7 @@ public: protected: vtkMRMLAnnotationNode(); - ~vtkMRMLAnnotationNode(); + ~vtkMRMLAnnotationNode() override; vtkMRMLAnnotationNode(const vtkMRMLAnnotationNode&); void operator=(const vtkMRMLAnnotationNode&); diff --git a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationPointDisplayNode.h b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationPointDisplayNode.h index 6e332454b7eede6bfeccc629d2c19726e36fc562..ee9951a38133fcad292ef9980bfbb922ec210c06 100644 --- a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationPointDisplayNode.h +++ b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationPointDisplayNode.h @@ -19,40 +19,40 @@ class VTK_SLICER_ANNOTATIONS_MODULE_MRML_EXPORT vtkMRMLAnnotationPointDisplayNo public: static vtkMRMLAnnotationPointDisplayNode *New ( ); vtkTypeMacro ( vtkMRMLAnnotationPointDisplayNode,vtkMRMLAnnotationDisplayNode ); - void PrintSelf ( ostream& os, vtkIndent indent ) VTK_OVERRIDE; + void PrintSelf ( ostream& os, vtkIndent indent ) override; //-------------------------------------------------------------------------- // MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance () VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance () override; // Description: // Read node attributes from XML (MRML) file - virtual void ReadXMLAttributes ( const char** atts ) VTK_OVERRIDE; + void ReadXMLAttributes ( const char** atts ) override; // Description: // Write this node's information to a MRML file in XML format. - virtual void WriteXML ( ostream& of, int indent ) VTK_OVERRIDE; + void WriteXML ( ostream& of, int indent ) override; // Description: // Copy the node's attributes to this object - virtual void Copy ( vtkMRMLNode *node ) VTK_OVERRIDE; + void Copy ( vtkMRMLNode *node ) override; // Description: // Get node XML tag name (like Volume, Annotation) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "AnnotationPointDisplay";} + const char* GetNodeTagName() override {return "AnnotationPointDisplay";} // Description: // Finds the storage node and read the data - virtual void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; // Description: // alternative method to propagate events generated in Display nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; /// Which kind of glyph should be used to display this fiducial? /// Vertex2D is supposed to start at 1 @@ -97,9 +97,9 @@ class VTK_SLICER_ANNOTATIONS_MODULE_MRML_EXPORT vtkMRMLAnnotationPointDisplayNo vtkGetMacro(GlyphScale,double); /// Create a backup of this node and attach it. - void CreateBackup() VTK_OVERRIDE; + void CreateBackup() override; /// Restore an attached backup of this node. - void RestoreBackup() VTK_OVERRIDE; + void RestoreBackup() override; /// Set projection color as fiducial color ///\sa SetProjectedColor @@ -132,7 +132,7 @@ class VTK_SLICER_ANNOTATIONS_MODULE_MRML_EXPORT vtkMRMLAnnotationPointDisplayNo protected: vtkMRMLAnnotationPointDisplayNode(); - ~vtkMRMLAnnotationPointDisplayNode() { }; + ~vtkMRMLAnnotationPointDisplayNode() override { }; vtkMRMLAnnotationPointDisplayNode( const vtkMRMLAnnotationPointDisplayNode& ); void operator= ( const vtkMRMLAnnotationPointDisplayNode& ); diff --git a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationROINode.h b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationROINode.h index e31703a478ce8930ba5930576cf3c04bc96563fa..17d464433372cbd76c01ca51cae88329f35c0e49 100644 --- a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationROINode.h +++ b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationROINode.h @@ -18,39 +18,39 @@ public: vtkTypeMacro(vtkMRMLAnnotationROINode,vtkMRMLAnnotationLinesNode); /// Description: /// Just prints short summary - void PrintAnnotationInfo(ostream& os, vtkIndent indent, int titleFlag = 1) VTK_OVERRIDE; + void PrintAnnotationInfo(ostream& os, vtkIndent indent, int titleFlag = 1) override; //-------------------------------------------------------------------------- // MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Description: /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "AnnotationROI";} + const char* GetNodeTagName() override {return "AnnotationROI";} - virtual const char* GetIcon() VTK_OVERRIDE {return ":/Icons/AnnotationROI.png";} + const char* GetIcon() override {return ":/Icons/AnnotationROI.png";} // Description: /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// Description: /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// Description: /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; - void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; /// Description: /// alternative method to propagate events generated in Display nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; /// /// Indicates if the ROI is updated interactively @@ -94,13 +94,13 @@ public: /// Description: /// transform utility functions - virtual void ApplyTransformMatrix(vtkMatrix4x4* transformMatrix) VTK_OVERRIDE; - virtual void ApplyTransform(vtkAbstractTransform* transform) VTK_OVERRIDE; + void ApplyTransformMatrix(vtkMatrix4x4* transformMatrix) override; + void ApplyTransform(vtkAbstractTransform* transform) override; virtual void GetTransformedPlanes(vtkPlanes *planes); /// Description: /// Add ROI to scene and add display nodes - void Initialize(vtkMRMLScene* mrmlScene) VTK_OVERRIDE; + void Initialize(vtkMRMLScene* mrmlScene) override; /// /// Get/Set for ROI Position in RAS cooridnates @@ -154,12 +154,12 @@ public: /// The default implementation in the model node would not work correctly, as the polydata /// in this class is used for storing the centerpoint position and radius. /// \sa GetBounds() - virtual void GetRASBounds(double bounds[6]) VTK_OVERRIDE; + void GetRASBounds(double bounds[6]) override; /// Get bounding box in global RAS form (xmin,xmax, ymin,ymax, zmin,zmax). /// This method always returns the bounds of the untransformed object. /// \sa GetRASBounds() - virtual void GetBounds(double bounds[6]) VTK_OVERRIDE; + void GetBounds(double bounds[6]) override; enum { @@ -170,7 +170,7 @@ public: protected: vtkMRMLAnnotationROINode(); - ~vtkMRMLAnnotationROINode(); + ~vtkMRMLAnnotationROINode() override; vtkMRMLAnnotationROINode(const vtkMRMLAnnotationROINode&); void operator=(const vtkMRMLAnnotationROINode&); diff --git a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationRulerNode.h b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationRulerNode.h index 2c9768a6ae44ee8bcd716918ecc7a06ccd321ac8..0735ab1c87d6b5020562404b3dd862d3248c6ea7 100644 --- a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationRulerNode.h +++ b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationRulerNode.h @@ -16,39 +16,39 @@ public: vtkTypeMacro(vtkMRMLAnnotationRulerNode,vtkMRMLAnnotationLinesNode); // Description: // Just prints short summary - void PrintAnnotationInfo(ostream& os, vtkIndent indent, int titleFlag = 1) VTK_OVERRIDE; + void PrintAnnotationInfo(ostream& os, vtkIndent indent, int titleFlag = 1) override; //-------------------------------------------------------------------------- // MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; // Description: // Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "AnnotationRuler";} + const char* GetNodeTagName() override {return "AnnotationRuler";} - virtual const char* GetIcon() VTK_OVERRIDE {return ":/Icons/AnnotationDistance.png";} + const char* GetIcon() override {return ":/Icons/AnnotationDistance.png";} // Description: // Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; // Description: // Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; // Description: // Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; - void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; // Description: // alternative method to propagate events generated in Display nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; @@ -158,11 +158,11 @@ public: // Description: // transform utility functions - virtual void ApplyTransform(vtkAbstractTransform* transform) VTK_OVERRIDE; + void ApplyTransform(vtkAbstractTransform* transform) override; // Description: // Create default storage node or NULL if does not have one - virtual vtkMRMLStorageNode* CreateDefaultStorageNode() VTK_OVERRIDE; + vtkMRMLStorageNode* CreateDefaultStorageNode() override; // void Initialize(vtkMRMLScene* mrmlScene); @@ -185,7 +185,7 @@ public: protected: vtkMRMLAnnotationRulerNode(); - ~vtkMRMLAnnotationRulerNode(); + ~vtkMRMLAnnotationRulerNode() override; vtkMRMLAnnotationRulerNode(const vtkMRMLAnnotationRulerNode&); void operator=(const vtkMRMLAnnotationRulerNode&); diff --git a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationRulerStorageNode.h b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationRulerStorageNode.h index 0f68619cfa232925f529d5219b4868c0f60cc267..e5970750900bbf53a99fd6e63d19b6b65a8dafce 100644 --- a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationRulerStorageNode.h +++ b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationRulerStorageNode.h @@ -18,37 +18,37 @@ class VTK_SLICER_ANNOTATIONS_MODULE_MRML_EXPORT vtkMRMLAnnotationRulerStorageNo public: static vtkMRMLAnnotationRulerStorageNode *New(); vtkTypeMacro(vtkMRMLAnnotationRulerStorageNode,vtkMRMLAnnotationLinesStorageNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; // Description: // Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; // Description: // Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; // Description: // Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; // Description: // Get node XML tag name (like Storage, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "AnnotationRulerStorage";} + const char* GetNodeTagName() override {return "AnnotationRulerStorage";} /// Read a single ruler from an open list file, called by the hierarchy /// storage node int ReadOneRuler(fstream & fstr, vtkMRMLAnnotationRulerNode *refNode); /// Return true if the node can be read in - bool CanReadInReferenceNode(vtkMRMLNode* refNode) VTK_OVERRIDE; + bool CanReadInReferenceNode(vtkMRMLNode* refNode) override; protected: vtkMRMLAnnotationRulerStorageNode(); - ~vtkMRMLAnnotationRulerStorageNode(); + ~vtkMRMLAnnotationRulerStorageNode() override; vtkMRMLAnnotationRulerStorageNode(const vtkMRMLAnnotationRulerStorageNode&); void operator=(const vtkMRMLAnnotationRulerStorageNode&); @@ -62,10 +62,10 @@ protected: int ReadAnnotationRulerProperties(vtkMRMLAnnotationRulerNode *refNode, char line[1024], int &typeColumn, int& line1IDColumn, int& selColumn, int& visColumn, int& numColumns); /// Read data and set it in the referenced node - virtual int ReadDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int ReadDataInternal(vtkMRMLNode *refNode) override; /// Write data from the referenced node into the stream - virtual int WriteAnnotationDataInternal(vtkMRMLNode *refNode, fstream & of) VTK_OVERRIDE; + int WriteAnnotationDataInternal(vtkMRMLNode *refNode, fstream & of) override; }; #endif diff --git a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationSnapshotNode.h b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationSnapshotNode.h index 83a101eea654a12d1009e73b3b379603bd40bdef..d82032392a976ccce6b8f4c826516ce4d6c2d88e 100644 --- a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationSnapshotNode.h +++ b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationSnapshotNode.h @@ -26,18 +26,18 @@ public: // MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; // Description: // Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "AnnotationSnapshot";} + const char* GetNodeTagName() override {return "AnnotationSnapshot";} - virtual const char* GetIcon() VTK_OVERRIDE {return ":/Icons/ViewCamera.png";} + const char* GetIcon() override {return ":/Icons/ViewCamera.png";} void SetSnapshotDescription(const vtkStdString& newDescription); vtkGetMacro(SnapshotDescription, vtkStdString) - void WriteXML(ostream& of, int nIndent) VTK_OVERRIDE; - void ReadXMLAttributes(const char** atts) VTK_OVERRIDE; + void WriteXML(ostream& of, int nIndent) override; + void ReadXMLAttributes(const char** atts) override; /// The attached screenshot virtual void SetScreenShot(vtkImageData* ); @@ -58,7 +58,7 @@ public: vtkGetMacro(ScreenShotType, int); /// Create default storage node or NULL if does not have one - virtual vtkMRMLStorageNode* CreateDefaultStorageNode() VTK_OVERRIDE; + vtkMRMLStorageNode* CreateDefaultStorageNode() override; enum { @@ -68,7 +68,7 @@ public: protected: vtkMRMLAnnotationSnapshotNode(); - ~vtkMRMLAnnotationSnapshotNode(); + ~vtkMRMLAnnotationSnapshotNode() override; vtkMRMLAnnotationSnapshotNode(const vtkMRMLAnnotationSnapshotNode&); void operator=(const vtkMRMLAnnotationSnapshotNode&); diff --git a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationSnapshotStorageNode.h b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationSnapshotStorageNode.h index 33c4034f6801c12d86bb615d34bd40a64c8f2635..9ef6822fecc1b4af1fcc49c5333e8b42257fb83b 100644 --- a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationSnapshotStorageNode.h +++ b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationSnapshotStorageNode.h @@ -29,32 +29,32 @@ class VTK_SLICER_ANNOTATIONS_MODULE_MRML_EXPORT vtkMRMLAnnotationSnapshotStorage public: static vtkMRMLAnnotationSnapshotStorageNode *New(); vtkTypeMacro(vtkMRMLAnnotationSnapshotStorageNode,vtkMRMLStorageNode); - virtual void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Get node XML tag name (like Storage, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "AnnotationSnapshotStorage";} + const char* GetNodeTagName() override {return "AnnotationSnapshotStorage";} /// Return true if the node can be read in - virtual bool CanReadInReferenceNode(vtkMRMLNode* refNode) VTK_OVERRIDE; + bool CanReadInReferenceNode(vtkMRMLNode* refNode) override; protected: vtkMRMLAnnotationSnapshotStorageNode(); - ~vtkMRMLAnnotationSnapshotStorageNode(); + ~vtkMRMLAnnotationSnapshotStorageNode() override; vtkMRMLAnnotationSnapshotStorageNode(const vtkMRMLAnnotationSnapshotStorageNode&); void operator=(const vtkMRMLAnnotationSnapshotStorageNode&); /// Initialize all the supported read file types - virtual void InitializeSupportedReadFileTypes() VTK_OVERRIDE; + void InitializeSupportedReadFileTypes() override; /// Initialize all the supported write file types - virtual void InitializeSupportedWriteFileTypes() VTK_OVERRIDE; + void InitializeSupportedWriteFileTypes() override; /// Read data and set it in the referenced node - virtual int ReadDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int ReadDataInternal(vtkMRMLNode *refNode) override; /// Write data from a referenced node - virtual int WriteDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int WriteDataInternal(vtkMRMLNode *refNode) override; }; #endif diff --git a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationSplineNode.h b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationSplineNode.h index 935ad32f9a5574a8f9567c3dadb584364ccccf22..db3efaa49515bf3229abe39a741fe30ab8d7f637 100644 --- a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationSplineNode.h +++ b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationSplineNode.h @@ -13,37 +13,37 @@ public: vtkTypeMacro(vtkMRMLAnnotationSplineNode, vtkMRMLAnnotationLinesNode); // Description: // Just prints short summary - void PrintAnnotationInfo(ostream& os, vtkIndent indent, int titleFlag = 1) VTK_OVERRIDE; + void PrintAnnotationInfo(ostream& os, vtkIndent indent, int titleFlag = 1) override; //-------------------------------------------------------------------------- // MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; // Description: // Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "AnnotationRuler";} + const char* GetNodeTagName() override {return "AnnotationRuler";} // Description: // Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; // Description: // Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; // Description: // Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; - void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; // Description: // alternative method to propagate events generated in Display nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; // Legacy code @@ -88,7 +88,7 @@ public: double *GetDistanceAnnotationTextColour(); void SetDistanceAnnotationTextColour(double initColor[3]); - void Initialize(vtkMRMLScene* mrmlScene) VTK_OVERRIDE; + void Initialize(vtkMRMLScene* mrmlScene) override; double GetSplineMeasurement(); void SetSplineMeasurement(double val); @@ -104,7 +104,7 @@ public: protected: vtkMRMLAnnotationSplineNode(); - ~vtkMRMLAnnotationSplineNode(); + ~vtkMRMLAnnotationSplineNode() override; vtkMRMLAnnotationSplineNode(const vtkMRMLAnnotationSplineNode&); void operator=(const vtkMRMLAnnotationSplineNode&); diff --git a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationStickyNode.h b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationStickyNode.h index 76e796c28e3b261628b502e049dbb0eeaf4a1c99..0bf18e617a601bfd723e14b20944b6759834e71c 100644 --- a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationStickyNode.h +++ b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationStickyNode.h @@ -28,10 +28,10 @@ public: // MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; // Description: // Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "AnnotationSticky";} + const char* GetNodeTagName() override {return "AnnotationSticky";} int SetSticky(const char* text,int selectedFlag); @@ -42,12 +42,12 @@ public: int SetStickyCoordinates(double newCoord[3]) {return this->SetControlPoint(0,newCoord,1,1);} - void Initialize(vtkMRMLScene* mrmlScene) VTK_OVERRIDE; + void Initialize(vtkMRMLScene* mrmlScene) override; protected: vtkMRMLAnnotationStickyNode() { }; - ~vtkMRMLAnnotationStickyNode() { }; + ~vtkMRMLAnnotationStickyNode() override { }; vtkMRMLAnnotationStickyNode(const vtkMRMLAnnotationStickyNode&); void operator=(const vtkMRMLAnnotationStickyNode&); diff --git a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationStorageNode.h b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationStorageNode.h index 8785139229f8e238d3e4893557d3e507d8736f62..a891ed0cc1a696d4806defb31ec2a1e71f5f4776 100644 --- a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationStorageNode.h +++ b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationStorageNode.h @@ -19,20 +19,20 @@ class VTK_SLICER_ANNOTATIONS_MODULE_MRML_EXPORT vtkMRMLAnnotationStorageNode : public: static vtkMRMLAnnotationStorageNode *New(); vtkTypeMacro(vtkMRMLAnnotationStorageNode,vtkMRMLStorageNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; // Description: // Get node XML tag name (like Storage, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "AnnotationStorage";} + const char* GetNodeTagName() override {return "AnnotationStorage";} /// Return true if the node can be read in - virtual bool CanReadInReferenceNode(vtkMRMLNode* refNode) VTK_OVERRIDE; + bool CanReadInReferenceNode(vtkMRMLNode* refNode) override; protected: vtkMRMLAnnotationStorageNode(); - ~vtkMRMLAnnotationStorageNode(); + ~vtkMRMLAnnotationStorageNode() override; vtkMRMLAnnotationStorageNode(const vtkMRMLAnnotationStorageNode&); void operator=(const vtkMRMLAnnotationStorageNode&); @@ -59,16 +59,16 @@ protected: const char* GetAnnotationStorageType() { return "text"; } /// Initialize all the supported read file types - virtual void InitializeSupportedReadFileTypes() VTK_OVERRIDE; + void InitializeSupportedReadFileTypes() override; /// Initialize all the supported write file types - virtual void InitializeSupportedWriteFileTypes() VTK_OVERRIDE; + void InitializeSupportedWriteFileTypes() override; /// Read data and set it in the referenced node - virtual int ReadDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int ReadDataInternal(vtkMRMLNode *refNode) override; /// Write data from a referenced node - virtual int WriteDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int WriteDataInternal(vtkMRMLNode *refNode) override; /// Write data from a referenced node into a passed stream virtual int WriteAnnotationDataInternal(vtkMRMLNode *refNode, fstream &of); diff --git a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationTextDisplayNode.h b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationTextDisplayNode.h index 259a86a1cb2637d1c1e40373df1c82280b4dbd21..fa3cffbab07c927e457af149ab794b0a804a9821 100644 --- a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationTextDisplayNode.h +++ b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationTextDisplayNode.h @@ -19,40 +19,40 @@ class VTK_SLICER_ANNOTATIONS_MODULE_MRML_EXPORT vtkMRMLAnnotationTextDisplayNod public: static vtkMRMLAnnotationTextDisplayNode *New ( ); vtkTypeMacro ( vtkMRMLAnnotationTextDisplayNode,vtkMRMLAnnotationDisplayNode ); - void PrintSelf ( ostream& os, vtkIndent indent ) VTK_OVERRIDE; + void PrintSelf ( ostream& os, vtkIndent indent ) override; //-------------------------------------------------------------------------- // MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance () VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance () override; // Description: // Read node attributes from XML (MRML) file - virtual void ReadXMLAttributes ( const char** atts ) VTK_OVERRIDE; + void ReadXMLAttributes ( const char** atts ) override; // Description: // Write this node's information to a MRML file in XML format. - virtual void WriteXML ( ostream& of, int indent ) VTK_OVERRIDE; + void WriteXML ( ostream& of, int indent ) override; // Description: // Copy the node's attributes to this object - virtual void Copy ( vtkMRMLNode *node ) VTK_OVERRIDE; + void Copy ( vtkMRMLNode *node ) override; // Description: // Get node XML tag name (like Volume, Annotation) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "AnnotationTextDisplay";} + const char* GetNodeTagName() override {return "AnnotationTextDisplay";} // Description: // Finds the storage node and read the data - virtual void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; // Description: // alternative method to propagate events generated in Display nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; // Description: // Get/Set for Text scale @@ -118,9 +118,9 @@ class VTK_SLICER_ANNOTATIONS_MODULE_MRML_EXPORT vtkMRMLAnnotationTextDisplayNod vtkBooleanMacro(AttachEdgeOnly,int); /// Create a backup of this node and attach it. - void CreateBackup() VTK_OVERRIDE; + void CreateBackup() override; /// Restore an attached backup of this node. - void RestoreBackup() VTK_OVERRIDE; + void RestoreBackup() override; /// Utility function to return a new string with \n's inserted in the input /// string to bring each line down below the MaxCharactersPerLine. Tries to @@ -129,7 +129,7 @@ class VTK_SLICER_ANNOTATIONS_MODULE_MRML_EXPORT vtkMRMLAnnotationTextDisplayNod std::string GetLineWrappedText(std::string inputText); protected: vtkMRMLAnnotationTextDisplayNode(); - ~vtkMRMLAnnotationTextDisplayNode() { } + ~vtkMRMLAnnotationTextDisplayNode() override { } vtkMRMLAnnotationTextDisplayNode( const vtkMRMLAnnotationTextDisplayNode& ); void operator= ( const vtkMRMLAnnotationTextDisplayNode& ); diff --git a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationTextNode.h b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationTextNode.h index 832bd0f846b01662eea719c6bc913dbb0e7767e7..4b68652f226f4325d5faa3480dedcc1040a1ebe2 100644 --- a/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationTextNode.h +++ b/Modules/Loadable/Annotations/MRML/vtkMRMLAnnotationTextNode.h @@ -26,12 +26,12 @@ public: // MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; // Description: // Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "AnnotationText";} + const char* GetNodeTagName() override {return "AnnotationText";} - virtual const char* GetIcon() VTK_OVERRIDE {return ":/Icons/AnnotationText.png";} + const char* GetIcon() override {return ":/Icons/AnnotationText.png";} int SetTextCoordinates(double newCoord[3]) {return this->SetControlPoint(0,newCoord,1,1);} double* GetTextCoordinates() {return this->GetControlPointCoordinates(0);} @@ -52,7 +52,7 @@ public: protected: vtkMRMLAnnotationTextNode(); - ~vtkMRMLAnnotationTextNode() { } + ~vtkMRMLAnnotationTextNode() override { } vtkMRMLAnnotationTextNode(const vtkMRMLAnnotationTextNode&); void operator=(const vtkMRMLAnnotationTextNode&); diff --git a/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationBidimensionalDisplayableManager.cxx b/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationBidimensionalDisplayableManager.cxx index de03f8e18a082c04bd6d14602a2d767beec59a59..5ae648f5858ceb5d25366554a516b2eaa36fd1dd 100644 --- a/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationBidimensionalDisplayableManager.cxx +++ b/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationBidimensionalDisplayableManager.cxx @@ -51,7 +51,7 @@ public: vtkAnnotationBidimensionalWidgetCallback(){} - virtual void Execute (vtkObject *vtkNotUsed(caller), unsigned long event, void*) + void Execute (vtkObject *vtkNotUsed(caller), unsigned long event, void*) override { if ((event == vtkCommand::EndInteractionEvent) || (event == vtkCommand::InteractionEvent)) diff --git a/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationBidimensionalDisplayableManager.h b/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationBidimensionalDisplayableManager.h index d6a124a17ce49ca6abd510f1fa6bb623cc336666..766c27b84fb71c5399070b96f28e9c0513c89bc8 100644 --- a/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationBidimensionalDisplayableManager.h +++ b/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationBidimensionalDisplayableManager.h @@ -36,29 +36,29 @@ public: static vtkMRMLAnnotationBidimensionalDisplayableManager *New(); vtkTypeMacro(vtkMRMLAnnotationBidimensionalDisplayableManager, vtkMRMLAnnotationDisplayableManager); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; // the following functions must be public to be accessible by the callback /// Propagate properties of MRML node to widget. - virtual void PropagateMRMLToWidget(vtkMRMLAnnotationNode* node, vtkAbstractWidget * widget) VTK_OVERRIDE; + void PropagateMRMLToWidget(vtkMRMLAnnotationNode* node, vtkAbstractWidget * widget) override; /// Propagate properties of widget to MRML node. - virtual void PropagateWidgetToMRML(vtkAbstractWidget * widget, vtkMRMLAnnotationNode* node) VTK_OVERRIDE; + void PropagateWidgetToMRML(vtkAbstractWidget * widget, vtkMRMLAnnotationNode* node) override; // update just the position, called from PropagateMRMLToWidget and in // response to slice node modified events - virtual void UpdatePosition(vtkAbstractWidget *widget, vtkMRMLNode *node) VTK_OVERRIDE; + void UpdatePosition(vtkAbstractWidget *widget, vtkMRMLNode *node) override; protected: vtkMRMLAnnotationBidimensionalDisplayableManager(){this->m_Focus="vtkMRMLAnnotationBidimensionalNode";} - virtual ~vtkMRMLAnnotationBidimensionalDisplayableManager(){} + ~vtkMRMLAnnotationBidimensionalDisplayableManager() override{} /// Callback for click in RenderWindow - virtual void OnClickInRenderWindow(double x, double y, const char *associatedNodeID) VTK_OVERRIDE; + void OnClickInRenderWindow(double x, double y, const char *associatedNodeID) override; /// Create a widget. - virtual vtkAbstractWidget * CreateWidget(vtkMRMLAnnotationNode* node) VTK_OVERRIDE; + vtkAbstractWidget * CreateWidget(vtkMRMLAnnotationNode* node) override; /// Gets called when widget was created - virtual void OnWidgetCreated(vtkAbstractWidget * widget, vtkMRMLAnnotationNode * node) VTK_OVERRIDE; + void OnWidgetCreated(vtkAbstractWidget * widget, vtkMRMLAnnotationNode * node) override; private: diff --git a/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationClickCounter.h b/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationClickCounter.h index acad833260ede0a4f598ff58e859a43b9e4d09dc..85a6ef391dc99d027dd539fa72dfd613306c6f35 100644 --- a/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationClickCounter.h +++ b/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationClickCounter.h @@ -30,7 +30,7 @@ public: static vtkMRMLAnnotationClickCounter *New(); vtkTypeMacro(vtkMRMLAnnotationClickCounter, vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Increase the click counter and return the number of clicks. /// \sa HasEnoughClicks() @@ -47,7 +47,7 @@ public: protected: vtkMRMLAnnotationClickCounter(); - virtual ~vtkMRMLAnnotationClickCounter(); + ~vtkMRMLAnnotationClickCounter() override; private: diff --git a/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationDisplayableManager.h b/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationDisplayableManager.h index 7eac76c9fd772fb77243dd678e37a232db0d2185..40198616dd675fbcc8ae2b37db0e526770d51c93 100644 --- a/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationDisplayableManager.h +++ b/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationDisplayableManager.h @@ -46,7 +46,7 @@ public: static vtkMRMLAnnotationDisplayableManager *New(); vtkTypeMacro(vtkMRMLAnnotationDisplayableManager, vtkMRMLAbstractDisplayableManager); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; // the following functions must be public to be accessible by the callback /// Propagate properties of MRML node to widget. @@ -103,33 +103,33 @@ public: protected: vtkMRMLAnnotationDisplayableManager(); - virtual ~vtkMRMLAnnotationDisplayableManager(); + ~vtkMRMLAnnotationDisplayableManager() override; - virtual void ProcessMRMLNodesEvents(vtkObject *caller, unsigned long event, void *callData) VTK_OVERRIDE; + void ProcessMRMLNodesEvents(vtkObject *caller, unsigned long event, void *callData) override; - virtual void Create() VTK_OVERRIDE; + void Create() override; /// wrap the superclass render request in a check for batch processing virtual void RequestRender(); /// Remove MRML observers - virtual void RemoveMRMLObservers() VTK_OVERRIDE; + void RemoveMRMLObservers() override; /// Called from RequestRender method if UpdateFromMRMLRequested is true /// \sa RequestRender() SetUpdateFromMRMLRequested() - virtual void UpdateFromMRML() VTK_OVERRIDE; + void UpdateFromMRML() override; - virtual void SetMRMLSceneInternal(vtkMRMLScene* newScene) VTK_OVERRIDE; + void SetMRMLSceneInternal(vtkMRMLScene* newScene) override; /// Called after the corresponding MRML event is triggered, from AbstractDisplayableManager /// \sa ProcessMRMLSceneEvents - virtual void UpdateFromMRMLScene() VTK_OVERRIDE; - virtual void OnMRMLSceneEndClose() VTK_OVERRIDE; - virtual void OnMRMLSceneNodeAdded(vtkMRMLNode* node) VTK_OVERRIDE; - virtual void OnMRMLSceneNodeRemoved(vtkMRMLNode* node) VTK_OVERRIDE; + void UpdateFromMRMLScene() override; + void OnMRMLSceneEndClose() override; + void OnMRMLSceneNodeAdded(vtkMRMLNode* node) override; + void OnMRMLSceneNodeRemoved(vtkMRMLNode* node) override; /// Called after the corresponding MRML View container was modified - virtual void OnMRMLDisplayableNodeModifiedEvent(vtkObject* caller) VTK_OVERRIDE; + void OnMRMLDisplayableNodeModifiedEvent(vtkObject* caller) override; /// Handler for specific SliceView actions virtual void OnMRMLSliceNodeModifiedEvent(vtkMRMLSliceNode * sliceNode); @@ -232,7 +232,7 @@ protected: int m_Updating; /// Respond to interactor style events - virtual void OnInteractorStyleEvent(int eventid) VTK_OVERRIDE; + void OnInteractorStyleEvent(int eventid) override; /// Accessor for internal flag that disables interactor style event processing vtkGetMacro(DisableInteractorStyleEventsProcessing, int); diff --git a/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationDisplayableManagerHelper.h b/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationDisplayableManagerHelper.h index a906ed4d76e0ce8dbbfe6ba9407f78cf0b7a8c69..420654c9af6b96c1df745dc74d81875ed845aed3 100644 --- a/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationDisplayableManagerHelper.h +++ b/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationDisplayableManagerHelper.h @@ -43,7 +43,7 @@ public: static vtkMRMLAnnotationDisplayableManagerHelper *New(); vtkTypeMacro(vtkMRMLAnnotationDisplayableManagerHelper, vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Lock/Unlock all widgets based on the state of the nodes void UpdateLockedAllWidgetsFromNodes(); @@ -142,7 +142,7 @@ public: protected: vtkMRMLAnnotationDisplayableManagerHelper(); - virtual ~vtkMRMLAnnotationDisplayableManagerHelper(); + ~vtkMRMLAnnotationDisplayableManagerHelper() override; private: diff --git a/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationFiducialDisplayableManager.cxx b/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationFiducialDisplayableManager.cxx index b578bb35066c9f9fa442e6d3b02152f2403c0d14..fd07a20fa537b85ff8a8937411299585223b244a 100644 --- a/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationFiducialDisplayableManager.cxx +++ b/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationFiducialDisplayableManager.cxx @@ -62,7 +62,7 @@ public: { } - virtual void Execute (vtkObject *vtkNotUsed(caller), unsigned long event, void*) + void Execute (vtkObject *vtkNotUsed(caller), unsigned long event, void*) override { // mark the Node with an attribute to indicate if it is currently being interacted with diff --git a/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationFiducialDisplayableManager.h b/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationFiducialDisplayableManager.h index f5a6fb8cc6e35b942eed7b77752dbad1f5e70e6b..79e13d04192242d21fe63d45241f5c4cea787149 100644 --- a/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationFiducialDisplayableManager.h +++ b/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationFiducialDisplayableManager.h @@ -36,38 +36,38 @@ public: static vtkMRMLAnnotationFiducialDisplayableManager *New(); vtkTypeMacro(vtkMRMLAnnotationFiducialDisplayableManager, vtkMRMLAnnotationDisplayableManager); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; protected: vtkMRMLAnnotationFiducialDisplayableManager(){this->m_Focus="vtkMRMLAnnotationFiducialNode";} - virtual ~vtkMRMLAnnotationFiducialDisplayableManager(){} + ~vtkMRMLAnnotationFiducialDisplayableManager() override{} /// Callback for click in RenderWindow - virtual void OnClickInRenderWindow(double x, double y, const char *associatedNodeID) VTK_OVERRIDE; + void OnClickInRenderWindow(double x, double y, const char *associatedNodeID) override; /// Create a widget. - virtual vtkAbstractWidget * CreateWidget(vtkMRMLAnnotationNode* node) VTK_OVERRIDE; + vtkAbstractWidget * CreateWidget(vtkMRMLAnnotationNode* node) override; /// Gets called when widget was created - virtual void OnWidgetCreated(vtkAbstractWidget * widget, vtkMRMLAnnotationNode * node) VTK_OVERRIDE; + void OnWidgetCreated(vtkAbstractWidget * widget, vtkMRMLAnnotationNode * node) override; /// Propagate properties of MRML node to widget. - virtual void PropagateMRMLToWidget(vtkMRMLAnnotationNode* node, vtkAbstractWidget * widget) VTK_OVERRIDE; + void PropagateMRMLToWidget(vtkMRMLAnnotationNode* node, vtkAbstractWidget * widget) override; /// Propagate properties of widget to MRML node. - virtual void PropagateWidgetToMRML(vtkAbstractWidget * widget, vtkMRMLAnnotationNode* node) VTK_OVERRIDE; + void PropagateWidgetToMRML(vtkAbstractWidget * widget, vtkMRMLAnnotationNode* node) override; /// set up an observer on the interactor style to watch for key press events virtual void AdditionnalInitializeStep(); /// respond to the interactor style event - virtual void OnInteractorStyleEvent(int eventid) VTK_OVERRIDE; + void OnInteractorStyleEvent(int eventid) override; // respond to control point modified events - virtual void UpdatePosition(vtkAbstractWidget *widget, vtkMRMLNode *node) VTK_OVERRIDE; + void UpdatePosition(vtkAbstractWidget *widget, vtkMRMLNode *node) override; std::map NodeGlyphTypes; // clean up when scene closes - virtual void OnMRMLSceneEndClose() VTK_OVERRIDE; + void OnMRMLSceneEndClose() override; private: diff --git a/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationROIDisplayableManager.cxx b/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationROIDisplayableManager.cxx index fe18014b5fdeb129dc3494eec962ac73e78d285b..fb30728f40695332162d510e6f039ec49aad36c4 100644 --- a/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationROIDisplayableManager.cxx +++ b/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationROIDisplayableManager.cxx @@ -62,7 +62,7 @@ public: vtkAnnotationROIWidgetCallback(){} - virtual void Execute (vtkObject *vtkNotUsed(caller), unsigned long event, void*) + void Execute (vtkObject *vtkNotUsed(caller), unsigned long event, void*) override { if ((event == vtkCommand::EndInteractionEvent) || (event == vtkCommand::InteractionEvent)) { diff --git a/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationROIDisplayableManager.h b/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationROIDisplayableManager.h index f5500eab87dca5b2d5f9a0a12cfdf7b71cf883de..fc1063abc336a72b844ad6506b3f1250985f6c63 100644 --- a/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationROIDisplayableManager.h +++ b/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationROIDisplayableManager.h @@ -35,42 +35,42 @@ public: static vtkMRMLAnnotationROIDisplayableManager *New(); vtkTypeMacro(vtkMRMLAnnotationROIDisplayableManager, vtkMRMLAnnotationDisplayableManager); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; protected: vtkMRMLAnnotationROIDisplayableManager(){this->m_Focus="vtkMRMLAnnotationROINode";} - virtual ~vtkMRMLAnnotationROIDisplayableManager(); + ~vtkMRMLAnnotationROIDisplayableManager() override; /// Callback for click in RenderWindow - virtual void OnClickInRenderWindow(double x, double y, const char *associatedNodeID) VTK_OVERRIDE; + void OnClickInRenderWindow(double x, double y, const char *associatedNodeID) override; /// Create a widget. - virtual vtkAbstractWidget * CreateWidget(vtkMRMLAnnotationNode* node) VTK_OVERRIDE; + vtkAbstractWidget * CreateWidget(vtkMRMLAnnotationNode* node) override; /// Gets called when widget was created - virtual void OnWidgetCreated(vtkAbstractWidget * widget, vtkMRMLAnnotationNode * node) VTK_OVERRIDE; + void OnWidgetCreated(vtkAbstractWidget * widget, vtkMRMLAnnotationNode * node) override; /// Propagate properties of MRML node to widget. - virtual void PropagateMRMLToWidget(vtkMRMLAnnotationNode* node, vtkAbstractWidget * widget) VTK_OVERRIDE; + void PropagateMRMLToWidget(vtkMRMLAnnotationNode* node, vtkAbstractWidget * widget) override; virtual void PropagateMRMLToWidget2D(vtkMRMLAnnotationNode* node, vtkAbstractWidget * widget); /// Propagate properties of widget to MRML node. - virtual void PropagateWidgetToMRML(vtkAbstractWidget * widget, vtkMRMLAnnotationNode* node) VTK_OVERRIDE; + void PropagateWidgetToMRML(vtkAbstractWidget * widget, vtkMRMLAnnotationNode* node) override; - virtual void OnMRMLSceneNodeRemoved(vtkMRMLNode* node) VTK_OVERRIDE; + void OnMRMLSceneNodeRemoved(vtkMRMLNode* node) override; /// Handler for specific SliceView actions - virtual void OnMRMLSliceNodeModifiedEvent(vtkMRMLSliceNode * sliceNode) VTK_OVERRIDE; + void OnMRMLSliceNodeModifiedEvent(vtkMRMLSliceNode * sliceNode) override; /// Update just the position for the widget, implemented by subclasses. - virtual void UpdatePosition(vtkAbstractWidget *widget, vtkMRMLNode *node) VTK_OVERRIDE; + void UpdatePosition(vtkAbstractWidget *widget, vtkMRMLNode *node) override; /// Check, if the widget is displayable in the current slice geometry - virtual bool IsWidgetDisplayable(vtkMRMLSliceNode *sliceNode, vtkMRMLAnnotationNode* node) VTK_OVERRIDE; + bool IsWidgetDisplayable(vtkMRMLSliceNode *sliceNode, vtkMRMLAnnotationNode* node) override; /// Set mrml parent transform to widgets - virtual void SetParentTransformToWidget(vtkMRMLAnnotationNode *node, vtkAbstractWidget *widget) VTK_OVERRIDE; + void SetParentTransformToWidget(vtkMRMLAnnotationNode *node, vtkAbstractWidget *widget) override; private: diff --git a/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationRulerDisplayableManager.cxx b/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationRulerDisplayableManager.cxx index 875b14556c6592ed5e080c45dfdbb099638ccf32..f4d477f3f35300f094f86a765f1f1328edf4a0c4 100644 --- a/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationRulerDisplayableManager.cxx +++ b/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationRulerDisplayableManager.cxx @@ -65,7 +65,7 @@ public: vtkAnnotationRulerWidgetCallback(){} - virtual void Execute (vtkObject *vtkNotUsed(caller), unsigned long event, void*) + void Execute (vtkObject *vtkNotUsed(caller), unsigned long event, void*) override { if ((event == vtkCommand::EndInteractionEvent) || (event == vtkCommand::InteractionEvent)) diff --git a/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationRulerDisplayableManager.h b/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationRulerDisplayableManager.h index 7eead75c4313d2f980ef4d0e6b9c02f3a78aff57..60ca6a01b209b77373bc4f7d66c320208471c904 100644 --- a/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationRulerDisplayableManager.h +++ b/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationRulerDisplayableManager.h @@ -37,28 +37,28 @@ public: static vtkMRMLAnnotationRulerDisplayableManager *New(); vtkTypeMacro(vtkMRMLAnnotationRulerDisplayableManager, vtkMRMLAnnotationDisplayableManager); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; protected: vtkMRMLAnnotationRulerDisplayableManager(){this->m_Focus="vtkMRMLAnnotationRulerNode";} - virtual ~vtkMRMLAnnotationRulerDisplayableManager(){} + ~vtkMRMLAnnotationRulerDisplayableManager() override{} /// Callback for click in RenderWindow - virtual void OnClickInRenderWindow(double x, double y, const char *associatedNodeID) VTK_OVERRIDE; + void OnClickInRenderWindow(double x, double y, const char *associatedNodeID) override; /// Create a widget. - virtual vtkAbstractWidget * CreateWidget(vtkMRMLAnnotationNode* node) VTK_OVERRIDE; + vtkAbstractWidget * CreateWidget(vtkMRMLAnnotationNode* node) override; /// Gets called when widget was created - virtual void OnWidgetCreated(vtkAbstractWidget * widget, vtkMRMLAnnotationNode * node) VTK_OVERRIDE; + void OnWidgetCreated(vtkAbstractWidget * widget, vtkMRMLAnnotationNode * node) override; /// Propagate properties of MRML node to widget. - virtual void PropagateMRMLToWidget(vtkMRMLAnnotationNode* node, vtkAbstractWidget * widget) VTK_OVERRIDE; + void PropagateMRMLToWidget(vtkMRMLAnnotationNode* node, vtkAbstractWidget * widget) override; /// Propagate properties of widget to MRML node. - virtual void PropagateWidgetToMRML(vtkAbstractWidget * widget, vtkMRMLAnnotationNode* node) VTK_OVERRIDE; + void PropagateWidgetToMRML(vtkAbstractWidget * widget, vtkMRMLAnnotationNode* node) override; // update the ruler end point positions from the MRML node - virtual void UpdatePosition(vtkAbstractWidget *widget, vtkMRMLNode *node) VTK_OVERRIDE; + void UpdatePosition(vtkAbstractWidget *widget, vtkMRMLNode *node) override; // Get the label from the node and unit node std::string GetLabelFormat(vtkMRMLAnnotationRulerNode* rulerNode); @@ -72,7 +72,7 @@ protected: /// When the unit has changed, modify the ruler nodes to refresh the label. /// \sa AddObserversToSelectionNode(), RemoveObserversFromSelectionNode() - virtual void OnMRMLSelectionNodeUnitModifiedEvent(vtkMRMLSelectionNode* selectionNode) VTK_OVERRIDE; + void OnMRMLSelectionNodeUnitModifiedEvent(vtkMRMLSelectionNode* selectionNode) override; private: diff --git a/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationTextDisplayableManager.cxx b/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationTextDisplayableManager.cxx index a319424eb4d6e96c3aac856c4a2f7b3917b223d5..db588483176bad5d81824ba578d3f9d6d69a243a 100644 --- a/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationTextDisplayableManager.cxx +++ b/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationTextDisplayableManager.cxx @@ -49,7 +49,7 @@ public: vtkAnnotationTextWidgetCallback(){} - virtual void Execute (vtkObject *vtkNotUsed(caller), unsigned long event, void*) + void Execute (vtkObject *vtkNotUsed(caller), unsigned long event, void*) override { if ((event == vtkCommand::EndInteractionEvent) || (event == vtkCommand::InteractionEvent)) { diff --git a/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationTextDisplayableManager.h b/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationTextDisplayableManager.h index 66412ab2ff05fa9fc7251178527a19e61d291f03..a93954334f32a4df5ccd32346a72282d39c22244 100644 --- a/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationTextDisplayableManager.h +++ b/Modules/Loadable/Annotations/MRMLDM/vtkMRMLAnnotationTextDisplayableManager.h @@ -36,28 +36,28 @@ public: static vtkMRMLAnnotationTextDisplayableManager *New(); vtkTypeMacro(vtkMRMLAnnotationTextDisplayableManager, vtkMRMLAnnotationDisplayableManager); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; protected: vtkMRMLAnnotationTextDisplayableManager(){this->m_Focus="vtkMRMLAnnotationTextNode";} - virtual ~vtkMRMLAnnotationTextDisplayableManager(){} + ~vtkMRMLAnnotationTextDisplayableManager() override{} /// Callback for click in RenderWindow - virtual void OnClickInRenderWindow(double x, double y, const char *associatedNodeID) VTK_OVERRIDE; + void OnClickInRenderWindow(double x, double y, const char *associatedNodeID) override; /// Create a widget. - virtual vtkAbstractWidget * CreateWidget(vtkMRMLAnnotationNode* node) VTK_OVERRIDE; + vtkAbstractWidget * CreateWidget(vtkMRMLAnnotationNode* node) override; /// Gets called when widget was created - virtual void OnWidgetCreated(vtkAbstractWidget * widget, vtkMRMLAnnotationNode * node) VTK_OVERRIDE; + void OnWidgetCreated(vtkAbstractWidget * widget, vtkMRMLAnnotationNode * node) override; /// Propagate properties of MRML node to widget. - virtual void PropagateMRMLToWidget(vtkMRMLAnnotationNode* node, vtkAbstractWidget * widget) VTK_OVERRIDE; + void PropagateMRMLToWidget(vtkMRMLAnnotationNode* node, vtkAbstractWidget * widget) override; /// Propagate properties of widget to MRML node. - virtual void PropagateWidgetToMRML(vtkAbstractWidget * widget, vtkMRMLAnnotationNode* node) VTK_OVERRIDE; + void PropagateWidgetToMRML(vtkAbstractWidget * widget, vtkMRMLAnnotationNode* node) override; // update just the position, called from PropagateMRMLToWidget and in // response to slice node modified events - virtual void UpdatePosition(vtkAbstractWidget *widget, vtkMRMLNode *node) VTK_OVERRIDE; + void UpdatePosition(vtkAbstractWidget *widget, vtkMRMLNode *node) override; /// Examine nodes in the scene and try to pick a caption coordinate that /// doesn't conflict. diff --git a/Modules/Loadable/Annotations/Testing/Cxx/vtkMRMLAnnotationDisplayableManagerTest1.cxx b/Modules/Loadable/Annotations/Testing/Cxx/vtkMRMLAnnotationDisplayableManagerTest1.cxx index 3e1a811f44ef4a1fd76e4ed83be67c25429d90db..bf0d4d86a75d5880ba1ae22ea9602c42d9986692 100644 --- a/Modules/Loadable/Annotations/Testing/Cxx/vtkMRMLAnnotationDisplayableManagerTest1.cxx +++ b/Modules/Loadable/Annotations/Testing/Cxx/vtkMRMLAnnotationDisplayableManagerTest1.cxx @@ -53,7 +53,7 @@ public: { this->Renderer = renderer; } int GetRenderRequestCount() { return this->RenderRequestCount; } - virtual void Execute(vtkObject*, unsigned long , void* ) + void Execute(vtkObject*, unsigned long , void* ) override { this->Renderer->GetRenderWindow()->Render(); this->RenderRequestCount++; diff --git a/Modules/Loadable/Annotations/Testing/Cxx/vtkMRMLAnnotationNodesUndoTest1.cxx b/Modules/Loadable/Annotations/Testing/Cxx/vtkMRMLAnnotationNodesUndoTest1.cxx index 12b1a03868bd5183406f4f04555a694fb5a77028..1ac200135cf55ce160e2adcf165111cde3565478 100644 --- a/Modules/Loadable/Annotations/Testing/Cxx/vtkMRMLAnnotationNodesUndoTest1.cxx +++ b/Modules/Loadable/Annotations/Testing/Cxx/vtkMRMLAnnotationNodesUndoTest1.cxx @@ -38,7 +38,7 @@ public: { this->Renderer = renderer; } int GetRenderRequestCount() { return this->RenderRequestCount; } - virtual void Execute(vtkObject*, unsigned long , void* ) + void Execute(vtkObject*, unsigned long , void* ) override { this->Renderer->GetRenderWindow()->Render(); this->RenderRequestCount++; diff --git a/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationBidimensionalRepresentation.h b/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationBidimensionalRepresentation.h index 2a3ba70c48bb0b12527fba33482d2a1f25416fcf..5e2002f9fee866490b85ac02587c00a3fab4b51c 100644 --- a/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationBidimensionalRepresentation.h +++ b/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationBidimensionalRepresentation.h @@ -30,7 +30,7 @@ public: static vtkAnnotationBidimensionalRepresentation *New(); vtkTypeMacro(vtkAnnotationBidimensionalRepresentation, vtkBiDimensionalRepresentation2D); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; void SetDistance1(double distance); void SetDistance2(double distance); @@ -38,9 +38,9 @@ public: protected: vtkAnnotationBidimensionalRepresentation(); - virtual ~vtkAnnotationBidimensionalRepresentation(); + ~vtkAnnotationBidimensionalRepresentation() override; - virtual void BuildRepresentation() VTK_OVERRIDE; + void BuildRepresentation() override; private: diff --git a/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationBidimensionalWidget.h b/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationBidimensionalWidget.h index 695927e0194f37466d66b2c9fe0ae6d6393455c5..c4df9a05278dbc6a8dff3dd6c77dbe0d92d1759e 100644 --- a/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationBidimensionalWidget.h +++ b/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationBidimensionalWidget.h @@ -30,14 +30,14 @@ public: static vtkAnnotationBidimensionalWidget *New(); vtkTypeMacro(vtkAnnotationBidimensionalWidget, vtkBiDimensionalWidget); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual void CreateDefaultRepresentation() VTK_OVERRIDE; + void CreateDefaultRepresentation() override; protected: vtkAnnotationBidimensionalWidget(); - virtual ~vtkAnnotationBidimensionalWidget(); + ~vtkAnnotationBidimensionalWidget() override; private: diff --git a/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationGlyphSource2D.h b/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationGlyphSource2D.h index 0061eafcc7e47c2b7be7384e48be833876b58ac8..e44fad57f858b32ccdb04cc8665b652f982c77c4 100644 --- a/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationGlyphSource2D.h +++ b/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationGlyphSource2D.h @@ -62,7 +62,7 @@ vtkAnnotationGlyphSource2D { public: vtkTypeMacro(vtkAnnotationGlyphSource2D,vtkPolyDataAlgorithm); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// /// Construct a vertex glyph centered at the origin, scale 1.0, white in @@ -144,9 +144,9 @@ public: protected: vtkAnnotationGlyphSource2D(); - ~vtkAnnotationGlyphSource2D() {}; + ~vtkAnnotationGlyphSource2D() override {}; - int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE; + int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override; double Center[3]; double Scale; diff --git a/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationROIRepresentation.h b/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationROIRepresentation.h index c0d51b624f218b9bbbf5f36edda77d45d1deefb7..b7bef2b3fc45f29fdf120a3c2ee8a61325ceb5f4 100644 --- a/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationROIRepresentation.h +++ b/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationROIRepresentation.h @@ -68,7 +68,7 @@ public: /// /// Standard methods for the class. vtkTypeMacro(vtkAnnotationROIRepresentation,vtkWidgetRepresentation); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; static const int NUMBER_HANDLES = 7; @@ -166,19 +166,19 @@ public: /// /// These are methods that satisfy vtkWidgetRepresentation's API. - virtual void PlaceWidget(double bounds[6]) VTK_OVERRIDE; - virtual void BuildRepresentation() VTK_OVERRIDE; - virtual int ComputeInteractionState(int X, int Y, int modify=0) VTK_OVERRIDE; - virtual void StartWidgetInteraction(double e[2]) VTK_OVERRIDE; - virtual void WidgetInteraction(double e[2]) VTK_OVERRIDE; - virtual double *GetBounds() VTK_OVERRIDE; + void PlaceWidget(double bounds[6]) override; + void BuildRepresentation() override; + int ComputeInteractionState(int X, int Y, int modify=0) override; + void StartWidgetInteraction(double e[2]) override; + void WidgetInteraction(double e[2]) override; + double *GetBounds() override; /// /// Methods supporting, and required by, the rendering process. - virtual void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE; - virtual int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE; - virtual int RenderTranslucentPolygonalGeometry(vtkViewport*) VTK_OVERRIDE; - virtual int HasTranslucentPolygonalGeometry() VTK_OVERRIDE; + void ReleaseGraphicsResources(vtkWindow*) override; + int RenderOpaqueGeometry(vtkViewport*) override; + int RenderTranslucentPolygonalGeometry(vtkViewport*) override; + int HasTranslucentPolygonalGeometry() override; enum {Outside=0,MoveF0,MoveF1,MoveF2,MoveF3,MoveF4,MoveF5,Translating,Rotating,Scaling}; @@ -200,12 +200,12 @@ public: /// get 3 extents along sides of the box void GetExtents(double bounds[]); - virtual void GetActors(vtkPropCollection *actors) VTK_OVERRIDE; + void GetActors(vtkPropCollection *actors) override; protected: vtkAnnotationROIRepresentation(); - ~vtkAnnotationROIRepresentation(); + ~vtkAnnotationROIRepresentation() override; /// Manage how the representation appears double LastEventPosition[4]; diff --git a/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationROIRepresentation2D.h b/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationROIRepresentation2D.h index 98f38207c043121a038e34ca9b21975fe3156283..a8a7d6743c595f351fbf297e105c179a159eb193 100644 --- a/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationROIRepresentation2D.h +++ b/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationROIRepresentation2D.h @@ -70,7 +70,7 @@ public: /// /// Standard methods for the class. vtkTypeMacro(vtkAnnotationROIRepresentation2D,vtkAnnotationROIRepresentation); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// /// Get the intersecting plane; @@ -79,25 +79,25 @@ public: /// Get Intersection transform to 2D coordinate system vtkGetObjectMacro(IntersectionPlaneTransform,vtkTransform); - virtual void GetActors2D(vtkPropCollection *actors) VTK_OVERRIDE; + void GetActors2D(vtkPropCollection *actors) override; void GetIntersectionActors(vtkPropCollection *actors); - virtual int ComputeInteractionState(int X, int Y, int modify=0) VTK_OVERRIDE; - virtual void StartWidgetInteraction(double e[2]) VTK_OVERRIDE; - virtual void WidgetInteraction(double e[2]) VTK_OVERRIDE; - virtual void SetInteractionState(int state) VTK_OVERRIDE; + int ComputeInteractionState(int X, int Y, int modify=0) override; + void StartWidgetInteraction(double e[2]) override; + void WidgetInteraction(double e[2]) override; + void SetInteractionState(int state) override; /// /// Methods supporting, and required by, the rendering process. - virtual void ReleaseGraphicsResources(vtkWindow*) VTK_OVERRIDE; - virtual int RenderOpaqueGeometry(vtkViewport*) VTK_OVERRIDE; - virtual int RenderTranslucentPolygonalGeometry(vtkViewport*) VTK_OVERRIDE; - virtual int RenderOverlay(vtkViewport *viewport) VTK_OVERRIDE; + void ReleaseGraphicsResources(vtkWindow*) override; + int RenderOpaqueGeometry(vtkViewport*) override; + int RenderTranslucentPolygonalGeometry(vtkViewport*) override; + int RenderOverlay(vtkViewport *viewport) override; - virtual int HasTranslucentPolygonalGeometry() VTK_OVERRIDE; + int HasTranslucentPolygonalGeometry() override; - virtual void SizeHandles() VTK_OVERRIDE; + void SizeHandles() override; vtkGetMacro(SliceIntersectionVisibility, int); vtkSetMacro(SliceIntersectionVisibility, int); @@ -105,8 +105,8 @@ public: vtkGetMacro(HandlesVisibility, int); vtkSetMacro(HandlesVisibility, int); - virtual int HighlightHandle(vtkProp *prop) VTK_OVERRIDE; - virtual void HighlightFace(int cellId) VTK_OVERRIDE; + int HighlightHandle(vtkProp *prop) override; + void HighlightFace(int cellId) override; /// /// Set/Get the handle diameter as a fraction of the window diagonal. @@ -118,7 +118,7 @@ public: protected: vtkAnnotationROIRepresentation2D(); - ~vtkAnnotationROIRepresentation2D(); + ~vtkAnnotationROIRepresentation2D() override; // Compute intersection line of the inputIntersectionFace and the slice plane // It is 50x faster than computing the intersection using vtkCutter @@ -153,8 +153,8 @@ protected: double ComputeHandleRadiusInWorldCoordinates(double radInPixels); - virtual void CreateDefaultProperties() VTK_OVERRIDE; - virtual void PositionHandles() VTK_OVERRIDE; + void CreateDefaultProperties() override; + void PositionHandles() override; int SliceIntersectionVisibility; diff --git a/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationROIWidget.h b/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationROIWidget.h index b2ce8cce09c49e6255699943440f8776e3eff54d..64e9c868a9115b5d8a64d64616f9cf4ea8d6ff19 100644 --- a/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationROIWidget.h +++ b/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationROIWidget.h @@ -110,7 +110,7 @@ public: /// /// Standard class methods for type information and printing. vtkTypeMacro(vtkAnnotationROIWidget,vtkAbstractWidget); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// /// Specify an instance of vtkWidgetRepresentation used to represent this @@ -138,11 +138,11 @@ public: /// /// Create the default widget representation if one is not set. By default, /// this is an instance of the vtkAnnotationROIRepresentation class. - virtual void CreateDefaultRepresentation() VTK_OVERRIDE; + void CreateDefaultRepresentation() override; protected: vtkAnnotationROIWidget(); - ~vtkAnnotationROIWidget(); + ~vtkAnnotationROIWidget() override; int WidgetState; enum _WidgetState {Start=0,Active}; diff --git a/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationROIWidget2D.h b/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationROIWidget2D.h index 481d2516e984750a4c7d604c0d8bf983910a0b48..8e74aff92165359f6ef846801599d1649b839822 100644 --- a/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationROIWidget2D.h +++ b/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationROIWidget2D.h @@ -109,13 +109,13 @@ public: /// /// Standard class methods for type information and printing. vtkTypeMacro(vtkAnnotationROIWidget2D,vtkAnnotationROIWidget); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// /// Specify an instance of vtkWidgetRepresentation used to represent this /// widget in the scene. Note that the representation is a subclass of vtkProp /// so it can be added to the renderer independent of the widget. - virtual void SetRepresentation(vtkAnnotationROIRepresentation *r) VTK_OVERRIDE + void SetRepresentation(vtkAnnotationROIRepresentation *r) override { this->Superclass::SetWidgetRepresentation(reinterpret_cast(r)); } @@ -123,11 +123,11 @@ public: /// /// Create the default widget representation if one is not set. By default, /// this is an instance of the vtkAnnotationROIRepresentation class. - virtual void CreateDefaultRepresentation() VTK_OVERRIDE; + void CreateDefaultRepresentation() override; protected: vtkAnnotationROIWidget2D(); - ~vtkAnnotationROIWidget2D(); + ~vtkAnnotationROIWidget2D() override; private: vtkAnnotationROIWidget2D(const vtkAnnotationROIWidget2D&); //Not implemented diff --git a/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationRulerRepresentation.h b/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationRulerRepresentation.h index 35f206c68949f9225813dc3561a11f09f7c2b4b8..1a2d746db28417f67b267d9bb5d1b490ae508472 100644 --- a/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationRulerRepresentation.h +++ b/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationRulerRepresentation.h @@ -30,7 +30,7 @@ public: static vtkAnnotationRulerRepresentation *New(); vtkTypeMacro(vtkAnnotationRulerRepresentation, vtkDistanceRepresentation2D); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; void SetDistance(double distance); @@ -41,9 +41,9 @@ public: protected: vtkAnnotationRulerRepresentation(); - virtual ~vtkAnnotationRulerRepresentation(); + ~vtkAnnotationRulerRepresentation() override; - virtual void BuildRepresentation() VTK_OVERRIDE; + void BuildRepresentation() override; private: diff --git a/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationRulerRepresentation3D.h b/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationRulerRepresentation3D.h index ee4885249d2227dff954db5d310266d5991c1204..a332d91cdeec722eb9736b95b2aff4a1ab59e0eb 100644 --- a/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationRulerRepresentation3D.h +++ b/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationRulerRepresentation3D.h @@ -30,13 +30,13 @@ public: static vtkAnnotationRulerRepresentation3D *New(); vtkTypeMacro(vtkAnnotationRulerRepresentation3D, vtkDistanceRepresentation3D); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; void SetDistance(double distance); // Description: // Get the line actor property - virtual vtkProperty *GetLineProperty() VTK_OVERRIDE; + vtkProperty *GetLineProperty() override; // Description: // Set/Get position of the label title. 0 is at the start of the @@ -56,14 +56,14 @@ public: // Required by the rendering process, check if the glyph and label actors // have translucency and return true if so. Fixes a bug when the label // was set to a non 1 opacity but was not being rendered. - virtual int HasTranslucentPolygonalGeometry() VTK_OVERRIDE; + int HasTranslucentPolygonalGeometry() override; protected: vtkAnnotationRulerRepresentation3D(); - virtual ~vtkAnnotationRulerRepresentation3D(); + ~vtkAnnotationRulerRepresentation3D() override; - virtual void BuildRepresentation() VTK_OVERRIDE; + void BuildRepresentation() override; // Internal use: set the label actor's position from current world point 1 // and 2 positions and label position factor diff --git a/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationRulerWidget.h b/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationRulerWidget.h index a3fde0f219824de48b44beac8447c6e23f39a8fc..61e2d12b77c44f3b4a56f5285957098e390c659c 100644 --- a/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationRulerWidget.h +++ b/Modules/Loadable/Annotations/VTKWidgets/vtkAnnotationRulerWidget.h @@ -29,9 +29,9 @@ public: static vtkAnnotationRulerWidget *New(); vtkTypeMacro(vtkAnnotationRulerWidget, vtkDistanceWidget); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual void CreateDefaultRepresentation() VTK_OVERRIDE; + void CreateDefaultRepresentation() override; /// Return True if the widget will build its 2D representation bool GetIs2DWidget(); @@ -42,7 +42,7 @@ public: protected: vtkAnnotationRulerWidget(); - virtual ~vtkAnnotationRulerWidget(); + ~vtkAnnotationRulerWidget() override; bool Is2DWidget; diff --git a/Modules/Loadable/Annotations/Widgets/DesignerPlugins/qMRMLAnnotationFiducialProjectionPropertyWidgetPlugin.h b/Modules/Loadable/Annotations/Widgets/DesignerPlugins/qMRMLAnnotationFiducialProjectionPropertyWidgetPlugin.h index 07a20dc2b1b4e9227fecf4842347c38c112967e4..e158204affbc1a35c5ddccac8ac847280be29c08 100644 --- a/Modules/Loadable/Annotations/Widgets/DesignerPlugins/qMRMLAnnotationFiducialProjectionPropertyWidgetPlugin.h +++ b/Modules/Loadable/Annotations/Widgets/DesignerPlugins/qMRMLAnnotationFiducialProjectionPropertyWidgetPlugin.h @@ -35,11 +35,11 @@ qMRMLAnnotationFiducialProjectionPropertyWidgetPlugin public: qMRMLAnnotationFiducialProjectionPropertyWidgetPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Modules/Loadable/Annotations/Widgets/DesignerPlugins/qMRMLAnnotationROIWidgetPlugin.h b/Modules/Loadable/Annotations/Widgets/DesignerPlugins/qMRMLAnnotationROIWidgetPlugin.h index 06dc5c3373765f980b748e591354cc3364917739..cd4d369f27eec5cc95abb9bfbb2f131daccf6a52 100644 --- a/Modules/Loadable/Annotations/Widgets/DesignerPlugins/qMRMLAnnotationROIWidgetPlugin.h +++ b/Modules/Loadable/Annotations/Widgets/DesignerPlugins/qMRMLAnnotationROIWidgetPlugin.h @@ -31,11 +31,11 @@ class Q_SLICER_MODULE_ANNOTATIONS_WIDGETS_PLUGINS_EXPORT qMRMLAnnotationROIWidge public: qMRMLAnnotationROIWidgetPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Modules/Loadable/Annotations/Widgets/DesignerPlugins/qMRMLAnnotationRulerProjectionPropertyWidgetPlugin.h b/Modules/Loadable/Annotations/Widgets/DesignerPlugins/qMRMLAnnotationRulerProjectionPropertyWidgetPlugin.h index 03c5d5ea2a0e0cfcca9bd7d47afa062227f82254..327796b93207bfa861c2a43dd2498e064be979d9 100644 --- a/Modules/Loadable/Annotations/Widgets/DesignerPlugins/qMRMLAnnotationRulerProjectionPropertyWidgetPlugin.h +++ b/Modules/Loadable/Annotations/Widgets/DesignerPlugins/qMRMLAnnotationRulerProjectionPropertyWidgetPlugin.h @@ -35,11 +35,11 @@ qMRMLAnnotationRulerProjectionPropertyWidgetPlugin public: qMRMLAnnotationRulerProjectionPropertyWidgetPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Modules/Loadable/Annotations/Widgets/DesignerPlugins/qMRMLAnnotationTreeViewPlugin.h b/Modules/Loadable/Annotations/Widgets/DesignerPlugins/qMRMLAnnotationTreeViewPlugin.h index 34d5caf47b60c50226b30ddb29e9419afe86ddc3..cd4cf312921156939abb3b9117e86b550541602f 100644 --- a/Modules/Loadable/Annotations/Widgets/DesignerPlugins/qMRMLAnnotationTreeViewPlugin.h +++ b/Modules/Loadable/Annotations/Widgets/DesignerPlugins/qMRMLAnnotationTreeViewPlugin.h @@ -32,11 +32,11 @@ class Q_SLICER_MODULE_ANNOTATIONS_WIDGETS_PLUGINS_EXPORT qMRMLAnnotationTreeView public: qMRMLAnnotationTreeViewPlugin(QObject* parent = 0); - QWidget *createWidget(QWidget* parent); - QString domXml() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget* parent) override; + QString domXml() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Modules/Loadable/Annotations/Widgets/DesignerPlugins/qSlicerAnnotationModuleWidgetsAbstractPlugin.h b/Modules/Loadable/Annotations/Widgets/DesignerPlugins/qSlicerAnnotationModuleWidgetsAbstractPlugin.h index 9a6caed41146c5326afd8854efb715ae71de59fd..721842be2d204b177b52e1814a795977035ed62e 100644 --- a/Modules/Loadable/Annotations/Widgets/DesignerPlugins/qSlicerAnnotationModuleWidgetsAbstractPlugin.h +++ b/Modules/Loadable/Annotations/Widgets/DesignerPlugins/qSlicerAnnotationModuleWidgetsAbstractPlugin.h @@ -34,11 +34,11 @@ public: qSlicerAnnotationModuleWidgetsAbstractPlugin(); // Don't reimplement this method. - QString group() const; + QString group() const override; // You can reimplement these methods - virtual QIcon icon() const; - virtual QString toolTip() const; - virtual QString whatsThis() const; + QIcon icon() const override; + QString toolTip() const override; + QString whatsThis() const override; }; diff --git a/Modules/Loadable/Annotations/Widgets/DesignerPlugins/qSlicerAnnotationModuleWidgetsPlugin.h b/Modules/Loadable/Annotations/Widgets/DesignerPlugins/qSlicerAnnotationModuleWidgetsPlugin.h index f015aee14982ad9925a6c3155ce5d84b94a4259c..b6d4c3f89a09bf1a12af659b6d736696909a9257 100644 --- a/Modules/Loadable/Annotations/Widgets/DesignerPlugins/qSlicerAnnotationModuleWidgetsPlugin.h +++ b/Modules/Loadable/Annotations/Widgets/DesignerPlugins/qSlicerAnnotationModuleWidgetsPlugin.h @@ -40,7 +40,7 @@ class Q_SLICER_MODULE_ANNOTATIONS_WIDGETS_PLUGINS_EXPORT qSlicerAnnotationModule Q_INTERFACES(QDesignerCustomWidgetCollectionInterface); public: - QList customWidgets() const + QList customWidgets() const override { QList plugins; plugins << new qMRMLAnnotationFiducialProjectionPropertyWidgetPlugin diff --git a/Modules/Loadable/Annotations/Widgets/qMRMLAnnotationROIWidget.h b/Modules/Loadable/Annotations/Widgets/qMRMLAnnotationROIWidget.h index 398b58bb2a11722911941ca236653e5d4a88711a..00c809df43d56def1f5c135e7332d32737df1f0c 100644 --- a/Modules/Loadable/Annotations/Widgets/qMRMLAnnotationROIWidget.h +++ b/Modules/Loadable/Annotations/Widgets/qMRMLAnnotationROIWidget.h @@ -43,7 +43,7 @@ class Q_SLICER_MODULE_ANNOTATIONS_WIDGETS_EXPORT qMRMLAnnotationROIWidget : publ public: /// Constructors explicit qMRMLAnnotationROIWidget(QWidget* parent = 0); - virtual ~qMRMLAnnotationROIWidget(); + ~qMRMLAnnotationROIWidget() override; /// Returns the current MRML ROI node vtkMRMLAnnotationROINode* mrmlROINode()const; diff --git a/Modules/Loadable/Annotations/qSlicerAnnotationsIOOptionsWidget.h b/Modules/Loadable/Annotations/qSlicerAnnotationsIOOptionsWidget.h index f82b3d91156ce68d5f16f89a6610c36885045aac..8e0a0c44722cc0bd11c2dd5dd43376275f787599 100644 --- a/Modules/Loadable/Annotations/qSlicerAnnotationsIOOptionsWidget.h +++ b/Modules/Loadable/Annotations/qSlicerAnnotationsIOOptionsWidget.h @@ -36,13 +36,13 @@ class qSlicerAnnotationsIOOptionsWidget : Q_OBJECT public: qSlicerAnnotationsIOOptionsWidget(QWidget *parent=0); - virtual ~qSlicerAnnotationsIOOptionsWidget(); + ~qSlicerAnnotationsIOOptionsWidget() override; QButtonGroup* FileTypeButtonGroup; public slots: - virtual void setFileName(const QString& fileName); - virtual void setFileNames(const QStringList& fileNames); + void setFileName(const QString& fileName) override; + void setFileNames(const QStringList& fileNames) override; protected slots: void updateProperties(); diff --git a/Modules/Loadable/Annotations/qSlicerAnnotationsModule.h b/Modules/Loadable/Annotations/qSlicerAnnotationsModule.h index 7a6d61e37f6a76b5be9dc81792c88cd9de1f8ec8..e184bc5c2de90641cf41b85249941a447dc78a9f 100644 --- a/Modules/Loadable/Annotations/qSlicerAnnotationsModule.h +++ b/Modules/Loadable/Annotations/qSlicerAnnotationsModule.h @@ -23,36 +23,36 @@ public: typedef qSlicerLoadableModule Superclass; qSlicerAnnotationsModule(QObject *parent=0); - virtual ~qSlicerAnnotationsModule(); + ~qSlicerAnnotationsModule() override; /// Return the help and acknowledgement text for the Annotation module. - virtual QString helpText()const; - virtual QString acknowledgementText()const; - virtual QStringList contributors()const; - virtual QStringList dependencies() const; + QString helpText()const override; + QString acknowledgementText()const override; + QStringList contributors()const override; + QStringList dependencies() const override; /// Return the icon of the Annotation module. - virtual QIcon icon()const; + QIcon icon()const override; - virtual QStringList categories()const; + QStringList categories()const override; /// Specify editable node types - virtual QStringList associatedNodeTypes()const; + QStringList associatedNodeTypes()const override; qSlicerGetTitleMacro(QTMODULE_TITLE); protected: /// All initialization code should be done in the setup - virtual void setup(); + void setup() override; // Description: // Create and return the widget representation associated to this module - virtual qSlicerAbstractModuleRepresentation* createWidgetRepresentation(); + qSlicerAbstractModuleRepresentation* createWidgetRepresentation() override; // Description: // Create and return the logic associated to this module - virtual vtkMRMLAbstractLogic* createLogic(); + vtkMRMLAbstractLogic* createLogic() override; public slots: /// a public slot to open up the screen capture diff --git a/Modules/Loadable/Annotations/qSlicerAnnotationsReader.h b/Modules/Loadable/Annotations/qSlicerAnnotationsReader.h index 4834f1a5bcd87fa8b5486f3ae49a9599e70cace4..97d0317d4363ef420d2bc19de941ec558bea44df 100644 --- a/Modules/Loadable/Annotations/qSlicerAnnotationsReader.h +++ b/Modules/Loadable/Annotations/qSlicerAnnotationsReader.h @@ -37,17 +37,17 @@ public: typedef qSlicerFileReader Superclass; qSlicerAnnotationsReader(QObject* parent = 0); qSlicerAnnotationsReader(vtkSlicerAnnotationModuleLogic* logic, QObject* parent = 0); - virtual ~qSlicerAnnotationsReader(); + ~qSlicerAnnotationsReader() override; vtkSlicerAnnotationModuleLogic* annotationLogic()const; void setAnnotationLogic(vtkSlicerAnnotationModuleLogic* logic); - virtual QString description()const; - virtual IOFileType fileType()const; - virtual QStringList extensions()const; - virtual qSlicerIOOptions* options()const; + QString description()const override; + IOFileType fileType()const override; + QStringList extensions()const override; + qSlicerIOOptions* options()const override; - virtual bool load(const IOProperties& properties); + bool load(const IOProperties& properties) override; protected: QScopedPointer d_ptr; diff --git a/Modules/Loadable/Annotations/qSlicerFiducialsReader.h b/Modules/Loadable/Annotations/qSlicerFiducialsReader.h index 0dc821f2e9a1796251d9c78bd3c4cc64b65cb13e..3eb34b6f57f6aa9491c01b987a37f67efc3c6644 100644 --- a/Modules/Loadable/Annotations/qSlicerFiducialsReader.h +++ b/Modules/Loadable/Annotations/qSlicerFiducialsReader.h @@ -37,16 +37,16 @@ public: typedef qSlicerFileReader Superclass; qSlicerFiducialsReader(QObject* parent = 0); qSlicerFiducialsReader(vtkSlicerAnnotationModuleLogic* logic, QObject* parent = 0); - virtual ~qSlicerFiducialsReader(); + ~qSlicerFiducialsReader() override; vtkSlicerAnnotationModuleLogic* annotationLogic()const; void setAnnotationLogic(vtkSlicerAnnotationModuleLogic* logic); - virtual QString description()const; - virtual IOFileType fileType()const; - virtual QStringList extensions()const; + QString description()const override; + IOFileType fileType()const override; + QStringList extensions()const override; - virtual bool load(const IOProperties& properties); + bool load(const IOProperties& properties) override; protected: QScopedPointer d_ptr; diff --git a/Modules/Loadable/Cameras/Logic/vtkSlicerCamerasModuleLogic.h b/Modules/Loadable/Cameras/Logic/vtkSlicerCamerasModuleLogic.h index 1f867387dbbc0633b023761f85dfea838cafa329..f59b6d27e730c5c8f470628ed16c3ba4a4b49479 100644 --- a/Modules/Loadable/Cameras/Logic/vtkSlicerCamerasModuleLogic.h +++ b/Modules/Loadable/Cameras/Logic/vtkSlicerCamerasModuleLogic.h @@ -38,7 +38,7 @@ class VTK_SLICER_CAMERAS_LOGIC_EXPORT vtkSlicerCamerasModuleLogic public: static vtkSlicerCamerasModuleLogic *New(); vtkTypeMacro(vtkSlicerCamerasModuleLogic, vtkSlicerModuleLogic); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Scan the scene and search for the active camera that is used /// in the view. @@ -55,10 +55,10 @@ public: protected: vtkSlicerCamerasModuleLogic(); - virtual ~vtkSlicerCamerasModuleLogic(); + ~vtkSlicerCamerasModuleLogic() override; - virtual void SetMRMLSceneInternal(vtkMRMLScene* newScene) VTK_OVERRIDE; - virtual void ProcessMRMLSceneEvents(vtkObject *, unsigned long, void *) VTK_OVERRIDE; + void SetMRMLSceneInternal(vtkMRMLScene* newScene) override; + void ProcessMRMLSceneEvents(vtkObject *, unsigned long, void *) override; bool CopyImportedCameras; diff --git a/Modules/Loadable/Cameras/qSlicerCamerasModule.h b/Modules/Loadable/Cameras/qSlicerCamerasModule.h index 17f89d1880607c9139f12405d613bd1a20e83bef..f9aa53c0a79edfdd1003944dec91c24f1a6e8276 100644 --- a/Modules/Loadable/Cameras/qSlicerCamerasModule.h +++ b/Modules/Loadable/Cameras/qSlicerCamerasModule.h @@ -40,28 +40,28 @@ class Q_SLICER_QTMODULES_CAMERAS_EXPORT qSlicerCamerasModule public: typedef qSlicerLoadableModule Superclass; qSlicerCamerasModule(QObject *parent=0); - virtual ~qSlicerCamerasModule(); + ~qSlicerCamerasModule() override; - virtual QStringList categories()const; - virtual QIcon icon()const; + QStringList categories()const override; + QIcon icon()const override; qSlicerGetTitleMacro(QTMODULE_TITLE); /// Return help/acknowledgement text - virtual QString helpText()const; - virtual QString acknowledgementText()const; - virtual QStringList contributors()const; + QString helpText()const override; + QString acknowledgementText()const override; + QStringList contributors()const override; /// Specify editable node types - virtual QStringList associatedNodeTypes()const; + QStringList associatedNodeTypes()const override; protected: /// Create and return the widget representation associated to this module - virtual qSlicerAbstractModuleRepresentation * createWidgetRepresentation(); + qSlicerAbstractModuleRepresentation * createWidgetRepresentation() override; /// Create and return the logic associated to this module - virtual vtkMRMLAbstractLogic* createLogic(); + vtkMRMLAbstractLogic* createLogic() override; protected: QScopedPointer d_ptr; diff --git a/Modules/Loadable/Cameras/qSlicerCamerasModuleWidget.h b/Modules/Loadable/Cameras/qSlicerCamerasModuleWidget.h index 15c4be54ae4c71c12d24b376d56b5fff660eac72..5e87482eb37040a293da6e6085403fea10b1d8f7 100644 --- a/Modules/Loadable/Cameras/qSlicerCamerasModuleWidget.h +++ b/Modules/Loadable/Cameras/qSlicerCamerasModuleWidget.h @@ -37,17 +37,17 @@ public: typedef qSlicerAbstractModuleWidget Superclass; qSlicerCamerasModuleWidget(QWidget *parent=0); - virtual ~qSlicerCamerasModuleWidget(); + ~qSlicerCamerasModuleWidget() override; - virtual bool setEditedNode(vtkMRMLNode* node, QString role = QString(), QString context = QString()); + bool setEditedNode(vtkMRMLNode* node, QString role = QString(), QString context = QString()) override; public slots: /// /// Inherited from qSlicerWidget. Reimplemented for refresh issues. - virtual void setMRMLScene(vtkMRMLScene*); + void setMRMLScene(vtkMRMLScene*) override; protected: - virtual void setup(); + void setup() override; void synchronizeCameraWithView(vtkMRMLViewNode* currentViewNode); protected slots: diff --git a/Modules/Loadable/Colors/Logic/vtkSlicerColorLogic.h b/Modules/Loadable/Colors/Logic/vtkSlicerColorLogic.h index 20762640de5beb5df6ad4ff666facf6ca07af72c..d8786f4a5725a6d0bf4ea00ab2e30a7a57c98f62 100644 --- a/Modules/Loadable/Colors/Logic/vtkSlicerColorLogic.h +++ b/Modules/Loadable/Colors/Logic/vtkSlicerColorLogic.h @@ -27,26 +27,26 @@ class VTK_SLICER_COLORS_MODULE_LOGIC_EXPORT vtkSlicerColorLogic /// The Usual vtk class functions static vtkSlicerColorLogic *New(); vtkTypeMacro(vtkSlicerColorLogic,vtkMRMLColorLogic); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Return a default color node id for a label map - virtual const char * GetDefaultLabelMapColorNodeID() VTK_OVERRIDE; + const char * GetDefaultLabelMapColorNodeID() override; /// Return a default color node id for the editor - virtual const char * GetDefaultEditorColorNodeID() VTK_OVERRIDE; + const char * GetDefaultEditorColorNodeID() override; /// Return a default color node id for the charts - virtual const char * GetDefaultChartColorNodeID() VTK_OVERRIDE; + const char * GetDefaultChartColorNodeID() override; /// look for color files in the Base/Logic/Resources/ColorFiles directory and /// put their names in the ColorFiles list. Look in any user defined color /// files paths and put them in the UserColorFiles list. - virtual std::vector FindDefaultColorFiles() VTK_OVERRIDE; - virtual std::vector FindUserColorFiles() VTK_OVERRIDE; + std::vector FindDefaultColorFiles() override; + std::vector FindUserColorFiles() override; protected: vtkSlicerColorLogic(); - ~vtkSlicerColorLogic(); + ~vtkSlicerColorLogic() override; vtkSlicerColorLogic(const vtkSlicerColorLogic&); void operator=(const vtkSlicerColorLogic&); std::vector FindColorFiles(const std::vector& directories); diff --git a/Modules/Loadable/Colors/VTKWidgets/vtkSlicerScalarBarActor.h b/Modules/Loadable/Colors/VTKWidgets/vtkSlicerScalarBarActor.h index a028be5e3fa1b2371b6485ff55f01b8c8670f118..d082651549e07ec1621140cf8a0de6bfa21d14e4 100644 --- a/Modules/Loadable/Colors/VTKWidgets/vtkSlicerScalarBarActor.h +++ b/Modules/Loadable/Colors/VTKWidgets/vtkSlicerScalarBarActor.h @@ -44,7 +44,7 @@ public: // The usual VTK class functions static vtkSlicerScalarBarActor *New(); vtkTypeMacro(vtkSlicerScalarBarActor,vtkScalarBarActor); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Get for the flag on using VTK6 annotation as label vtkGetMacro(UseAnnotationAsLabel, int); @@ -65,7 +65,7 @@ public: protected: vtkSlicerScalarBarActor(); - ~vtkSlicerScalarBarActor(); + ~vtkSlicerScalarBarActor() override; // Description: // Determine the size and placement of any tick marks to be rendered. @@ -78,11 +78,11 @@ protected: // // It centers labels on color swatches instead of placing labels // at the edge. - virtual void LayoutTicks() VTK_OVERRIDE; + void LayoutTicks() override; // It centers labels on color swatches instead of placing labels // at the edge. - virtual void ConfigureTicks() VTK_OVERRIDE; + void ConfigureTicks() override; /// flag for setting color name as label int UseAnnotationAsLabel; diff --git a/Modules/Loadable/Colors/qSlicerColorsModule.h b/Modules/Loadable/Colors/qSlicerColorsModule.h index 5ae15f29ad2e516e01f34a82d292128d831c5381..c787eaf986cdbaa76983c1ecc1a2fa4c0c8f4bc3 100644 --- a/Modules/Loadable/Colors/qSlicerColorsModule.h +++ b/Modules/Loadable/Colors/qSlicerColorsModule.h @@ -40,33 +40,33 @@ class Q_SLICER_QTMODULES_COLORS_EXPORT qSlicerColorsModule public: typedef qSlicerLoadableModule Superclass; qSlicerColorsModule(QObject *parent=0); - virtual ~qSlicerColorsModule(); + ~qSlicerColorsModule() override; - virtual QStringList categories()const; - virtual QIcon icon()const; + QStringList categories()const override; + QIcon icon()const override; qSlicerGetTitleMacro(QTMODULE_TITLE); /// Return help/acknowledgement text - virtual QString helpText()const; - virtual QString acknowledgementText()const; - virtual QStringList contributors()const; - virtual bool isHidden()const; + QString helpText()const override; + QString acknowledgementText()const override; + QStringList contributors()const override; + bool isHidden()const override; /// Specify editable node types - virtual QStringList associatedNodeTypes()const; + QStringList associatedNodeTypes()const override; - virtual void setMRMLScene(vtkMRMLScene* newMRMLScene); + void setMRMLScene(vtkMRMLScene* newMRMLScene) override; protected: /// Reimplemented to initialize the color logic - virtual void setup(); + void setup() override; /// Create and return the widget representation associated to this module - virtual qSlicerAbstractModuleRepresentation * createWidgetRepresentation(); + qSlicerAbstractModuleRepresentation * createWidgetRepresentation() override; /// Create and return the logic associated to this module - virtual vtkMRMLAbstractLogic* createLogic(); + vtkMRMLAbstractLogic* createLogic() override; protected: QScopedPointer d_ptr; diff --git a/Modules/Loadable/Colors/qSlicerColorsReader.h b/Modules/Loadable/Colors/qSlicerColorsReader.h index dbdc645584a2185e018f42539a5d54fa5a98aa0a..d082212c1951da0e1bad169705fde5807f1a33e8 100644 --- a/Modules/Loadable/Colors/qSlicerColorsReader.h +++ b/Modules/Loadable/Colors/qSlicerColorsReader.h @@ -36,16 +36,16 @@ class qSlicerColorsReader public: typedef qSlicerFileReader Superclass; qSlicerColorsReader(vtkSlicerColorLogic* colorLogic = 0, QObject* parent = 0); - virtual ~qSlicerColorsReader(); + ~qSlicerColorsReader() override; void setColorLogic(vtkSlicerColorLogic* colorLogic); vtkSlicerColorLogic* colorLogic()const; - virtual QString description()const; - virtual IOFileType fileType()const; - virtual QStringList extensions()const; + QString description()const override; + IOFileType fileType()const override; + QStringList extensions()const override; - virtual bool load(const IOProperties& properties); + bool load(const IOProperties& properties) override; protected: QScopedPointer d_ptr; diff --git a/Modules/Loadable/CropVolume/Logic/vtkSlicerCropVolumeLogic.h b/Modules/Loadable/CropVolume/Logic/vtkSlicerCropVolumeLogic.h index d445d24852e7c5bcf3057ca6513aabb57337f9c0..b0d354224867f43ed01a47efa3bf1ca668c2b623 100644 --- a/Modules/Loadable/CropVolume/Logic/vtkSlicerCropVolumeLogic.h +++ b/Modules/Loadable/CropVolume/Logic/vtkSlicerCropVolumeLogic.h @@ -69,7 +69,7 @@ public: static vtkSlicerCropVolumeLogic *New(); vtkTypeMacro(vtkSlicerCropVolumeLogic,vtkSlicerModuleLogic); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; void SetVolumesLogic(vtkSlicerVolumesLogic* logic); vtkSlicerVolumesLogic* GetVolumesLogic(); @@ -102,11 +102,11 @@ public: static bool IsROIAlignedWithInputVolume(vtkMRMLCropVolumeParametersNode* parametersNode); - virtual void RegisterNodes() VTK_OVERRIDE; + void RegisterNodes() override; protected: vtkSlicerCropVolumeLogic(); - virtual ~vtkSlicerCropVolumeLogic(); + ~vtkSlicerCropVolumeLogic() override; private: vtkSlicerCropVolumeLogic(const vtkSlicerCropVolumeLogic&); // Not implemented diff --git a/Modules/Loadable/CropVolume/MRML/vtkMRMLCropVolumeParametersNode.h b/Modules/Loadable/CropVolume/MRML/vtkMRMLCropVolumeParametersNode.h index 4dace1065230980413e2ba32e1157f2f9bed7774..66a65109d69481ce29543cb64c8be6ba5b9ca75f 100644 --- a/Modules/Loadable/CropVolume/MRML/vtkMRMLCropVolumeParametersNode.h +++ b/Modules/Loadable/CropVolume/MRML/vtkMRMLCropVolumeParametersNode.h @@ -38,21 +38,21 @@ public: static vtkMRMLCropVolumeParametersNode *New(); vtkTypeMacro(vtkMRMLCropVolumeParametersNode,vtkMRMLNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Set node attributes from XML attributes - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "CropVolumeParameters";} + const char* GetNodeTagName() override {return "CropVolumeParameters";} /// Set volume node to be cropped void SetInputVolumeNodeID(const char *nodeID); @@ -98,7 +98,7 @@ public: protected: vtkMRMLCropVolumeParametersNode(); - ~vtkMRMLCropVolumeParametersNode(); + ~vtkMRMLCropVolumeParametersNode() override; vtkMRMLCropVolumeParametersNode(const vtkMRMLCropVolumeParametersNode&); void operator=(const vtkMRMLCropVolumeParametersNode&); diff --git a/Modules/Loadable/CropVolume/qSlicerCropVolumeModule.h b/Modules/Loadable/CropVolume/qSlicerCropVolumeModule.h index ebc50164078a8d9e3f6b171523dddf2a5859577f..91601370c232fb9cec0405f0e78781d7fea0941d 100644 --- a/Modules/Loadable/CropVolume/qSlicerCropVolumeModule.h +++ b/Modules/Loadable/CropVolume/qSlicerCropVolumeModule.h @@ -20,32 +20,32 @@ public: typedef qSlicerLoadableModule Superclass; explicit qSlicerCropVolumeModule(QObject *parent=0); - virtual ~qSlicerCropVolumeModule(); + ~qSlicerCropVolumeModule() override; qSlicerGetTitleMacro(QTMODULE_TITLE); /// Return a custom icon for the module - virtual QIcon icon()const; - virtual QStringList categories() const; + QIcon icon()const override; + QStringList categories() const override; - virtual QString helpText()const; - virtual QString acknowledgementText()const; - virtual QStringList contributors()const; + QString helpText()const override; + QString acknowledgementText()const override; + QStringList contributors()const override; - virtual QStringList dependencies()const; + QStringList dependencies()const override; /// Specify editable node types - virtual QStringList associatedNodeTypes()const; + QStringList associatedNodeTypes()const override; protected: /// Initialize the module. Register the volumes reader/writer - virtual void setup(); + void setup() override; /// Create and return the widget representation associated to this module - virtual qSlicerAbstractModuleRepresentation * createWidgetRepresentation(); + qSlicerAbstractModuleRepresentation * createWidgetRepresentation() override; /// Create and return the logic associated to this module - virtual vtkMRMLAbstractLogic* createLogic(); + vtkMRMLAbstractLogic* createLogic() override; protected: QScopedPointer d_ptr; diff --git a/Modules/Loadable/Data/Logic/vtkSlicerDataModuleLogic.h b/Modules/Loadable/Data/Logic/vtkSlicerDataModuleLogic.h index cfe4e9502a4e3132d21e00409d12912bfd088619..8bc39d0218fcf478ade9f46e2ca3a1e6ea1f6136 100644 --- a/Modules/Loadable/Data/Logic/vtkSlicerDataModuleLogic.h +++ b/Modules/Loadable/Data/Logic/vtkSlicerDataModuleLogic.h @@ -39,7 +39,7 @@ class VTK_SLICER_DATA_LOGIC_EXPORT vtkSlicerDataModuleLogic : public: static vtkSlicerDataModuleLogic *New(); vtkTypeMacro(vtkSlicerDataModuleLogic, vtkSlicerModuleLogic); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; public: vtkSetMacro( SceneChanged, bool ); @@ -48,17 +48,17 @@ public: protected: vtkSlicerDataModuleLogic(); - virtual ~vtkSlicerDataModuleLogic(); + ~vtkSlicerDataModuleLogic() override; /// Register MRML Node classes to Scene. Gets called automatically when the MRMLScene is attached to this logic class. - virtual void RegisterNodes() VTK_OVERRIDE; + void RegisterNodes() override; - virtual void SetMRMLSceneInternal(vtkMRMLScene* newScene) VTK_OVERRIDE; - virtual void UpdateFromMRMLScene() VTK_OVERRIDE; + void SetMRMLSceneInternal(vtkMRMLScene* newScene) override; + void UpdateFromMRMLScene() override; /// Reimplemented to delete the storage/display nodes when a displayable /// node is being removed. - virtual void OnMRMLSceneNodeRemoved(vtkMRMLNode* removedNode) VTK_OVERRIDE; + void OnMRMLSceneNodeRemoved(vtkMRMLNode* removedNode) override; /// /// This property controls whether the removal from the scene of a model node diff --git a/Modules/Loadable/Data/qSlicerDataModule.h b/Modules/Loadable/Data/qSlicerDataModule.h index 2b9072c174c7740f69b39bf7875f626def299c9d..ae8cacadd66e3665dbca845142adc52776b0899d 100644 --- a/Modules/Loadable/Data/qSlicerDataModule.h +++ b/Modules/Loadable/Data/qSlicerDataModule.h @@ -39,27 +39,27 @@ class Q_SLICER_QTMODULES_DATA_EXPORT qSlicerDataModule public: typedef qSlicerLoadableModule Superclass; qSlicerDataModule(QObject *parent=0); - virtual ~qSlicerDataModule(); + ~qSlicerDataModule() override; - virtual void setup(); + void setup() override; - virtual QIcon icon()const; - virtual QStringList categories()const; - virtual QStringList dependencies()const; + QIcon icon()const override; + QStringList categories()const override; + QStringList dependencies()const override; qSlicerGetTitleMacro(QTMODULE_TITLE); /// Return help/acknowledgement text - virtual QString helpText()const; - virtual QString acknowledgementText()const; - virtual QStringList contributors()const; + QString helpText()const override; + QString acknowledgementText()const override; + QStringList contributors()const override; protected: /// Create and return the widget representation associated to this module - virtual qSlicerAbstractModuleRepresentation * createWidgetRepresentation(); + qSlicerAbstractModuleRepresentation * createWidgetRepresentation() override; /// Create and return the logic associated to this module - virtual vtkMRMLAbstractLogic* createLogic(); + vtkMRMLAbstractLogic* createLogic() override; protected: QScopedPointer d_ptr; diff --git a/Modules/Loadable/Data/qSlicerSceneIOOptionsWidget.h b/Modules/Loadable/Data/qSlicerSceneIOOptionsWidget.h index 14586e19abea314de0b66c2b670c1afebc09196b..a21f1b8f80033a1fef2e24c71784b31422a920e9 100644 --- a/Modules/Loadable/Data/qSlicerSceneIOOptionsWidget.h +++ b/Modules/Loadable/Data/qSlicerSceneIOOptionsWidget.h @@ -36,11 +36,11 @@ class Q_SLICER_QTMODULES_DATA_EXPORT qSlicerSceneIOOptionsWidget Q_OBJECT public: qSlicerSceneIOOptionsWidget(QWidget *parent=0); - virtual ~qSlicerSceneIOOptionsWidget(); + ~qSlicerSceneIOOptionsWidget() override; // Update checkboxes in the widget based on // "clear" and "copyCameras" Boolean properties. - void updateGUI(const qSlicerIO::IOProperties& ioProperties); + void updateGUI(const qSlicerIO::IOProperties& ioProperties) override; protected slots: void updateProperties(); diff --git a/Modules/Loadable/Data/qSlicerSceneReader.h b/Modules/Loadable/Data/qSlicerSceneReader.h index fb7bf01530a45e67ebbaae33ee6b5a811ff8603c..d60642ca0a676c25740e0cb95a9dc9fe0fd1ce31 100644 --- a/Modules/Loadable/Data/qSlicerSceneReader.h +++ b/Modules/Loadable/Data/qSlicerSceneReader.h @@ -40,22 +40,22 @@ class Q_SLICER_QTMODULES_DATA_EXPORT qSlicerSceneReader public: typedef qSlicerFileReader Superclass; qSlicerSceneReader(vtkSlicerCamerasModuleLogic* camerasLogic, QObject* _parent = 0); - virtual ~qSlicerSceneReader(); + ~qSlicerSceneReader() override; - virtual QString description()const; + QString description()const override; /// Support QString("SceneFile") - virtual qSlicerIO::IOFileType fileType()const; + qSlicerIO::IOFileType fileType()const override; /// Support only .mrml files - virtual QStringList extensions()const; + QStringList extensions()const override; /// Options to control scene loading - virtual qSlicerIOOptions* options()const; + qSlicerIOOptions* options()const override; /// the supported properties are: /// QString fileName: the path of the mrml scene to load /// bool clear: whether the current should be cleared or not - virtual bool load(const qSlicerIO::IOProperties& properties); + bool load(const qSlicerIO::IOProperties& properties) override; protected: QScopedPointer d_ptr; diff --git a/Modules/Loadable/Data/qSlicerSceneWriter.h b/Modules/Loadable/Data/qSlicerSceneWriter.h index 2a867df3f15b31eb15d0ed468802e9271c14626a..aa8b751ffff8d4a3c6041dde47affc4b8c8af94e 100644 --- a/Modules/Loadable/Data/qSlicerSceneWriter.h +++ b/Modules/Loadable/Data/qSlicerSceneWriter.h @@ -34,22 +34,22 @@ class Q_SLICER_QTMODULES_DATA_EXPORT qSlicerSceneWriter public: typedef qSlicerFileWriter Superclass; qSlicerSceneWriter(QObject* parent = 0); - virtual ~qSlicerSceneWriter(); + ~qSlicerSceneWriter() override; - virtual QString description()const; - virtual IOFileType fileType()const; + QString description()const override; + IOFileType fileType()const override; /// Return true if the object is handled by the writer. - virtual bool canWriteObject(vtkObject* object)const; + bool canWriteObject(vtkObject* object)const override; /// Return a list of the supported extensions for a particuliar object. /// Please read QFileDialog::nameFilters for the allowed formats /// Example: "Image (*.jpg *.png *.tiff)", "Model (*.vtk)" - virtual QStringList extensions(vtkObject* object)const; + QStringList extensions(vtkObject* object)const override; /// Write the node identified by nodeID into the fileName file. /// Returns true on success. - virtual bool write(const qSlicerIO::IOProperties& properties); + bool write(const qSlicerIO::IOProperties& properties) override; protected: bool writeToMRML(const qSlicerIO::IOProperties& properties); diff --git a/Modules/Loadable/DoubleArrays/Logic/vtkSlicerDoubleArraysLogic.h b/Modules/Loadable/DoubleArrays/Logic/vtkSlicerDoubleArraysLogic.h index 89e26f7fd2f1bba153b343e611a8e58cfe7c923e..def339aa2d2438d6be9c4ee222bc359316699e17 100644 --- a/Modules/Loadable/DoubleArrays/Logic/vtkSlicerDoubleArraysLogic.h +++ b/Modules/Loadable/DoubleArrays/Logic/vtkSlicerDoubleArraysLogic.h @@ -41,13 +41,13 @@ public: static vtkSlicerDoubleArraysLogic *New(); vtkTypeMacro(vtkSlicerDoubleArraysLogic, vtkSlicerModuleLogic); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; vtkMRMLDoubleArrayNode* AddDoubleArray(const char* fileName, const char* name = 0); protected: vtkSlicerDoubleArraysLogic(); - virtual ~vtkSlicerDoubleArraysLogic(); + ~vtkSlicerDoubleArraysLogic() override; private: vtkSlicerDoubleArraysLogic(const vtkSlicerDoubleArraysLogic&); // Not implemented diff --git a/Modules/Loadable/DoubleArrays/qSlicerDoubleArraysModule.h b/Modules/Loadable/DoubleArrays/qSlicerDoubleArraysModule.h index 630308489e18c26847c80bb9fd2d398bd1543e9b..b3041b28aecd3b9f1508e92426b6af7ea3e291e1 100644 --- a/Modules/Loadable/DoubleArrays/qSlicerDoubleArraysModule.h +++ b/Modules/Loadable/DoubleArrays/qSlicerDoubleArraysModule.h @@ -37,28 +37,28 @@ public: typedef qSlicerLoadableModule Superclass; explicit qSlicerDoubleArraysModule(QObject *parent=0); - virtual ~qSlicerDoubleArraysModule(); + ~qSlicerDoubleArraysModule() override; qSlicerGetTitleMacro(QTMODULE_TITLE); - virtual QString helpText()const; - virtual QString acknowledgementText()const; - virtual QStringList contributors()const; + QString helpText()const override; + QString acknowledgementText()const override; + QStringList contributors()const override; - virtual QStringList categories()const; - virtual QStringList dependencies() const; - virtual bool isHidden()const; + QStringList categories()const override; + QStringList dependencies() const override; + bool isHidden()const override; protected: /// Initialize the module. Register the volumes reader/writer - virtual void setup(); + void setup() override; /// Create and return the widget representation associated to this module - virtual qSlicerAbstractModuleRepresentation * createWidgetRepresentation(); + qSlicerAbstractModuleRepresentation * createWidgetRepresentation() override; /// Create and return the logic associated to this module - virtual vtkMRMLAbstractLogic* createLogic(); + vtkMRMLAbstractLogic* createLogic() override; protected: QScopedPointer d_ptr; diff --git a/Modules/Loadable/DoubleArrays/qSlicerDoubleArraysReader.h b/Modules/Loadable/DoubleArrays/qSlicerDoubleArraysReader.h index 9954799a527d6549030f2c75d246b7c42080fe8e..cb7ff8a2ca17f5619ca53705e25f2c550b2d86db 100644 --- a/Modules/Loadable/DoubleArrays/qSlicerDoubleArraysReader.h +++ b/Modules/Loadable/DoubleArrays/qSlicerDoubleArraysReader.h @@ -37,16 +37,16 @@ public: qSlicerDoubleArraysReader(QObject* parent = 0); qSlicerDoubleArraysReader(vtkSlicerDoubleArraysLogic* logic, QObject* parent = 0); - virtual ~qSlicerDoubleArraysReader(); + ~qSlicerDoubleArraysReader() override; vtkSlicerDoubleArraysLogic* logic()const; void setLogic(vtkSlicerDoubleArraysLogic* logic); - virtual QString description()const; - virtual IOFileType fileType()const; - virtual QStringList extensions()const; + QString description()const override; + IOFileType fileType()const override; + QStringList extensions()const override; - virtual bool load(const IOProperties& properties); + bool load(const IOProperties& properties) override; protected: QScopedPointer d_ptr; diff --git a/Modules/Loadable/Markups/Logic/vtkSlicerMarkupsLogic.cxx b/Modules/Loadable/Markups/Logic/vtkSlicerMarkupsLogic.cxx index 9681f477b1f8a0e1f68d08ff68a225f8ada1514b..83287da8c716853aa5b98f4e2db02a76fe1a7461 100644 --- a/Modules/Loadable/Markups/Logic/vtkSlicerMarkupsLogic.cxx +++ b/Modules/Loadable/Markups/Logic/vtkSlicerMarkupsLogic.cxx @@ -68,7 +68,7 @@ public: vtkSlicerMarkupsLogicCallback(){} - virtual void Execute (vtkObject *vtkNotUsed(caller), unsigned long event, void*) + void Execute (vtkObject *vtkNotUsed(caller), unsigned long event, void*) override { if (event == vtkCommand::ModifiedEvent) { diff --git a/Modules/Loadable/Markups/Logic/vtkSlicerMarkupsLogic.h b/Modules/Loadable/Markups/Logic/vtkSlicerMarkupsLogic.h index 303965f949b957dd2ee79cc8115f4d0405cc48f7..c66defe2cc22630edd93399685aafd91706548b6 100644 --- a/Modules/Loadable/Markups/Logic/vtkSlicerMarkupsLogic.h +++ b/Modules/Loadable/Markups/Logic/vtkSlicerMarkupsLogic.h @@ -45,11 +45,11 @@ public: static vtkSlicerMarkupsLogic *New(); vtkTypeMacro(vtkSlicerMarkupsLogic,vtkSlicerModuleLogic); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual void ProcessMRMLNodesEvents(vtkObject *caller, + void ProcessMRMLNodesEvents(vtkObject *caller, unsigned long event, - void *callData ) VTK_OVERRIDE; + void *callData ) override; /// Utility method to return the id of the selection node. Checks /// the mrml application logic if set, otherwise checks the scene @@ -216,17 +216,17 @@ public: protected: vtkSlicerMarkupsLogic(); - virtual ~vtkSlicerMarkupsLogic(); + ~vtkSlicerMarkupsLogic() override; /// Initialize listening to MRML events - virtual void SetMRMLSceneInternal(vtkMRMLScene * newScene) VTK_OVERRIDE; - virtual void ObserveMRMLScene() VTK_OVERRIDE; + void SetMRMLSceneInternal(vtkMRMLScene * newScene) override; + void ObserveMRMLScene() override; /// Register MRML Node classes to Scene. Gets called automatically when the MRMLScene is attached to this logic class. - virtual void RegisterNodes() VTK_OVERRIDE; - virtual void UpdateFromMRMLScene() VTK_OVERRIDE; - virtual void OnMRMLSceneNodeAdded(vtkMRMLNode* node) VTK_OVERRIDE; - virtual void OnMRMLSceneNodeRemoved(vtkMRMLNode* node) VTK_OVERRIDE; + void RegisterNodes() override; + void UpdateFromMRMLScene() override; + void OnMRMLSceneNodeAdded(vtkMRMLNode* node) override; + void OnMRMLSceneNodeRemoved(vtkMRMLNode* node) override; private: diff --git a/Modules/Loadable/Markups/MRML/vtkCurveGenerator.h b/Modules/Loadable/Markups/MRML/vtkCurveGenerator.h index 0eaf187cb662523d0c67c14fb4c899be4fe858ec..922d42ad3948a1cbeedb686e51e1292ecc9a7997 100644 --- a/Modules/Loadable/Markups/MRML/vtkCurveGenerator.h +++ b/Modules/Loadable/Markups/MRML/vtkCurveGenerator.h @@ -41,7 +41,7 @@ public: vtkTypeMacro(vtkCurveGenerator, vtkObject); static vtkCurveGenerator* New(); - void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream &os, vtkIndent indent) override; // This indicates whether the curve should loop back in on itself, // connecting the last point back to the first point (disabled by default). @@ -167,7 +167,7 @@ public: protected: vtkCurveGenerator(); - ~vtkCurveGenerator(); + ~vtkCurveGenerator() override; private: // inputs diff --git a/Modules/Loadable/Markups/MRML/vtkLinearSpline.h b/Modules/Loadable/Markups/MRML/vtkLinearSpline.h index b62148055bfd349ce9add5fd88c778ac4ca1d53d..49c3b5a00a29c36b40b502e8cdd90804fff354ee 100644 --- a/Modules/Loadable/Markups/MRML/vtkLinearSpline.h +++ b/Modules/Loadable/Markups/MRML/vtkLinearSpline.h @@ -42,26 +42,26 @@ public: static vtkLinearSpline *New(); vtkTypeMacro(vtkLinearSpline,vtkSpline); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /** * Compute linear splines for each dependent variable */ - void Compute () VTK_OVERRIDE; + void Compute () override; /** * Evaluate a 1D linear spline. */ - double Evaluate (double t) VTK_OVERRIDE; + double Evaluate (double t) override; /** * Deep copy of linear spline data. */ - void DeepCopy(vtkSpline *s) VTK_OVERRIDE; + void DeepCopy(vtkSpline *s) override; protected: vtkLinearSpline(); - ~vtkLinearSpline() VTK_OVERRIDE {} + ~vtkLinearSpline() override {} private: vtkLinearSpline(const vtkLinearSpline&) = delete; diff --git a/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsAngleNode.h b/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsAngleNode.h index c2bc293643f3950a42767ff37522f4a74c47c4fe..97f225bb27d8df7f3f485e9107f2d0b1000d6b03 100644 --- a/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsAngleNode.h +++ b/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsAngleNode.h @@ -39,30 +39,30 @@ public: static vtkMRMLMarkupsAngleNode *New(); vtkTypeMacro(vtkMRMLMarkupsAngleNode,vtkMRMLMarkupsNode); /// Print out the node information to the output stream - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual const char* GetIcon() VTK_OVERRIDE {return ":/Icons/MarkupsAngleMouseModePlace.png";} + const char* GetIcon() override {return ":/Icons/MarkupsAngleMouseModePlace.png";} //-------------------------------------------------------------------------- // MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "MarkupsAngle";} + const char* GetNodeTagName() override {return "MarkupsAngle";} /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; protected: vtkMRMLMarkupsAngleNode(); - ~vtkMRMLMarkupsAngleNode(); + ~vtkMRMLMarkupsAngleNode() override; vtkMRMLMarkupsAngleNode(const vtkMRMLMarkupsAngleNode&); void operator=(const vtkMRMLMarkupsAngleNode&); diff --git a/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsClosedCurveNode.h b/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsClosedCurveNode.h index a85dd83929f24acb3ed6fc9136ac2e4bf82d82f4..fcd0b8b295d195ee5943a99dff61eba1226e66e6 100644 --- a/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsClosedCurveNode.h +++ b/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsClosedCurveNode.h @@ -39,19 +39,19 @@ public: static vtkMRMLMarkupsClosedCurveNode *New(); vtkTypeMacro(vtkMRMLMarkupsClosedCurveNode, vtkMRMLMarkupsCurveNode); - virtual const char* GetIcon() VTK_OVERRIDE {return ":/Icons/MarkupsCurveMouseModePlace.png";} + const char* GetIcon() override {return ":/Icons/MarkupsCurveMouseModePlace.png";} //-------------------------------------------------------------------------- // MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "MarkupsClosedCurve";} + const char* GetNodeTagName() override {return "MarkupsClosedCurve";} protected: vtkMRMLMarkupsClosedCurveNode(); - ~vtkMRMLMarkupsClosedCurveNode(); + ~vtkMRMLMarkupsClosedCurveNode() override; vtkMRMLMarkupsClosedCurveNode(const vtkMRMLMarkupsClosedCurveNode&); void operator=(const vtkMRMLMarkupsClosedCurveNode&); diff --git a/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsCurveNode.h b/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsCurveNode.h index d822fb25a7ff417fadff418a0665a0e1e7e7a2d3..33c721f735051b1f52c1a7fc8b5a929d05dd6f57 100644 --- a/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsCurveNode.h +++ b/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsCurveNode.h @@ -39,30 +39,30 @@ public: static vtkMRMLMarkupsCurveNode *New(); vtkTypeMacro(vtkMRMLMarkupsCurveNode,vtkMRMLMarkupsNode); /// Print out the node information to the output stream - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual const char* GetIcon() VTK_OVERRIDE {return ":/Icons/MarkupsCurveMouseModePlace.png";} + const char* GetIcon() override {return ":/Icons/MarkupsCurveMouseModePlace.png";} //-------------------------------------------------------------------------- // MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "MarkupsCurve";} + const char* GetNodeTagName() override {return "MarkupsCurve";} /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; protected: vtkMRMLMarkupsCurveNode(); - ~vtkMRMLMarkupsCurveNode(); + ~vtkMRMLMarkupsCurveNode() override; vtkMRMLMarkupsCurveNode(const vtkMRMLMarkupsCurveNode&); void operator=(const vtkMRMLMarkupsCurveNode&); }; diff --git a/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsDisplayNode.h b/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsDisplayNode.h index facc2b6600ddf61e22a145cdf864cd995581ef6c..04e4d0c63558c308f5913169fe7cc6c3dd8d797b 100644 --- a/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsDisplayNode.h +++ b/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsDisplayNode.h @@ -35,34 +35,34 @@ class VTK_SLICER_MARKUPS_MODULE_MRML_EXPORT vtkMRMLMarkupsDisplayNode : public public: static vtkMRMLMarkupsDisplayNode *New(); vtkTypeMacro ( vtkMRMLMarkupsDisplayNode,vtkMRMLDisplayNode ); - void PrintSelf ( ostream& os, vtkIndent indent ) VTK_OVERRIDE; + void PrintSelf ( ostream& os, vtkIndent indent ) override; //-------------------------------------------------------------------------- // MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance ( ) VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance ( ) override; // Read node attributes from XML (MRML) file - virtual void ReadXMLAttributes ( const char** atts ) VTK_OVERRIDE; + void ReadXMLAttributes ( const char** atts ) override; // Write this node's information to a MRML file in XML format. - virtual void WriteXML ( ostream& of, int indent ) VTK_OVERRIDE; + void WriteXML ( ostream& of, int indent ) override; // Copy the node's attributes to this object - virtual void Copy ( vtkMRMLNode *node ) VTK_OVERRIDE; + void Copy ( vtkMRMLNode *node ) override; // Get node XML tag name (like Volume, Markups) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "MarkupsDisplay";}; + const char* GetNodeTagName() override {return "MarkupsDisplay";}; // Finds the storage node and read the data - virtual void UpdateScene(vtkMRMLScene *scene) VTK_OVERRIDE; + void UpdateScene(vtkMRMLScene *scene) override; // Alternative method to propagate events generated in Display nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; /// Convenienve function for getting the displayable markups node vtkMRMLMarkupsNode* GetMarkupsNode(); @@ -223,7 +223,7 @@ public: protected: vtkMRMLMarkupsDisplayNode(); - ~vtkMRMLMarkupsDisplayNode(); + ~vtkMRMLMarkupsDisplayNode() override; vtkMRMLMarkupsDisplayNode( const vtkMRMLMarkupsDisplayNode& ); void operator= ( const vtkMRMLMarkupsDisplayNode& ); diff --git a/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsFiducialNode.h b/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsFiducialNode.h index ca936a4f38e1132388cae4ae8dfa76c9dd7cc1a2..c28cd3fff1f1647c5c74507e16b49de32fcb98de 100644 --- a/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsFiducialNode.h +++ b/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsFiducialNode.h @@ -41,26 +41,26 @@ public: static vtkMRMLMarkupsFiducialNode *New(); vtkTypeMacro(vtkMRMLMarkupsFiducialNode,vtkMRMLMarkupsNode); /// Print out the node information to the output stream - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual const char* GetIcon() VTK_OVERRIDE {return ":/Icons/MarkupsMouseModePlace.png";} + const char* GetIcon() override {return ":/Icons/MarkupsMouseModePlace.png";} //-------------------------------------------------------------------------- // MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "MarkupsFiducial";} + const char* GetNodeTagName() override {return "MarkupsFiducial";} /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// Maximum number of control points limits the number of markups allowed in the node. /// If maximum number of control points is set to 0 then no it means there @@ -121,11 +121,11 @@ public: /// Get world coordinates on nth fiducial void GetNthFiducialWorldCoordinates(int n, double coords[4]); - void UpdateCurvePolyFromCurveInputPoly() VTK_OVERRIDE; + void UpdateCurvePolyFromCurveInputPoly() override; protected: vtkMRMLMarkupsFiducialNode(); - ~vtkMRMLMarkupsFiducialNode(); + ~vtkMRMLMarkupsFiducialNode() override; vtkMRMLMarkupsFiducialNode(const vtkMRMLMarkupsFiducialNode&); void operator=(const vtkMRMLMarkupsFiducialNode&); diff --git a/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsFiducialStorageNode.h b/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsFiducialStorageNode.h index 73db11aaf814501ce619025fcd9f842127225b9d..bdad7b3089b960cdd702678e44654937c80b783c 100644 --- a/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsFiducialStorageNode.h +++ b/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsFiducialStorageNode.h @@ -37,24 +37,24 @@ class VTK_SLICER_MARKUPS_MODULE_MRML_EXPORT vtkMRMLMarkupsFiducialStorageNode : public: static vtkMRMLMarkupsFiducialStorageNode *New(); vtkTypeMacro(vtkMRMLMarkupsFiducialStorageNode,vtkMRMLMarkupsStorageNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// /// Get node XML tag name (like Storage, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "MarkupsFiducialStorage";}; + const char* GetNodeTagName() override {return "MarkupsFiducialStorage";}; /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; - virtual bool CanReadInReferenceNode(vtkMRMLNode *refNode) VTK_OVERRIDE; + bool CanReadInReferenceNode(vtkMRMLNode *refNode) override; virtual bool SetPointFromString(vtkMRMLMarkupsNode *markupsNode, int pointIndex, const char* str); @@ -68,18 +68,18 @@ public: protected: vtkMRMLMarkupsFiducialStorageNode(); - ~vtkMRMLMarkupsFiducialStorageNode(); + ~vtkMRMLMarkupsFiducialStorageNode() override; vtkMRMLMarkupsFiducialStorageNode(const vtkMRMLMarkupsFiducialStorageNode&); void operator=(const vtkMRMLMarkupsFiducialStorageNode&); /// Initialize all the supported write file types - virtual void InitializeSupportedReadFileTypes() VTK_OVERRIDE; + void InitializeSupportedReadFileTypes() override; /// Initialize all the supported write file types - virtual void InitializeSupportedWriteFileTypes() VTK_OVERRIDE; + void InitializeSupportedWriteFileTypes() override; /// Read data and set it in the referenced node - virtual int ReadDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int ReadDataInternal(vtkMRMLNode *refNode) override; /// Write data from a referenced node. /// Assumes 1 point per markup for a fiducial referenced node: @@ -89,7 +89,7 @@ protected: /// x,y,z,ow,ox,oy,oz,vis,sel,lock,label,id,, /// label can have spaces, everything up to next comma is used, no quotes /// necessary, same with the description - virtual int WriteDataInternal(vtkMRMLNode *refNode) VTK_OVERRIDE; + int WriteDataInternal(vtkMRMLNode *refNode) override; std::string FieldDelimiterCharacters; }; diff --git a/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsLineNode.h b/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsLineNode.h index 02a1b418fdd48fbd1e54f8b234d91a587d920634..2c4bde08b31989b9b4c2756f577ada474a10ff17 100644 --- a/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsLineNode.h +++ b/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsLineNode.h @@ -39,30 +39,30 @@ public: static vtkMRMLMarkupsLineNode *New(); vtkTypeMacro(vtkMRMLMarkupsLineNode,vtkMRMLMarkupsNode); /// Print out the node information to the output stream - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - virtual const char* GetIcon() VTK_OVERRIDE {return ":/Icons/MarkupsLineMouseModePlace.png";} + const char* GetIcon() override {return ":/Icons/MarkupsLineMouseModePlace.png";} //-------------------------------------------------------------------------- // MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "MarkupsLine";} + const char* GetNodeTagName() override {return "MarkupsLine";} /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; protected: vtkMRMLMarkupsLineNode(); - ~vtkMRMLMarkupsLineNode(); + ~vtkMRMLMarkupsLineNode() override; vtkMRMLMarkupsLineNode(const vtkMRMLMarkupsLineNode&); void operator=(const vtkMRMLMarkupsLineNode&); diff --git a/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsNode.h b/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsNode.h index 70ee6b4230700c90dacddcf689433847eaf5d536..c2f6eaa2b7a353a6a1197bd9852aa67d61b7a74c 100644 --- a/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsNode.h +++ b/Modules/Loadable/Markups/MRML/vtkMRMLMarkupsNode.h @@ -115,7 +115,7 @@ public: static vtkMRMLMarkupsNode *New(); vtkTypeMacro(vtkMRMLMarkupsNode,vtkMRMLDisplayableNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; virtual const char* GetIcon() {return "";}; @@ -123,38 +123,38 @@ public: // MRMLNode methods //-------------------------------------------------------------------------- - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Get node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE {return "Markups";}; + const char* GetNodeTagName() override {return "Markups";}; /// Read node attributes from XML file - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// Write this node's information to a vector of strings for passing to a CLI, /// precede each datum with the prefix if not an empty string /// coordinateSystemFlag = 0 for RAS, 1 for LPS /// multipleFlag = 1 for the whole list, 1 for the first selected control point - virtual void WriteCLI(std::vector& commandLine, + void WriteCLI(std::vector& commandLine, std::string prefix, int coordinateSystem = 0, - int multipleFlag = 1) VTK_OVERRIDE; + int multipleFlag = 1) override; /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// Alternative method to propagate events generated in Display nodes - virtual void ProcessMRMLEvents ( vtkObject * /*caller*/, + void ProcessMRMLEvents ( vtkObject * /*caller*/, unsigned long /*event*/, - void * /*callData*/ ) VTK_OVERRIDE; + void * /*callData*/ ) override; /// Create default storage node or NULL if does not have one - virtual vtkMRMLStorageNode* CreateDefaultStorageNode() VTK_OVERRIDE; + vtkMRMLStorageNode* CreateDefaultStorageNode() override; /// Create and observe default display node(s) - virtual void CreateDefaultDisplayNodes() VTK_OVERRIDE; + void CreateDefaultDisplayNodes() override; /// Access to a VTK string array, not currently used int AddText(const char *newText); @@ -413,10 +413,10 @@ public: /// Returns true since can apply non linear transforms /// \sa ApplyTransform - virtual bool CanApplyNonLinearTransforms()const VTK_OVERRIDE; + bool CanApplyNonLinearTransforms()const override; /// Apply the passed transformation to all of the control points /// \sa CanApplyNonLinearTransforms - virtual void ApplyTransform(vtkAbstractTransform* transform) VTK_OVERRIDE; + void ApplyTransform(vtkAbstractTransform* transform) override; /// Get the markup node label format string that defines the markup names. /// \sa SetMarkupLabelFormat @@ -445,7 +445,7 @@ public: /// So if you invoke class specific modified events without calling Modified() on the /// markups, GetModifiedSinceRead() won't return true. /// \sa vtkMRMLStorableNode::GetModifiedSinceRead() - virtual bool GetModifiedSinceRead() VTK_OVERRIDE; + bool GetModifiedSinceRead() override; /// Reset the id of the Nth control point according to the local policy /// Called after an already initialised markup has been added to the @@ -481,12 +481,12 @@ public: int GetControlPointIndexFromInterpolatedPointIndex(vtkIdType interpolatedPointIndex); - virtual void GetRASBounds(double bounds[6]) VTK_OVERRIDE; - virtual void GetBounds(double bounds[6]) VTK_OVERRIDE; + void GetRASBounds(double bounds[6]) override; + void GetBounds(double bounds[6]) override; protected: vtkMRMLMarkupsNode(); - ~vtkMRMLMarkupsNode(); + ~vtkMRMLMarkupsNode() override; vtkMRMLMarkupsNode(const vtkMRMLMarkupsNode&); void operator=(const vtkMRMLMarkupsNode&); diff --git a/Modules/Loadable/Markups/MRML/vtkParametricPolynomialApproximation.h b/Modules/Loadable/Markups/MRML/vtkParametricPolynomialApproximation.h index b1333177dc2c25398ff21dfac86581ee14a3f4ca..46557212402e78b3ad0661ddb23074b4fd6d62a5 100644 --- a/Modules/Loadable/Markups/MRML/vtkParametricPolynomialApproximation.h +++ b/Modules/Loadable/Markups/MRML/vtkParametricPolynomialApproximation.h @@ -43,26 +43,26 @@ class VTK_SLICER_MARKUPS_MODULE_MRML_EXPORT vtkParametricPolynomialApproximation { public: vtkTypeMacro(vtkParametricPolynomialApproximation, vtkParametricFunction); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; static vtkParametricPolynomialApproximation *New(); /** * Return the parametric dimension of the class. */ - int GetDimension() VTK_OVERRIDE { return 1; } + int GetDimension() override { return 1; } /** * Evaluate the parametric function at parametric coordinate u[0] returning * the point coordinate Pt[3]. */ - void Evaluate(double u[3], double Pt[3], double Du[9]) VTK_OVERRIDE; + void Evaluate(double u[3], double Pt[3], double Du[9]) override; /** * Evaluate a scalar value at parametric coordinate u[0] and Pt[3]. * Simply returns the parameter u[0]. */ - double EvaluateScalar(double u[3], double Pt[3], double Du[9]) VTK_OVERRIDE; + double EvaluateScalar(double u[3], double Pt[3], double Du[9]) override; //@{ /** @@ -148,7 +148,7 @@ public: protected: vtkParametricPolynomialApproximation(); - ~vtkParametricPolynomialApproximation() VTK_OVERRIDE; + ~vtkParametricPolynomialApproximation() override; private: // What kind of fit (global/local) diff --git a/Modules/Loadable/Markups/MRMLDM/vtkMRMLMarkupsDisplayableManager.h b/Modules/Loadable/Markups/MRMLDM/vtkMRMLMarkupsDisplayableManager.h index cd0eb1d5775784a11c0bcf1bfe74f1643f8ff83a..3836df1e6c95dc9d591f1e4fbdc27103ab697ce3 100644 --- a/Modules/Loadable/Markups/MRMLDM/vtkMRMLMarkupsDisplayableManager.h +++ b/Modules/Loadable/Markups/MRMLDM/vtkMRMLMarkupsDisplayableManager.h @@ -48,7 +48,7 @@ public: static vtkMRMLMarkupsDisplayableManager *New(); vtkTypeMacro(vtkMRMLMarkupsDisplayableManager, vtkMRMLAbstractDisplayableManager); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Check if this is a 2d SliceView displayable manager, returns true if so, /// false otherwise. Checks return from GetSliceNode for non null, which means @@ -59,12 +59,12 @@ public: vtkMRMLMarkupsDisplayableManagerHelper * GetHelper() { return this->Helper; }; - bool CanProcessInteractionEvent(vtkMRMLInteractionEventData* eventData, double &closestDistance2) VTK_OVERRIDE; - bool ProcessInteractionEvent(vtkMRMLInteractionEventData* eventData) VTK_OVERRIDE; + bool CanProcessInteractionEvent(vtkMRMLInteractionEventData* eventData, double &closestDistance2) override; + bool ProcessInteractionEvent(vtkMRMLInteractionEventData* eventData) override; - void SetHasFocus(bool hasFocus) VTK_OVERRIDE; - bool GetGrabFocus() VTK_OVERRIDE; - bool GetInteractive() VTK_OVERRIDE; + void SetHasFocus(bool hasFocus) override; + bool GetGrabFocus() override; + bool GetInteractive() override; // Updates markup point preview position. // Returns true if the event is processed. @@ -84,34 +84,34 @@ public: protected: vtkMRMLMarkupsDisplayableManager(); - virtual ~vtkMRMLMarkupsDisplayableManager(); + ~vtkMRMLMarkupsDisplayableManager() override; vtkSlicerMarkupsWidget* FindClosestWidget(vtkMRMLInteractionEventData *callData, double &closestDistance2); - virtual void ProcessMRMLNodesEvents(vtkObject *caller, unsigned long event, void *callData) VTK_OVERRIDE; + void ProcessMRMLNodesEvents(vtkObject *caller, unsigned long event, void *callData) override; /// Wrap the superclass render request in a check for batch processing virtual void RequestRender(); /// Called from RequestRender method if UpdateFromMRMLRequested is true /// \sa RequestRender() SetUpdateFromMRMLRequested() - virtual void UpdateFromMRML() VTK_OVERRIDE; + void UpdateFromMRML() override; - virtual void SetMRMLSceneInternal(vtkMRMLScene* newScene) VTK_OVERRIDE; + void SetMRMLSceneInternal(vtkMRMLScene* newScene) override; /// Called after the corresponding MRML event is triggered, from AbstractDisplayableManager /// \sa ProcessMRMLSceneEvents - virtual void UpdateFromMRMLScene() VTK_OVERRIDE; - virtual void OnMRMLSceneEndClose() VTK_OVERRIDE; - virtual void OnMRMLSceneEndImport() VTK_OVERRIDE; - virtual void OnMRMLSceneNodeAdded(vtkMRMLNode* node) VTK_OVERRIDE; - virtual void OnMRMLSceneNodeRemoved(vtkMRMLNode* node) VTK_OVERRIDE; + void UpdateFromMRMLScene() override; + void OnMRMLSceneEndClose() override; + void OnMRMLSceneEndImport() override; + void OnMRMLSceneNodeAdded(vtkMRMLNode* node) override; + void OnMRMLSceneNodeRemoved(vtkMRMLNode* node) override; /// Create a widget. vtkSlicerMarkupsWidget* CreateWidget(vtkMRMLMarkupsDisplayNode* node); /// Called after the corresponding MRML View container was modified - virtual void OnMRMLDisplayableNodeModifiedEvent(vtkObject* caller) VTK_OVERRIDE; + void OnMRMLDisplayableNodeModifiedEvent(vtkObject* caller) override; /// Handler for specific SliceView actions, iterate over the widgets in the helper virtual void OnMRMLSliceNodeModifiedEvent(); @@ -141,7 +141,7 @@ protected: std::set Focus; /// Respond to interactor style events - virtual void OnInteractorStyleEvent(int eventid) VTK_OVERRIDE; + void OnInteractorStyleEvent(int eventid) override; /// Accessor for internal flag that disables interactor style event processing vtkGetMacro(DisableInteractorStyleEventsProcessing, int); diff --git a/Modules/Loadable/Markups/MRMLDM/vtkMRMLMarkupsDisplayableManagerHelper.h b/Modules/Loadable/Markups/MRMLDM/vtkMRMLMarkupsDisplayableManagerHelper.h index a593fd480210c71ead00ad678765480733efd8a5..fea9cb253981ea907a26ec8097a5301b45afce41 100644 --- a/Modules/Loadable/Markups/MRMLDM/vtkMRMLMarkupsDisplayableManagerHelper.h +++ b/Modules/Loadable/Markups/MRMLDM/vtkMRMLMarkupsDisplayableManagerHelper.h @@ -55,7 +55,7 @@ public: static vtkMRMLMarkupsDisplayableManagerHelper *New(); vtkTypeMacro(vtkMRMLMarkupsDisplayableManagerHelper, vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; vtkGetObjectMacro(DisplayableManager, vtkMRMLMarkupsDisplayableManager); void SetDisplayableManager(vtkMRMLMarkupsDisplayableManager*); @@ -93,7 +93,7 @@ public: protected: vtkMRMLMarkupsDisplayableManagerHelper(); - virtual ~vtkMRMLMarkupsDisplayableManagerHelper(); + ~vtkMRMLMarkupsDisplayableManagerHelper() override; private: diff --git a/Modules/Loadable/Markups/SubjectHierarchyPlugins/qSlicerSubjectHierarchyMarkupsPlugin.cxx b/Modules/Loadable/Markups/SubjectHierarchyPlugins/qSlicerSubjectHierarchyMarkupsPlugin.cxx index 2841519363e9b91bc0e16e757a0e6090ab3c6cca..5031e80c7417febf8a3e8dc8f8d19289f8cdf8e4 100644 --- a/Modules/Loadable/Markups/SubjectHierarchyPlugins/qSlicerSubjectHierarchyMarkupsPlugin.cxx +++ b/Modules/Loadable/Markups/SubjectHierarchyPlugins/qSlicerSubjectHierarchyMarkupsPlugin.cxx @@ -65,7 +65,7 @@ protected: qSlicerSubjectHierarchyMarkupsPlugin* const q_ptr; public: qSlicerSubjectHierarchyMarkupsPluginPrivate(qSlicerSubjectHierarchyMarkupsPlugin& object); - ~qSlicerSubjectHierarchyMarkupsPluginPrivate(); + ~qSlicerSubjectHierarchyMarkupsPluginPrivate() override; void init(); public: QIcon MarkupIcon; diff --git a/Modules/Loadable/Markups/SubjectHierarchyPlugins/qSlicerSubjectHierarchyMarkupsPlugin.h b/Modules/Loadable/Markups/SubjectHierarchyPlugins/qSlicerSubjectHierarchyMarkupsPlugin.h index 31c0d737332c1d5ae08ac5208edf75d5646cafe4..6066f1663b7c4ef737a2effa499f3a357b66c43e 100644 --- a/Modules/Loadable/Markups/SubjectHierarchyPlugins/qSlicerSubjectHierarchyMarkupsPlugin.h +++ b/Modules/Loadable/Markups/SubjectHierarchyPlugins/qSlicerSubjectHierarchyMarkupsPlugin.h @@ -45,7 +45,7 @@ public: public: typedef qSlicerSubjectHierarchyAbstractPlugin Superclass; qSlicerSubjectHierarchyMarkupsPlugin(QObject* parent = NULL); - virtual ~qSlicerSubjectHierarchyMarkupsPlugin(); + ~qSlicerSubjectHierarchyMarkupsPlugin() override; public: /// Determines if a data node can be placed in the hierarchy using the actual plugin, @@ -55,9 +55,9 @@ public: /// Default value is invalid. In that case the parent will be ignored, the confidence numbers are got based on the to-be child node alone. /// \return Floating point confidence number between 0 and 1, where 0 means that the plugin cannot handle the /// node, and 1 means that the plugin is the only one that can handle the node (by node type or identifier attribute) - virtual double canAddNodeToSubjectHierarchy( + double canAddNodeToSubjectHierarchy( vtkMRMLNode* node, - vtkIdType parentItemID=vtkMRMLSubjectHierarchyNode::INVALID_ITEM_ID )const; + vtkIdType parentItemID=vtkMRMLSubjectHierarchyNode::INVALID_ITEM_ID )const override; /// Determines if the actual plugin can handle a subject hierarchy item. The plugin with /// the highest confidence number will "own" the item in the subject hierarchy (set icon, tooltip, @@ -65,18 +65,18 @@ public: /// \param item Item to handle in the subject hierarchy tree /// \return Floating point confidence number between 0 and 1, where 0 means that the plugin cannot handle the /// item, and 1 means that the plugin is the only one that can handle the item (by node type or identifier attribute) - virtual double canOwnSubjectHierarchyItem(vtkIdType itemID)const; + double canOwnSubjectHierarchyItem(vtkIdType itemID)const override; /// Get role that the plugin assigns to the subject hierarchy item. /// Each plugin should provide only one role. - Q_INVOKABLE virtual const QString roleForPlugin()const; + Q_INVOKABLE const QString roleForPlugin()const override; /// Get icon of an owned subject hierarchy item /// \return Icon to set, empty icon if nothing to set - virtual QIcon icon(vtkIdType itemID); + QIcon icon(vtkIdType itemID) override; /// Get visibility icon for a visibility state - virtual QIcon visibilityIcon(int visible); + QIcon visibilityIcon(int visible) override; /// Set display color of an owned subject hierarchy item /// \param color Display color to set @@ -85,7 +85,7 @@ public: /// qSlicerTerminologyItemDelegate::NameRole : string /// qSlicerTerminologyItemDelegate::NameAutoGeneratedRole : bool /// qSlicerTerminologyItemDelegate::ColorAutoGeneratedRole : bool - virtual void setDisplayColor(vtkIdType itemID, QColor color, QMap terminologyMetaData); + void setDisplayColor(vtkIdType itemID, QColor color, QMap terminologyMetaData) override; /// Get display color of an owned subject hierarchy item /// \param terminologyMetaData Output map containing terminology meta data. Contents: @@ -93,7 +93,7 @@ public: /// qSlicerTerminologyItemDelegate::NameRole : string /// qSlicerTerminologyItemDelegate::NameAutoGeneratedRole : bool /// qSlicerTerminologyItemDelegate::ColorAutoGeneratedRole : bool - virtual QColor getDisplayColor(vtkIdType itemID, QMap &terminologyMetaData)const; + QColor getDisplayColor(vtkIdType itemID, QMap &terminologyMetaData)const override; protected: QScopedPointer d_ptr; diff --git a/Modules/Loadable/Markups/VTKWidgets/vtkMarkupsGlyphSource2D.h b/Modules/Loadable/Markups/VTKWidgets/vtkMarkupsGlyphSource2D.h index 6fc7f88846a6d843ff93cc45f77f7e4938bc43e5..ae545f0fe31fcff20e122e870f934ff78c19fb54 100644 --- a/Modules/Loadable/Markups/VTKWidgets/vtkMarkupsGlyphSource2D.h +++ b/Modules/Loadable/Markups/VTKWidgets/vtkMarkupsGlyphSource2D.h @@ -50,7 +50,7 @@ class VTK_SLICER_MARKUPS_MODULE_VTKWIDGETS_EXPORT vtkMarkupsGlyphSource2D : publ { public: vtkTypeMacro(vtkMarkupsGlyphSource2D,vtkPolyDataAlgorithm); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Construct a vertex glyph centered at the origin, scale 1.0, white in /// color, filled, with line segment passing through the point. @@ -122,9 +122,9 @@ public: protected: vtkMarkupsGlyphSource2D(); - ~vtkMarkupsGlyphSource2D() {}; + ~vtkMarkupsGlyphSource2D() override {}; - int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE; + int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override; double Center[3]; double Scale; diff --git a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerAngleRepresentation2D.h b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerAngleRepresentation2D.h index f13d1772afbf5d725c76332bd48177d45f3e54c0..a06cae6a0d7c1e8fdad56c6b15db7cda70efa323 100644 --- a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerAngleRepresentation2D.h +++ b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerAngleRepresentation2D.h @@ -56,7 +56,7 @@ public: /// Subclasses of vtkContourCurveRepresentation must implement these methods. These /// are the methods that the widget and its representation use to /// communicate with each other. - void UpdateFromMRML(vtkMRMLNode* caller, unsigned long event, void *callData = NULL) VTK_OVERRIDE; + void UpdateFromMRML(vtkMRMLNode* caller, unsigned long event, void *callData = NULL) override; /// Methods to make this class behave as a vtkProp. void GetActors(vtkPropCollection *) override; @@ -70,9 +70,9 @@ public: double *GetBounds() override; void CanInteract(const int displayPosition[2], const double worldPosition[3], - int &foundComponentType, int &foundComponentIndex, double &closestDistance2) VTK_OVERRIDE; + int &foundComponentType, int &foundComponentIndex, double &closestDistance2) override; - virtual bool GetTransformationReferencePoint(double referencePointWorld[3]) VTK_OVERRIDE; + bool GetTransformationReferencePoint(double referencePointWorld[3]) override; protected: vtkSlicerAngleRepresentation2D(); diff --git a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerAngleRepresentation3D.h b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerAngleRepresentation3D.h index 569876ecae1b35aa2a6a3b4e95f11d79082a667e..d985b15879f265251ee967569e73d9c1aef3a66c 100644 --- a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerAngleRepresentation3D.h +++ b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerAngleRepresentation3D.h @@ -50,32 +50,32 @@ public: /// Standard methods for instances of this class. vtkTypeMacro(vtkSlicerAngleRepresentation3D,vtkSlicerMarkupsWidgetRepresentation3D); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Subclasses of vtkMRMLAbstractWidgetRepresentation must implement these methods. These /// are the methods that the widget and its representation use to /// communicate with each other. - void UpdateFromMRML(vtkMRMLNode* caller, unsigned long event, void *callData=NULL) VTK_OVERRIDE; + void UpdateFromMRML(vtkMRMLNode* caller, unsigned long event, void *callData=NULL) override; /// Methods to make this class behave as a vtkProp. - void GetActors(vtkPropCollection *) VTK_OVERRIDE; - void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE; - int RenderOverlay(vtkViewport *viewport) VTK_OVERRIDE; - int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE; - int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) VTK_OVERRIDE; - vtkTypeBool HasTranslucentPolygonalGeometry() VTK_OVERRIDE; + void GetActors(vtkPropCollection *) override; + void ReleaseGraphicsResources(vtkWindow *) override; + int RenderOverlay(vtkViewport *viewport) override; + int RenderOpaqueGeometry(vtkViewport *viewport) override; + int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) override; + vtkTypeBool HasTranslucentPolygonalGeometry() override; /// Return the bounds of the representation - double *GetBounds() VTK_OVERRIDE; + double *GetBounds() override; - virtual bool GetTransformationReferencePoint(double referencePointWorld[3]) VTK_OVERRIDE; + bool GetTransformationReferencePoint(double referencePointWorld[3]) override; void CanInteract(const int displayPosition[2], const double worldPosition[3], - int &foundComponentType, int &foundComponentIndex, double &closestDistance2) VTK_OVERRIDE; + int &foundComponentType, int &foundComponentIndex, double &closestDistance2) override; protected: vtkSlicerAngleRepresentation3D(); - ~vtkSlicerAngleRepresentation3D() VTK_OVERRIDE; + ~vtkSlicerAngleRepresentation3D() override; vtkSmartPointer Line; vtkSmartPointer LineMapper; diff --git a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerAngleWidget.h b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerAngleWidget.h index 1566acaf0d7793c0cb855c67325eec4d0c0a52f4..d825f264ee93045f0086286f33adf3e4a5c920ce 100644 --- a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerAngleWidget.h +++ b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerAngleWidget.h @@ -172,7 +172,7 @@ public: vtkTypeMacro(vtkSlicerAngleWidget,vtkSlicerMarkupsWidget); /// Create the default widget representation and initializes the widget and representation. - void CreateDefaultRepresentation(vtkMRMLMarkupsDisplayNode* markupsDisplayNode, vtkMRMLAbstractViewNode* viewNode, vtkRenderer* renderer) VTK_OVERRIDE; + void CreateDefaultRepresentation(vtkMRMLMarkupsDisplayNode* markupsDisplayNode, vtkMRMLAbstractViewNode* viewNode, vtkRenderer* renderer) override; protected: vtkSlicerAngleWidget(); diff --git a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerClosedCurveWidget.h b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerClosedCurveWidget.h index eb8900f420eebf428e79f0b4674446775ce92cf6..c032f1528a84910a36a9b506ec4b29f8f2c606f4 100644 --- a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerClosedCurveWidget.h +++ b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerClosedCurveWidget.h @@ -75,7 +75,7 @@ public: vtkTypeMacro(vtkSlicerClosedCurveWidget, vtkSlicerMarkupsWidget); /// Create the default widget representation and initializes the widget and representation. - void CreateDefaultRepresentation(vtkMRMLMarkupsDisplayNode* markupsDisplayNode, vtkMRMLAbstractViewNode* viewNode, vtkRenderer* renderer) VTK_OVERRIDE; + void CreateDefaultRepresentation(vtkMRMLMarkupsDisplayNode* markupsDisplayNode, vtkMRMLAbstractViewNode* viewNode, vtkRenderer* renderer) override; protected: vtkSlicerClosedCurveWidget(); diff --git a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerCurveRepresentation2D.h b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerCurveRepresentation2D.h index 3c98f6c5de3bb64c01372fb6c58aef02c34aa771..0ab6068f3cd39d9ee96173762e543955d6a3e62b 100644 --- a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerCurveRepresentation2D.h +++ b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerCurveRepresentation2D.h @@ -61,9 +61,9 @@ public: /// Subclasses of vtkContourCurveRepresentation must implement these methods. These /// are the methods that the widget and its representation use to /// communicate with each other. - void UpdateFromMRML(vtkMRMLNode* caller, unsigned long event, void *callData = NULL) VTK_OVERRIDE; + void UpdateFromMRML(vtkMRMLNode* caller, unsigned long event, void *callData = NULL) override; void CanInteract(const int displayPosition[2], const double worldPosition[3], - int &foundComponentType, int &foundComponentIndex, double &closestDistance2) VTK_OVERRIDE; + int &foundComponentType, int &foundComponentIndex, double &closestDistance2) override; /// Methods to make this class behave as a vtkProp. void GetActors(vtkPropCollection *) override; diff --git a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerCurveRepresentation3D.h b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerCurveRepresentation3D.h index 441efca5601f3a2058b24c8f933586a3b0ac3f19..40b5debedee4d3194c16c0964421619ced0ce699 100644 --- a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerCurveRepresentation3D.h +++ b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerCurveRepresentation3D.h @@ -51,35 +51,35 @@ public: /// Standard methods for instances of this class. vtkTypeMacro(vtkSlicerCurveRepresentation3D,vtkSlicerMarkupsWidgetRepresentation3D); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Subclasses of vtkMRMLAbstractWidgetRepresentation must implement these methods. These /// are the methods that the widget and its representation use to /// communicate with each other. - void UpdateFromMRML(vtkMRMLNode* caller, unsigned long event, void *callData = NULL) VTK_OVERRIDE; + void UpdateFromMRML(vtkMRMLNode* caller, unsigned long event, void *callData = NULL) override; /// Methods to make this class behave as a vtkProp. - void GetActors(vtkPropCollection *) VTK_OVERRIDE; - void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE; - int RenderOverlay(vtkViewport *viewport) VTK_OVERRIDE; - int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE; - int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) VTK_OVERRIDE; - vtkTypeBool HasTranslucentPolygonalGeometry() VTK_OVERRIDE; + void GetActors(vtkPropCollection *) override; + void ReleaseGraphicsResources(vtkWindow *) override; + int RenderOverlay(vtkViewport *viewport) override; + int RenderOpaqueGeometry(vtkViewport *viewport) override; + int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) override; + vtkTypeBool HasTranslucentPolygonalGeometry() override; /// Return the bounds of the representation - double *GetBounds() VTK_OVERRIDE; + double *GetBounds() override; void CanInteract(const int displayPosition[2], const double worldPosition[3], - int &foundComponentType, int &foundComponentIndex, double &closestDistance2) VTK_OVERRIDE; + int &foundComponentType, int &foundComponentIndex, double &closestDistance2) override; void CanInteractWithCurve(const int displayPosition[2], const double worldPosition[3], int &foundComponentType, int &componentIndex, double &closestDistance2); protected: vtkSlicerCurveRepresentation3D(); - ~vtkSlicerCurveRepresentation3D() VTK_OVERRIDE; + ~vtkSlicerCurveRepresentation3D() override; - void SetMarkupsNode(vtkMRMLMarkupsNode *markupsNode) VTK_OVERRIDE; + void SetMarkupsNode(vtkMRMLMarkupsNode *markupsNode) override; vtkSmartPointer Line; vtkSmartPointer LineMapper; diff --git a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerCurveWidget.h b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerCurveWidget.h index ce75dc3e5970bb78a1437c875731175e03248fe9..ffbd4093bd239fa18ec786556acae27284510fc7 100644 --- a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerCurveWidget.h +++ b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerCurveWidget.h @@ -172,13 +172,13 @@ public: vtkTypeMacro(vtkSlicerCurveWidget, vtkSlicerMarkupsWidget); /// Create the default widget representation and initializes the widget and representation. - void CreateDefaultRepresentation(vtkMRMLMarkupsDisplayNode* markupsDisplayNode, vtkMRMLAbstractViewNode* viewNode, vtkRenderer* renderer) VTK_OVERRIDE; + void CreateDefaultRepresentation(vtkMRMLMarkupsDisplayNode* markupsDisplayNode, vtkMRMLAbstractViewNode* viewNode, vtkRenderer* renderer) override; protected: vtkSlicerCurveWidget(); ~vtkSlicerCurveWidget() override; - bool ProcessControlPointInsert(vtkMRMLInteractionEventData* eventData) VTK_OVERRIDE; + bool ProcessControlPointInsert(vtkMRMLInteractionEventData* eventData) override; vtkMRMLMarkupsCurveNode* GetMarkupsCurveNode(); diff --git a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerLineRepresentation2D.h b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerLineRepresentation2D.h index cc944c609618ffc3ee7493cee7b82d29072172d5..1aa901b0f363f898c768c2462ff4b41ad1933d60 100644 --- a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerLineRepresentation2D.h +++ b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerLineRepresentation2D.h @@ -54,10 +54,10 @@ public: /// Subclasses of vtkContourCurveRepresentation must implement these methods. These /// are the methods that the widget and its representation use to /// communicate with each other. - void UpdateFromMRML(vtkMRMLNode* caller, unsigned long event, void *callData=NULL) VTK_OVERRIDE; + void UpdateFromMRML(vtkMRMLNode* caller, unsigned long event, void *callData=NULL) override; void CanInteract(const int displayPosition[2], const double worldPosition[3], - int &foundComponentType, int &foundComponentIndex, double &closestDistance2) VTK_OVERRIDE; + int &foundComponentType, int &foundComponentIndex, double &closestDistance2) override; /// Methods to make this class behave as a vtkProp. void GetActors(vtkPropCollection *) override; diff --git a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerLineRepresentation3D.h b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerLineRepresentation3D.h index 23b1d47a7e9ff92813c0d52db5f5f793f3f3e496..87bea4f604d78c6149f44603aa7e57aee74acea6 100644 --- a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerLineRepresentation3D.h +++ b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerLineRepresentation3D.h @@ -47,30 +47,30 @@ public: /// Standard methods for instances of this class. vtkTypeMacro(vtkSlicerLineRepresentation3D,vtkSlicerMarkupsWidgetRepresentation3D); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Subclasses of vtkMRMLAbstractWidgetRepresentation must implement these methods. These /// are the methods that the widget and its representation use to /// communicate with each other. - void UpdateFromMRML(vtkMRMLNode* caller, unsigned long event, void *callData=NULL) VTK_OVERRIDE; + void UpdateFromMRML(vtkMRMLNode* caller, unsigned long event, void *callData=NULL) override; void CanInteract(const int displayPosition[2], const double worldPosition[3], - int &foundComponentType, int &foundComponentIndex, double &closestDistance2) VTK_OVERRIDE; + int &foundComponentType, int &foundComponentIndex, double &closestDistance2) override; /// Methods to make this class behave as a vtkProp. - void GetActors(vtkPropCollection *) VTK_OVERRIDE; - void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE; - int RenderOverlay(vtkViewport *viewport) VTK_OVERRIDE; - int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE; - int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) VTK_OVERRIDE; - vtkTypeBool HasTranslucentPolygonalGeometry() VTK_OVERRIDE; + void GetActors(vtkPropCollection *) override; + void ReleaseGraphicsResources(vtkWindow *) override; + int RenderOverlay(vtkViewport *viewport) override; + int RenderOpaqueGeometry(vtkViewport *viewport) override; + int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) override; + vtkTypeBool HasTranslucentPolygonalGeometry() override; /// Return the bounds of the representation - double *GetBounds() VTK_OVERRIDE; + double *GetBounds() override; protected: vtkSlicerLineRepresentation3D(); - ~vtkSlicerLineRepresentation3D() VTK_OVERRIDE; + ~vtkSlicerLineRepresentation3D() override; vtkSmartPointer Line; vtkSmartPointer LineMapper; diff --git a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerLineWidget.h b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerLineWidget.h index 525dde816b6e58b11555b53563908fa38d6dca69..5ac074315fe9a1f7fa2979a4c1dc0a65993ccdd9 100644 --- a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerLineWidget.h +++ b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerLineWidget.h @@ -172,11 +172,11 @@ public: vtkTypeMacro(vtkSlicerLineWidget,vtkSlicerMarkupsWidget); /// Create the default widget representation and initializes the widget and representation. - void CreateDefaultRepresentation(vtkMRMLMarkupsDisplayNode* markupsDisplayNode, vtkMRMLAbstractViewNode* viewNode, vtkRenderer* renderer) VTK_OVERRIDE; + void CreateDefaultRepresentation(vtkMRMLMarkupsDisplayNode* markupsDisplayNode, vtkMRMLAbstractViewNode* viewNode, vtkRenderer* renderer) override; protected: vtkSlicerLineWidget(); - ~vtkSlicerLineWidget() VTK_OVERRIDE; + ~vtkSlicerLineWidget() override; private: vtkSlicerLineWidget(const vtkSlicerLineWidget&) = delete; diff --git a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerMarkupsWidget.h b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerMarkupsWidget.h index c7943e83e3f2ef25a419a7dd856b9155109d4663..e60c914da28c8d21f3b2f2d452495438ee05967f 100644 --- a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerMarkupsWidget.h +++ b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerMarkupsWidget.h @@ -47,7 +47,7 @@ class VTK_SLICER_MARKUPS_MODULE_VTKWIDGETS_EXPORT vtkSlicerMarkupsWidget : publi public: /// Standard methods for a VTK class. vtkTypeMacro(vtkSlicerMarkupsWidget, vtkMRMLAbstractWidget); - virtual void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Create the default widget representation and initializes the widget and representation. virtual void CreateDefaultRepresentation(vtkMRMLMarkupsDisplayNode* markupsDisplayNode, vtkMRMLAbstractViewNode* viewNode, vtkRenderer* renderer) = 0; @@ -93,16 +93,16 @@ public: virtual int AddNodeOnWidget(const int displayPos[2]); /// Return true if the widget can process the event. - bool CanProcessInteractionEvent(vtkMRMLInteractionEventData* eventData, double &distance2) VTK_OVERRIDE; + bool CanProcessInteractionEvent(vtkMRMLInteractionEventData* eventData, double &distance2) override; /// Process interaction event. - bool ProcessInteractionEvent(vtkMRMLInteractionEventData* eventData) VTK_OVERRIDE; + bool ProcessInteractionEvent(vtkMRMLInteractionEventData* eventData) override; /// Called when the the widget loses the focus. - void Leave() VTK_OVERRIDE; + void Leave() override; // Allows the widget to request interactive mode (faster updates) - bool GetInteractive() VTK_OVERRIDE; + bool GetInteractive() override; vtkMRMLMarkupsNode* GetMarkupsNode(); vtkMRMLMarkupsDisplayNode* GetMarkupsDisplayNode(); @@ -112,7 +112,7 @@ public: protected: vtkSlicerMarkupsWidget(); - ~vtkSlicerMarkupsWidget() VTK_OVERRIDE; + ~vtkSlicerMarkupsWidget() override; void StartWidgetInteraction(vtkMRMLInteractionEventData* eventData); void EndWidgetInteraction(); diff --git a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerMarkupsWidgetRepresentation.h b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerMarkupsWidgetRepresentation.h index 801edea110b3767e0f25e250a8d538be10c29be4..02c78d2ae57ce1e9e538d5d7f77452c2ccffa492 100644 --- a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerMarkupsWidgetRepresentation.h +++ b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerMarkupsWidgetRepresentation.h @@ -70,10 +70,10 @@ class VTK_SLICER_MARKUPS_MODULE_VTKWIDGETS_EXPORT vtkSlicerMarkupsWidgetRepresen public: /// Standard methods for instances of this class. vtkTypeMacro(vtkSlicerMarkupsWidgetRepresentation, vtkMRMLAbstractWidgetRepresentation); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; // Update the representation from markups node - void UpdateFromMRML(vtkMRMLNode* caller, unsigned long event, void *callData = NULL) VTK_OVERRIDE; + void UpdateFromMRML(vtkMRMLNode* caller, unsigned long event, void *callData = NULL) override; /// Get the nth node's display position. Will return /// 1 on success, or 0 if there are not at least @@ -108,7 +108,7 @@ public: protected: vtkSlicerMarkupsWidgetRepresentation(); - ~vtkSlicerMarkupsWidgetRepresentation() VTK_OVERRIDE; + ~vtkSlicerMarkupsWidgetRepresentation() override; class ControlPointsPipeline { diff --git a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerMarkupsWidgetRepresentation2D.h b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerMarkupsWidgetRepresentation2D.h index 15a8440b197cfb113e2f12e584103ac5e7c03e09..27835d1da6be3961c5a9aee41986a8d1e5955b2d 100644 --- a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerMarkupsWidgetRepresentation2D.h +++ b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerMarkupsWidgetRepresentation2D.h @@ -47,11 +47,11 @@ class VTK_SLICER_MARKUPS_MODULE_VTKWIDGETS_EXPORT vtkSlicerMarkupsWidgetRepresen public: /// Standard methods for instances of this class. vtkTypeMacro(vtkSlicerMarkupsWidgetRepresentation2D, vtkSlicerMarkupsWidgetRepresentation); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Position is displayed (slice) position void CanInteract(const int displayPosition[2], const double worldPosition[3], - int &foundComponentType, int &foundComponentIndex, double &closestDistance2) VTK_OVERRIDE; + int &foundComponentType, int &foundComponentIndex, double &closestDistance2) override; /// Checks if interaction with straight line between visible points is possible. /// Can be used on the output of CanInteract, as if no better component is found then the input is returned. @@ -61,20 +61,20 @@ public: /// Subclasses of vtkSlicerMarkupsWidgetRepresentation2D must implement these methods. These /// are the methods that the widget and its representation use to /// communicate with each other. - virtual void UpdateFromMRML(vtkMRMLNode* caller, unsigned long event, void *callData=NULL); + void UpdateFromMRML(vtkMRMLNode* caller, unsigned long event, void *callData=NULL) override; /// Methods to make this class behave as a vtkProp. - void GetActors(vtkPropCollection *) VTK_OVERRIDE; - void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE; - int RenderOverlay(vtkViewport *viewport) VTK_OVERRIDE; - int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE; - int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) VTK_OVERRIDE; - vtkTypeBool HasTranslucentPolygonalGeometry() VTK_OVERRIDE; + void GetActors(vtkPropCollection *) override; + void ReleaseGraphicsResources(vtkWindow *) override; + int RenderOverlay(vtkViewport *viewport) override; + int RenderOpaqueGeometry(vtkViewport *viewport) override; + int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) override; + vtkTypeBool HasTranslucentPolygonalGeometry() override; /// Get the nth node's position on the slice. Will return /// 1 on success, or 0 if there are not at least /// (n+1) nodes (0 based counting). - int GetNthNodeDisplayPosition(int n, double pos[2]) VTK_OVERRIDE; + int GetNthNodeDisplayPosition(int n, double pos[2]) override; /// Set the Nth node slice visibility (i.e. if it is on the slice). virtual void SetNthPointSliceVisibility(int n, bool visibility); @@ -91,12 +91,12 @@ public: protected: vtkSlicerMarkupsWidgetRepresentation2D(); - ~vtkSlicerMarkupsWidgetRepresentation2D() VTK_OVERRIDE; + ~vtkSlicerMarkupsWidgetRepresentation2D() override; /// Get MRML view node as slice view node vtkMRMLSliceNode *GetSliceNode(); - bool GetAllControlPointsVisible() VTK_OVERRIDE; + bool GetAllControlPointsVisible() override; /// Check, if the point is displayable in the current slice geometry virtual bool IsPointDisplayableOnSlice(vtkMRMLMarkupsNode* node, int pointIndex = 0); @@ -112,7 +112,7 @@ protected: { public: ControlPointsPipeline2D(); - virtual ~ControlPointsPipeline2D(); + ~ControlPointsPipeline2D() override; vtkSmartPointer Actor; vtkSmartPointer Mapper; diff --git a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerMarkupsWidgetRepresentation3D.h b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerMarkupsWidgetRepresentation3D.h index 481de1ef7c0ecd413047b3b757fa582b2abd4940..70d0443813d7130f57a9458ee05a2dd1b316380d 100644 --- a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerMarkupsWidgetRepresentation3D.h +++ b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerMarkupsWidgetRepresentation3D.h @@ -51,28 +51,28 @@ class VTK_SLICER_MARKUPS_MODULE_VTKWIDGETS_EXPORT vtkSlicerMarkupsWidgetRepresen public: /// Standard methods for instances of this class. vtkTypeMacro(vtkSlicerMarkupsWidgetRepresentation3D, vtkSlicerMarkupsWidgetRepresentation); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; - void SetRenderer(vtkRenderer *ren) VTK_OVERRIDE; + void SetRenderer(vtkRenderer *ren) override; /// Subclasses of vtkSlicerMarkupsWidgetRepresentation3D must implement these methods. These /// are the methods that the widget and its representation use to /// communicate with each other. - void UpdateFromMRML(vtkMRMLNode* caller, unsigned long event, void *callData = NULL) VTK_OVERRIDE; + void UpdateFromMRML(vtkMRMLNode* caller, unsigned long event, void *callData = NULL) override; /// Methods to make this class behave as a vtkProp. - void GetActors(vtkPropCollection *) VTK_OVERRIDE; - void ReleaseGraphicsResources(vtkWindow *) VTK_OVERRIDE; - int RenderOverlay(vtkViewport *viewport) VTK_OVERRIDE; - int RenderOpaqueGeometry(vtkViewport *viewport) VTK_OVERRIDE; - int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) VTK_OVERRIDE; - vtkTypeBool HasTranslucentPolygonalGeometry() VTK_OVERRIDE; + void GetActors(vtkPropCollection *) override; + void ReleaseGraphicsResources(vtkWindow *) override; + int RenderOverlay(vtkViewport *viewport) override; + int RenderOpaqueGeometry(vtkViewport *viewport) override; + int RenderTranslucentPolygonalGeometry(vtkViewport *viewport) override; + vtkTypeBool HasTranslucentPolygonalGeometry() override; /// Return the bounds of the representation - double *GetBounds() VTK_OVERRIDE; + double *GetBounds() override; void CanInteract(const int displayPosition[2], const double worldPosition[3], - int &foundComponentType, int &foundComponentIndex, double &closestDistance2) VTK_OVERRIDE; + int &foundComponentType, int &foundComponentIndex, double &closestDistance2) override; /// Checks if interaction with straight line between visible points is possible. /// Can be used on the output of CanInteract, as if no better component is found then the input is returned. @@ -83,13 +83,13 @@ public: protected: vtkSlicerMarkupsWidgetRepresentation3D(); - ~vtkSlicerMarkupsWidgetRepresentation3D() VTK_OVERRIDE; + ~vtkSlicerMarkupsWidgetRepresentation3D() override; class ControlPointsPipeline3D : public ControlPointsPipeline { public: ControlPointsPipeline3D(); - virtual ~ControlPointsPipeline3D(); + ~ControlPointsPipeline3D() override; vtkSmartPointer SelectVisiblePoints; vtkSmartPointer Actor; diff --git a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerPointsRepresentation2D.h b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerPointsRepresentation2D.h index 1d2b45bcc326e02d17e707f57e2337e5bcc145c2..05e6045bda74edd9477f318ba144cae9dc649cd0 100644 --- a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerPointsRepresentation2D.h +++ b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerPointsRepresentation2D.h @@ -46,7 +46,7 @@ public: protected: vtkSlicerPointsRepresentation2D(); - ~vtkSlicerPointsRepresentation2D() VTK_OVERRIDE; + ~vtkSlicerPointsRepresentation2D() override; private: vtkSlicerPointsRepresentation2D(const vtkSlicerPointsRepresentation2D&) = delete; diff --git a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerPointsRepresentation3D.h b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerPointsRepresentation3D.h index 142e197b0814ab1565d3472a40a0cfb746e0a6e3..7e4c953ce20e36ae81fb33c7427dc4b45d5fae16 100644 --- a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerPointsRepresentation3D.h +++ b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerPointsRepresentation3D.h @@ -46,7 +46,7 @@ public: protected: vtkSlicerPointsRepresentation3D(); - ~vtkSlicerPointsRepresentation3D() VTK_OVERRIDE; + ~vtkSlicerPointsRepresentation3D() override; private: vtkSlicerPointsRepresentation3D(const vtkSlicerPointsRepresentation3D&) = delete; diff --git a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerPointsWidget.h b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerPointsWidget.h index 8ad7e190cdd03b79def566dc8109c2dfd344cb01..20198c9990ceaa365e97034ad8076fe100065092 100644 --- a/Modules/Loadable/Markups/VTKWidgets/vtkSlicerPointsWidget.h +++ b/Modules/Loadable/Markups/VTKWidgets/vtkSlicerPointsWidget.h @@ -43,11 +43,11 @@ public: vtkTypeMacro(vtkSlicerPointsWidget, vtkSlicerMarkupsWidget); /// Create the default widget representation and initializes the widget and representation. - void CreateDefaultRepresentation(vtkMRMLMarkupsDisplayNode* markupsDisplayNode, vtkMRMLAbstractViewNode* viewNode, vtkRenderer* renderer) VTK_OVERRIDE; + void CreateDefaultRepresentation(vtkMRMLMarkupsDisplayNode* markupsDisplayNode, vtkMRMLAbstractViewNode* viewNode, vtkRenderer* renderer) override; protected: vtkSlicerPointsWidget(); - ~vtkSlicerPointsWidget() VTK_OVERRIDE; + ~vtkSlicerPointsWidget() override; private: vtkSlicerPointsWidget(const vtkSlicerPointsWidget&) = delete; diff --git a/Modules/Loadable/Markups/Widgets/DesignerPlugins/qMRMLMarkupsFiducialProjectionPropertyWidgetPlugin.h b/Modules/Loadable/Markups/Widgets/DesignerPlugins/qMRMLMarkupsFiducialProjectionPropertyWidgetPlugin.h index 75fd43b6de5e0086d3dbf1c57b3afe3953073f1e..32f76d5604c31fadc30c107d41d78c57175329d3 100644 --- a/Modules/Loadable/Markups/Widgets/DesignerPlugins/qMRMLMarkupsFiducialProjectionPropertyWidgetPlugin.h +++ b/Modules/Loadable/Markups/Widgets/DesignerPlugins/qMRMLMarkupsFiducialProjectionPropertyWidgetPlugin.h @@ -36,11 +36,11 @@ qMRMLMarkupsFiducialProjectionPropertyWidgetPlugin public: qMRMLMarkupsFiducialProjectionPropertyWidgetPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Modules/Loadable/Markups/Widgets/DesignerPlugins/qSlicerMarkupsModuleWidgetsAbstractPlugin.h b/Modules/Loadable/Markups/Widgets/DesignerPlugins/qSlicerMarkupsModuleWidgetsAbstractPlugin.h index f516532a374df0fb2246d65498c190097df72230..0c6a0544a689ec96f0c04df4e697d27789350c00 100644 --- a/Modules/Loadable/Markups/Widgets/DesignerPlugins/qSlicerMarkupsModuleWidgetsAbstractPlugin.h +++ b/Modules/Loadable/Markups/Widgets/DesignerPlugins/qSlicerMarkupsModuleWidgetsAbstractPlugin.h @@ -34,11 +34,11 @@ public: qSlicerMarkupsModuleWidgetsAbstractPlugin(); // Don't reimplement this method. - QString group() const; + QString group() const override; // You can reimplement these methods - virtual QIcon icon() const; - virtual QString toolTip() const; - virtual QString whatsThis() const; + QIcon icon() const override; + QString toolTip() const override; + QString whatsThis() const override; }; diff --git a/Modules/Loadable/Markups/Widgets/DesignerPlugins/qSlicerMarkupsModuleWidgetsPlugin.h b/Modules/Loadable/Markups/Widgets/DesignerPlugins/qSlicerMarkupsModuleWidgetsPlugin.h index 876b233a4c918979e37323dec01e03686edbd3b7..d85eff4b11980e043e007e2de8280b0fd3a853e1 100644 --- a/Modules/Loadable/Markups/Widgets/DesignerPlugins/qSlicerMarkupsModuleWidgetsPlugin.h +++ b/Modules/Loadable/Markups/Widgets/DesignerPlugins/qSlicerMarkupsModuleWidgetsPlugin.h @@ -39,7 +39,7 @@ class Q_SLICER_MODULE_MARKUPS_WIDGETS_PLUGINS_EXPORT qSlicerMarkupsModuleWidgets Q_INTERFACES(QDesignerCustomWidgetCollectionInterface); public: - QList customWidgets() const + QList customWidgets() const override { QList plugins; plugins << new qMRMLMarkupsFiducialProjectionPropertyWidgetPlugin; diff --git a/Modules/Loadable/Markups/Widgets/DesignerPlugins/qSlicerMarkupsPlaceWidgetPlugin.h b/Modules/Loadable/Markups/Widgets/DesignerPlugins/qSlicerMarkupsPlaceWidgetPlugin.h index b9dbda16c36b8161bcfcc8640ac07a99cf4a9345..25a4a0d64e528b63d497acb558c38e7d23ba23e3 100644 --- a/Modules/Loadable/Markups/Widgets/DesignerPlugins/qSlicerMarkupsPlaceWidgetPlugin.h +++ b/Modules/Loadable/Markups/Widgets/DesignerPlugins/qSlicerMarkupsPlaceWidgetPlugin.h @@ -32,11 +32,11 @@ qSlicerMarkupsPlaceWidgetPlugin public: qSlicerMarkupsPlaceWidgetPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Modules/Loadable/Markups/Widgets/DesignerPlugins/qSlicerSimpleMarkupsWidgetPlugin.h b/Modules/Loadable/Markups/Widgets/DesignerPlugins/qSlicerSimpleMarkupsWidgetPlugin.h index 5f9da83d229c9f4c5e28e7c206b3b63eb90c1712..c670c70cd66607c7987f63b4479d9e02b4757a33 100644 --- a/Modules/Loadable/Markups/Widgets/DesignerPlugins/qSlicerSimpleMarkupsWidgetPlugin.h +++ b/Modules/Loadable/Markups/Widgets/DesignerPlugins/qSlicerSimpleMarkupsWidgetPlugin.h @@ -36,11 +36,11 @@ qSlicerSimpleMarkupsWidgetPlugin public: qSlicerSimpleMarkupsWidgetPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Modules/Loadable/Markups/qSlicerMarkupsModule.h b/Modules/Loadable/Markups/qSlicerMarkupsModule.h index 081c12d44ebc1f2ef74263c1036a0e044359660b..08054813db0ee7bd9edf4684501063ec7804e93d 100644 --- a/Modules/Loadable/Markups/qSlicerMarkupsModule.h +++ b/Modules/Loadable/Markups/qSlicerMarkupsModule.h @@ -37,38 +37,38 @@ public: typedef qSlicerLoadableModule Superclass; explicit qSlicerMarkupsModule(QObject *parent=0); - virtual ~qSlicerMarkupsModule(); + ~qSlicerMarkupsModule() override; qSlicerGetTitleMacro(QTMODULE_TITLE); /// Help to use the module - virtual QString helpText()const; + QString helpText()const override; /// Return acknowledgements - virtual QString acknowledgementText()const; + QString acknowledgementText()const override; /// Return the authors of the module - virtual QStringList contributors()const; + QStringList contributors()const override; /// Return a custom icon for the module - virtual QIcon icon()const; + QIcon icon()const override; /// Return the categories for the module - virtual QStringList categories()const; + QStringList categories()const override; /// Specify editable node types - virtual QStringList associatedNodeTypes()const; + QStringList associatedNodeTypes()const override; protected: /// Initialize the module. Register the volumes reader/writer - virtual void setup(); + void setup() override; /// Create and return the widget representation associated to this module - virtual qSlicerAbstractModuleRepresentation * createWidgetRepresentation(); + qSlicerAbstractModuleRepresentation * createWidgetRepresentation() override; /// Create and return the logic associated to this module - virtual vtkMRMLAbstractLogic* createLogic(); + vtkMRMLAbstractLogic* createLogic() override; QScopedPointer d_ptr; diff --git a/Modules/Loadable/Markups/qSlicerMarkupsReader.h b/Modules/Loadable/Markups/qSlicerMarkupsReader.h index 2dcb8da81dcf9c313d2e386dabf5a5375f67ea92..37c19ad5dfa62694b6ae97afd02c0288be71eab5 100644 --- a/Modules/Loadable/Markups/qSlicerMarkupsReader.h +++ b/Modules/Loadable/Markups/qSlicerMarkupsReader.h @@ -34,16 +34,16 @@ public: typedef qSlicerFileReader Superclass; qSlicerMarkupsReader(QObject* parent = 0); qSlicerMarkupsReader(vtkSlicerMarkupsLogic* logic, QObject* parent = 0); - virtual ~qSlicerMarkupsReader(); + ~qSlicerMarkupsReader() override; vtkSlicerMarkupsLogic* markupsLogic()const; void setMarkupsLogic(vtkSlicerMarkupsLogic* logic); - virtual QString description()const; - virtual IOFileType fileType()const; - virtual QStringList extensions()const; + QString description()const override; + IOFileType fileType()const override; + QStringList extensions()const override; - virtual bool load(const IOProperties& properties); + bool load(const IOProperties& properties) override; protected: QScopedPointer d_ptr; diff --git a/Modules/Loadable/Models/Logic/vtkSlicerModelsLogic.h b/Modules/Loadable/Models/Logic/vtkSlicerModelsLogic.h index bc26868f9bd9f97f7e0097112dce3a880a6713ba..bd0ade1d0296f14d62c252fd01c1e00eab8e53d5 100644 --- a/Modules/Loadable/Models/Logic/vtkSlicerModelsLogic.h +++ b/Modules/Loadable/Models/Logic/vtkSlicerModelsLogic.h @@ -36,7 +36,7 @@ class VTK_SLICER_MODELS_MODULE_LOGIC_EXPORT vtkSlicerModelsLogic /// The Usual vtk class functions static vtkSlicerModelsLogic *New(); vtkTypeMacro(vtkSlicerModelsLogic, vtkSlicerModuleLogic); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// /// The color logic is used to retrieve the default color node ID for @@ -94,16 +94,16 @@ class VTK_SLICER_MODELS_MODULE_LOGIC_EXPORT vtkSlicerModelsLogic protected: vtkSlicerModelsLogic(); - ~vtkSlicerModelsLogic(); + ~vtkSlicerModelsLogic() override; vtkSlicerModelsLogic(const vtkSlicerModelsLogic&); void operator=(const vtkSlicerModelsLogic&); /// Reimplemented to observe the NodeRemovedEvent scene event. - virtual void SetMRMLSceneInternal(vtkMRMLScene* newScene) VTK_OVERRIDE; + void SetMRMLSceneInternal(vtkMRMLScene* newScene) override; /// Reimplemented to make sure the singleton vtkMRMLClipModelsNode is /// instantiated. - virtual void ObserveMRMLScene() VTK_OVERRIDE; + void ObserveMRMLScene() override; // vtkMRMLModelNode *ActiveModelNode; diff --git a/Modules/Loadable/Models/SubjectHierarchyPlugins/qSlicerSubjectHierarchyModelsPlugin.cxx b/Modules/Loadable/Models/SubjectHierarchyPlugins/qSlicerSubjectHierarchyModelsPlugin.cxx index 36f9ae266a9c2b62ee8ec52d12fa59ec97d0c98a..69a9b7489fe0be0ac8ccdc9b7888dca9adfbec8a 100644 --- a/Modules/Loadable/Models/SubjectHierarchyPlugins/qSlicerSubjectHierarchyModelsPlugin.cxx +++ b/Modules/Loadable/Models/SubjectHierarchyPlugins/qSlicerSubjectHierarchyModelsPlugin.cxx @@ -59,7 +59,7 @@ protected: qSlicerSubjectHierarchyModelsPlugin* const q_ptr; public: qSlicerSubjectHierarchyModelsPluginPrivate(qSlicerSubjectHierarchyModelsPlugin& object); - ~qSlicerSubjectHierarchyModelsPluginPrivate(); + ~qSlicerSubjectHierarchyModelsPluginPrivate() override; void init(); public: QIcon ModelIcon; diff --git a/Modules/Loadable/Models/SubjectHierarchyPlugins/qSlicerSubjectHierarchyModelsPlugin.h b/Modules/Loadable/Models/SubjectHierarchyPlugins/qSlicerSubjectHierarchyModelsPlugin.h index d39615ba418914c1134c3aa9d340f24c4f23f8cc..c79078cddd689b3bd6236f5f61f1eec35b49b51b 100644 --- a/Modules/Loadable/Models/SubjectHierarchyPlugins/qSlicerSubjectHierarchyModelsPlugin.h +++ b/Modules/Loadable/Models/SubjectHierarchyPlugins/qSlicerSubjectHierarchyModelsPlugin.h @@ -45,7 +45,7 @@ public: public: typedef qSlicerSubjectHierarchyAbstractPlugin Superclass; qSlicerSubjectHierarchyModelsPlugin(QObject* parent = NULL); - virtual ~qSlicerSubjectHierarchyModelsPlugin(); + ~qSlicerSubjectHierarchyModelsPlugin() override; public: /// Determines if a data node can be placed in the hierarchy using the actual plugin, @@ -55,9 +55,9 @@ public: /// Default value is invalid. In that case the parent will be ignored, the confidence numbers are got based on the to-be child node alone. /// \return Floating point confidence number between 0 and 1, where 0 means that the plugin cannot handle the /// node, and 1 means that the plugin is the only one that can handle the node (by node type or identifier attribute) - virtual double canAddNodeToSubjectHierarchy( + double canAddNodeToSubjectHierarchy( vtkMRMLNode* node, - vtkIdType parentItemID=vtkMRMLSubjectHierarchyNode::INVALID_ITEM_ID )const; + vtkIdType parentItemID=vtkMRMLSubjectHierarchyNode::INVALID_ITEM_ID )const override; /// Determines if the actual plugin can handle a subject hierarchy item. The plugin with /// the highest confidence number will "own" the item in the subject hierarchy (set icon, tooltip, @@ -65,21 +65,21 @@ public: /// \param item Item to handle in the subject hierarchy tree /// \return Floating point confidence number between 0 and 1, where 0 means that the plugin cannot handle the /// item, and 1 means that the plugin is the only one that can handle the item (by node type or identifier attribute) - virtual double canOwnSubjectHierarchyItem(vtkIdType itemID)const; + double canOwnSubjectHierarchyItem(vtkIdType itemID)const override; /// Get role that the plugin assigns to the subject hierarchy item. /// Each plugin should provide only one role. - Q_INVOKABLE virtual const QString roleForPlugin()const; + Q_INVOKABLE const QString roleForPlugin()const override; /// Get icon of an owned subject hierarchy item /// \return Icon to set, empty icon if nothing to set - virtual QIcon icon(vtkIdType itemID); + QIcon icon(vtkIdType itemID) override; /// Get visibility icon for a visibility state - virtual QIcon visibilityIcon(int visible); + QIcon visibilityIcon(int visible) override; /// Generate tooltip for a owned subject hierarchy item - virtual QString tooltip(vtkIdType itemID)const; + QString tooltip(vtkIdType itemID)const override; /// Set display color of an owned subject hierarchy item /// \param color Display color to set @@ -88,7 +88,7 @@ public: /// qSlicerTerminologyItemDelegate::NameRole : string /// qSlicerTerminologyItemDelegate::NameAutoGeneratedRole : bool /// qSlicerTerminologyItemDelegate::ColorAutoGeneratedRole : bool - virtual void setDisplayColor(vtkIdType itemID, QColor color, QMap terminologyMetaData); + void setDisplayColor(vtkIdType itemID, QColor color, QMap terminologyMetaData) override; /// Get display color of an owned subject hierarchy item /// \param terminologyMetaData Output map containing terminology meta data. Contents: @@ -96,15 +96,15 @@ public: /// qSlicerTerminologyItemDelegate::NameRole : string /// qSlicerTerminologyItemDelegate::NameAutoGeneratedRole : bool /// qSlicerTerminologyItemDelegate::ColorAutoGeneratedRole : bool - virtual QColor getDisplayColor(vtkIdType itemID, QMap &terminologyMetaData)const; + QColor getDisplayColor(vtkIdType itemID, QMap &terminologyMetaData)const override; /// Get visibility context menu item actions to add to tree view. /// These item visibility context menu actions can be shown in the implementations of \sa showVisibilityContextMenuActionsForItem - virtual QList visibilityContextMenuActions()const; + QList visibilityContextMenuActions()const override; /// Show visibility context menu actions valid for a given subject hierarchy item. /// \param itemID Subject Hierarchy item to show the visibility context menu items for - virtual void showVisibilityContextMenuActionsForItem(vtkIdType itemID); + void showVisibilityContextMenuActionsForItem(vtkIdType itemID) override; protected slots: /// Toggle slice intersection visibility when action clicked in the context menu diff --git a/Modules/Loadable/Models/Widgets/DesignerPlugins/qMRMLModelDisplayNodeWidgetPlugin.h b/Modules/Loadable/Models/Widgets/DesignerPlugins/qMRMLModelDisplayNodeWidgetPlugin.h index a4f7330b318852638bba15dda10fc5d0c4398cab..d52e535d8f2c98967d51d1d1f6f18628b7a13e3f 100644 --- a/Modules/Loadable/Models/Widgets/DesignerPlugins/qMRMLModelDisplayNodeWidgetPlugin.h +++ b/Modules/Loadable/Models/Widgets/DesignerPlugins/qMRMLModelDisplayNodeWidgetPlugin.h @@ -32,12 +32,12 @@ class Q_SLICER_QTMODULES_MODELS_WIDGETS_PLUGINS_EXPORT qMRMLModelDisplayNodeWidg public: qMRMLModelDisplayNodeWidgetPlugin(QObject * newParent = 0); - QWidget *createWidget(QWidget *newParent); - QString domXml() const; - QIcon icon() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *newParent) override; + QString domXml() const override; + QIcon icon() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Modules/Loadable/Models/Widgets/DesignerPlugins/qSlicerModelsWidgetsAbstractPlugin.h b/Modules/Loadable/Models/Widgets/DesignerPlugins/qSlicerModelsWidgetsAbstractPlugin.h index 1a65ff4d0ec405d631f16b98aca00631daf2ddaf..e40f12960805064865a6130d2346cfd4ce41ecb9 100644 --- a/Modules/Loadable/Models/Widgets/DesignerPlugins/qSlicerModelsWidgetsAbstractPlugin.h +++ b/Modules/Loadable/Models/Widgets/DesignerPlugins/qSlicerModelsWidgetsAbstractPlugin.h @@ -34,11 +34,11 @@ public: qSlicerModelsWidgetsAbstractPlugin(); // Don't reimplement this method. - QString group() const; + QString group() const override; // You can reimplement these methods - virtual QIcon icon() const; - virtual QString toolTip() const; - virtual QString whatsThis() const; + QIcon icon() const override; + QString toolTip() const override; + QString whatsThis() const override; }; diff --git a/Modules/Loadable/Models/Widgets/DesignerPlugins/qSlicerModelsWidgetsPlugin.h b/Modules/Loadable/Models/Widgets/DesignerPlugins/qSlicerModelsWidgetsPlugin.h index 483193a20a26ffb305b942ddacb725123055f4d3..b01ef0479e6ec690dfdf308041113751d7f673e3 100644 --- a/Modules/Loadable/Models/Widgets/DesignerPlugins/qSlicerModelsWidgetsPlugin.h +++ b/Modules/Loadable/Models/Widgets/DesignerPlugins/qSlicerModelsWidgetsPlugin.h @@ -37,7 +37,7 @@ class Q_SLICER_QTMODULES_MODELS_WIDGETS_PLUGINS_EXPORT qSlicerModelsWidgetsPlugi Q_INTERFACES(QDesignerCustomWidgetCollectionInterface); public: - QList customWidgets() const + QList customWidgets() const override { QList plugins; plugins << new qMRMLModelDisplayNodeWidgetPlugin; diff --git a/Modules/Loadable/Models/qSlicerModelsModule.h b/Modules/Loadable/Models/qSlicerModelsModule.h index 6695ae33a288c1def9b16e00207601da6b11828e..1c2fdf5bfe07e6784379af813c49077e6477aa57 100644 --- a/Modules/Loadable/Models/qSlicerModelsModule.h +++ b/Modules/Loadable/Models/qSlicerModelsModule.h @@ -43,32 +43,32 @@ public: typedef qSlicerLoadableModule Superclass; explicit qSlicerModelsModule(QObject *parent=0); - virtual ~qSlicerModelsModule(); + ~qSlicerModelsModule() override; qSlicerGetTitleMacro(QTMODULE_TITLE); - virtual QString helpText()const; - virtual QString acknowledgementText()const; - virtual QStringList contributors()const; + QString helpText()const override; + QString acknowledgementText()const override; + QStringList contributors()const override; /// Return a custom icon for the module - virtual QIcon icon()const; + QIcon icon()const override; - virtual QStringList categories()const; - virtual QStringList dependencies() const; + QStringList categories()const override; + QStringList dependencies() const override; /// Specify editable node types - virtual QStringList associatedNodeTypes()const; + QStringList associatedNodeTypes()const override; protected: /// Initialize the module. Register the volumes reader/writer - virtual void setup(); + void setup() override; /// Create and return the widget representation associated to this module - virtual qSlicerAbstractModuleRepresentation * createWidgetRepresentation(); + qSlicerAbstractModuleRepresentation * createWidgetRepresentation() override; /// Create and return the logic associated to this module - virtual vtkMRMLAbstractLogic* createLogic(); + vtkMRMLAbstractLogic* createLogic() override; protected: QScopedPointer d_ptr; diff --git a/Modules/Loadable/Models/qSlicerModelsReader.h b/Modules/Loadable/Models/qSlicerModelsReader.h index ba7677867ab7d5c4c7e9cdb9f0134db179cc2398..92886155a5fb0419a9fe09a6ce15ac4a8bb1fb0e 100644 --- a/Modules/Loadable/Models/qSlicerModelsReader.h +++ b/Modules/Loadable/Models/qSlicerModelsReader.h @@ -37,16 +37,16 @@ class qSlicerModelsReader public: typedef qSlicerFileReader Superclass; qSlicerModelsReader(vtkSlicerModelsLogic* modelsLogic = 0, QObject* parent = 0); - virtual ~qSlicerModelsReader(); + ~qSlicerModelsReader() override; void setModelsLogic(vtkSlicerModelsLogic* modelsLogic); vtkSlicerModelsLogic* modelsLogic()const; - virtual QString description()const; - virtual IOFileType fileType()const; - virtual QStringList extensions()const; + QString description()const override; + IOFileType fileType()const override; + QStringList extensions()const override; - virtual bool load(const IOProperties& properties); + bool load(const IOProperties& properties) override; protected: QScopedPointer d_ptr; diff --git a/Modules/Loadable/Models/qSlicerScalarOverlayReader.h b/Modules/Loadable/Models/qSlicerScalarOverlayReader.h index 0ee60647233231c1f319017ab6b82496ce86961c..37d6887b6b51ec26cde4704b549af3c61cbf1c52 100644 --- a/Modules/Loadable/Models/qSlicerScalarOverlayReader.h +++ b/Modules/Loadable/Models/qSlicerScalarOverlayReader.h @@ -36,17 +36,17 @@ class qSlicerScalarOverlayReader public: typedef qSlicerFileReader Superclass; qSlicerScalarOverlayReader(vtkSlicerModelsLogic* modelsLogic, QObject* parent = 0); - virtual ~qSlicerScalarOverlayReader(); + ~qSlicerScalarOverlayReader() override; void setModelsLogic(vtkSlicerModelsLogic* modelsLogic); vtkSlicerModelsLogic* modelsLogic()const; - virtual QString description()const; - virtual IOFileType fileType()const; - virtual QStringList extensions()const; - virtual qSlicerIOOptions* options()const; + QString description()const override; + IOFileType fileType()const override; + QStringList extensions()const override; + qSlicerIOOptions* options()const override; - virtual bool load(const IOProperties& properties); + bool load(const IOProperties& properties) override; protected: QScopedPointer d_ptr; diff --git a/Modules/Loadable/Plots/Logic/vtkSlicerPlotsLogic.h b/Modules/Loadable/Plots/Logic/vtkSlicerPlotsLogic.h index c3c15d51c4bb96fd6bc7cf465ed927a211a995b3..1104fa6c685e01b0df7ab769c0cf2c4f9887bfe4 100644 --- a/Modules/Loadable/Plots/Logic/vtkSlicerPlotsLogic.h +++ b/Modules/Loadable/Plots/Logic/vtkSlicerPlotsLogic.h @@ -47,7 +47,7 @@ public: static vtkSlicerPlotsLogic *New(); vtkTypeMacro(vtkSlicerPlotsLogic, vtkSlicerModuleLogic); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Returns ID of the layout that is similar to current layout but also contains a table view static int GetLayoutWithPlot(int currentLayout); @@ -65,7 +65,7 @@ public: protected: vtkSlicerPlotsLogic(); - virtual ~vtkSlicerPlotsLogic(); + ~vtkSlicerPlotsLogic() override; private: vtkSlicerPlotsLogic(const vtkSlicerPlotsLogic&); // Not implemented diff --git a/Modules/Loadable/Plots/SubjectHierarchyPlugins/qSlicerSubjectHierarchyPlotsPlugin.cxx b/Modules/Loadable/Plots/SubjectHierarchyPlugins/qSlicerSubjectHierarchyPlotsPlugin.cxx index e337864527bd9f81027d7752d47b8da26ed01a30..44c82456acf87bdaacfedae9367cb4765fd00759 100644 --- a/Modules/Loadable/Plots/SubjectHierarchyPlugins/qSlicerSubjectHierarchyPlotsPlugin.cxx +++ b/Modules/Loadable/Plots/SubjectHierarchyPlugins/qSlicerSubjectHierarchyPlotsPlugin.cxx @@ -54,7 +54,7 @@ protected: qSlicerSubjectHierarchyPlotsPlugin* const q_ptr; public: qSlicerSubjectHierarchyPlotsPluginPrivate(qSlicerSubjectHierarchyPlotsPlugin& object); - ~qSlicerSubjectHierarchyPlotsPluginPrivate(); + ~qSlicerSubjectHierarchyPlotsPluginPrivate() override; void init(); public: QIcon PlotChartIcon; diff --git a/Modules/Loadable/Plots/SubjectHierarchyPlugins/qSlicerSubjectHierarchyPlotsPlugin.h b/Modules/Loadable/Plots/SubjectHierarchyPlugins/qSlicerSubjectHierarchyPlotsPlugin.h index a4dbc1732858758bac99486afbfed07cbcd5b56e..9a573a20a79a3e271bd7b1b0631afe9765a910d3 100644 --- a/Modules/Loadable/Plots/SubjectHierarchyPlugins/qSlicerSubjectHierarchyPlotsPlugin.h +++ b/Modules/Loadable/Plots/SubjectHierarchyPlugins/qSlicerSubjectHierarchyPlotsPlugin.h @@ -39,7 +39,7 @@ public: public: typedef qSlicerSubjectHierarchyAbstractPlugin Superclass; qSlicerSubjectHierarchyPlotsPlugin(QObject* parent = NULL); - virtual ~qSlicerSubjectHierarchyPlotsPlugin(); + ~qSlicerSubjectHierarchyPlotsPlugin() override; public: @@ -53,9 +53,9 @@ public: /// Default value is invalid. In that case the parent will be ignored, the confidence numbers are got based on the to-be child node alone. /// \return Floating point confidence number between 0 and 1, where 0 means that the plugin cannot handle the /// node, and 1 means that the plugin is the only one that can handle the node (by node type or identifier attribute) - virtual double canAddNodeToSubjectHierarchy( + double canAddNodeToSubjectHierarchy( vtkMRMLNode* node, - vtkIdType parentItemID=vtkMRMLSubjectHierarchyNode::INVALID_ITEM_ID )const; + vtkIdType parentItemID=vtkMRMLSubjectHierarchyNode::INVALID_ITEM_ID )const override; /// Determines if the actual plugin can handle a subject hierarchy item. The plugin with /// the highest confidence number will "own" the item in the subject hierarchy (set icon, tooltip, @@ -63,25 +63,25 @@ public: /// \param item Item to handle in the subject hierarchy tree /// \return Floating point confidence number between 0 and 1, where 0 means that the plugin cannot handle the /// item, and 1 means that the plugin is the only one that can handle the item (by node type or identifier attribute) - virtual double canOwnSubjectHierarchyItem(vtkIdType itemID)const; + double canOwnSubjectHierarchyItem(vtkIdType itemID)const override; /// Get role that the plugin assigns to the subject hierarchy item. /// Each plugin should provide only one role. - Q_INVOKABLE virtual const QString roleForPlugin()const; + Q_INVOKABLE const QString roleForPlugin()const override; /// Get icon of an owned subject hierarchy item /// \return Icon to set, empty icon if nothing to set - virtual QIcon icon(vtkIdType itemID); + QIcon icon(vtkIdType itemID) override; /// Get visibility icon for a visibility state - virtual QIcon visibilityIcon(int visible); + QIcon visibilityIcon(int visible) override; /// Set display visibility of a owned subject hierarchy item - virtual void setDisplayVisibility(vtkIdType itemID, int visible); + void setDisplayVisibility(vtkIdType itemID, int visible) override; /// Get display visibility of a owned subject hierarchy item /// \return Display visibility (0: hidden, 1: shown, 2: partially shown) - virtual int getDisplayVisibility(vtkIdType itemID)const; + int getDisplayVisibility(vtkIdType itemID)const override; protected: /// Return the chart view node object from the layout diff --git a/Modules/Loadable/Plots/Widgets/DesignerPlugins/qMRMLPlotChartPropertiesWidgetPlugin.h b/Modules/Loadable/Plots/Widgets/DesignerPlugins/qMRMLPlotChartPropertiesWidgetPlugin.h index 6180bac5bd848a43d342897ce68df968f367f4d5..7fcfdfe47c9d707669a1ecadaa6457f43622a99e 100644 --- a/Modules/Loadable/Plots/Widgets/DesignerPlugins/qMRMLPlotChartPropertiesWidgetPlugin.h +++ b/Modules/Loadable/Plots/Widgets/DesignerPlugins/qMRMLPlotChartPropertiesWidgetPlugin.h @@ -32,11 +32,11 @@ qMRMLPlotChartPropertiesWidgetPlugin public: qMRMLPlotChartPropertiesWidgetPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Modules/Loadable/Plots/Widgets/DesignerPlugins/qMRMLPlotSeriesPropertiesWidgetPlugin.h b/Modules/Loadable/Plots/Widgets/DesignerPlugins/qMRMLPlotSeriesPropertiesWidgetPlugin.h index a654166da29b316999496a7a139835dc220ef85e..ee4009a5de8d01d3ad2605255bdd277b23ad91c6 100644 --- a/Modules/Loadable/Plots/Widgets/DesignerPlugins/qMRMLPlotSeriesPropertiesWidgetPlugin.h +++ b/Modules/Loadable/Plots/Widgets/DesignerPlugins/qMRMLPlotSeriesPropertiesWidgetPlugin.h @@ -32,11 +32,11 @@ qMRMLPlotSeriesPropertiesWidgetPlugin public: qMRMLPlotSeriesPropertiesWidgetPlugin(QObject *_parent = 0); - QWidget *createWidget(QWidget *_parent); - QString domXml() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget *_parent) override; + QString domXml() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Modules/Loadable/Plots/Widgets/DesignerPlugins/qSlicerPlotsModuleWidgetsAbstractPlugin.h b/Modules/Loadable/Plots/Widgets/DesignerPlugins/qSlicerPlotsModuleWidgetsAbstractPlugin.h index a203f125df8827e2fa092688584143e62f21c0fe..7348be8af082b3a4b5fafe017725fa9b22e58afe 100644 --- a/Modules/Loadable/Plots/Widgets/DesignerPlugins/qSlicerPlotsModuleWidgetsAbstractPlugin.h +++ b/Modules/Loadable/Plots/Widgets/DesignerPlugins/qSlicerPlotsModuleWidgetsAbstractPlugin.h @@ -34,11 +34,11 @@ public: qSlicerPlotsModuleWidgetsAbstractPlugin(); // Don't reimplement this method. - QString group() const; + QString group() const override; // You can reimplement these methods - virtual QIcon icon() const; - virtual QString toolTip() const; - virtual QString whatsThis() const; + QIcon icon() const override; + QString toolTip() const override; + QString whatsThis() const override; }; diff --git a/Modules/Loadable/Plots/Widgets/DesignerPlugins/qSlicerPlotsModuleWidgetsPlugin.h b/Modules/Loadable/Plots/Widgets/DesignerPlugins/qSlicerPlotsModuleWidgetsPlugin.h index 3f5a2e5ea44e07822d43cf543840b0aded319aef..6cef7a7e961d33354660130956df27f8bf946eb2 100644 --- a/Modules/Loadable/Plots/Widgets/DesignerPlugins/qSlicerPlotsModuleWidgetsPlugin.h +++ b/Modules/Loadable/Plots/Widgets/DesignerPlugins/qSlicerPlotsModuleWidgetsPlugin.h @@ -38,7 +38,7 @@ class Q_SLICER_MODULE_PLOTS_WIDGETS_PLUGINS_EXPORT qSlicerPlotsModuleWidgetsPlug Q_INTERFACES(QDesignerCustomWidgetCollectionInterface); public: - QList customWidgets() const + QList customWidgets() const override { QList plugins; plugins << new qMRMLPlotChartPropertiesWidgetPlugin; diff --git a/Modules/Loadable/Plots/Widgets/qMRMLPlotChartPropertiesWidget_p.h b/Modules/Loadable/Plots/Widgets/qMRMLPlotChartPropertiesWidget_p.h index 16cbe10051ebde3321e47638493a7bb78421e378..c99bd5e74c9ff33d889eed453925d1877221e4b0 100644 --- a/Modules/Loadable/Plots/Widgets/qMRMLPlotChartPropertiesWidget_p.h +++ b/Modules/Loadable/Plots/Widgets/qMRMLPlotChartPropertiesWidget_p.h @@ -62,7 +62,7 @@ protected: qMRMLPlotChartPropertiesWidget* const q_ptr; public: qMRMLPlotChartPropertiesWidgetPrivate(qMRMLPlotChartPropertiesWidget& object); - ~qMRMLPlotChartPropertiesWidgetPrivate(); + ~qMRMLPlotChartPropertiesWidgetPrivate() override; void setupUi(qMRMLWidget* widget); diff --git a/Modules/Loadable/Plots/Widgets/qMRMLPlotSeriesPropertiesWidget_p.h b/Modules/Loadable/Plots/Widgets/qMRMLPlotSeriesPropertiesWidget_p.h index e4ac144cc4596da7c43318bf9f440b58c74e1cac..736b5a0d96322d4bfcdb0a4f63a33cec303877cf 100644 --- a/Modules/Loadable/Plots/Widgets/qMRMLPlotSeriesPropertiesWidget_p.h +++ b/Modules/Loadable/Plots/Widgets/qMRMLPlotSeriesPropertiesWidget_p.h @@ -63,7 +63,7 @@ protected: qMRMLPlotSeriesPropertiesWidget* const q_ptr; public: qMRMLPlotSeriesPropertiesWidgetPrivate(qMRMLPlotSeriesPropertiesWidget& object); - ~qMRMLPlotSeriesPropertiesWidgetPrivate(); + ~qMRMLPlotSeriesPropertiesWidgetPrivate() override; void setupUi(qMRMLWidget* widget); diff --git a/Modules/Loadable/Plots/qSlicerPlotsModule.h b/Modules/Loadable/Plots/qSlicerPlotsModule.h index 8b22050b4e2ec3c32f0c3c5604dcb80c0042de76..118a99fa39a31037aec8be3f46b704ae6c29977b 100644 --- a/Modules/Loadable/Plots/qSlicerPlotsModule.h +++ b/Modules/Loadable/Plots/qSlicerPlotsModule.h @@ -42,30 +42,30 @@ public: typedef qSlicerLoadableModule Superclass; explicit qSlicerPlotsModule(QObject *parent=0); - virtual ~qSlicerPlotsModule(); + ~qSlicerPlotsModule() override; qSlicerGetTitleMacro(QTMODULE_TITLE); - virtual QIcon icon()const; - virtual QString helpText()const; - virtual QString acknowledgementText()const; - virtual QStringList contributors()const; + QIcon icon()const override; + QString helpText()const override; + QString acknowledgementText()const override; + QStringList contributors()const override; - virtual QStringList categories()const; - virtual QStringList dependencies()const; + QStringList categories()const override; + QStringList dependencies()const override; - virtual QStringList associatedNodeTypes()const; + QStringList associatedNodeTypes()const override; protected: /// Initialize the module. Register the volumes reader/writer - virtual void setup(); + void setup() override; /// Create and return the widget representation associated to this module - virtual qSlicerAbstractModuleRepresentation * createWidgetRepresentation(); + qSlicerAbstractModuleRepresentation * createWidgetRepresentation() override; /// Create and return the logic associated to this module - virtual vtkMRMLAbstractLogic* createLogic(); + vtkMRMLAbstractLogic* createLogic() override; protected: QScopedPointer d_ptr; diff --git a/Modules/Loadable/Reformat/Logic/vtkSlicerReformatLogic.h b/Modules/Loadable/Reformat/Logic/vtkSlicerReformatLogic.h index 3c4a676d508d05a37e1a6642c553a60212f32429..c51a2d3a8abbe909c8341fc9f790c0c8afb826f6 100644 --- a/Modules/Loadable/Reformat/Logic/vtkSlicerReformatLogic.h +++ b/Modules/Loadable/Reformat/Logic/vtkSlicerReformatLogic.h @@ -46,7 +46,7 @@ public: static vtkSlicerReformatLogic *New(); vtkTypeMacro(vtkSlicerReformatLogic,vtkSlicerModuleLogic); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Set the world coordinate origin position void SetSliceOrigin(vtkMRMLSliceNode* node, double x, double y, double z); @@ -64,7 +64,7 @@ public: protected: vtkSlicerReformatLogic(); - virtual ~vtkSlicerReformatLogic(); + ~vtkSlicerReformatLogic() override; private: diff --git a/Modules/Loadable/Reformat/qSlicerReformatModule.h b/Modules/Loadable/Reformat/qSlicerReformatModule.h index 1168a2ae6ac1e1e37ede4af7811cb6238f02e734..9085a81f9b83b2ea3cf3e5fe4010cdde1543f30c 100644 --- a/Modules/Loadable/Reformat/qSlicerReformatModule.h +++ b/Modules/Loadable/Reformat/qSlicerReformatModule.h @@ -40,38 +40,38 @@ public: typedef qSlicerLoadableModule Superclass; explicit qSlicerReformatModule(QObject *parent=0); - virtual ~qSlicerReformatModule(); + ~qSlicerReformatModule() override; qSlicerGetTitleMacro(QTMODULE_TITLE); /// Help to use the module - virtual QString helpText()const; + QString helpText()const override; /// Return acknowledgements - virtual QString acknowledgementText()const; + QString acknowledgementText()const override; /// Return a custom icon for the module - virtual QIcon icon()const; + QIcon icon()const override; /// Return the category for the module - virtual QStringList categories()const; + QStringList categories()const override; /// Return the contributor for the module - virtual QStringList contributors()const; + QStringList contributors()const override; /// Specify editable node types - virtual QStringList associatedNodeTypes()const; + QStringList associatedNodeTypes()const override; protected: /// Initialize the module. Register the volumes reader/writer - virtual void setup(); + void setup() override; /// Create and return the widget representation associated to this module - virtual qSlicerAbstractModuleRepresentation * createWidgetRepresentation(); + qSlicerAbstractModuleRepresentation * createWidgetRepresentation() override; /// Create and return the logic associated to this module - virtual vtkMRMLAbstractLogic* createLogic(); + vtkMRMLAbstractLogic* createLogic() override; protected: QScopedPointer d_ptr; diff --git a/Modules/Loadable/SceneViews/GUI/qSlicerSceneViewsModuleDialog.h b/Modules/Loadable/SceneViews/GUI/qSlicerSceneViewsModuleDialog.h index 2599ccbcf954d4f31ba999ae299ca7c5f3ead682..80c4ea601fb326aefc0b41a9a272f6157fe60adb 100644 --- a/Modules/Loadable/SceneViews/GUI/qSlicerSceneViewsModuleDialog.h +++ b/Modules/Loadable/SceneViews/GUI/qSlicerSceneViewsModuleDialog.h @@ -13,7 +13,7 @@ public: typedef qMRMLScreenShotDialog Superclass; qSlicerSceneViewsModuleDialog(); - ~qSlicerSceneViewsModuleDialog(); + ~qSlicerSceneViewsModuleDialog() override; /// Set the SceneViews module logic. void setLogic(vtkSlicerSceneViewsModuleLogic* logic); @@ -23,7 +23,7 @@ public: /// Reset the dialog and give it a unique name. void reset(); - virtual void accept(); + void accept() override; private: vtkSlicerSceneViewsModuleLogic* m_Logic; diff --git a/Modules/Loadable/SceneViews/Logic/vtkSlicerSceneViewsModuleLogic.h b/Modules/Loadable/SceneViews/Logic/vtkSlicerSceneViewsModuleLogic.h index e109c131fac073f24ca1e4082a6339f863e9442b..49de8fda5de630751cbe22d9b81bdb172fb5415a 100644 --- a/Modules/Loadable/SceneViews/Logic/vtkSlicerSceneViewsModuleLogic.h +++ b/Modules/Loadable/SceneViews/Logic/vtkSlicerSceneViewsModuleLogic.h @@ -48,13 +48,13 @@ public: static vtkSlicerSceneViewsModuleLogic *New(); vtkTypeMacro(vtkSlicerSceneViewsModuleLogic,vtkSlicerModuleLogic); - virtual void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Initialize listening to MRML events - virtual void SetMRMLSceneInternal(vtkMRMLScene * newScene) VTK_OVERRIDE; + void SetMRMLSceneInternal(vtkMRMLScene * newScene) override; /// Register MRML Node classes to Scene. Gets called automatically when the MRMLScene is attached to this logic class. - virtual void RegisterNodes() VTK_OVERRIDE; + void RegisterNodes() override; /// Create a sceneView.. void CreateSceneView(const char* name, const char* description, int screenshotType, vtkImageData* screenshot); @@ -92,14 +92,14 @@ protected: vtkSlicerSceneViewsModuleLogic(); - virtual ~vtkSlicerSceneViewsModuleLogic(); + ~vtkSlicerSceneViewsModuleLogic() override; - virtual void OnMRMLSceneNodeAdded(vtkMRMLNode* node) VTK_OVERRIDE; - virtual void OnMRMLSceneEndImport() VTK_OVERRIDE; - virtual void OnMRMLSceneEndRestore() VTK_OVERRIDE; - virtual void OnMRMLSceneEndClose() VTK_OVERRIDE; + void OnMRMLSceneNodeAdded(vtkMRMLNode* node) override; + void OnMRMLSceneEndImport() override; + void OnMRMLSceneEndRestore() override; + void OnMRMLSceneEndClose() override; - virtual void OnMRMLNodeModified(vtkMRMLNode* node) VTK_OVERRIDE; + void OnMRMLNodeModified(vtkMRMLNode* node) override; private: diff --git a/Modules/Loadable/SceneViews/SubjectHierarchyPlugins/qSlicerSubjectHierarchySceneViewsPlugin.cxx b/Modules/Loadable/SceneViews/SubjectHierarchyPlugins/qSlicerSubjectHierarchySceneViewsPlugin.cxx index b221b5287fa30b58f5a26a0fe8c041e56be4a3a7..f038175442c15c621364a5e796dacd1d63a5dc2b 100644 --- a/Modules/Loadable/SceneViews/SubjectHierarchyPlugins/qSlicerSubjectHierarchySceneViewsPlugin.cxx +++ b/Modules/Loadable/SceneViews/SubjectHierarchyPlugins/qSlicerSubjectHierarchySceneViewsPlugin.cxx @@ -51,7 +51,7 @@ protected: qSlicerSubjectHierarchySceneViewsPlugin* const q_ptr; public: qSlicerSubjectHierarchySceneViewsPluginPrivate(qSlicerSubjectHierarchySceneViewsPlugin& object); - ~qSlicerSubjectHierarchySceneViewsPluginPrivate(); + ~qSlicerSubjectHierarchySceneViewsPluginPrivate() override; void init(); public: QIcon SceneViewIcon; diff --git a/Modules/Loadable/SceneViews/SubjectHierarchyPlugins/qSlicerSubjectHierarchySceneViewsPlugin.h b/Modules/Loadable/SceneViews/SubjectHierarchyPlugins/qSlicerSubjectHierarchySceneViewsPlugin.h index 87aee6a147a4bd5138440e883d741c75614c59de..66aef8460f6422c6bd36f44feeb6edd1392a7b00 100644 --- a/Modules/Loadable/SceneViews/SubjectHierarchyPlugins/qSlicerSubjectHierarchySceneViewsPlugin.h +++ b/Modules/Loadable/SceneViews/SubjectHierarchyPlugins/qSlicerSubjectHierarchySceneViewsPlugin.h @@ -47,7 +47,7 @@ public: public: typedef qSlicerSubjectHierarchyAbstractPlugin Superclass; qSlicerSubjectHierarchySceneViewsPlugin(QObject* parent = NULL); - virtual ~qSlicerSubjectHierarchySceneViewsPlugin(); + ~qSlicerSubjectHierarchySceneViewsPlugin() override; public: /// Determines if a data node can be placed in the hierarchy using the actual plugin, @@ -57,9 +57,9 @@ public: /// Default value is invalid. In that case the parent will be ignored, the confidence numbers are got based on the to-be child node alone. /// \return Floating point confidence number between 0 and 1, where 0 means that the plugin cannot handle the /// node, and 1 means that the plugin is the only one that can handle the node (by node type or identifier attribute) - virtual double canAddNodeToSubjectHierarchy( + double canAddNodeToSubjectHierarchy( vtkMRMLNode* node, - vtkIdType parentItemID=vtkMRMLSubjectHierarchyNode::INVALID_ITEM_ID )const; + vtkIdType parentItemID=vtkMRMLSubjectHierarchyNode::INVALID_ITEM_ID )const override; /// Determines if the actual plugin can handle a subject hierarchy item. The plugin with /// the highest confidence number will "own" the item in the subject hierarchy (set icon, tooltip, @@ -67,22 +67,22 @@ public: /// \param item Item to handle in the subject hierarchy tree /// \return Floating point confidence number between 0 and 1, where 0 means that the plugin cannot handle the /// item, and 1 means that the plugin is the only one that can handle the item (by node type or identifier attribute) - virtual double canOwnSubjectHierarchyItem(vtkIdType itemID)const; + double canOwnSubjectHierarchyItem(vtkIdType itemID)const override; /// Get role that the plugin assigns to the subject hierarchy item. /// Each plugin should provide only one role. - Q_INVOKABLE virtual const QString roleForPlugin()const; + Q_INVOKABLE const QString roleForPlugin()const override; /// Get icon of an owned subject hierarchy item /// \return Icon to set, empty icon if nothing to set - virtual QIcon icon(vtkIdType itemID); + QIcon icon(vtkIdType itemID) override; /// Get item context menu item actions to add to tree view - virtual QList itemContextMenuActions()const; + QList itemContextMenuActions()const override; /// Show context menu actions valid for a given subject hierarchy item. /// \param itemID Subject Hierarchy item to show the context menu items for - virtual void showContextMenuActionsForItem(vtkIdType itemID); + void showContextMenuActionsForItem(vtkIdType itemID) override; protected slots: /// Restore scene view diff --git a/Modules/Loadable/SceneViews/qSlicerSceneViewsModule.h b/Modules/Loadable/SceneViews/qSlicerSceneViewsModule.h index df1af5577da9ce495e9b0c85e7def1df7cc520d6..56b580ef5c389083ed75fde4fbabf2bf50123bcb 100644 --- a/Modules/Loadable/SceneViews/qSlicerSceneViewsModule.h +++ b/Modules/Loadable/SceneViews/qSlicerSceneViewsModule.h @@ -23,19 +23,19 @@ public: typedef qSlicerLoadableModule Superclass; qSlicerSceneViewsModule(QObject *parent=0); - virtual ~qSlicerSceneViewsModule(); + ~qSlicerSceneViewsModule() override; /// Return the help and acknowledgement text for the SceneViews module. - virtual QString helpText()const ; - virtual QString acknowledgementText()const; - virtual QStringList contributors()const; + QString helpText()const override ; + QString acknowledgementText()const override; + QStringList contributors()const override; /// Return the icon of the SceneViews module. - virtual QIcon icon()const; - virtual QStringList categories()const; + QIcon icon()const override; + QStringList categories()const override; /// Specify editable node types - virtual QStringList associatedNodeTypes()const; + QStringList associatedNodeTypes()const override; qSlicerGetTitleMacro(QTMODULE_TITLE); @@ -49,15 +49,15 @@ public slots: protected: /// All initialization code should be done in the setup - virtual void setup(); + void setup() override; // Description: // Create and return the widget representation associated to this module - virtual qSlicerAbstractModuleRepresentation* createWidgetRepresentation(); + qSlicerAbstractModuleRepresentation* createWidgetRepresentation() override; // Description: // Create and return the logic associated to this module - virtual vtkMRMLAbstractLogic* createLogic(); + vtkMRMLAbstractLogic* createLogic() override; protected: QScopedPointer d_ptr; diff --git a/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorAbstractEffect.h b/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorAbstractEffect.h index 4be31434b0cd0f6181e12564deac812d82853020..cf958712f74af2ae4b84ac11bc3ba6d6f82dc1d8 100644 --- a/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorAbstractEffect.h +++ b/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorAbstractEffect.h @@ -82,7 +82,7 @@ public: public: typedef QObject Superclass; qSlicerSegmentEditorAbstractEffect(QObject* parent = NULL); - virtual ~qSlicerSegmentEditorAbstractEffect(); + ~qSlicerSegmentEditorAbstractEffect() override; // API: Methods that are to be reimplemented in the effect subclasses public: diff --git a/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorAbstractEffect_p.h b/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorAbstractEffect_p.h index 3372166840e7534efd0cdd4c3de3c881cd785d03..df7464a8bf5bda6ac7784624c84bcdf29d8844ac 100644 --- a/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorAbstractEffect_p.h +++ b/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorAbstractEffect_p.h @@ -63,7 +63,7 @@ protected: qSlicerSegmentEditorAbstractEffect* const q_ptr; public: qSlicerSegmentEditorAbstractEffectPrivate(qSlicerSegmentEditorAbstractEffect& object); - ~qSlicerSegmentEditorAbstractEffectPrivate(); + ~qSlicerSegmentEditorAbstractEffectPrivate() override; signals: // Signals that are used for effects to request operations from the editor // without having any dependency on the editor. diff --git a/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorAbstractLabelEffect.h b/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorAbstractLabelEffect.h index a39dd72e88d7b50467286218fa8fbe8ec522f870..68a793c1fa1e51c74058b699671d0040d0797d67 100644 --- a/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorAbstractLabelEffect.h +++ b/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorAbstractLabelEffect.h @@ -47,31 +47,31 @@ public: public: typedef qSlicerSegmentEditorAbstractEffect Superclass; qSlicerSegmentEditorAbstractLabelEffect(QObject* parent = NULL); - virtual ~qSlicerSegmentEditorAbstractLabelEffect(); + ~qSlicerSegmentEditorAbstractLabelEffect() override; public: /// Clone editor effect /// (redefinition of pure virtual function to allow python wrapper to identify this as abstract class) - virtual qSlicerSegmentEditorAbstractEffect* clone() = 0; + qSlicerSegmentEditorAbstractEffect* clone() override = 0; /// Create options frame widgets, make connections, and add them to the main options frame using \sa addOptionsWidget - virtual void setupOptionsFrame(); + void setupOptionsFrame() override; /// Set default parameters in the parameter MRML node - virtual void setMRMLDefaults(); + void setMRMLDefaults() override; /// Perform actions needed on reference geometry change - virtual void referenceGeometryChanged(); + void referenceGeometryChanged() override; /// Perform actions needed on master volume change - virtual void masterVolumeNodeChanged(); + void masterVolumeNodeChanged() override; public slots: /// Update user interface from parameter set node - virtual void updateGUIFromMRML(); + void updateGUIFromMRML() override; /// Update parameter set node from user interface - virtual void updateMRMLFromGUI(); + void updateMRMLFromGUI() override; // Utility functions public: diff --git a/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorAbstractLabelEffect_p.h b/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorAbstractLabelEffect_p.h index 6060977e84960fbf42628e6a112e2bc9f6ca4498..92266daaf3f552b229e25ffae22ff63ba488b1f5 100644 --- a/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorAbstractLabelEffect_p.h +++ b/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorAbstractLabelEffect_p.h @@ -55,7 +55,7 @@ protected: public: typedef QObject Superclass; qSlicerSegmentEditorAbstractLabelEffectPrivate(qSlicerSegmentEditorAbstractLabelEffect& object); - ~qSlicerSegmentEditorAbstractLabelEffectPrivate(); + ~qSlicerSegmentEditorAbstractLabelEffectPrivate() override; protected slots: diff --git a/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorEffectFactory.h b/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorEffectFactory.h index cc8d072761c1afbcae04ff5fc9e147de0bae0896..cc650bf23070e9372bd57df87e73a2a6283270d8 100644 --- a/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorEffectFactory.h +++ b/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorEffectFactory.h @@ -75,7 +75,7 @@ public: qSlicerSegmentEditorEffectFactory(QObject* parent=NULL); /// Private destructor made public to enable python wrapping - virtual ~qSlicerSegmentEditorEffectFactory(); + ~qSlicerSegmentEditorEffectFactory() override; private: Q_DISABLE_COPY(qSlicerSegmentEditorEffectFactory); diff --git a/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorEraseEffect.cxx b/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorEraseEffect.cxx index a468a1de2c145ac1597dde8e19c9702e73684caa..ddf304b9146c670c54714d2b8831ec8b18f17425 100644 --- a/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorEraseEffect.cxx +++ b/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorEraseEffect.cxx @@ -29,7 +29,7 @@ protected: qSlicerSegmentEditorEraseEffect* const q_ptr; public: qSlicerSegmentEditorEraseEffectPrivate(qSlicerSegmentEditorEraseEffect& object); - ~qSlicerSegmentEditorEraseEffectPrivate(); + ~qSlicerSegmentEditorEraseEffectPrivate() override; public: QIcon EraseIcon; }; diff --git a/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorEraseEffect.h b/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorEraseEffect.h index ae5ebaf6fed827bab65e890a4561e3e03e1b9432..7dcfc144d92aa60f504b0dc9b604a5bcb0bdb740 100644 --- a/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorEraseEffect.h +++ b/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorEraseEffect.h @@ -38,17 +38,17 @@ public: public: typedef qSlicerSegmentEditorPaintEffect Superclass; qSlicerSegmentEditorEraseEffect(QObject* parent = NULL); - virtual ~qSlicerSegmentEditorEraseEffect(); + ~qSlicerSegmentEditorEraseEffect() override; public: /// Get icon for effect to be displayed in segment editor - virtual QIcon icon(); + QIcon icon() override; /// Get help text for effect to be displayed in the help box - Q_INVOKABLE virtual const QString helpText()const; + Q_INVOKABLE const QString helpText()const override; /// Clone editor effect - virtual qSlicerSegmentEditorAbstractEffect* clone(); + qSlicerSegmentEditorAbstractEffect* clone() override; protected: QScopedPointer d_ptr; diff --git a/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorPaintEffect.cxx b/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorPaintEffect.cxx index 7221fec943c995872f41cafd0aaf280a0f44ad7b..48e59c1f109975822affba713be2cdfcaecf4352 100644 --- a/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorPaintEffect.cxx +++ b/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorPaintEffect.cxx @@ -154,15 +154,15 @@ public: this->FeedbackActor->SetMapper(this->FeedbackMapper); this->FeedbackActor->VisibilityOff(); }; - ~BrushPipeline2D() + ~BrushPipeline2D() override { }; - void SetBrushVisibility(bool visibility) + void SetBrushVisibility(bool visibility) override { this->BrushActor->SetVisibility(visibility); }; - void SetFeedbackVisibility(bool visibility) + void SetFeedbackVisibility(bool visibility) override { this->FeedbackActor->SetVisibility(visibility); }; @@ -197,14 +197,14 @@ public: this->FeedbackActor->SetMapper(this->FeedbackMapper); this->FeedbackActor->VisibilityOff(); }; - ~BrushPipeline3D() + ~BrushPipeline3D() override { }; - void SetBrushVisibility(bool visibility) + void SetBrushVisibility(bool visibility) override { this->BrushActor->SetVisibility(visibility); }; - void SetFeedbackVisibility(bool visibility) + void SetFeedbackVisibility(bool visibility) override { this->FeedbackActor->SetVisibility(visibility); }; diff --git a/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorPaintEffect.h b/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorPaintEffect.h index cbf724f65ecfc0c88be9831602706b1731cfe938..2a8944ad4cc60ef158c43aec5f4b4bfa8b1f99c1 100644 --- a/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorPaintEffect.h +++ b/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorPaintEffect.h @@ -39,48 +39,48 @@ public: public: typedef qSlicerSegmentEditorAbstractLabelEffect Superclass; qSlicerSegmentEditorPaintEffect(QObject* parent = NULL); - virtual ~qSlicerSegmentEditorPaintEffect(); + ~qSlicerSegmentEditorPaintEffect() override; public: /// Get icon for effect to be displayed in segment editor - virtual QIcon icon(); + QIcon icon() override; /// Get help text for effect to be displayed in the help box - Q_INVOKABLE virtual const QString helpText()const; + Q_INVOKABLE const QString helpText()const override; /// Clone editor effect - virtual qSlicerSegmentEditorAbstractEffect* clone(); + qSlicerSegmentEditorAbstractEffect* clone() override; /// Perform actions to deactivate the effect (such as destroy actors, etc.) - Q_INVOKABLE virtual void deactivate(); + Q_INVOKABLE void deactivate() override; /// Callback function invoked when interaction happens /// \param callerInteractor Interactor object that was observed to catch the event /// \param eid Event identifier /// \param viewWidget Widget of the Slicer layout view. Can be \sa qMRMLSliceWidget or \sa qMRMLThreeDWidget - virtual bool processInteractionEvents(vtkRenderWindowInteractor* callerInteractor, unsigned long eid, qMRMLWidget* viewWidget); + bool processInteractionEvents(vtkRenderWindowInteractor* callerInteractor, unsigned long eid, qMRMLWidget* viewWidget) override; /// Callback function invoked when view node is modified /// \param callerViewNode View node that was observed to catch the event. Can be either \sa vtkMRMLSliceNode or \sa vtkMRMLViewNode /// \param eid Event identifier /// \param viewWidget Widget of the Slicer layout view. Can be \sa qMRMLSliceWidget or \sa qMRMLThreeDWidget - virtual void processViewNodeEvents(vtkMRMLAbstractViewNode* callerViewNode, unsigned long eid, qMRMLWidget* viewWidget); + void processViewNodeEvents(vtkMRMLAbstractViewNode* callerViewNode, unsigned long eid, qMRMLWidget* viewWidget) override; /// Create options frame widgets, make connections, and add them to the main options frame using \sa addOptionsWidget - virtual void setupOptionsFrame(); + void setupOptionsFrame() override; /// Set default parameters in the parameter MRML node - virtual void setMRMLDefaults(); + void setMRMLDefaults() override; /// Perform actions needed on reference geometry change - virtual void referenceGeometryChanged(); + void referenceGeometryChanged() override; public slots: /// Update user interface from parameter set node - virtual void updateGUIFromMRML(); + void updateGUIFromMRML() override; /// Update parameter set node from user interface - virtual void updateMRMLFromGUI(); + void updateMRMLFromGUI() override; protected: /// Flag determining to always erase (not just when smudge from empty region) diff --git a/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorPaintEffect_p.h b/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorPaintEffect_p.h index a4b71ab2d01ae76d91b2789ac897c0b5161079f0..a6dffc4ed0bf6e422cd90a19331075da11fbadd7 100644 --- a/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorPaintEffect_p.h +++ b/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorPaintEffect_p.h @@ -77,7 +77,7 @@ protected: public: typedef QObject Superclass; qSlicerSegmentEditorPaintEffectPrivate(qSlicerSegmentEditorPaintEffect& object); - ~qSlicerSegmentEditorPaintEffectPrivate(); + ~qSlicerSegmentEditorPaintEffectPrivate() override; /// Depending on the \sa DelayedPaint mode, either paint the given point or queue /// it up with a marker for later painting diff --git a/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorScissorsEffect.cxx b/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorScissorsEffect.cxx index ed56777364edcaafa0786bfbba607c7a3444cde1..61c82e7c053b900aefb0b45bf85033efdf12d61c 100644 --- a/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorScissorsEffect.cxx +++ b/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorScissorsEffect.cxx @@ -104,7 +104,7 @@ public: outlinePropertyThin->SetLineStipplePattern(0xff00); // Note: line stipple may not be supported in VTK OpenGL2 backend outlinePropertyThin->SetLineWidth(1); }; - ~ScissorsPipeline() + ~ScissorsPipeline() override { }; public: @@ -125,7 +125,7 @@ protected: qSlicerSegmentEditorScissorsEffect* const q_ptr; public: qSlicerSegmentEditorScissorsEffectPrivate(qSlicerSegmentEditorScissorsEffect& object); - ~qSlicerSegmentEditorScissorsEffectPrivate(); + ~qSlicerSegmentEditorScissorsEffectPrivate() override; public: enum { diff --git a/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorScissorsEffect.h b/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorScissorsEffect.h index caa5d616a4c814a50b0cfe5feed2fa2a0ca473a0..d42891538c549c3c4fc0ca0a506ab45565c06c82 100644 --- a/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorScissorsEffect.h +++ b/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorScissorsEffect.h @@ -39,39 +39,39 @@ public: public: typedef qSlicerSegmentEditorAbstractLabelEffect Superclass; qSlicerSegmentEditorScissorsEffect(QObject* parent = NULL); - virtual ~qSlicerSegmentEditorScissorsEffect(); + ~qSlicerSegmentEditorScissorsEffect() override; public: /// Get icon for effect to be displayed in segment editor - virtual QIcon icon(); + QIcon icon() override; /// Get help text for effect to be displayed in the help box - Q_INVOKABLE virtual const QString helpText()const; + Q_INVOKABLE const QString helpText()const override; /// Create options frame widgets, make connections, and add them to the main options frame using \sa addOptionsWidget - virtual void setupOptionsFrame(); + void setupOptionsFrame() override; /// Set default parameters in the parameter MRML node - virtual void setMRMLDefaults(); + void setMRMLDefaults() override; /// Clone editor effect - virtual qSlicerSegmentEditorAbstractEffect* clone(); + qSlicerSegmentEditorAbstractEffect* clone() override; /// Callback function invoked when interaction happens /// \param callerInteractor Interactor object that was observed to catch the event /// \param eid Event identifier /// \param viewWidget Widget of the Slicer layout view. Can be \sa qMRMLSliceWidget or \sa qMRMLThreeDWidget - virtual bool processInteractionEvents(vtkRenderWindowInteractor* callerInteractor, unsigned long eid, qMRMLWidget* viewWidget); + bool processInteractionEvents(vtkRenderWindowInteractor* callerInteractor, unsigned long eid, qMRMLWidget* viewWidget) override; /// Perform actions to deactivate the effect (such as destroy actors, etc.) - Q_INVOKABLE virtual void deactivate(); + Q_INVOKABLE void deactivate() override; public slots: /// Update user interface from parameter set node - virtual void updateGUIFromMRML(); + void updateGUIFromMRML() override; /// Update parameter set node from user interface - virtual void updateMRMLFromGUI(); + void updateMRMLFromGUI() override; virtual void setOperation(int operationIndex); virtual void setShape(int shapeIndex); diff --git a/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorScriptedEffect.h b/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorScriptedEffect.h index b8b5d72c7384afe6a93c8864179149aa157ed0bc..5b61f2a24eb86ee72f01f299fa47dfc4f27a8b26 100644 --- a/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorScriptedEffect.h +++ b/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorScriptedEffect.h @@ -51,7 +51,7 @@ class Q_SLICER_SEGMENTATIONS_EFFECTS_EXPORT qSlicerSegmentEditorScriptedEffect public: typedef qSlicerSegmentEditorAbstractEffect Superclass; qSlicerSegmentEditorScriptedEffect(QObject* parent = NULL); - virtual ~qSlicerSegmentEditorScriptedEffect(); + ~qSlicerSegmentEditorScriptedEffect() override; Q_INVOKABLE QString pythonSource()const; @@ -64,64 +64,64 @@ public: /// Set the name property value. /// \sa name - virtual void setName(QString name); + void setName(QString name) override; /// Set flag indicating whether effect operates on segments (true) or the whole segmentation (false). - virtual void setPerSegment(bool perSegment); + void setPerSegment(bool perSegment) override; // API: Methods that are to be reimplemented in the effect subclasses public: /// Get icon for effect to be displayed in segment editor - virtual QIcon icon(); + QIcon icon() override; /// Get help text for effect to be displayed in the help box - virtual const QString helpText()const; + const QString helpText()const override; /// Clone editor effect. Override to return a new instance of the effect sub-class - virtual qSlicerSegmentEditorAbstractEffect* clone(); + qSlicerSegmentEditorAbstractEffect* clone() override; /// Perform actions to activate the effect (show options frame, etc.) - virtual void activate(); + void activate() override; /// Perform actions to deactivate the effect (hide options frame, destroy actors, etc.) - virtual void deactivate(); + void deactivate() override; /// Create options frame widgets, make connections, and add them to the main options frame using \sa addOptionsWidget - virtual void setupOptionsFrame(); + void setupOptionsFrame() override; /// Create a cursor customized for the given effect, potentially for each view - virtual QCursor createCursor(qMRMLWidget* viewWidget); + QCursor createCursor(qMRMLWidget* viewWidget) override; /// Callback function invoked when interaction happens /// \param callerInteractor Interactor object that was observed to catch the event /// \param eid Event identifier /// \param viewWidget Widget of the Slicer layout view. Can be \sa qMRMLSliceWidget or \sa qMRMLThreeDWidget - virtual bool processInteractionEvents(vtkRenderWindowInteractor* callerInteractor, unsigned long eid, qMRMLWidget* viewWidget); + bool processInteractionEvents(vtkRenderWindowInteractor* callerInteractor, unsigned long eid, qMRMLWidget* viewWidget) override; /// Callback function invoked when view node is modified /// \param callerViewNode View node that was observed to catch the event. Can be either \sa vtkMRMLSliceNode or \sa vtkMRMLViewNode /// \param eid Event identifier /// \param viewWidget Widget of the Slicer layout view. Can be \sa qMRMLSliceWidget or \sa qMRMLThreeDWidget - virtual void processViewNodeEvents(vtkMRMLAbstractViewNode* callerViewNode, unsigned long eid, qMRMLWidget* viewWidget); + void processViewNodeEvents(vtkMRMLAbstractViewNode* callerViewNode, unsigned long eid, qMRMLWidget* viewWidget) override; /// Set default parameters in the parameter MRML node - virtual void setMRMLDefaults(); + void setMRMLDefaults() override; /// Simple mechanism to let the effects know that reference geometry change has changed - virtual void referenceGeometryChanged(); + void referenceGeometryChanged() override; /// Simple mechanism to let the effects know that master volume has changed - virtual void masterVolumeNodeChanged(); + void masterVolumeNodeChanged() override; /// Simple mechanism to let the effects know that the layout has changed - virtual void layoutChanged(); + void layoutChanged() override; /// Let the effect know that the interaction node is modified - virtual void interactionNodeModified(vtkMRMLInteractionNode* interactionNode); + void interactionNodeModified(vtkMRMLInteractionNode* interactionNode) override; public slots: /// Update user interface from parameter set node - virtual void updateGUIFromMRML(); + void updateGUIFromMRML() override; /// Update parameter set node from user interface - virtual void updateMRMLFromGUI(); + void updateMRMLFromGUI() override; protected: QScopedPointer d_ptr; diff --git a/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorScriptedLabelEffect.h b/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorScriptedLabelEffect.h index cfdc6806f4802246169f426f2eca7eb510fc31f9..288f53171d2fe9c864676d0e5e1f18664cbae507 100644 --- a/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorScriptedLabelEffect.h +++ b/Modules/Loadable/Segmentations/EditorEffects/qSlicerSegmentEditorScriptedLabelEffect.h @@ -53,7 +53,7 @@ class Q_SLICER_SEGMENTATIONS_EFFECTS_EXPORT qSlicerSegmentEditorScriptedLabelEff public: typedef qSlicerSegmentEditorAbstractLabelEffect Superclass; qSlicerSegmentEditorScriptedLabelEffect(QObject* parent = NULL); - virtual ~qSlicerSegmentEditorScriptedLabelEffect(); + ~qSlicerSegmentEditorScriptedLabelEffect() override; Q_INVOKABLE QString pythonSource()const; @@ -66,64 +66,64 @@ public: /// Set the name property value. /// \sa name - virtual void setName(QString name); + void setName(QString name) override; /// Set flag indicating whether effect operates on segments (true) or the whole segmentation (false). - virtual void setPerSegment(bool perSegment); + void setPerSegment(bool perSegment) override; // API: Methods that are to be reimplemented in the effect subclasses public: /// Get icon for effect to be displayed in segment editor - virtual QIcon icon(); + QIcon icon() override; /// Get help text for effect to be displayed in the help box - virtual const QString helpText()const; + const QString helpText()const override; /// Clone editor effect. Override to return a new instance of the effect sub-class - virtual qSlicerSegmentEditorAbstractEffect* clone(); + qSlicerSegmentEditorAbstractEffect* clone() override; /// Perform actions to activate the effect (show options frame, etc.) - virtual void activate(); + void activate() override; /// Perform actions to deactivate the effect (hide options frame, destroy actors, etc.) - virtual void deactivate(); + void deactivate() override; /// Create options frame widgets, make connections, and add them to the main options frame using \sa addOptionsWidget - virtual void setupOptionsFrame(); + void setupOptionsFrame() override; /// Create a cursor customized for the given effect, potentially for each view - virtual QCursor createCursor(qMRMLWidget* viewWidget); + QCursor createCursor(qMRMLWidget* viewWidget) override; /// Callback function invoked when interaction happens /// \param callerInteractor Interactor object that was observed to catch the event /// \param eid Event identifier /// \param viewWidget Widget of the Slicer layout view. Can be \sa qMRMLSliceWidget or \sa qMRMLThreeDWidget - virtual bool processInteractionEvents(vtkRenderWindowInteractor* callerInteractor, unsigned long eid, qMRMLWidget* viewWidget); + bool processInteractionEvents(vtkRenderWindowInteractor* callerInteractor, unsigned long eid, qMRMLWidget* viewWidget) override; /// Callback function invoked when view node is modified /// \param callerViewNode View node that was observed to catch the event. Can be either \sa vtkMRMLSliceNode or \sa vtkMRMLViewNode /// \param eid Event identifier /// \param viewWidget Widget of the Slicer layout view. Can be \sa qMRMLSliceWidget or \sa qMRMLThreeDWidget - virtual void processViewNodeEvents(vtkMRMLAbstractViewNode* callerViewNode, unsigned long eid, qMRMLWidget* viewWidget); + void processViewNodeEvents(vtkMRMLAbstractViewNode* callerViewNode, unsigned long eid, qMRMLWidget* viewWidget) override; /// Set default parameters in the parameter MRML node - virtual void setMRMLDefaults(); + void setMRMLDefaults() override; /// Simple mechanism to let the effects know that reference geometry change has changed - virtual void referenceGeometryChanged(); + void referenceGeometryChanged() override; /// Simple mechanism to let the effects know that master volume has changed - virtual void masterVolumeNodeChanged(); + void masterVolumeNodeChanged() override; /// Simple mechanism to let the effects know that the layout has changed - virtual void layoutChanged(); + void layoutChanged() override; /// Let the effect know that the interaction node is modified - virtual void interactionNodeModified(vtkMRMLInteractionNode* interactionNode); + void interactionNodeModified(vtkMRMLInteractionNode* interactionNode) override; public slots: /// Update user interface from parameter set node - virtual void updateGUIFromMRML(); + void updateGUIFromMRML() override; /// Update parameter set node from user interface - virtual void updateMRMLFromGUI(); + void updateMRMLFromGUI() override; protected: QScopedPointer d_ptr; diff --git a/Modules/Loadable/Segmentations/Logic/vtkImageGrowCutSegment.cxx b/Modules/Loadable/Segmentations/Logic/vtkImageGrowCutSegment.cxx index 36fe901008fa27c4c8650777342e40e2df6d5948..9be9c06ffd5c5ab03c07503cb33a049f8023be0e 100644 --- a/Modules/Loadable/Segmentations/Logic/vtkImageGrowCutSegment.cxx +++ b/Modules/Loadable/Segmentations/Logic/vtkImageGrowCutSegment.cxx @@ -37,13 +37,13 @@ public: { } - virtual void operator =(FibHeapNode& RHS) + void operator =(FibHeapNode& RHS) override { FHN_Assign(RHS); m_Key = ((HeapNode&)RHS).m_Key; } - virtual int operator ==(FibHeapNode& RHS) + int operator ==(FibHeapNode& RHS) override { if (FHN_Cmp(RHS)) { @@ -52,7 +52,7 @@ public: return m_Key == ((HeapNode&)RHS).m_Key ? 1 : 0; } - virtual int operator <(FibHeapNode& RHS) + int operator <(FibHeapNode& RHS) override { int x = FHN_Cmp(RHS); if (x != 0) diff --git a/Modules/Loadable/Segmentations/Logic/vtkImageGrowCutSegment.h b/Modules/Loadable/Segmentations/Logic/vtkImageGrowCutSegment.h index 25061914712e6615f38fc067d85b6d24b11d278a..b19c392744a9488917836df30681cf427df7f20d 100644 --- a/Modules/Loadable/Segmentations/Logic/vtkImageGrowCutSegment.h +++ b/Modules/Loadable/Segmentations/Logic/vtkImageGrowCutSegment.h @@ -11,7 +11,7 @@ class VTK_SLICER_SEGMENTATIONS_LOGIC_EXPORT vtkImageGrowCutSegment : public vtkI public: static vtkImageGrowCutSegment* New(); vtkTypeMacro(vtkImageGrowCutSegment, vtkImageAlgorithm); - void PrintSelf(ostream &os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream &os, vtkIndent indent) override; // Set input grayscale volume (input 0) void SetIntensityVolume(vtkImageData* grayscaleImage) { this->SetInputData(0, grayscaleImage); } @@ -31,10 +31,10 @@ public: protected: vtkImageGrowCutSegment(); - virtual ~vtkImageGrowCutSegment(); + ~vtkImageGrowCutSegment() override; - virtual void ExecuteDataWithInformation(vtkDataObject *outData, vtkInformation *outInfo) VTK_OVERRIDE; - virtual int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) VTK_OVERRIDE; + void ExecuteDataWithInformation(vtkDataObject *outData, vtkInformation *outInfo) override; + int RequestInformation(vtkInformation *, vtkInformationVector **, vtkInformationVector *) override; private: class vtkInternal; diff --git a/Modules/Loadable/Segmentations/Logic/vtkSlicerSegmentationGeometryLogic.h b/Modules/Loadable/Segmentations/Logic/vtkSlicerSegmentationGeometryLogic.h index 36585669c67098e94c2561865b25821f7529d18a..a2ae497f713cbd4f4312d64f4a140928b2108766 100644 --- a/Modules/Loadable/Segmentations/Logic/vtkSlicerSegmentationGeometryLogic.h +++ b/Modules/Loadable/Segmentations/Logic/vtkSlicerSegmentationGeometryLogic.h @@ -42,7 +42,7 @@ class VTK_SLICER_SEGMENTATIONS_LOGIC_EXPORT vtkSlicerSegmentationGeometryLogic : public: static vtkSlicerSegmentationGeometryLogic* New(); vtkTypeMacro(vtkSlicerSegmentationGeometryLogic, vtkObject); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Calculate output geometry into \sa GeometryImageData with current options /// \return Error message. Empty when successful @@ -85,7 +85,7 @@ public: protected: vtkSlicerSegmentationGeometryLogic(); - virtual ~vtkSlicerSegmentationGeometryLogic(); + ~vtkSlicerSegmentationGeometryLogic() override; protected: /// Input segmentation MRML node to modify the labelmap geometry of diff --git a/Modules/Loadable/Segmentations/Logic/vtkSlicerSegmentationsModuleLogic.h b/Modules/Loadable/Segmentations/Logic/vtkSlicerSegmentationsModuleLogic.h index cb1f370728c14684700697938f45745e6de563da..9a2d03511c6d403eb8b26033854948052d68b52d 100644 --- a/Modules/Loadable/Segmentations/Logic/vtkSlicerSegmentationsModuleLogic.h +++ b/Modules/Loadable/Segmentations/Logic/vtkSlicerSegmentationsModuleLogic.h @@ -54,7 +54,7 @@ class VTK_SLICER_SEGMENTATIONS_LOGIC_EXPORT vtkSlicerSegmentationsModuleLogic : public: static vtkSlicerSegmentationsModuleLogic *New(); vtkTypeMacro(vtkSlicerSegmentationsModuleLogic,vtkSlicerModuleLogic); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Get segmentation node containing a segmentation object. As segmentation objects are out-of-MRML /// VTK objects, there is no direct link from it to its parent node, so must be found from the MRML scene. @@ -342,10 +342,10 @@ public: void SetTerminologiesLogic(vtkSlicerTerminologiesModuleLogic* terminologiesLogic); protected: - virtual void SetMRMLSceneInternal(vtkMRMLScene * newScene) VTK_OVERRIDE; + void SetMRMLSceneInternal(vtkMRMLScene * newScene) override; /// Register MRML Node classes to Scene. Gets called automatically when the MRMLScene is attached to this logic class. - virtual void RegisterNodes() VTK_OVERRIDE; + void RegisterNodes() override; /// Callback function observing UID added events for subject hierarchy nodes. /// In case the newly added UID is a volume node referenced from a segmentation, @@ -355,7 +355,7 @@ protected: static void OnSubjectHierarchyUIDAdded(vtkObject* caller, unsigned long eid, void* clientData, void* callData); /// Handle MRML node added events - virtual void OnMRMLSceneNodeAdded(vtkMRMLNode* node) VTK_OVERRIDE; + void OnMRMLSceneNodeAdded(vtkMRMLNode* node) override; static bool ExportSegmentsClosedSurfaceRepresentationToStlFiles(std::string destinationFolder, vtkMRMLSegmentationNode* segmentationNode, std::vector& segmentIDs, bool lps, double sizeScale, bool merge); @@ -369,7 +369,7 @@ protected: protected: vtkSlicerSegmentationsModuleLogic(); - virtual ~vtkSlicerSegmentationsModuleLogic(); + ~vtkSlicerSegmentationsModuleLogic() override; /// Command handling subject hierarchy UID added events vtkCallbackCommand* SubjectHierarchyUIDCallbackCommand; diff --git a/Modules/Loadable/Segmentations/MRML/vtkMRMLSegmentEditorNode.h b/Modules/Loadable/Segmentations/MRML/vtkMRMLSegmentEditorNode.h index 6daa6dd9ba1acdd0d1547ad471454db346185b23..0bc02bcd5743c996495fb31e52b85cecaaf407bb 100644 --- a/Modules/Loadable/Segmentations/MRML/vtkMRMLSegmentEditorNode.h +++ b/Modules/Loadable/Segmentations/MRML/vtkMRMLSegmentEditorNode.h @@ -89,22 +89,22 @@ public: public: static vtkMRMLSegmentEditorNode *New(); vtkTypeMacro(vtkMRMLSegmentEditorNode, vtkMRMLNode); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Create instance of a GAD node. - virtual vtkMRMLNode* CreateNodeInstance() VTK_OVERRIDE; + vtkMRMLNode* CreateNodeInstance() override; /// Set node attributes from name/value pairs - virtual void ReadXMLAttributes( const char** atts) VTK_OVERRIDE; + void ReadXMLAttributes( const char** atts) override; /// Write this node's information to a MRML file in XML format. - virtual void WriteXML(ostream& of, int indent) VTK_OVERRIDE; + void WriteXML(ostream& of, int indent) override; /// Copy the node's attributes to this object - virtual void Copy(vtkMRMLNode *node) VTK_OVERRIDE; + void Copy(vtkMRMLNode *node) override; /// Get unique node XML tag name (like Volume, Model) - virtual const char* GetNodeTagName() VTK_OVERRIDE { return "SegmentEditor"; } + const char* GetNodeTagName() override { return "SegmentEditor"; } static int ConvertOverwriteModeFromString(const char* modeStr); static const char* ConvertOverwriteModeToString(int mode); @@ -162,7 +162,7 @@ public: protected: vtkMRMLSegmentEditorNode(); - ~vtkMRMLSegmentEditorNode(); + ~vtkMRMLSegmentEditorNode() override; vtkMRMLSegmentEditorNode(const vtkMRMLSegmentEditorNode&); void operator=(const vtkMRMLSegmentEditorNode&); diff --git a/Modules/Loadable/Segmentations/MRMLDM/vtkMRMLSegmentationsDisplayableManager2D.h b/Modules/Loadable/Segmentations/MRMLDM/vtkMRMLSegmentationsDisplayableManager2D.h index 932e1a1104a5e7d178be4787626b3e7835e3352b..0ce6920bc3cee897e18910c0d093a47090f80a05 100644 --- a/Modules/Loadable/Segmentations/MRMLDM/vtkMRMLSegmentationsDisplayableManager2D.h +++ b/Modules/Loadable/Segmentations/MRMLDM/vtkMRMLSegmentationsDisplayableManager2D.h @@ -41,11 +41,11 @@ class VTK_SLICER_SEGMENTATIONS_MODULE_MRMLDISPLAYABLEMANAGER_EXPORT vtkMRMLSegme public: static vtkMRMLSegmentationsDisplayableManager2D* New(); vtkTypeMacro(vtkMRMLSegmentationsDisplayableManager2D, vtkMRMLAbstractSliceViewDisplayableManager); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; /// Assemble and return info string to display in Data probe for a given viewer XYZ position. /// \return Invalid string by default, meaning no information to display. - virtual std::string GetDataProbeInfoStringForPosition(double xyz[3]) VTK_OVERRIDE; + std::string GetDataProbeInfoStringForPosition(double xyz[3]) override; /// Get list of segments visible at selected display position. /// segmentValues is optional, if not NULL then it returns value for each segment for fractional representations @@ -53,25 +53,25 @@ public: vtkStringArray* segmentIDs, vtkDoubleArray* segmentValues = NULL); protected: - virtual void UnobserveMRMLScene() VTK_OVERRIDE; - virtual void OnMRMLSceneNodeAdded(vtkMRMLNode* node) VTK_OVERRIDE; - virtual void OnMRMLSceneNodeRemoved(vtkMRMLNode* node) VTK_OVERRIDE; - virtual void ProcessMRMLNodesEvents(vtkObject* caller, unsigned long event, void* callData) VTK_OVERRIDE; + void UnobserveMRMLScene() override; + void OnMRMLSceneNodeAdded(vtkMRMLNode* node) override; + void OnMRMLSceneNodeRemoved(vtkMRMLNode* node) override; + void ProcessMRMLNodesEvents(vtkObject* caller, unsigned long event, void* callData) override; /// Update Actors based on transforms in the scene - virtual void UpdateFromMRML() VTK_OVERRIDE; + void UpdateFromMRML() override; - virtual void OnMRMLSceneStartClose() VTK_OVERRIDE; - virtual void OnMRMLSceneEndClose() VTK_OVERRIDE; + void OnMRMLSceneStartClose() override; + void OnMRMLSceneEndClose() override; - virtual void OnMRMLSceneEndBatchProcess() VTK_OVERRIDE; + void OnMRMLSceneEndBatchProcess() override; /// Initialize the displayable manager based on its associated vtkMRMLSliceNode - virtual void Create() VTK_OVERRIDE; + void Create() override; protected: vtkMRMLSegmentationsDisplayableManager2D(); - virtual ~vtkMRMLSegmentationsDisplayableManager2D(); + ~vtkMRMLSegmentationsDisplayableManager2D() override; private: vtkMRMLSegmentationsDisplayableManager2D(const vtkMRMLSegmentationsDisplayableManager2D&);// Not implemented diff --git a/Modules/Loadable/Segmentations/MRMLDM/vtkMRMLSegmentationsDisplayableManager3D.h b/Modules/Loadable/Segmentations/MRMLDM/vtkMRMLSegmentationsDisplayableManager3D.h index d5761642f5351cb368f021490d9568a71db7cb4f..330f7227c732c2b1997212a3ca632b6689a02a53 100644 --- a/Modules/Loadable/Segmentations/MRMLDM/vtkMRMLSegmentationsDisplayableManager3D.h +++ b/Modules/Loadable/Segmentations/MRMLDM/vtkMRMLSegmentationsDisplayableManager3D.h @@ -40,35 +40,35 @@ public: static vtkMRMLSegmentationsDisplayableManager3D* New(); vtkTypeMacro(vtkMRMLSegmentationsDisplayableManager3D,vtkMRMLAbstractThreeDViewDisplayableManager); - void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE; + void PrintSelf(ostream& os, vtkIndent indent) override; protected: vtkMRMLSegmentationsDisplayableManager3D(); - virtual ~vtkMRMLSegmentationsDisplayableManager3D(); + ~vtkMRMLSegmentationsDisplayableManager3D() override; - virtual void UnobserveMRMLScene() VTK_OVERRIDE; - virtual void OnMRMLSceneNodeAdded(vtkMRMLNode* node) VTK_OVERRIDE; - virtual void OnMRMLSceneNodeRemoved(vtkMRMLNode* node) VTK_OVERRIDE; - virtual void ProcessMRMLNodesEvents(vtkObject* caller, unsigned long event, void* callData) VTK_OVERRIDE; + void UnobserveMRMLScene() override; + void OnMRMLSceneNodeAdded(vtkMRMLNode* node) override; + void OnMRMLSceneNodeRemoved(vtkMRMLNode* node) override; + void ProcessMRMLNodesEvents(vtkObject* caller, unsigned long event, void* callData) override; /// Update actors based on segmentations in the scene - virtual void UpdateFromMRML() VTK_OVERRIDE; + void UpdateFromMRML() override; - virtual void OnMRMLSceneStartClose() VTK_OVERRIDE; - virtual void OnMRMLSceneEndClose() VTK_OVERRIDE; + void OnMRMLSceneStartClose() override; + void OnMRMLSceneEndClose() override; - virtual void OnMRMLSceneEndBatchProcess() VTK_OVERRIDE; + void OnMRMLSceneEndBatchProcess() override; /// Initialize the displayable manager - virtual void Create() VTK_OVERRIDE; + void Create() override; /// Find display node managed by the displayable manager at a specified world RAS position. /// \return Non-zero in case a node is found at the position, 0 otherwise - virtual int Pick3D(double ras[3]) VTK_OVERRIDE; + int Pick3D(double ras[3]) override; /// Get the MRML ID of the picked node, returns empty string if no pick - virtual const char* GetPickedNodeID() VTK_OVERRIDE; + const char* GetPickedNodeID() override; /// Get the ID of the picked segment, returns empty string if no pick virtual const char* GetPickedSegmentID(); diff --git a/Modules/Loadable/Segmentations/SubjectHierarchyPlugins/qSlicerSubjectHierarchySegmentationsPlugin.cxx b/Modules/Loadable/Segmentations/SubjectHierarchyPlugins/qSlicerSubjectHierarchySegmentationsPlugin.cxx index f29978db3c2d8fca03aec65fad63711c4cc80e6e..f16c4d6b64432c523476b2a2acd8db040e0596bc 100644 --- a/Modules/Loadable/Segmentations/SubjectHierarchyPlugins/qSlicerSubjectHierarchySegmentationsPlugin.cxx +++ b/Modules/Loadable/Segmentations/SubjectHierarchyPlugins/qSlicerSubjectHierarchySegmentationsPlugin.cxx @@ -59,7 +59,7 @@ protected: qSlicerSubjectHierarchySegmentationsPlugin* const q_ptr; public: qSlicerSubjectHierarchySegmentationsPluginPrivate(qSlicerSubjectHierarchySegmentationsPlugin& object); - ~qSlicerSubjectHierarchySegmentationsPluginPrivate(); + ~qSlicerSubjectHierarchySegmentationsPluginPrivate() override; void init(); public: QIcon SegmentationIcon; diff --git a/Modules/Loadable/Segmentations/SubjectHierarchyPlugins/qSlicerSubjectHierarchySegmentationsPlugin.h b/Modules/Loadable/Segmentations/SubjectHierarchyPlugins/qSlicerSubjectHierarchySegmentationsPlugin.h index f77109cf923587d719e7dbddbf892907968d21ff..eb7d4e67a415579a9f042dd3add57317ce840714 100644 --- a/Modules/Loadable/Segmentations/SubjectHierarchyPlugins/qSlicerSubjectHierarchySegmentationsPlugin.h +++ b/Modules/Loadable/Segmentations/SubjectHierarchyPlugins/qSlicerSubjectHierarchySegmentationsPlugin.h @@ -38,7 +38,7 @@ public: public: typedef qSlicerSubjectHierarchyAbstractPlugin Superclass; qSlicerSubjectHierarchySegmentationsPlugin(QObject* parent = NULL); - virtual ~qSlicerSubjectHierarchySegmentationsPlugin(); + ~qSlicerSubjectHierarchySegmentationsPlugin() override; public: /// Determines if a data node can be placed in the hierarchy using the actual plugin, @@ -48,10 +48,10 @@ public: /// Default value is invalid. In that case the parent will be ignored, the confidence numbers are got based on the to-be child node alone. /// \return Floating point confidence number between 0 and 1, where 0 means that the plugin cannot handle the /// node, and 1 means that the plugin is the only one that can handle the node (by node type or identifier attribute) - virtual double canAddNodeToSubjectHierarchy(vtkMRMLNode* node, vtkIdType parentItemID=vtkMRMLSubjectHierarchyNode::INVALID_ITEM_ID )const; + double canAddNodeToSubjectHierarchy(vtkMRMLNode* node, vtkIdType parentItemID=vtkMRMLSubjectHierarchyNode::INVALID_ITEM_ID )const override; /// Creates subject hierarchy item using default method and updates all segments - virtual bool addNodeToSubjectHierarchy(vtkMRMLNode* node, vtkIdType parentItemID); + bool addNodeToSubjectHierarchy(vtkMRMLNode* node, vtkIdType parentItemID) override; /// Determines if the actual plugin can handle a subject hierarchy item. The plugin with /// the highest confidence number will "own" the item in the subject hierarchy (set icon, tooltip, @@ -59,46 +59,46 @@ public: /// \param item Item to handle in the subject hierarchy tree /// \return Floating point confidence number between 0 and 1, where 0 means that the plugin cannot handle the /// item, and 1 means that the plugin is the only one that can handle the item (by node type or identifier attribute) - virtual double canOwnSubjectHierarchyItem(vtkIdType itemID)const; + double canOwnSubjectHierarchyItem(vtkIdType itemID)const override; /// Get role that the plugin assigns to the subject hierarchy node. /// Each plugin should provide only one role. - Q_INVOKABLE virtual const QString roleForPlugin()const; + Q_INVOKABLE const QString roleForPlugin()const override; /// Generate tooltip for a owned subject hierarchy item - virtual QString tooltip(vtkIdType itemID)const; + QString tooltip(vtkIdType itemID)const override; /// Get help text for plugin to be added in subject hierarchy module widget help box - virtual const QString helpText()const; + const QString helpText()const override; /// Get icon of an owned subject hierarchy item /// \return Icon to set, empty icon if nothing to set - virtual QIcon icon(vtkIdType itemID); + QIcon icon(vtkIdType itemID) override; /// Get visibility icon for a visibility state - virtual QIcon visibilityIcon(int visible); + QIcon visibilityIcon(int visible) override; /// Set display visibility of a owned subject hierarchy item - virtual void setDisplayVisibility(vtkIdType itemID, int visible); + void setDisplayVisibility(vtkIdType itemID, int visible) override; /// Get display visibility of a owned subject hierarchy item /// \return Display visibility (0: hidden, 1: shown, 2: partially shown) - virtual int getDisplayVisibility(vtkIdType itemID)const; + int getDisplayVisibility(vtkIdType itemID)const override; /// Get item context menu item actions to add to tree view - virtual QList itemContextMenuActions()const; + QList itemContextMenuActions()const override; /// Show context menu actions valid for a given subject hierarchy item. /// \param itemID Subject Hierarchy item to show the context menu items for - virtual void showContextMenuActionsForItem(vtkIdType itemID); + void showContextMenuActionsForItem(vtkIdType itemID) override; /// Get visibility context menu item actions to add to tree view. /// These item visibility context menu actions can be shown in the implementations of \sa showVisibilityContextMenuActionsForItem - virtual QList visibilityContextMenuActions()const; + QList visibilityContextMenuActions()const override; /// Show visibility context menu actions valid for a given subject hierarchy item. /// \param itemID Subject Hierarchy item to show the visibility context menu items for - virtual void showVisibilityContextMenuActionsForItem(vtkIdType itemID); + void showVisibilityContextMenuActionsForItem(vtkIdType itemID) override; public slots: /// Called when segment is added in an observed segmentation node diff --git a/Modules/Loadable/Segmentations/SubjectHierarchyPlugins/qSlicerSubjectHierarchySegmentsPlugin.cxx b/Modules/Loadable/Segmentations/SubjectHierarchyPlugins/qSlicerSubjectHierarchySegmentsPlugin.cxx index 4a54d4346843921d3a41bf429ede4c80c88bc766..a9c0914244585960f0481f22bbd5cccb55257f0a 100644 --- a/Modules/Loadable/Segmentations/SubjectHierarchyPlugins/qSlicerSubjectHierarchySegmentsPlugin.cxx +++ b/Modules/Loadable/Segmentations/SubjectHierarchyPlugins/qSlicerSubjectHierarchySegmentsPlugin.cxx @@ -62,7 +62,7 @@ protected: qSlicerSubjectHierarchySegmentsPlugin* const q_ptr; public: qSlicerSubjectHierarchySegmentsPluginPrivate(qSlicerSubjectHierarchySegmentsPlugin& object); - ~qSlicerSubjectHierarchySegmentsPluginPrivate(); + ~qSlicerSubjectHierarchySegmentsPluginPrivate() override; void init(); public: QIcon SegmentIcon; diff --git a/Modules/Loadable/Segmentations/SubjectHierarchyPlugins/qSlicerSubjectHierarchySegmentsPlugin.h b/Modules/Loadable/Segmentations/SubjectHierarchyPlugins/qSlicerSubjectHierarchySegmentsPlugin.h index 3594d74a8ccb622726806e6c2a4cbc6aa51bfcd5..f91d78af58c99bac85065111714203aa85d84098 100644 --- a/Modules/Loadable/Segmentations/SubjectHierarchyPlugins/qSlicerSubjectHierarchySegmentsPlugin.h +++ b/Modules/Loadable/Segmentations/SubjectHierarchyPlugins/qSlicerSubjectHierarchySegmentsPlugin.h @@ -39,7 +39,7 @@ public: public: typedef qSlicerSubjectHierarchyAbstractPlugin Superclass; qSlicerSubjectHierarchySegmentsPlugin(QObject* parent = NULL); - virtual ~qSlicerSubjectHierarchySegmentsPlugin(); + ~qSlicerSubjectHierarchySegmentsPlugin() override; public: /// Determines if a subject hierarchy item can be reparented in the hierarchy using the current plugin, @@ -50,11 +50,11 @@ public: /// \param parentItemID Prospective parent of the item to reparent. /// \return Floating point confidence number between 0 and 1, where 0 means that the plugin cannot handle the /// item, and 1 means that the plugin is the only one that can handle the item - virtual double canReparentItemInsideSubjectHierarchy(vtkIdType itemID, vtkIdType parentItemID)const; + double canReparentItemInsideSubjectHierarchy(vtkIdType itemID, vtkIdType parentItemID)const override; /// Reparent an item that was already in the subject hierarchy under a new parent. /// \return True if reparented successfully, false otherwise - virtual bool reparentItemInsideSubjectHierarchy(vtkIdType itemID, vtkIdType parentItemID); + bool reparentItemInsideSubjectHierarchy(vtkIdType itemID, vtkIdType parentItemID) override; /// Determines if the actual plugin can handle a subject hierarchy item. The plugin with /// the highest confidence number will "own" the item in the subject hierarchy (set icon, tooltip, @@ -62,34 +62,34 @@ public: /// \param item Item to handle in the subject hierarchy tree /// \return Floating point confidence number between 0 and 1, where 0 means that the plugin cannot handle the /// item, and 1 means that the plugin is the only one that can handle the item (by node type or identifier attribute) - virtual double canOwnSubjectHierarchyItem(vtkIdType itemID)const; + double canOwnSubjectHierarchyItem(vtkIdType itemID)const override; /// Get role that the plugin assigns to the subject hierarchy item. /// Each plugin should provide only one role. - Q_INVOKABLE virtual const QString roleForPlugin()const; + Q_INVOKABLE const QString roleForPlugin()const override; /// Get help text for plugin to be added in subject hierarchy module widget help box - virtual const QString helpText()const; + const QString helpText()const override; /// Get icon of an owned subject hierarchy item /// \return Icon to set, empty icon if nothing to set - virtual QIcon icon(vtkIdType itemID); + QIcon icon(vtkIdType itemID) override; /// Get visibility icon for a visibility state - virtual QIcon visibilityIcon(int visible); + QIcon visibilityIcon(int visible) override; /// Open module belonging to item and set inputs in opened module - virtual void editProperties(vtkIdType itemID); + void editProperties(vtkIdType itemID) override; /// Generate tooltip for a owned subject hierarchy item - virtual QString tooltip(vtkIdType itemID)const; + QString tooltip(vtkIdType itemID)const override; /// Set display visibility of a owned subject hierarchy item - virtual void setDisplayVisibility(vtkIdType itemID, int visible); + void setDisplayVisibility(vtkIdType itemID, int visible) override; /// Get display visibility of a owned subject hierarchy item /// \return Display visibility (0: hidden, 1: shown, 2: partially shown) - virtual int getDisplayVisibility(vtkIdType itemID)const; + int getDisplayVisibility(vtkIdType itemID)const override; /// Set display color of an owned subject hierarchy item /// \param color Display color to set @@ -98,7 +98,7 @@ public: /// qSlicerTerminologyItemDelegate::NameRole : string /// qSlicerTerminologyItemDelegate::NameAutoGeneratedRole : bool /// qSlicerTerminologyItemDelegate::ColorAutoGeneratedRole : bool - virtual void setDisplayColor(vtkIdType itemID, QColor color, QMap terminologyMetaData); + void setDisplayColor(vtkIdType itemID, QColor color, QMap terminologyMetaData) override; /// Get display color of an owned subject hierarchy item /// \param terminologyMetaData Output map containing terminology meta data. Contents: @@ -106,15 +106,15 @@ public: /// qSlicerTerminologyItemDelegate::NameRole : string /// qSlicerTerminologyItemDelegate::NameAutoGeneratedRole : bool /// qSlicerTerminologyItemDelegate::ColorAutoGeneratedRole : bool - virtual QColor getDisplayColor(vtkIdType itemID, QMap &terminologyMetaData)const; + QColor getDisplayColor(vtkIdType itemID, QMap &terminologyMetaData)const override; /// Get visibility context menu item actions to add to tree view. /// These item visibility context menu actions can be shown in the implementations of \sa showVisibilityContextMenuActionsForItem - virtual QList visibilityContextMenuActions()const; + QList visibilityContextMenuActions()const override; /// Show visibility context menu actions valid for a given subject hierarchy item. /// \param itemID Subject Hierarchy item to show the visibility context menu items for - virtual void showVisibilityContextMenuActionsForItem(vtkIdType itemID); + void showVisibilityContextMenuActionsForItem(vtkIdType itemID) override; protected slots: /// Show only selected segment, hide all others in segmentation diff --git a/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qMRMLSegmentEditorWidgetPlugin.h b/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qMRMLSegmentEditorWidgetPlugin.h index e5bc6ed6bf61efb15349fb33336314e85f1827af..0d8c4a7d5c1b5f420dfc10694bf91f7636b1f67c 100644 --- a/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qMRMLSegmentEditorWidgetPlugin.h +++ b/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qMRMLSegmentEditorWidgetPlugin.h @@ -32,11 +32,11 @@ class Q_SLICER_MODULE_SEGMENTATIONS_WIDGETS_PLUGINS_EXPORT qMRMLSegmentEditorWid public: qMRMLSegmentEditorWidgetPlugin(QObject* parent = 0); - QWidget *createWidget(QWidget* parent); - QString domXml() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget* parent) override; + QString domXml() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qMRMLSegmentSelectorWidgetPlugin.h b/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qMRMLSegmentSelectorWidgetPlugin.h index 9b5cd48eabf528a8be215c9c45e2ebc64b3a21e5..b23d6334fff11d2cbff694bdde00f533d449a938 100644 --- a/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qMRMLSegmentSelectorWidgetPlugin.h +++ b/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qMRMLSegmentSelectorWidgetPlugin.h @@ -32,11 +32,11 @@ class Q_SLICER_MODULE_SEGMENTATIONS_WIDGETS_PLUGINS_EXPORT qMRMLSegmentSelectorW public: qMRMLSegmentSelectorWidgetPlugin(QObject* parent = 0); - QWidget *createWidget(QWidget* parent); - QString domXml() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget* parent) override; + QString domXml() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qMRMLSegmentationConversionParametersWidgetPlugin.h b/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qMRMLSegmentationConversionParametersWidgetPlugin.h index c2d53d8a2c240bf8cb456b258d5bb9dfe1fab48d..93304d804f7bfeb29d57706f178e31689eb31890 100644 --- a/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qMRMLSegmentationConversionParametersWidgetPlugin.h +++ b/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qMRMLSegmentationConversionParametersWidgetPlugin.h @@ -32,11 +32,11 @@ class Q_SLICER_MODULE_SEGMENTATIONS_WIDGETS_PLUGINS_EXPORT qMRMLSegmentationConv public: qMRMLSegmentationConversionParametersWidgetPlugin(QObject* parent = 0); - QWidget *createWidget(QWidget* parent); - QString domXml() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget* parent) override; + QString domXml() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qMRMLSegmentationDisplayNodeWidgetPlugin.h b/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qMRMLSegmentationDisplayNodeWidgetPlugin.h index 913b126fc98193f6c912e490f31bc18f469488fe..62e6d7a9e663508f59adb1cc643329a5266c9e33 100644 --- a/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qMRMLSegmentationDisplayNodeWidgetPlugin.h +++ b/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qMRMLSegmentationDisplayNodeWidgetPlugin.h @@ -32,11 +32,11 @@ class Q_SLICER_MODULE_SEGMENTATIONS_WIDGETS_PLUGINS_EXPORT qMRMLSegmentationDisp public: qMRMLSegmentationDisplayNodeWidgetPlugin(QObject* parent = 0); - QWidget *createWidget(QWidget* parent); - QString domXml() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget* parent) override; + QString domXml() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qMRMLSegmentationFileExportWidgetPlugin.h b/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qMRMLSegmentationFileExportWidgetPlugin.h index d5453a888c64cce694fbc5c40b7b7f39c8f8fd18..8d58d08743a0a7c65eb953329d1ca6aead20b82a 100644 --- a/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qMRMLSegmentationFileExportWidgetPlugin.h +++ b/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qMRMLSegmentationFileExportWidgetPlugin.h @@ -32,11 +32,11 @@ class Q_SLICER_MODULE_SEGMENTATIONS_WIDGETS_PLUGINS_EXPORT qMRMLSegmentationFile public: qMRMLSegmentationFileExportWidgetPlugin(QObject* parent = 0); - QWidget *createWidget(QWidget* parent); - QString domXml() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget* parent) override; + QString domXml() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qMRMLSegmentationRepresentationsListViewPlugin.h b/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qMRMLSegmentationRepresentationsListViewPlugin.h index 9ada6160f896e78c511db98f3e0098fa75e06dbf..4fee834a44b7382f4fb48f7cc4c492269eca358b 100644 --- a/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qMRMLSegmentationRepresentationsListViewPlugin.h +++ b/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qMRMLSegmentationRepresentationsListViewPlugin.h @@ -32,11 +32,11 @@ class Q_SLICER_MODULE_SEGMENTATIONS_WIDGETS_PLUGINS_EXPORT qMRMLSegmentationRepr public: qMRMLSegmentationRepresentationsListViewPlugin(QObject* parent = 0); - QWidget *createWidget(QWidget* parent); - QString domXml() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget* parent) override; + QString domXml() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qMRMLSegmentsTableViewPlugin.h b/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qMRMLSegmentsTableViewPlugin.h index 8ab7796673ac8e1852a5190bd017af64137300e2..f113b63bb032c08f7d07753267d53d9a1fe1641d 100644 --- a/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qMRMLSegmentsTableViewPlugin.h +++ b/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qMRMLSegmentsTableViewPlugin.h @@ -32,11 +32,11 @@ class Q_SLICER_MODULE_SEGMENTATIONS_WIDGETS_PLUGINS_EXPORT qMRMLSegmentsTableVie public: qMRMLSegmentsTableViewPlugin(QObject* parent = 0); - QWidget *createWidget(QWidget* parent); - QString domXml() const; - QString includeFile() const; - bool isContainer() const; - QString name() const; + QWidget *createWidget(QWidget* parent) override; + QString domXml() const override; + QString includeFile() const override; + bool isContainer() const override; + QString name() const override; }; diff --git a/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qSlicerSegmentationsModuleWidgetsAbstractPlugin.h b/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qSlicerSegmentationsModuleWidgetsAbstractPlugin.h index 7f66a6b845244d6d40883da1d16d598df594dcab..177a242d5412a910904e05397b8e3fa042bd2f12 100644 --- a/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qSlicerSegmentationsModuleWidgetsAbstractPlugin.h +++ b/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qSlicerSegmentationsModuleWidgetsAbstractPlugin.h @@ -34,11 +34,11 @@ public: qSlicerSegmentationsModuleWidgetsAbstractPlugin(); // Don't reimplement this method. - QString group() const; + QString group() const override; // You can reimplement these methods - virtual QIcon icon() const; - virtual QString toolTip() const; - virtual QString whatsThis() const; + QIcon icon() const override; + QString toolTip() const override; + QString whatsThis() const override; }; #endif diff --git a/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qSlicerSegmentationsModuleWidgetsPlugin.h b/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qSlicerSegmentationsModuleWidgetsPlugin.h index 4cde83761ee6ee1a1d956778a8549239a206a91a..06caec6f90cfdc800d4434707ca124be996b3c3f 100644 --- a/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qSlicerSegmentationsModuleWidgetsPlugin.h +++ b/Modules/Loadable/Segmentations/Widgets/DesignerPlugins/qSlicerSegmentationsModuleWidgetsPlugin.h @@ -43,7 +43,7 @@ class Q_SLICER_MODULE_SEGMENTATIONS_WIDGETS_PLUGINS_EXPORT qSlicerSegmentationsM Q_INTERFACES(QDesignerCustomWidgetCollectionInterface); public: - QList customWidgets() const + QList customWidgets() const override { QList plugins; plugins << new qMRMLSegmentsTableViewPlugin diff --git a/Modules/Loadable/Segmentations/Widgets/qMRMLDoubleSpinBoxDelegate.h b/Modules/Loadable/Segmentations/Widgets/qMRMLDoubleSpinBoxDelegate.h index b1111116a8860748397610d07bc33a35c1a2406d..82046171b4f74413b1c7400ad77861c5be1735a7 100644 --- a/Modules/Loadable/Segmentations/Widgets/qMRMLDoubleSpinBoxDelegate.h +++ b/Modules/Loadable/Segmentations/Widgets/qMRMLDoubleSpinBoxDelegate.h @@ -39,12 +39,12 @@ class Q_SLICER_MODULE_SEGMENTATIONS_WIDGETS_EXPORT qMRMLDoubleSpinBoxDelegate : public: qMRMLDoubleSpinBoxDelegate(QObject *parent = 0); - QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const; + QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override; - void setEditorData(QWidget *editor, const QModelIndex &index) const; - void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const; + void setEditorData(QWidget *editor, const QModelIndex &index) const override; + void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override; - void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const; + void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const override; protected slots: void commitSenderData(); diff --git a/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentEditorWidget.h b/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentEditorWidget.h index 68a892033659dd292d6c61ce8c8f517e3f88de29..2f5f148e1d20a2c97e9223df73d3a4a2fee625f2 100644 --- a/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentEditorWidget.h +++ b/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentEditorWidget.h @@ -81,7 +81,7 @@ public: /// Constructor explicit qMRMLSegmentEditorWidget(QWidget* parent = 0); /// Destructor - virtual ~qMRMLSegmentEditorWidget(); + ~qMRMLSegmentEditorWidget() override; /// Get the segment editor parameter set node Q_INVOKABLE vtkMRMLSegmentEditorNode* mrmlSegmentEditorNode()const; @@ -196,7 +196,7 @@ public: public slots: /// Set the MRML \a scene associated with the widget - virtual void setMRMLScene(vtkMRMLScene* newScene); + void setMRMLScene(vtkMRMLScene* newScene) override; /// Set the segment editor parameter set node void setMRMLSegmentEditorNode(vtkMRMLSegmentEditorNode* newSegmentEditorNode); diff --git a/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentationConversionParametersWidget.h b/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentationConversionParametersWidget.h index f94e2e8105d345f6698080ecac879a6a152799b5..beefd08c6fcef345b51bdd794b55985ae97b35b7 100644 --- a/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentationConversionParametersWidget.h +++ b/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentationConversionParametersWidget.h @@ -52,7 +52,7 @@ public: /// Constructor explicit qMRMLSegmentationConversionParametersWidget(QWidget* parent = 0); /// Destructor - virtual ~qMRMLSegmentationConversionParametersWidget(); + ~qMRMLSegmentationConversionParametersWidget() override; /// Get segmentation MRML node vtkMRMLNode* segmentationNode(); diff --git a/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentationDisplayNodeWidget.h b/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentationDisplayNodeWidget.h index 4f08fc1bc3a60ffccd964ca1344771ae0cb71c13..1b360e8b790dc6473eef13479079149a7cee3829 100644 --- a/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentationDisplayNodeWidget.h +++ b/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentationDisplayNodeWidget.h @@ -50,7 +50,7 @@ public: /// Constructor explicit qMRMLSegmentationDisplayNodeWidget(QWidget* parent = 0); /// Destructor - virtual ~qMRMLSegmentationDisplayNodeWidget(); + ~qMRMLSegmentationDisplayNodeWidget() override; /// Get current segmentation display node Q_INVOKABLE vtkMRMLSegmentationDisplayNode* segmentationDisplayNode() const; diff --git a/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentationFileExportWidget.h b/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentationFileExportWidget.h index 2f2924769cedd4a7601975d93e370bd4193de878..2c0898563260652d06852c1548ca0aa2fb6f3d9c 100644 --- a/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentationFileExportWidget.h +++ b/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentationFileExportWidget.h @@ -56,7 +56,7 @@ public: /// Constructor explicit qMRMLSegmentationFileExportWidget(QWidget* parent = 0); /// Destructor - virtual ~qMRMLSegmentationFileExportWidget(); + ~qMRMLSegmentationFileExportWidget() override; QString settingsKey()const; void setSettingsKey(const QString& key); diff --git a/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentationGeometryDialog.h b/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentationGeometryDialog.h index ba68353662752b4a75d4ecbae95dba2d2d1343be..445cdf1eb2253aeb91f6497ee3b2e8a91a6c38a8 100644 --- a/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentationGeometryDialog.h +++ b/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentationGeometryDialog.h @@ -52,7 +52,7 @@ public: public: typedef QObject Superclass; qMRMLSegmentationGeometryDialog(vtkMRMLSegmentationNode* segmentationNode, QObject* parent=NULL); - virtual ~qMRMLSegmentationGeometryDialog(); + ~qMRMLSegmentationGeometryDialog() override; public: /// Show dialog diff --git a/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentationGeometryWidget.h b/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentationGeometryWidget.h index 56f473f478760b329b8c64ac50538efb1dd81567..2d0e828084a58df18c4445c08a9fee27916757aa 100644 --- a/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentationGeometryWidget.h +++ b/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentationGeometryWidget.h @@ -52,7 +52,7 @@ public: /// Constructor explicit qMRMLSegmentationGeometryWidget(QWidget* parent = 0); /// Destructor - virtual ~qMRMLSegmentationGeometryWidget(); + ~qMRMLSegmentationGeometryWidget() override; /// Get segmentation MRML node Q_INVOKABLE vtkMRMLSegmentationNode* segmentationNode()const; diff --git a/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentationRepresentationsListView.h b/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentationRepresentationsListView.h index c74f0786243c8e232394de78d31470014a7a53a9..a9b2e8b391ec6b914b7411292163e6edd0b9d0e7 100644 --- a/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentationRepresentationsListView.h +++ b/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentationRepresentationsListView.h @@ -45,7 +45,7 @@ public: /// Constructor explicit qMRMLSegmentationRepresentationsListView(QWidget* parent = 0); /// Destructor - virtual ~qMRMLSegmentationRepresentationsListView(); + ~qMRMLSegmentationRepresentationsListView() override; /// Get segmentation MRML node vtkMRMLNode* segmentationNode(); diff --git a/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentsTableView.h b/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentsTableView.h index f703d6f064890c437f089a3fa57fd465a1ff4803..c0177aa1e8b459d041ed4824c09549c6be95a548 100644 --- a/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentsTableView.h +++ b/Modules/Loadable/Segmentations/Widgets/qMRMLSegmentsTableView.h @@ -69,7 +69,7 @@ public: /// Constructor explicit qMRMLSegmentsTableView(QWidget* parent = 0); /// Destructor - virtual ~qMRMLSegmentsTableView(); + ~qMRMLSegmentsTableView() override; /// Get segmentation MRML node Q_INVOKABLE vtkMRMLNode* segmentationNode(); @@ -109,7 +109,7 @@ public slots: /// Set segmentation MRML node void setSegmentationNode(vtkMRMLNode* node); - virtual void setMRMLScene(vtkMRMLScene* newScene); + void setMRMLScene(vtkMRMLScene* newScene) override; /// Set selection mode in the table. Input value is int for Python compatibility. Actual values are /// defined in QAbstractItemView::SelectionMode. For example, QAbstractItemView::NoSelection, @@ -174,10 +174,10 @@ protected: void setSegmentVisibility(QObject* senderObject, int visible, int visible3D, int visible2DFill, int visible2DOutline); /// To prevent accidentally moving out of the widget when pressing up/down arrows - virtual bool eventFilter(QObject* target, QEvent* event); + bool eventFilter(QObject* target, QEvent* event) override; /// Handle context menu events - virtual void contextMenuEvent(QContextMenuEvent* event); + void contextMenuEvent(QContextMenuEvent* event) override; protected: QScopedPointer d_ptr; diff --git a/Modules/Loadable/Segmentations/qSlicerSegmentationsReader.h b/Modules/Loadable/Segmentation