diff --git a/Applications/DataExplorer/VtkVis/QVtkDataSetMapper.h b/Applications/DataExplorer/VtkVis/QVtkDataSetMapper.h index 4351aadf7b789ecf7458686f267b44aadc1d2da2..38d2115bd4889182857780c260f54c29cce9d764 100644 --- a/Applications/DataExplorer/VtkVis/QVtkDataSetMapper.h +++ b/Applications/DataExplorer/VtkVis/QVtkDataSetMapper.h @@ -30,7 +30,7 @@ public: vtkTypeMacro(QVtkDataSetMapper, vtkDataSetMapper); /// @brief Prints information about itself. - void PrintSelf(ostream& os, vtkIndent indent); + void PrintSelf(ostream& os, vtkIndent indent) override; public slots: /// @brief Sets the scalar visibility on this mapper. diff --git a/Applications/DataExplorer/VtkVis/VtkAppendArrayFilter.h b/Applications/DataExplorer/VtkVis/VtkAppendArrayFilter.h index 250b5ddf443aae61d62c1d1225efc35aca2203f0..b4a674e05084a2fad24c48a45749089e8337d868 100644 --- a/Applications/DataExplorer/VtkVis/VtkAppendArrayFilter.h +++ b/Applications/DataExplorer/VtkVis/VtkAppendArrayFilter.h @@ -34,7 +34,7 @@ public: vtkTypeMacro(VtkAppendArrayFilter, vtkUnstructuredGridAlgorithm); /// @brief Prints the mesh data to an output stream. - void PrintSelf(ostream& os, vtkIndent indent); + void PrintSelf(ostream& os, vtkIndent indent) override; /// @brief Sets user properties. void SetUserProperty(QString name, QVariant value) @@ -52,7 +52,7 @@ protected: /// @brief The filter logic. int RequestData(vtkInformation* request, vtkInformationVector** inputVector, - vtkInformationVector* outputVector); + vtkInformationVector* outputVector) override; private: std::vector<double> _array; diff --git a/Applications/DataExplorer/VtkVis/VtkColorByHeightFilter.h b/Applications/DataExplorer/VtkVis/VtkColorByHeightFilter.h index cd5f50d5f06aeebb4e39cd677d1720829103cb86..b25983a86eb4ce98c2b89a34082d8ccc6869d419 100644 --- a/Applications/DataExplorer/VtkVis/VtkColorByHeightFilter.h +++ b/Applications/DataExplorer/VtkVis/VtkColorByHeightFilter.h @@ -42,7 +42,7 @@ public: vtkTypeMacro(VtkColorByHeightFilter, vtkPolyDataAlgorithm); /// @brief Prints the mesh data to an output stream. - void PrintSelf(ostream& os, vtkIndent indent); + void PrintSelf(ostream& os, vtkIndent indent) override; /// @brief Returns the underlying colour look up table object. vtkGetObjectMacro(ColorLookupTable,VtkColorLookupTable); @@ -71,7 +71,7 @@ protected: /// @brief The filter logic. int RequestData(vtkInformation* request, vtkInformationVector** inputVector, - vtkInformationVector* outputVector); + vtkInformationVector* outputVector) override; /// @brief Calculates the color lookup table based on set parameters. VtkColorLookupTable* BuildColorTable(); diff --git a/Applications/DataExplorer/VtkVis/VtkConsoleOutputWindow.h b/Applications/DataExplorer/VtkVis/VtkConsoleOutputWindow.h index 775febff1a18291f069986a4419594c4c6f92f84..c240b18f53c74774ec2eaa1232b3884d4a5d58a6 100644 --- a/Applications/DataExplorer/VtkVis/VtkConsoleOutputWindow.h +++ b/Applications/DataExplorer/VtkVis/VtkConsoleOutputWindow.h @@ -21,7 +21,7 @@ class VtkConsoleOutputWindow : public vtkOutputWindow { public: vtkTypeMacro(VtkConsoleOutputWindow,vtkOutputWindow); - void PrintSelf(ostream& os, vtkIndent indent); + void PrintSelf(ostream& os, vtkIndent indent) override; static VtkConsoleOutputWindow * New(); virtual void DisplayText(const char*); diff --git a/Applications/DataExplorer/VtkVis/VtkGeoImageSource.h b/Applications/DataExplorer/VtkVis/VtkGeoImageSource.h index 02f0760e1871e593d6910ec9df387b1b2946228b..cab9b5b52c6aae60435025699e0b495a82216c62 100644 --- a/Applications/DataExplorer/VtkVis/VtkGeoImageSource.h +++ b/Applications/DataExplorer/VtkVis/VtkGeoImageSource.h @@ -37,7 +37,7 @@ public: vtkTypeMacro(VtkGeoImageSource, vtkSimpleImageToImageFilter); /// @brief Prints information about itself. - void PrintSelf(ostream& os, vtkIndent indent); + void PrintSelf(ostream& os, vtkIndent indent) override; /// @brief Returns the ImageData object. vtkImageData* getImageData(); diff --git a/Applications/DataExplorer/VtkVis/VtkImageDataToLinePolyDataFilter.h b/Applications/DataExplorer/VtkVis/VtkImageDataToLinePolyDataFilter.h index f4963d49f2f74c1698844352b4714be356c3013e..f3bb6c961adb00bb45b5336525fc57d6a851bada 100644 --- a/Applications/DataExplorer/VtkVis/VtkImageDataToLinePolyDataFilter.h +++ b/Applications/DataExplorer/VtkVis/VtkImageDataToLinePolyDataFilter.h @@ -34,7 +34,7 @@ public: vtkTypeMacro(VtkImageDataToLinePolyDataFilter, vtkPolyDataAlgorithm); /// @brief Prints information about itself. - void PrintSelf(ostream& os, vtkIndent indent); + void PrintSelf(ostream& os, vtkIndent indent) override; /// @brief Sets the scaling of the length of the lines. ogsUserPropertyMacro(LengthScaleFactor,double); @@ -61,7 +61,7 @@ protected: /// @brief Converts the image data to lines virtual int RequestData(vtkInformation* request, vtkInformationVector** inputVector, - vtkInformationVector* outputVector); + vtkInformationVector* outputVector) override; /// @brief The spacing of the image double ImageSpacing; diff --git a/Applications/DataExplorer/VtkVis/VtkPointsSource.h b/Applications/DataExplorer/VtkVis/VtkPointsSource.h index 651c206c0a349d1983f2a1ad57cd7735823f8d9f..a061ab30cf191b4760b880bdfbede20d2e27abd3 100644 --- a/Applications/DataExplorer/VtkVis/VtkPointsSource.h +++ b/Applications/DataExplorer/VtkVis/VtkPointsSource.h @@ -38,7 +38,7 @@ public: void setPoints(const std::vector<GeoLib::Point*>* points) { _points = points; } /// Prints its data on a stream. - void PrintSelf(ostream& os, vtkIndent indent); + void PrintSelf(ostream& os, vtkIndent indent) override; virtual void SetUserProperty(QString name, QVariant value); @@ -49,11 +49,11 @@ protected: /// Computes the polygonal data object. int RequestData(vtkInformation* request, vtkInformationVector** inputVector, - vtkInformationVector* outputVector); + vtkInformationVector* outputVector) override; int RequestInformation(vtkInformation* request, vtkInformationVector** inputVector, - vtkInformationVector* outputVector); + vtkInformationVector* outputVector) override; /// The points to visualize const std::vector<GeoLib::Point*>* _points; diff --git a/Applications/DataExplorer/VtkVis/VtkPolylinesSource.h b/Applications/DataExplorer/VtkVis/VtkPolylinesSource.h index cc831ccf70c4d440ce7c144198ed9a50d5e64bca..6245a2c0ac23bc06269c0403f78f35f07e4de748 100644 --- a/Applications/DataExplorer/VtkVis/VtkPolylinesSource.h +++ b/Applications/DataExplorer/VtkVis/VtkPolylinesSource.h @@ -41,7 +41,7 @@ public: void setPolylines(const std::vector<GeoLib::Polyline*>* polylines) { _polylines = polylines; } /// Prints its data on a stream. - void PrintSelf(ostream& os, vtkIndent indent); + void PrintSelf(ostream& os, vtkIndent indent) override; virtual void SetUserProperty(QString name, QVariant value); @@ -52,11 +52,11 @@ protected: /// Computes the polygonal data object. int RequestData(vtkInformation* request, vtkInformationVector** inputVector, - vtkInformationVector* outputVector); + vtkInformationVector* outputVector) override; int RequestInformation(vtkInformation* request, vtkInformationVector** inputVector, - vtkInformationVector* outputVector); + vtkInformationVector* outputVector) override; /// The polylines to visualize. const std::vector<GeoLib::Polyline*>* _polylines; diff --git a/Applications/DataExplorer/VtkVis/VtkStationSource.h b/Applications/DataExplorer/VtkVis/VtkStationSource.h index 3bb149304e95b033576ee97ddf8d9c02b5ee1dec..6c02606fe48a5917f5cb3ed69eb365ec876aa9f2 100644 --- a/Applications/DataExplorer/VtkVis/VtkStationSource.h +++ b/Applications/DataExplorer/VtkVis/VtkStationSource.h @@ -49,7 +49,7 @@ public: void setStations(const std::vector<GeoLib::Point*>* stations) { _stations = stations; } /// Prints its data on a stream. - void PrintSelf(ostream& os, vtkIndent indent); + void PrintSelf(ostream& os, vtkIndent indent) override; virtual void SetUserProperty(QString name, QVariant value); @@ -59,11 +59,11 @@ protected: /// Computes the polygonal data object. int RequestData(vtkInformation* request, vtkInformationVector** inputVector, - vtkInformationVector* outputVector); + vtkInformationVector* outputVector) override; int RequestInformation(vtkInformation* request, vtkInformationVector** inputVector, - vtkInformationVector* outputVector); + vtkInformationVector* outputVector) override; /// The stations to visualize const std::vector<GeoLib::Point*>* _stations; diff --git a/Applications/DataExplorer/VtkVis/VtkSurfacesSource.h b/Applications/DataExplorer/VtkVis/VtkSurfacesSource.h index 42c4c353f1bcb04afa34a491930e403448fa4207..ca02a3bcccacd266389e3f54d35a44c2a824595d 100644 --- a/Applications/DataExplorer/VtkVis/VtkSurfacesSource.h +++ b/Applications/DataExplorer/VtkVis/VtkSurfacesSource.h @@ -37,7 +37,7 @@ public: void setSurfaces(const std::vector<GeoLib::Surface*>* surfaces) { _surfaces = surfaces; } /// Prints its data on a stream. - void PrintSelf(ostream& os, vtkIndent indent); + void PrintSelf(ostream& os, vtkIndent indent) override; /** * \brief Generates random colors for each surface. @@ -53,11 +53,11 @@ protected: /// Computes the polygonal data object. int RequestData(vtkInformation* request, vtkInformationVector** inputVector, - vtkInformationVector* outputVector); + vtkInformationVector* outputVector) override; int RequestInformation(vtkInformation* request, vtkInformationVector** inputVector, - vtkInformationVector* outputVector); + vtkInformationVector* outputVector) override; /// The surfaces to visualize const std::vector<GeoLib::Surface*>* _surfaces; diff --git a/Applications/DataExplorer/VtkVis/VtkTextureOnSurfaceFilter.h b/Applications/DataExplorer/VtkVis/VtkTextureOnSurfaceFilter.h index 9b8ba8c7abcd7088b1475bcf070f982e4a9c96fd..473f819035073c1815e46362b87e856e6b657f4c 100644 --- a/Applications/DataExplorer/VtkVis/VtkTextureOnSurfaceFilter.h +++ b/Applications/DataExplorer/VtkVis/VtkTextureOnSurfaceFilter.h @@ -44,7 +44,7 @@ public: vtkTypeMacro(VtkTextureOnSurfaceFilter,vtkPolyDataAlgorithm); /// Prints the object data to an output stream. - void PrintSelf(ostream& os, vtkIndent indent); + void PrintSelf(ostream& os, vtkIndent indent) override; /// Sets the raster/image to be used as a texture map void SetRaster(vtkImageAlgorithm* img, double x0, double y0, double scalingFactor); @@ -59,7 +59,7 @@ protected: /// been called before this method is executed. int RequestData(vtkInformation* request, vtkInformationVector** inputVector, - vtkInformationVector* outputVector); + vtkInformationVector* outputVector) override; private: std::pair<float, float> _origin; diff --git a/MeshLib/Vtk/VtkMappedMesh.h b/MeshLib/Vtk/VtkMappedMesh.h index 36720fd95d5bda527592475c4764470eaae4180c..9b6546c23546bf840db8d9611e05791cf276481d 100644 --- a/MeshLib/Vtk/VtkMappedMesh.h +++ b/MeshLib/Vtk/VtkMappedMesh.h @@ -33,7 +33,7 @@ class VtkMappedMeshImpl : public vtkObject { public: static VtkMappedMeshImpl *New(); - virtual void PrintSelf(std::ostream &os, vtkIndent indent); + virtual void PrintSelf(std::ostream &os, vtkIndent indent) override; vtkTypeMacro(VtkMappedMeshImpl, vtkObject); void SetNodes(std::vector<MeshLib::Node*> const & nodes); diff --git a/MeshLib/Vtk/VtkMappedMeshSource.h b/MeshLib/Vtk/VtkMappedMeshSource.h index 9ca4ed67e7affd7f26c79e2cc8a51c8d46c27850..8498c2c1361aaa0352649b9d3fbe1d559194ea93 100644 --- a/MeshLib/Vtk/VtkMappedMeshSource.h +++ b/MeshLib/Vtk/VtkMappedMeshSource.h @@ -55,7 +55,7 @@ class VtkMappedMeshSource final : public vtkUnstructuredGridAlgorithm public: static VtkMappedMeshSource *New(); vtkTypeMacro(VtkMappedMeshSource, vtkUnstructuredGridAlgorithm); - void PrintSelf(std::ostream &os, vtkIndent indent); + void PrintSelf(std::ostream &os, vtkIndent indent) override; /// Sets the mesh. Calling is mandatory void SetMesh(const MeshLib::Mesh* mesh) { this->_mesh = mesh; this->Modified(); } @@ -67,11 +67,11 @@ protected: VtkMappedMeshSource(); int ProcessRequest(vtkInformation *request, vtkInformationVector **inputVector, - vtkInformationVector *outputVector); + vtkInformationVector *outputVector) override; int RequestData(vtkInformation *, vtkInformationVector **, - vtkInformationVector *); + vtkInformationVector *) override; int RequestInformation(vtkInformation *, vtkInformationVector **, - vtkInformationVector *); + vtkInformationVector *) override; private: VtkMappedMeshSource(const VtkMappedMeshSource &); // Not implemented. diff --git a/MeshLib/Vtk/VtkMappedPropertyVectorTemplate.h b/MeshLib/Vtk/VtkMappedPropertyVectorTemplate.h index 8db9c2f5b2985a8a09f233a300f03731b00bf1dc..f557a1d5e5db342e07a410cfdc5a23fa46c7576f 100644 --- a/MeshLib/Vtk/VtkMappedPropertyVectorTemplate.h +++ b/MeshLib/Vtk/VtkMappedPropertyVectorTemplate.h @@ -32,7 +32,7 @@ class VtkMappedPropertyVectorTemplate : public: vtkMappedDataArrayNewInstanceMacro(VtkMappedPropertyVectorTemplate<Scalar>); static VtkMappedPropertyVectorTemplate* New(); - virtual void PrintSelf(std::ostream &os, vtkIndent indent); + virtual void PrintSelf(std::ostream &os, vtkIndent indent) override; // Description: // Set the raw scalar arrays for the coordinate set. diff --git a/MeshLib/Vtk/VtkMeshNodalCoordinatesTemplate.h b/MeshLib/Vtk/VtkMeshNodalCoordinatesTemplate.h index 7186a3bd81c86c952bd52a3fe7f2de80b23681a5..d10b377210129710a6ac037da95ce3202fdb8add 100644 --- a/MeshLib/Vtk/VtkMeshNodalCoordinatesTemplate.h +++ b/MeshLib/Vtk/VtkMeshNodalCoordinatesTemplate.h @@ -36,7 +36,7 @@ class VtkMeshNodalCoordinatesTemplate: public: vtkMappedDataArrayNewInstanceMacro(VtkMeshNodalCoordinatesTemplate<Scalar>); static VtkMeshNodalCoordinatesTemplate *New(); - virtual void PrintSelf(std::ostream &os, vtkIndent indent); + virtual void PrintSelf(std::ostream &os, vtkIndent indent) override; /// Pass the nodes from OGS mesh void SetNodes(std::vector<MeshLib::Node*> const & nodes);