From 5d944663f52a65ab8b742c02dade09f67c334030 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Mon, 12 Dec 2016 15:33:03 +0100
Subject: [PATCH] Add override specifier for vtk methods.
Required since vtk-7.1 transition to c++11.
---
Applications/DataExplorer/VtkVis/QVtkDataSetMapper.h | 2 +-
Applications/DataExplorer/VtkVis/VtkAppendArrayFilter.h | 4 ++--
Applications/DataExplorer/VtkVis/VtkColorByHeightFilter.h | 4 ++--
Applications/DataExplorer/VtkVis/VtkConsoleOutputWindow.h | 2 +-
Applications/DataExplorer/VtkVis/VtkGeoImageSource.h | 2 +-
.../VtkVis/VtkImageDataToLinePolyDataFilter.h | 4 ++--
Applications/DataExplorer/VtkVis/VtkPointsSource.h | 6 +++---
Applications/DataExplorer/VtkVis/VtkPolylinesSource.h | 6 +++---
Applications/DataExplorer/VtkVis/VtkStationSource.h | 6 +++---
Applications/DataExplorer/VtkVis/VtkSurfacesSource.h | 6 +++---
.../DataExplorer/VtkVis/VtkTextureOnSurfaceFilter.h | 4 ++--
MeshLib/Vtk/VtkMappedMesh.h | 2 +-
MeshLib/Vtk/VtkMappedMeshSource.h | 8 ++++----
MeshLib/Vtk/VtkMappedPropertyVectorTemplate.h | 2 +-
MeshLib/Vtk/VtkMeshNodalCoordinatesTemplate.h | 2 +-
15 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/Applications/DataExplorer/VtkVis/QVtkDataSetMapper.h b/Applications/DataExplorer/VtkVis/QVtkDataSetMapper.h
index 4351aadf7b7..38d2115bd48 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 250b5ddf443..b4a674e0508 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 cd5f50d5f06..b25983a86eb 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 775febff1a1..c240b18f53c 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 02f0760e187..cab9b5b52c6 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 f4963d49f2f..f3bb6c961ad 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 651c206c0a3..a061ab30cf1 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 cc831ccf70c..6245a2c0ac2 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 3bb149304e9..6c02606fe48 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 42c4c353f1b..ca02a3bccca 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 9b8ba8c7abc..473f8190350 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 36720fd95d5..9b6546c2354 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 9ca4ed67e7a..8498c2c1361 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 8db9c2f5b29..f557a1d5e5d 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 7186a3bd81c..d10b3772101 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);
--
GitLab