diff --git a/Applications/DataExplorer/Base/CheckboxDelegate.h b/Applications/DataExplorer/Base/CheckboxDelegate.h
index 2e4d8cd4be7ad9d8dfa9f184d7c1db4024e6f93b..89aedb2ec5756ac179c29f90d77a04edaae87163 100644
--- a/Applications/DataExplorer/Base/CheckboxDelegate.h
+++ b/Applications/DataExplorer/Base/CheckboxDelegate.h
@@ -35,13 +35,15 @@ public:
/// \brief Paints a checkbox. This overrides the default painting of a combo box.
void paint(QPainter* painter, const QStyleOptionViewItem& option,
- const QModelIndex& index) const;
+ const QModelIndex& index) const override;
/// \brief Handles the click events and sets the model data.
bool editorEvent(QEvent* event, QAbstractItemModel* model,
- const QStyleOptionViewItem &option, const QModelIndex &index);
+ const QStyleOptionViewItem& option,
+ const QModelIndex& index) override;
- QSize sizeHint (const QStyleOptionViewItem & option, const QModelIndex & index) const;
+ QSize sizeHint(const QStyleOptionViewItem& option,
+ const QModelIndex& index) const override;
private:
QRect checkboxRect(const QStyleOptionViewItem& viewItemStyleOptions) const;
diff --git a/Applications/DataExplorer/Base/ColorPickerPushButton.h b/Applications/DataExplorer/Base/ColorPickerPushButton.h
index 3cb466406e76b6c1b9f2538844329f7433b7ccf5..1f298bba4d0ce35b503458db8a08f9e09770d144 100644
--- a/Applications/DataExplorer/Base/ColorPickerPushButton.h
+++ b/Applications/DataExplorer/Base/ColorPickerPushButton.h
@@ -34,7 +34,7 @@ public:
public slots:
/// Calls the QColorDialog
- void mouseReleaseEvent(QMouseEvent* e);
+ void mouseReleaseEvent(QMouseEvent* e) override;
/// Sets the color.
void setColor(QColor color);
diff --git a/Applications/DataExplorer/Base/QNonScalableGraphicsTextItem.h b/Applications/DataExplorer/Base/QNonScalableGraphicsTextItem.h
index 2db5bdb0fbd3511d30fa28357f1e1cfd3371f6b4..f8014011968874cd43255e372c38b2b66004be02 100644
--- a/Applications/DataExplorer/Base/QNonScalableGraphicsTextItem.h
+++ b/Applications/DataExplorer/Base/QNonScalableGraphicsTextItem.h
@@ -27,8 +27,10 @@ public:
QNonScalableGraphicsTextItem(QGraphicsItem* parent = nullptr);
QNonScalableGraphicsTextItem(const QString& text,
QGraphicsItem* parent = nullptr);
- ~QNonScalableGraphicsTextItem();
+ ~QNonScalableGraphicsTextItem() override;
- void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget);
- virtual QRectF boundingRect() const;
+ void paint(QPainter* painter,
+ const QStyleOptionGraphicsItem* option,
+ QWidget* widget) override;
+ QRectF boundingRect() const override;
};
diff --git a/Applications/DataExplorer/Base/RecentFiles.h b/Applications/DataExplorer/Base/RecentFiles.h
index ec8d6b5456f490455e9fbfecfcc9cc54b816ac2e..06aeeb2dd0a50f42446135fff96f03ef15b79458 100644
--- a/Applications/DataExplorer/Base/RecentFiles.h
+++ b/Applications/DataExplorer/Base/RecentFiles.h
@@ -49,7 +49,7 @@ public:
* \param settingsName The setting key
*/
RecentFiles(QObject* parent, const char* slot, QString settingsName);
- ~RecentFiles();
+ ~RecentFiles() override;
/// Returns the created menu. Add this menu to your QMainWindow menu.
QMenu* menu();
diff --git a/Applications/DataExplorer/Base/StrictDoubleValidator.h b/Applications/DataExplorer/Base/StrictDoubleValidator.h
index bb3cd3b105052b0db7df80ef0d3c97db3edf6365..19273c5948a2494b03ac2ff294c261e7208a5661 100644
--- a/Applications/DataExplorer/Base/StrictDoubleValidator.h
+++ b/Applications/DataExplorer/Base/StrictDoubleValidator.h
@@ -30,7 +30,7 @@ public:
QDoubleValidator( parent)
{}
- QValidator::State validate(QString & input, int &pos) const
+ QValidator::State validate(QString& input, int& pos) const override
{
if (input.isEmpty() || input == "." || input == "-") return Intermediate;
diff --git a/Applications/DataExplorer/Base/StrictIntValidator.h b/Applications/DataExplorer/Base/StrictIntValidator.h
index 677fea754fafb025ed1b8ed7733236318574226a..a4ee5f54e50f46a4e915f3f0b98839b830ac6cde 100644
--- a/Applications/DataExplorer/Base/StrictIntValidator.h
+++ b/Applications/DataExplorer/Base/StrictIntValidator.h
@@ -27,7 +27,7 @@ public:
: QIntValidator(min, max, parent)
{}
- QValidator::State validate(QString & input, int &pos) const
+ QValidator::State validate(QString& input, int& pos) const override
{
if (input.isEmpty()) return Intermediate;
diff --git a/Applications/DataExplorer/Base/TreeModel.h b/Applications/DataExplorer/Base/TreeModel.h
index 94ce021823433d37817ae7a98b74e0f89ab142bd..b0bc52b9fdb1f6c55940f9b093c5d4a4d17620de 100644
--- a/Applications/DataExplorer/Base/TreeModel.h
+++ b/Applications/DataExplorer/Base/TreeModel.h
@@ -32,19 +32,21 @@ class TreeModel : public QAbstractItemModel
public:
TreeModel(QObject* parent = nullptr);
- virtual ~TreeModel();
+ ~TreeModel() override;
- QVariant data(const QModelIndex &index, int role) const;
- bool setData(const QModelIndex &index, const QVariant &value, int role /* = Qt::EditRole */);
- Qt::ItemFlags flags(const QModelIndex &index) const;
+ QVariant data(const QModelIndex& index, int role) const override;
+ bool setData(const QModelIndex& index, const QVariant& value,
+ int role /* = Qt::EditRole */) override;
+ Qt::ItemFlags flags(const QModelIndex& index) const override;
TreeItem* getItem(const QModelIndex &index) const;
- QVariant headerData(int section, Qt::Orientation orientation, int role =
- Qt::DisplayRole) const;
- QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
- QModelIndex parent(const QModelIndex &index) const;
- bool removeRows(int row, int count, const QModelIndex & parent);
- int rowCount(const QModelIndex &parent = QModelIndex()) const;
- int columnCount(const QModelIndex &parent = QModelIndex()) const;
+ QVariant headerData(int section, Qt::Orientation orientation,
+ int role = Qt::DisplayRole) const override;
+ QModelIndex index(int row, int column,
+ const QModelIndex& parent = QModelIndex()) const override;
+ QModelIndex parent(const QModelIndex& index) const override;
+ bool removeRows(int row, int count, const QModelIndex& parent) override;
+ int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+ int columnCount(const QModelIndex& parent = QModelIndex()) const override;
TreeItem* rootItem() const;
diff --git a/Applications/DataExplorer/DataView/AddLayerToMeshDialog.h b/Applications/DataExplorer/DataView/AddLayerToMeshDialog.h
index 1563895a2112e24dfd816c3789bae705b0dc9b28..08a3c6504dc77dcc7980f83bf47ab5cd72d1fcd8 100644
--- a/Applications/DataExplorer/DataView/AddLayerToMeshDialog.h
+++ b/Applications/DataExplorer/DataView/AddLayerToMeshDialog.h
@@ -40,8 +40,8 @@ public:
private slots:
/// Instructions if the OK-Button has been pressed.
- void accept();
+ void accept() override;
/// Instructions if the Cancel-Button has been pressed.
- void reject();
+ void reject() override;
};
diff --git a/Applications/DataExplorer/DataView/ColorTableModel.h b/Applications/DataExplorer/DataView/ColorTableModel.h
index d8e69a8e097c9d04defff11ba832a74ac08d8a89..cb44582e7e95dba4a8b7267c1979da7906744b6a 100644
--- a/Applications/DataExplorer/DataView/ColorTableModel.h
+++ b/Applications/DataExplorer/DataView/ColorTableModel.h
@@ -30,20 +30,20 @@ public:
ColorTableModel(
const std::map<std::string, DataHolderLib::Color*>& colorLookupTable,
QObject* parent = nullptr);
- ~ColorTableModel();
+ ~ColorTableModel() override;
- int columnCount(const QModelIndex& parent = QModelIndex()) const;
+ int columnCount(const QModelIndex& parent = QModelIndex()) const override;
- QVariant data( const QModelIndex& index, int role ) const;
+ QVariant data(const QModelIndex& index, int role) const override;
- int rowCount(const QModelIndex& parent = QModelIndex()) const
+ int rowCount(const QModelIndex& parent = QModelIndex()) const override
{
Q_UNUSED (parent);
return _listOfPairs.size();
}
- 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;
private:
bool buildTable( const std::map<std::string, DataHolderLib::Color*> &colorLookupTable );
diff --git a/Applications/DataExplorer/DataView/ColorTableView.h b/Applications/DataExplorer/DataView/ColorTableView.h
index 47ae8b2b7dc3a2c51c2d2ba1a20ab34a837291d9..0d51773824d5dbe598d53c4d9a5ec3f45a78fd0b 100644
--- a/Applications/DataExplorer/DataView/ColorTableView.h
+++ b/Applications/DataExplorer/DataView/ColorTableView.h
@@ -39,8 +39,9 @@ public:
/// Constructor
ColorTableViewDelegate(QWidget* parent = nullptr) : QItemDelegate(parent) {}
/// Overwrites the paint-method to set user-defined properties instead of the default properties.
- void paint(QPainter* painter, const QStyleOptionViewItem &option,
- const QModelIndex &index) const;
+ void paint(QPainter* painter, const QStyleOptionViewItem& option,
+ const QModelIndex& index) const override;
- QSize sizeHint( const QStyleOptionViewItem &option, const QModelIndex &index ) const;
+ QSize sizeHint(const QStyleOptionViewItem& option,
+ const QModelIndex& index) const override;
};
diff --git a/Applications/DataExplorer/DataView/CondFromRasterDialog.h b/Applications/DataExplorer/DataView/CondFromRasterDialog.h
index 9de5003574a6c5e2e82e18ce9f6f531d6ba6b0cf..d3a291ff4d61ba94857f749717a22a82615b4ce0 100644
--- a/Applications/DataExplorer/DataView/CondFromRasterDialog.h
+++ b/Applications/DataExplorer/DataView/CondFromRasterDialog.h
@@ -33,7 +33,7 @@ class CondFromRasterDialog : public QDialog, private Ui_CondFromRaster
public:
CondFromRasterDialog(std::vector<MeshLib::Mesh*> msh_vec,
QDialog* parent = nullptr);
- ~CondFromRasterDialog(void);
+ ~CondFromRasterDialog(void) override;
private:
const std::vector<MeshLib::Mesh*> _msh_vec;
@@ -44,10 +44,10 @@ private slots:
void on_selectButton_pressed();
/// Instructions if the OK-Button has been pressed.
- void accept();
+ void accept() override;
/// Instructions if the Cancel-Button has been pressed.
- void reject();
+ void reject() override;
signals:
void directNodesWritten(std::string);
diff --git a/Applications/DataExplorer/DataView/CreateStructuredGridDialog.h b/Applications/DataExplorer/DataView/CreateStructuredGridDialog.h
index 89f061a014aa572ed1adba764ad6fb9a2ee9f7c1..e150c5590c1bea0f0afdecf52a2c8ea14e070cf7 100644
--- a/Applications/DataExplorer/DataView/CreateStructuredGridDialog.h
+++ b/Applications/DataExplorer/DataView/CreateStructuredGridDialog.h
@@ -39,10 +39,10 @@ private slots:
void on_elemExtentButton_toggled();
/// Instructions if the OK-Button has been pressed.
- void accept();
+ void accept() override;
/// Instructions if the Cancel-Button has been pressed.
- void reject() { this->done(QDialog::Rejected); };
+ void reject() override { this->done(QDialog::Rejected); };
private:
void enable2dWidgets() const;
diff --git a/Applications/DataExplorer/DataView/DataExplorerSettingsDialog.h b/Applications/DataExplorer/DataView/DataExplorerSettingsDialog.h
index 7fcc38b4e1dc4c77c76255ce364c6bc959b17f06..3259d38b4ddb994494e8c13d24588d1e8ef26f2f 100644
--- a/Applications/DataExplorer/DataView/DataExplorerSettingsDialog.h
+++ b/Applications/DataExplorer/DataView/DataExplorerSettingsDialog.h
@@ -26,16 +26,14 @@ class DataExplorerSettingsDialog : public QDialog, private Ui_DataExplorerSettin
public:
DataExplorerSettingsDialog(QDialog* parent = nullptr);
- ~DataExplorerSettingsDialog(void);
-
+ ~DataExplorerSettingsDialog(void) override;
private slots:
void on_gmshPathButton_clicked();
/// Instructions if the OK-Button has been pressed.
- void accept();
+ void accept() override;
/// Instructions if the Cancel-Button has been pressed.
- void reject() { this->done(QDialog::Rejected); };
-
+ void reject() override { this->done(QDialog::Rejected); };
};
diff --git a/Applications/DataExplorer/DataView/DiagramView/DetailWindow.h b/Applications/DataExplorer/DataView/DiagramView/DetailWindow.h
index c5dcb6ac8c7a15e7ad9ad32cb4def5a221e04600..230c6370d02751b9f7dd300328fccfbfa66a65c3 100644
--- a/Applications/DataExplorer/DataView/DiagramView/DetailWindow.h
+++ b/Applications/DataExplorer/DataView/DiagramView/DetailWindow.h
@@ -44,7 +44,7 @@ public:
DetailWindow(std::vector<std::size_t> data, QWidget* parent = nullptr);
- ~DetailWindow(void);
+ ~DetailWindow(void) override;
/**
* Adds another plot to window. Axes are automatically resized, a random color is used.
diff --git a/Applications/DataExplorer/DataView/DiagramView/DiagramPrefsDialog.h b/Applications/DataExplorer/DataView/DiagramView/DiagramPrefsDialog.h
index d14723ef7ccae101fd3b65436ab3526ec0f3561a..b2570c79e1370dee40143ec0fb99f2b1adb67508 100644
--- a/Applications/DataExplorer/DataView/DiagramView/DiagramPrefsDialog.h
+++ b/Applications/DataExplorer/DataView/DiagramView/DiagramPrefsDialog.h
@@ -71,7 +71,7 @@ public:
DetailWindow* window = nullptr,
QDialog* parent = nullptr);
- ~DiagramPrefsDialog(void);
+ ~DiagramPrefsDialog(void) override;
private:
/**
@@ -104,10 +104,10 @@ private:
private slots:
/// Instructions if the OK-Button has been pressed.
/// Note: Clicking the "Load from file"-button overrides the database input!
- void accept();
+ void accept() override;
/// Instructions if the Cancel-Button has been pressed.
- void reject();
+ void reject() override;
/// Instructions if the "Load File"-Button has been pressed.
void on_loadFileButton_clicked();
diff --git a/Applications/DataExplorer/DataView/DiagramView/DiagramScene.h b/Applications/DataExplorer/DataView/DiagramView/DiagramScene.h
index 1453dadc5bac47b784babb4c11b11244f555dc69..ef7f40cc4314d85462f96261528a2f3c30755a25 100644
--- a/Applications/DataExplorer/DataView/DiagramView/DiagramScene.h
+++ b/Applications/DataExplorer/DataView/DiagramView/DiagramScene.h
@@ -30,7 +30,7 @@ class DiagramScene : public QGraphicsScene
public:
DiagramScene(QObject* parent = nullptr);
DiagramScene(DiagramList* list, QObject* parent = nullptr);
- ~DiagramScene();
+ ~DiagramScene() override;
QArrow* addArrow(float length, float angle, QPen &pen);
void addGraph(DiagramList* list);
diff --git a/Applications/DataExplorer/DataView/DiagramView/DiagramView.h b/Applications/DataExplorer/DataView/DiagramView/DiagramView.h
index 968bf3cdaf711105da4da77b512efe847afc5e7e..d43065b4122dad35a9359d74eba7571dee34b206 100644
--- a/Applications/DataExplorer/DataView/DiagramView/DiagramView.h
+++ b/Applications/DataExplorer/DataView/DiagramView/DiagramView.h
@@ -38,7 +38,7 @@ public:
* \param parent The parent QWidget.
*/
DiagramView(DiagramList* list, QWidget* parent = nullptr);
- ~DiagramView();
+ ~DiagramView() override;
/// Adds a new graph to the scene.
void addGraph(DiagramList* list);
@@ -49,13 +49,13 @@ public:
protected:
/// Resizes the scene.
- void resizeEvent(QResizeEvent* event);
+ void resizeEvent(QResizeEvent* event) override;
private:
void initialize();
void keepItemAspectRatio();
- QSize minimumSizeHint() const;
- QSize sizeHint() const;
+ QSize minimumSizeHint() const override;
+ QSize sizeHint() const override;
void update();
DiagramScene* _scene;
diff --git a/Applications/DataExplorer/DataView/DiagramView/QArrow.h b/Applications/DataExplorer/DataView/DiagramView/QArrow.h
index 4731222866cbd2213922eb60ed0691b91e480000..1db5b959a5cce42b3200294e401309961290d206 100644
--- a/Applications/DataExplorer/DataView/DiagramView/QArrow.h
+++ b/Applications/DataExplorer/DataView/DiagramView/QArrow.h
@@ -28,12 +28,13 @@ public:
QArrow(float l, float a, float hl, float hw, QPen& pen,
QGraphicsItem* parent = nullptr);
QArrow(float l, float a, QPen& pen, QGraphicsItem* parent = nullptr);
- ~QArrow();
+ ~QArrow() override;
double getLength();
double getAngle();
- void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget);
- QRectF boundingRect() const;
+ void paint(QPainter* painter, const QStyleOptionGraphicsItem* option,
+ QWidget* widget) override;
+ QRectF boundingRect() const override;
void setAngle(double a);
void setLength(double l);
diff --git a/Applications/DataExplorer/DataView/DiagramView/QGraphicsGrid.h b/Applications/DataExplorer/DataView/DiagramView/QGraphicsGrid.h
index 3518d07edda5cdcc77de38a069e9d854d5d2572b..df90d639ee7044dc5d12127c5dee7d1f2b8c4746 100644
--- a/Applications/DataExplorer/DataView/DiagramView/QGraphicsGrid.h
+++ b/Applications/DataExplorer/DataView/DiagramView/QGraphicsGrid.h
@@ -51,10 +51,12 @@ public:
bool ticks,
QPen pen,
QGraphicsItem* parent = nullptr);
- ~QGraphicsGrid();
+ ~QGraphicsGrid() override;
- QRectF boundingRect() const;
- void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget);
+ QRectF boundingRect() const override;
+ void paint(QPainter* painter,
+ const QStyleOptionGraphicsItem* option,
+ QWidget* widget) override;
void setNumberOfXCells(int xCells);
void setNumberOfYCells(int yCells);
void setRect(QRectF rect);
diff --git a/Applications/DataExplorer/DataView/ElementTreeModel.h b/Applications/DataExplorer/DataView/ElementTreeModel.h
index dfac4a60e2fb2971a449eaa2325edc9a408d974d..3ce6059b58dd4ed8dee884fe3f9c36f93ee6dbaa 100644
--- a/Applications/DataExplorer/DataView/ElementTreeModel.h
+++ b/Applications/DataExplorer/DataView/ElementTreeModel.h
@@ -33,7 +33,7 @@ class ElementTreeModel : public TreeModel
public:
ElementTreeModel(QObject* parent = nullptr);
- ~ElementTreeModel();
+ ~ElementTreeModel() override;
vtkUnstructuredGridAlgorithm const* getSource() const { return _mesh_source; };
diff --git a/Applications/DataExplorer/DataView/ElementTreeView.h b/Applications/DataExplorer/DataView/ElementTreeView.h
index cdd048901f1b9f4c6111a8f0cf8567e7f4b93bef..af980f1c31ce8d8ee38949f34fffb179a9d46986 100644
--- a/Applications/DataExplorer/DataView/ElementTreeView.h
+++ b/Applications/DataExplorer/DataView/ElementTreeView.h
@@ -33,7 +33,8 @@ public slots:
protected slots:
/// Is called when the selection of this view changes.
- void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
+ void selectionChanged(const QItemSelection& selected,
+ const QItemSelection& deselected) override;
signals:
void nodeSelected(vtkUnstructuredGridAlgorithm const*const, unsigned, bool);
diff --git a/Applications/DataExplorer/DataView/GEOModels.h b/Applications/DataExplorer/DataView/GEOModels.h
index eebcf35cba6ca8419c6c7365cd3fdc74ef59032c..54981a89ab2fb13a42cdb65e806d3dfffce13b55 100644
--- a/Applications/DataExplorer/DataView/GEOModels.h
+++ b/Applications/DataExplorer/DataView/GEOModels.h
@@ -39,7 +39,7 @@ class GEOModels : public QObject
public:
GEOModels(GeoLib::GEOObjects& geo_objects, QObject* parent = nullptr);
- ~GEOModels();
+ ~GEOModels() override;
GeoTreeModel* getGeoModel() { return _geoModel; }
StationTreeModel* getStationModel() { return _stationModel; }
diff --git a/Applications/DataExplorer/DataView/GMSHPrefsDialog.h b/Applications/DataExplorer/DataView/GMSHPrefsDialog.h
index 768b7d688624a01384189dd14da33d5e85d483de..80ba02e8afce059a736f69dcc3232098b2fdd5c7 100644
--- a/Applications/DataExplorer/DataView/GMSHPrefsDialog.h
+++ b/Applications/DataExplorer/DataView/GMSHPrefsDialog.h
@@ -33,7 +33,7 @@ class GMSHPrefsDialog : public QDialog, private Ui_GMSHPrefs
public:
GMSHPrefsDialog(GeoLib::GEOObjects const& geoObjects, QDialog* parent = nullptr);
- ~GMSHPrefsDialog(void);
+ ~GMSHPrefsDialog(void) override;
private:
std::vector<std::string> getSelectedObjects(QStringList list);
@@ -47,10 +47,10 @@ private slots:
void on_radioAdaptive_toggled(bool isTrue);
/// Instructions if the OK-Button has been pressed.
- void accept();
+ void accept() override;
/// Instructions if the Cancel-Button has been pressed.
- void reject();
+ void reject() override;
signals:
void requestMeshing(std::vector<std::string> &, unsigned, double, double, double, bool);
diff --git a/Applications/DataExplorer/DataView/GeoObjectListItem.h b/Applications/DataExplorer/DataView/GeoObjectListItem.h
index 99c5e66789415ebbb801eea93e94ccb0a5b2efac..9f5655e21a4e9f4d1ac7f1ef6a6a5f485e8ce67d 100644
--- a/Applications/DataExplorer/DataView/GeoObjectListItem.h
+++ b/Applications/DataExplorer/DataView/GeoObjectListItem.h
@@ -75,11 +75,7 @@ public:
static_cast<VtkSurfacesSource*>(_vtkSource)->SetName(geo_name + " - Surfaces");
}
- ~GeoObjectListItem()
- {
- _vtkSource->Delete();
- }
-
+ ~GeoObjectListItem() override { _vtkSource->Delete(); }
/// Returns the type of geo-objects contained in the subtree of this item.
GeoLib::GEOTYPE getType() { return _type; }
diff --git a/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.h b/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.h
index 5977fb0603172b9045b97058e734f8ffb7a3aed5..40c0efa147733aa0b1f7cbd53e15bba96a408b05 100644
--- a/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.h
+++ b/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.h
@@ -34,7 +34,7 @@ public:
GeoOnMeshMappingDialog(
std::vector<std::unique_ptr<MeshLib::Mesh>> const& mesh_vec,
QDialog* parent = nullptr);
- ~GeoOnMeshMappingDialog(void);
+ ~GeoOnMeshMappingDialog(void) override;
std::string const& getNewGeoName() const { return _new_geo_name; };
int getDataSetChoice() const;
@@ -48,9 +48,8 @@ private slots:
void on_meshNameComboBox_currentIndexChanged(int idx);
/// Instructions if the OK-Button has been pressed.
- void accept();
+ void accept() override;
/// Instructions if the Cancel-Button has been pressed.
- void reject() { this->done(QDialog::Rejected); };
-
+ void reject() override { this->done(QDialog::Rejected); };
};
diff --git a/Applications/DataExplorer/DataView/GeoTreeItem.h b/Applications/DataExplorer/DataView/GeoTreeItem.h
index 2b18702bc4700ab05508dd8c5a51b5fbbcf278a1..52011079b1c956317de1039d4891dfd514161159 100644
--- a/Applications/DataExplorer/DataView/GeoTreeItem.h
+++ b/Applications/DataExplorer/DataView/GeoTreeItem.h
@@ -38,7 +38,7 @@ public:
: TreeItem(data, parent), _item(item)
{
}
- ~GeoTreeItem() = default;
+ ~GeoTreeItem() override = default;
/// Returns the geo-object associated with this item (i.e. a point, polyline or surface).
const GeoLib::GeoObject* getGeoObject() const { return _item; }
diff --git a/Applications/DataExplorer/DataView/GeoTreeModel.h b/Applications/DataExplorer/DataView/GeoTreeModel.h
index 253090f33c4c28824d8e5e3cd097262e7f149277..8135af2dc1c901cb002e5d9c77028517ed9ccbb3 100644
--- a/Applications/DataExplorer/DataView/GeoTreeModel.h
+++ b/Applications/DataExplorer/DataView/GeoTreeModel.h
@@ -43,7 +43,7 @@ class GeoTreeModel : public TreeModel
public:
GeoTreeModel(QObject* parent = nullptr);
- ~GeoTreeModel();
+ ~GeoTreeModel() override;
/**
* Inserts a new subtree under _rootItem for a geometry with the given name along with a subtree named "Points" for that new geometry.
diff --git a/Applications/DataExplorer/DataView/GeoTreeView.h b/Applications/DataExplorer/DataView/GeoTreeView.h
index 98a94e3964228629c22c22e0a34a74dfc82a59f7..ed096bf84afd00ffcd2fcbc2fc0229649e947212 100644
--- a/Applications/DataExplorer/DataView/GeoTreeView.h
+++ b/Applications/DataExplorer/DataView/GeoTreeView.h
@@ -38,7 +38,8 @@ public:
protected slots:
/// Instructions if the selection of items in the view has changed.
- void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
+ void selectionChanged(const QItemSelection& selected,
+ const QItemSelection& deselected) override;
/// Instructions if the selection of items in the view has changed by events outside the view (i.e. by actions made in the visualisation).
void selectionChangedFromOutside(const QItemSelection &selected,
@@ -46,7 +47,7 @@ protected slots:
private:
/// Actions to be taken after a right mouse click is performed in the station view.
- void contextMenuEvent( QContextMenuEvent* e );
+ void contextMenuEvent(QContextMenuEvent* e) override;
/// Calls a FEMConditionSetupDialog.
void setElementAsCondition(bool set_on_points = false);
diff --git a/Applications/DataExplorer/DataView/LicenseDialog.h b/Applications/DataExplorer/DataView/LicenseDialog.h
index 582af9f6c0220c8ccb0a5dfce10b7a6a50b55a19..08f88f5e1780522698c1f94dbbd7b80702c8039d 100644
--- a/Applications/DataExplorer/DataView/LicenseDialog.h
+++ b/Applications/DataExplorer/DataView/LicenseDialog.h
@@ -26,7 +26,7 @@ class LicenseDialog : public QDialog, private Ui_License
public:
LicenseDialog(QDialog* parent = nullptr);
- ~LicenseDialog() = default;
+ ~LicenseDialog() override = default;
;
private:
diff --git a/Applications/DataExplorer/DataView/LineEditDialog.h b/Applications/DataExplorer/DataView/LineEditDialog.h
index f2a444e12bc235f6172ffdf02c4085f4948c7eeb..ff0da51b8c808ca0774ab86d1d558105896a71a3 100644
--- a/Applications/DataExplorer/DataView/LineEditDialog.h
+++ b/Applications/DataExplorer/DataView/LineEditDialog.h
@@ -33,7 +33,7 @@ class LineEditDialog : public QDialog, private Ui_LineEdit
public:
LineEditDialog(const GeoLib::PolylineVec& ply_vec,
QDialog* parent = nullptr);
- ~LineEditDialog(void);
+ ~LineEditDialog(void) override;
private:
std::vector<std::size_t> getSelectedIndeces(QStringList list);
@@ -50,10 +50,10 @@ private slots:
void on_deselectPlyButton_pressed();
/// Instructions if the OK-Button has been pressed.
- void accept();
+ void accept() override;
/// Instructions if the Cancel-Button has been pressed.
- void reject();
+ void reject() override;
signals:
void connectPolylines(const std::string&,
diff --git a/Applications/DataExplorer/DataView/LinearEditDialog.h b/Applications/DataExplorer/DataView/LinearEditDialog.h
index a94039ec128e918c715a2e62263fd9bcb9a1ef50..8c35c7d5c9ac4c56b19ffba064350e8c9e7b207a 100644
--- a/Applications/DataExplorer/DataView/LinearEditDialog.h
+++ b/Applications/DataExplorer/DataView/LinearEditDialog.h
@@ -31,7 +31,7 @@ public:
const std::vector<std::size_t>& dis_nodes,
const std::vector<double>& dis_values,
QDialog* parent = nullptr);
- ~LinearEditDialog(void);
+ ~LinearEditDialog(void) override;
private:
void setupDialog(const std::vector<std::size_t> &dis_nodes, const std::vector<double> &dis_values);
@@ -42,10 +42,10 @@ private slots:
void on_comboBox_currentIndexChanged(int index);
/// Instructions if the OK-Button has been pressed.
- void accept();
+ void accept() override;
/// Instructions if the Cancel-Button has been pressed.
- void reject();
+ void reject() override;
signals:
void transmitDisValues(std::vector< std::pair<std::size_t,double> >);
diff --git a/Applications/DataExplorer/DataView/MergeGeometriesDialog.h b/Applications/DataExplorer/DataView/MergeGeometriesDialog.h
index c8dcc161a2594563fbde985ffddfb4b0422d37a3..5c1462e4b9c59a2a999d2adb507753befd69e071 100644
--- a/Applications/DataExplorer/DataView/MergeGeometriesDialog.h
+++ b/Applications/DataExplorer/DataView/MergeGeometriesDialog.h
@@ -34,7 +34,7 @@ class MergeGeometriesDialog : public QDialog, private Ui_MergeGeometries
public:
MergeGeometriesDialog(GeoLib::GEOObjects& geoObjects,
QDialog* parent = nullptr);
- ~MergeGeometriesDialog(void);
+ ~MergeGeometriesDialog(void) override;
/// Returns a vector of selected geometries
std::vector<std::string> const getSelectedGeometries() const;
@@ -52,8 +52,8 @@ private slots:
void on_deselectGeoButton_pressed();
/// Instructions if the OK-Button has been pressed.
- void accept();
+ void accept() override;
/// Instructions if the Cancel-Button has been pressed.
- void reject();
+ void reject() override;
};
diff --git a/Applications/DataExplorer/DataView/MeshAnalysisDialog.h b/Applications/DataExplorer/DataView/MeshAnalysisDialog.h
index 7fde240dc4323065714905fb20c670dd0b49fff3..d6c0180eebf2668b3db035002c090293198c226c 100644
--- a/Applications/DataExplorer/DataView/MeshAnalysisDialog.h
+++ b/Applications/DataExplorer/DataView/MeshAnalysisDialog.h
@@ -36,7 +36,7 @@ public:
MeshAnalysisDialog(
std::vector<std::unique_ptr<MeshLib::Mesh>> const& mesh_vec,
QDialog* parent = nullptr);
- ~MeshAnalysisDialog(void);
+ ~MeshAnalysisDialog(void) override;
private:
/// Prepares the output for the node message window
diff --git a/Applications/DataExplorer/DataView/MeshElementRemovalDialog.h b/Applications/DataExplorer/DataView/MeshElementRemovalDialog.h
index edd0cf89fab9e3fb2a852e5bde752302352774a3..2a4b5fb8380e33c89379eb3c95664084f7305441 100644
--- a/Applications/DataExplorer/DataView/MeshElementRemovalDialog.h
+++ b/Applications/DataExplorer/DataView/MeshElementRemovalDialog.h
@@ -38,7 +38,7 @@ class MeshElementRemovalDialog : public QDialog, private Ui_MeshElementRemoval
public:
MeshElementRemovalDialog(DataHolderLib::Project const& project,
QDialog* parent = nullptr);
- ~MeshElementRemovalDialog(void);
+ ~MeshElementRemovalDialog(void) override;
private slots:
void on_boundingBoxCheckBox_toggled(bool is_checked);
@@ -51,8 +51,8 @@ private slots:
void on_yMaxEdit_textChanged() { aabb_edits[3] = true; }
void on_zMinEdit_textChanged() { aabb_edits[4] = true; }
void on_zMaxEdit_textChanged() { aabb_edits[5] = true; }
- void accept();
- void reject();
+ void accept() override;
+ void reject() override;
private:
DataHolderLib::Project const& _project;
diff --git a/Applications/DataExplorer/DataView/MeshLayerEditDialog.h b/Applications/DataExplorer/DataView/MeshLayerEditDialog.h
index 83f443134d757a52403066665b2790e14197a88e..32d8850dbdffc84f3cb8fe1efd7888371366f7ef 100644
--- a/Applications/DataExplorer/DataView/MeshLayerEditDialog.h
+++ b/Applications/DataExplorer/DataView/MeshLayerEditDialog.h
@@ -40,7 +40,7 @@ class MeshLayerEditDialog : public QDialog, private Ui_MeshLayerEdit
public:
MeshLayerEditDialog(const MeshLib::Mesh* mesh, QDialog* parent = nullptr);
- ~MeshLayerEditDialog(void);
+ ~MeshLayerEditDialog(void) override;
private:
void createMeshToolSelection();
@@ -72,10 +72,10 @@ private slots:
void createStatic();
/// Instructions if the OK-Button has been pressed.
- void accept();
+ void accept() override;
/// Instructions if the Cancel-Button has been pressed.
- void reject();
+ void reject() override;
signals:
void mshEditFinished(MeshLib::Mesh*);
diff --git a/Applications/DataExplorer/DataView/MeshMapping2DDialog.h b/Applications/DataExplorer/DataView/MeshMapping2DDialog.h
index 7702cd357b47c1eb4f72758c6d2180d65b19a79c..f113ec3bcc2dc7e0ef0c078a300f7e6277da3b3f 100644
--- a/Applications/DataExplorer/DataView/MeshMapping2DDialog.h
+++ b/Applications/DataExplorer/DataView/MeshMapping2DDialog.h
@@ -37,8 +37,8 @@ private slots:
void on_rasterSelectButton_pressed();
/// Instructions if the OK-Button has been pressed.
- void accept();
+ void accept() override;
/// Instructions if the Cancel-Button has been pressed.
- void reject() { this->done(QDialog::Rejected); }
+ void reject() override { this->done(QDialog::Rejected); }
};
diff --git a/Applications/DataExplorer/DataView/MeshQualitySelectionDialog.h b/Applications/DataExplorer/DataView/MeshQualitySelectionDialog.h
index 9160253fa49a44ed4e1d8bb820aa2c6895ebaa3f..32e907707dbff181666a6b06278aa323ee577166 100644
--- a/Applications/DataExplorer/DataView/MeshQualitySelectionDialog.h
+++ b/Applications/DataExplorer/DataView/MeshQualitySelectionDialog.h
@@ -29,7 +29,7 @@ class MeshQualitySelectionDialog : public QDialog, private Ui_MeshQualitySelecti
public:
MeshQualitySelectionDialog(QDialog* parent = nullptr);
- ~MeshQualitySelectionDialog(void);
+ ~MeshQualitySelectionDialog(void) override;
/// Returns selected metric
MeshLib::MeshQualityType getSelectedMetric() const { return _metric; }
@@ -48,6 +48,6 @@ private slots:
void on_histogramCheckBox_toggled(bool is_checked) const;
void on_histogramPathButton_pressed();
- void accept();
- void reject();
+ void accept() override;
+ void reject() override;
};
diff --git a/Applications/DataExplorer/DataView/MeshValueEditDialog.h b/Applications/DataExplorer/DataView/MeshValueEditDialog.h
index 518981d079ed4eabf57fd715235ffc61b32a1d0c..fbbf2d7bc4486d92f9180d9dedab380543e4e587 100644
--- a/Applications/DataExplorer/DataView/MeshValueEditDialog.h
+++ b/Applications/DataExplorer/DataView/MeshValueEditDialog.h
@@ -33,17 +33,17 @@ public:
/// Constructor for creating a new FEM condition.
MeshValueEditDialog(MeshLib::Mesh* mesh, QDialog* parent = nullptr);
- ~MeshValueEditDialog(void);
+ ~MeshValueEditDialog(void) override;
private:
MeshLib::Mesh* _mesh;
private slots:
/// Instructions if the OK-Button has been pressed.
- void accept();
+ void accept() override;
/// Instructions if the Cancel-Button has been pressed.
- void reject();
+ void reject() override;
void on_replaceButton_toggled(bool isSelected);
diff --git a/Applications/DataExplorer/DataView/ModelTreeItem.h b/Applications/DataExplorer/DataView/ModelTreeItem.h
index a2e664e9fb83e639e438be886f02c00bc5b864ba..c33f9b988a143703b0a7ae76a8b5c35e32ed2794 100644
--- a/Applications/DataExplorer/DataView/ModelTreeItem.h
+++ b/Applications/DataExplorer/DataView/ModelTreeItem.h
@@ -34,8 +34,7 @@ public:
*/
ModelTreeItem(const QList<QVariant>& data, TreeItem* parent,
BaseItem* item = nullptr);
- ~ModelTreeItem() { delete _item; }
-
+ ~ModelTreeItem() override { delete _item; }
/// Returns the station object from which this item has been constructed
GeoLib::Station* getStation() { return _stn; }
diff --git a/Applications/DataExplorer/DataView/MshItem.h b/Applications/DataExplorer/DataView/MshItem.h
index be5eb456ecad908074c7414634e0545c2e36589a..a88201ccc7af4c6438a45c92ab7a40eea7a5d458 100644
--- a/Applications/DataExplorer/DataView/MshItem.h
+++ b/Applications/DataExplorer/DataView/MshItem.h
@@ -36,7 +36,7 @@ public:
/// \param mesh The mesh associated with this item
MshItem(const QList<QVariant>& data, TreeItem* parent,
const MeshLib::Mesh* mesh);
- ~MshItem();
+ ~MshItem() override;
/// Returns the mesh.
MeshLib::Mesh const* getMesh() const { return _mesh_source->GetMesh(); }
diff --git a/Applications/DataExplorer/DataView/MshModel.h b/Applications/DataExplorer/DataView/MshModel.h
index 2013e855daf1c1a03e03ffeffca65495a3d27b86..d18de6974674a4a6371d956c9331e0c0efa6eb4a 100644
--- a/Applications/DataExplorer/DataView/MshModel.h
+++ b/Applications/DataExplorer/DataView/MshModel.h
@@ -45,7 +45,7 @@ public:
void addMesh(std::unique_ptr<MeshLib::Mesh> mesh);
/// Returns the number of columns used for the data list
- int columnCount(const QModelIndex& parent = QModelIndex()) const;
+ int columnCount(const QModelIndex& parent = QModelIndex()) const override;
public slots:
/// Adds a new mesh (using no unique_ptr as this interferes with Qt's signal/slot policy)
diff --git a/Applications/DataExplorer/DataView/MshView.h b/Applications/DataExplorer/DataView/MshView.h
index 8cdde7798e0f96aa89a677106802c615b44b1d00..a0c43ba320555330a8a61fb5d86e4745e1d1c0db 100644
--- a/Applications/DataExplorer/DataView/MshView.h
+++ b/Applications/DataExplorer/DataView/MshView.h
@@ -38,14 +38,15 @@ class MshView : public QTreeView
public:
MshView(QWidget* parent = nullptr);
- ~MshView();
+ ~MshView() override;
public slots:
void updateView();
protected slots:
/// Is called when the selection of this view changes.
- void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
+ void selectionChanged(const QItemSelection& selected,
+ const QItemSelection& deselected) override;
private:
struct MeshAction
@@ -55,7 +56,7 @@ private:
unsigned max_dim;
};
- void contextMenuEvent( QContextMenuEvent* event );
+ void contextMenuEvent(QContextMenuEvent* event) override;
private slots:
/// Opens a dialog for mapping 2d meshes.
diff --git a/Applications/DataExplorer/DataView/NetCdfConfigureDialog.h b/Applications/DataExplorer/DataView/NetCdfConfigureDialog.h
index 8be5093a210848aed23a88cb5c701d05d8384529..bbfbdf3be08cc4a650780f20420566649cb1aead 100644
--- a/Applications/DataExplorer/DataView/NetCdfConfigureDialog.h
+++ b/Applications/DataExplorer/DataView/NetCdfConfigureDialog.h
@@ -35,14 +35,14 @@ class NetCdfConfigureDialog : public QDialog, private Ui_NetCdfConfigure
public:
NetCdfConfigureDialog(const std::string& fileName,
QDialog* parent = nullptr);
- ~NetCdfConfigureDialog(void);
+ ~NetCdfConfigureDialog(void) override;
MeshLib::Mesh* getMesh() { return _currentMesh; };
std::string getName();
VtkGeoImageSource* getRaster() { return _currentRaster; };
private slots:
- void accept();
- void reject();
+ void accept() override;
+ void reject() override;
void on_comboBoxVariable_currentIndexChanged(int id);
void on_comboBoxDim1_currentIndexChanged(int id);
void on_comboBoxDim2_currentIndexChanged(int id);
diff --git a/Applications/DataExplorer/DataView/SHPImportDialog.h b/Applications/DataExplorer/DataView/SHPImportDialog.h
index 2b67a363c5d7d0f8726075cae9a6e30989925813..06005556061b926087940a00854efacd15b6fae8 100644
--- a/Applications/DataExplorer/DataView/SHPImportDialog.h
+++ b/Applications/DataExplorer/DataView/SHPImportDialog.h
@@ -43,7 +43,7 @@ public:
/// Constructor
SHPImportDialog(std::string filename, GeoLib::GEOObjects& geo_objects,
QDialog* parent = nullptr);
- ~SHPImportDialog();
+ ~SHPImportDialog() override;
QDialogButtonBox* _buttonBox; /// The buttons used in this dialog.
@@ -62,10 +62,10 @@ private:
private slots:
/// Instructions if the OK-Button has been pressed.
- void accept();
+ void accept() override;
/// Instructions if the Cancel-Button has been pressed.
- void reject();
+ void reject() override;
signals:
void shpLoaded(QString);
diff --git a/Applications/DataExplorer/DataView/SaveMeshDialog.h b/Applications/DataExplorer/DataView/SaveMeshDialog.h
index fe86351d5d90e9a94638fbc3116423eb68fb321e..0f58d56ecf01211602a9ad1a5275e4b58ddea7b6 100644
--- a/Applications/DataExplorer/DataView/SaveMeshDialog.h
+++ b/Applications/DataExplorer/DataView/SaveMeshDialog.h
@@ -30,7 +30,7 @@ class SaveMeshDialog : public QDialog, private Ui_SaveMesh
public:
SaveMeshDialog(MeshLib::Mesh const& mesh, QDialog* parent = nullptr);
- ~SaveMeshDialog() = default;
+ ~SaveMeshDialog() override = default;
private slots:
/// Selection of path to save file
@@ -39,10 +39,10 @@ private slots:
void on_dataModeBox_currentIndexChanged(int index);
/// Instructions if the OK-Button has been pressed.
- void accept();
+ void accept() override;
/// Instructions if the Cancel-Button has been pressed.
- void reject() { this->done(QDialog::Rejected); };
+ void reject() override { this->done(QDialog::Rejected); };
private:
MeshLib::Mesh const& _mesh;
diff --git a/Applications/DataExplorer/DataView/SelectMeshDialog.h b/Applications/DataExplorer/DataView/SelectMeshDialog.h
index 57da27a82f8e3f40d90aaf6870bfe6aa0785b9a2..434aab877a5de18c248bc6614ba17909ce0f88a4 100644
--- a/Applications/DataExplorer/DataView/SelectMeshDialog.h
+++ b/Applications/DataExplorer/DataView/SelectMeshDialog.h
@@ -37,7 +37,7 @@ public:
SelectMeshDialog(const GeoLib::GeoObject* geo_object,
const std::list<std::string>& msh_names,
QDialog* parent = nullptr);
- ~SelectMeshDialog();
+ ~SelectMeshDialog() override;
QDialogButtonBox* _buttonBox; /// The buttons used in this dialog.
@@ -53,10 +53,10 @@ private:
private slots:
/// Instructions if the OK-Button has been pressed.
- void accept();
+ void accept() override;
/// Instructions if the Cancel-Button has been pressed.
- void reject();
+ void reject() override;
signals:
//void requestNameChange(const std::string&, const GeoLib::GEOTYPE, std::size_t, std::string);
diff --git a/Applications/DataExplorer/DataView/SetNameDialog.h b/Applications/DataExplorer/DataView/SetNameDialog.h
index 4cca4829ae8a2e1cde8b4b41223a847ddc28f862..fea7b06c955e0778833c690894a0412c3bf4ff62 100644
--- a/Applications/DataExplorer/DataView/SetNameDialog.h
+++ b/Applications/DataExplorer/DataView/SetNameDialog.h
@@ -34,7 +34,7 @@ public:
/// Constructor
SetNameDialog(const std::string& geo_object_type, std::size_t id,
const std::string& old_name, QDialog* parent = nullptr);
- ~SetNameDialog();
+ ~SetNameDialog() override;
std::string getNewName();
@@ -49,8 +49,8 @@ private:
private slots:
/// Instructions if the OK-Button has been pressed.
- void accept();
+ void accept() override;
/// Instructions if the Cancel-Button has been pressed.
- void reject();
+ void reject() override;
};
diff --git a/Applications/DataExplorer/DataView/StationTreeModel.h b/Applications/DataExplorer/DataView/StationTreeModel.h
index f4257527c6225d09119ecbb314f5c464507a5a61..9197fffb5fcdca3bc182d610f2b22a889f708e17 100644
--- a/Applications/DataExplorer/DataView/StationTreeModel.h
+++ b/Applications/DataExplorer/DataView/StationTreeModel.h
@@ -44,11 +44,12 @@ class StationTreeModel : public TreeModel
public:
StationTreeModel(QObject* parent = nullptr);
- ~StationTreeModel();
+ ~StationTreeModel() override;
void addStationList(QString listName, const std::vector<GeoLib::Point*>* stations);
const std::vector<ModelTreeItem*> &getLists() { return _lists; }
- QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
+ QModelIndex index(int row, int column,
+ const QModelIndex& parent = QModelIndex()) const override;
//BaseItem* itemFromIndex( const QModelIndex& index ) const;
void removeStationList(QModelIndex index);
void removeStationList(const std::string &name);
diff --git a/Applications/DataExplorer/DataView/StationTreeView.h b/Applications/DataExplorer/DataView/StationTreeView.h
index 567eb536b60a26a7b92ef0598b7f86f849dc5408..f2155fd7c7cfa35117d245410b91d5cad2722a04 100644
--- a/Applications/DataExplorer/DataView/StationTreeView.h
+++ b/Applications/DataExplorer/DataView/StationTreeView.h
@@ -41,7 +41,8 @@ public slots:
protected slots:
/// Instructions if the selection of items in the view has changed.
- void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
+ void selectionChanged(const QItemSelection& selected,
+ const QItemSelection& deselected) override;
/// Instructions if the selection of items in the view has changed by events outside the view (i.e. by actions made in the visualisation).
void selectionChangedFromOutside(const QItemSelection &selected,
@@ -49,7 +50,7 @@ protected slots:
private:
/// Actions to be taken after a right mouse click is performed in the station view.
- void contextMenuEvent( QContextMenuEvent* e );
+ void contextMenuEvent(QContextMenuEvent* e) override;
/// Create image files from all stratigraphies in a borehole vector
void writeStratigraphiesAsImages(QString listName);
diff --git a/Applications/DataExplorer/DataView/StratView/StratBar.h b/Applications/DataExplorer/DataView/StratView/StratBar.h
index 97111408dbc0873a331a9c0a2e3b95e6a8950bf8..1362a7a936838d4386aea68a81b68a30f6c5f1a0 100644
--- a/Applications/DataExplorer/DataView/StratView/StratBar.h
+++ b/Applications/DataExplorer/DataView/StratView/StratBar.h
@@ -38,13 +38,15 @@ public:
StratBar(GeoLib::StationBorehole* station,
std::map<std::string, DataHolderLib::Color>* stratColors = nullptr,
QGraphicsItem* parent = nullptr);
- ~StratBar();
+ ~StratBar() override;
/// Returns the bounding rectangle of the bar.
- QRectF boundingRect() const;
+ QRectF boundingRect() const override;
/// Paints the bar.
- void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget);
+ void paint(QPainter* painter,
+ const QStyleOptionGraphicsItem* option,
+ QWidget* widget) override;
private:
/**
diff --git a/Applications/DataExplorer/DataView/StratView/StratScene.h b/Applications/DataExplorer/DataView/StratView/StratScene.h
index 47612198c1e8c308d9811df136960b0d16e9a03b..8bcf28e3e291b58e93e253215a6602a98e348985 100644
--- a/Applications/DataExplorer/DataView/StratView/StratScene.h
+++ b/Applications/DataExplorer/DataView/StratView/StratScene.h
@@ -33,7 +33,7 @@ public:
GeoLib::StationBorehole* station,
std::map<std::string, DataHolderLib::Color>* stratColors = nullptr,
QObject* parent = nullptr);
- ~StratScene();
+ ~StratScene() override;
/// The margin between the boundary of the scene and the bounding box of all items within the scene
static const int MARGIN = 50;
diff --git a/Applications/DataExplorer/DataView/StratView/StratView.h b/Applications/DataExplorer/DataView/StratView/StratView.h
index fde63435e9507efabb6095b854991088dce18fb8..d405a8fc94445a56121499f6b1b2dc7cf92b9c9e 100644
--- a/Applications/DataExplorer/DataView/StratView/StratView.h
+++ b/Applications/DataExplorer/DataView/StratView/StratView.h
@@ -35,7 +35,7 @@ public:
* Creates an empty view.
*/
StratView(QWidget* parent = nullptr) : _scene(nullptr) { Q_UNUSED(parent); }
- ~StratView();
+ ~StratView() override;
/// Sets the Borehole whose data should be visualised.
void setStation(GeoLib::StationBorehole* station,
@@ -51,17 +51,23 @@ public:
protected:
/// Resizes the scene.
- void resizeEvent(QResizeEvent* event);
+ void resizeEvent(QResizeEvent* event) override;
private:
/// Initialises the view.
void initialize();
/// The minimum size of the window.
- QSize minimumSizeHint() const { return QSize(3 * _scene->MARGIN,2 * _scene->MARGIN); }
+ QSize minimumSizeHint() const override
+ {
+ return QSize(3 * _scene->MARGIN, 2 * _scene->MARGIN);
+ }
/// The default size of the window.
- QSize sizeHint() const { return QSize(6 * _scene->MARGIN, 4 * _scene->MARGIN); }
+ QSize sizeHint() const override
+ {
+ return QSize(6 * _scene->MARGIN, 4 * _scene->MARGIN);
+ }
/// Updates the view automatically when a Borehole is added or when the window containing the view changes its state.
void update();
diff --git a/Applications/DataExplorer/DataView/StratView/StratWindow.h b/Applications/DataExplorer/DataView/StratView/StratWindow.h
index 40bf8cdf72a7787ab2be187472e2a7a597e13143..741e382a19774ce11a48fe8062769c87555a98cf 100644
--- a/Applications/DataExplorer/DataView/StratView/StratWindow.h
+++ b/Applications/DataExplorer/DataView/StratView/StratWindow.h
@@ -40,7 +40,7 @@ public:
GeoLib::StationBorehole* station,
std::map<std::string, DataHolderLib::Color>* stratColors = nullptr,
QWidget* parent = nullptr);
- ~StratWindow(void) { this->destroy(); }
+ ~StratWindow(void) override { this->destroy(); }
private:
/// Automatically resize window based on the measurements of the borehole.
diff --git a/Applications/DataExplorer/DataView/SurfaceExtractionDialog.h b/Applications/DataExplorer/DataView/SurfaceExtractionDialog.h
index 13e7742d90c6525a8f7626623b3b10337ab90b3e..c395fe0dfbdb4983ea197a5677fba442972dad95 100644
--- a/Applications/DataExplorer/DataView/SurfaceExtractionDialog.h
+++ b/Applications/DataExplorer/DataView/SurfaceExtractionDialog.h
@@ -32,17 +32,17 @@ class SurfaceExtractionDialog : public QDialog, private Ui_SurfaceExtraction
public:
SurfaceExtractionDialog(QDialog* parent = nullptr);
- ~SurfaceExtractionDialog() = default;
+ ~SurfaceExtractionDialog() override = default;
int getTolerance() const { return _tolerance; }
MathLib::Vector3 const& getNormal() const { return _dir; }
private slots:
/// Instructions if the OK-Button has been pressed.
- void accept();
+ void accept() override;
/// Instructions if the Cancel-Button has been pressed.
- void reject() { this->done(QDialog::Rejected); };
+ void reject() override { this->done(QDialog::Rejected); };
private:
int _tolerance;
diff --git a/Applications/DataExplorer/VtkVis/MeshFromRasterDialog.h b/Applications/DataExplorer/VtkVis/MeshFromRasterDialog.h
index 474b9649699d714429eeee088c833ef1ba314efe..2933ef04c093fe1f4882d11bb68532930dd702ec 100644
--- a/Applications/DataExplorer/VtkVis/MeshFromRasterDialog.h
+++ b/Applications/DataExplorer/VtkVis/MeshFromRasterDialog.h
@@ -35,7 +35,7 @@ class MeshFromRasterDialog : public QDialog, private Ui_MeshFromRaster
public:
/// Constructor
MeshFromRasterDialog(QDialog* parent = nullptr);
- ~MeshFromRasterDialog(void);
+ ~MeshFromRasterDialog(void) override;
std::string getMeshName() const { return _mesh_name; }
std::string getArrayName() const { return _array_name; }
@@ -44,10 +44,10 @@ public:
private slots:
/// Instructions if the OK-Button has been pressed.
- void accept();
+ void accept() override;
/// Instructions if the Cancel-Button has been pressed.
- void reject();
+ void reject() override;
private:
std::string _mesh_name;
diff --git a/Applications/DataExplorer/VtkVis/QVtkDataSetMapper.h b/Applications/DataExplorer/VtkVis/QVtkDataSetMapper.h
index 99d2fc1ffb377d66439779c859e03dffa92293e1..b1be9f97073941c0b029b002938bb3ca5133eade 100644
--- a/Applications/DataExplorer/VtkVis/QVtkDataSetMapper.h
+++ b/Applications/DataExplorer/VtkVis/QVtkDataSetMapper.h
@@ -34,7 +34,7 @@ public:
public slots:
/// @brief Sets the scalar visibility on this mapper.
virtual void SetScalarVisibility(bool on);
- virtual void SetScalarVisibility(int on) override
+ void SetScalarVisibility(int on) override
{
SetScalarVisibility(static_cast<bool>(on));
}
@@ -44,7 +44,7 @@ protected:
QVtkDataSetMapper();
/// @brief Destructor.
- virtual ~QVtkDataSetMapper();
+ ~QVtkDataSetMapper() override;
private:
QVtkDataSetMapper(const QVtkDataSetMapper&); // Not implemented.
diff --git a/Applications/DataExplorer/VtkVis/VisualizationWidget.h b/Applications/DataExplorer/VtkVis/VisualizationWidget.h
index 68c9ae3e56e3695ae6b41861a34434738cb38884..4689cb336c58ee94e23961839a4ea6f438d3a98b 100644
--- a/Applications/DataExplorer/VtkVis/VisualizationWidget.h
+++ b/Applications/DataExplorer/VtkVis/VisualizationWidget.h
@@ -35,7 +35,7 @@ public:
VisualizationWidget(QWidget* parent = nullptr);
/// @brief Destructor.
- ~VisualizationWidget();
+ ~VisualizationWidget() override;
/// @brief Returns the VtkCustomInteractorStyle.
VtkCustomInteractorStyle* interactorStyle() const;
diff --git a/Applications/DataExplorer/VtkVis/VtkAlgorithmProperties.h b/Applications/DataExplorer/VtkVis/VtkAlgorithmProperties.h
index 418682932adea8fe68760ad947097c44d57093cf..e78dafe30bc11ccc7313ce0892e550ff868fda0a 100644
--- a/Applications/DataExplorer/VtkVis/VtkAlgorithmProperties.h
+++ b/Applications/DataExplorer/VtkVis/VtkAlgorithmProperties.h
@@ -142,7 +142,7 @@ public:
/// Constructor (sets default values)
VtkAlgorithmProperties(QObject* parent = nullptr);
- virtual ~VtkAlgorithmProperties();
+ ~VtkAlgorithmProperties() override;
/// @brief Returns the vtk properties
vtkProperty* GetProperties() const { return _property; }
diff --git a/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyCheckbox.h b/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyCheckbox.h
index 5d4026ca40af5efc4c31ac96b30f336dd5c0558e..1ea61b6c950616337d30df605de91799046e3fb2 100644
--- a/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyCheckbox.h
+++ b/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyCheckbox.h
@@ -35,7 +35,7 @@ public:
QWidget* parent = nullptr);
/// @brief Destructor.
- virtual ~VtkAlgorithmPropertyCheckbox();
+ ~VtkAlgorithmPropertyCheckbox() override;
private:
const QString _name;
diff --git a/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyLineEdit.h b/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyLineEdit.h
index b628d77f3c1635bf0f992490475928d869a59b53..d34ab370662825b7fc9a871e78c285d40cef8aff 100644
--- a/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyLineEdit.h
+++ b/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyLineEdit.h
@@ -38,7 +38,7 @@ public:
QVariant::Type type,
VtkAlgorithmProperties* algProps,
QWidget* parent = nullptr);
- virtual ~VtkAlgorithmPropertyLineEdit();
+ ~VtkAlgorithmPropertyLineEdit() override;
private:
const QString _name;
diff --git a/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyVectorEdit.h b/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyVectorEdit.h
index 9242c3ebfd699d71716faa76a096abefb71ffc2d..04223b83f888576c9ab9674875111a05f6835d9c 100644
--- a/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyVectorEdit.h
+++ b/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyVectorEdit.h
@@ -38,7 +38,7 @@ public:
QVariant::Type type,
VtkAlgorithmProperties* algProps,
QWidget* parent = nullptr);
- virtual ~VtkAlgorithmPropertyVectorEdit();
+ ~VtkAlgorithmPropertyVectorEdit() override;
private:
const QString _name;
diff --git a/Applications/DataExplorer/VtkVis/VtkAppendArrayFilter.h b/Applications/DataExplorer/VtkVis/VtkAppendArrayFilter.h
index 46e04876f82004c7efd6313187f930b306aca667..176b040572d09dcda381855a47c2a5747145c401 100644
--- a/Applications/DataExplorer/VtkVis/VtkAppendArrayFilter.h
+++ b/Applications/DataExplorer/VtkVis/VtkAppendArrayFilter.h
@@ -46,7 +46,7 @@ public:
protected:
VtkAppendArrayFilter();
- ~VtkAppendArrayFilter();
+ ~VtkAppendArrayFilter() override;
/// @brief The filter logic.
int RequestData(vtkInformation* request,
diff --git a/Applications/DataExplorer/VtkVis/VtkBGImageSource.h b/Applications/DataExplorer/VtkVis/VtkBGImageSource.h
index 897122f87ee7cf31164500c2364487be2821c8e6..5c5b8d49b2fa39f4148fe0f87ed1bc7950bccc9a 100644
--- a/Applications/DataExplorer/VtkVis/VtkBGImageSource.h
+++ b/Applications/DataExplorer/VtkVis/VtkBGImageSource.h
@@ -36,11 +36,11 @@ public:
/// Sets the raster/image to be used as a texture map
void SetRaster(vtkImageAlgorithm *img, double x0, double y0, double scalingFactor);
- virtual void SetUserProperty(QString name, QVariant value) override;
+ void SetUserProperty(QString name, QVariant value) override;
protected:
VtkBGImageSource();
- ~VtkBGImageSource();
+ ~VtkBGImageSource() override;
private:
diff --git a/Applications/DataExplorer/VtkVis/VtkColorByHeightFilter.h b/Applications/DataExplorer/VtkVis/VtkColorByHeightFilter.h
index e23e3beaec3c587e3db635fec953427bb04d96a5..76e738a44cf9d3d528201f5c594bf631e5e6f95e 100644
--- a/Applications/DataExplorer/VtkVis/VtkColorByHeightFilter.h
+++ b/Applications/DataExplorer/VtkVis/VtkColorByHeightFilter.h
@@ -49,7 +49,7 @@ public:
vtkGetObjectMacro(ColorLookupTable,VtkColorLookupTable);
/// @brief This filter gets updated when the color look-up table was modified.
- virtual vtkMTimeType GetMTime() override;
+ vtkMTimeType GetMTime() override;
/// @brief Sets user properties.
void SetUserProperty(QString name, QVariant value) override
@@ -67,7 +67,7 @@ public:
protected:
VtkColorByHeightFilter();
- ~VtkColorByHeightFilter();
+ ~VtkColorByHeightFilter() override;
/// @brief The filter logic.
int RequestData(vtkInformation* request,
diff --git a/Applications/DataExplorer/VtkVis/VtkColorLookupTable.h b/Applications/DataExplorer/VtkVis/VtkColorLookupTable.h
index 7745fb883846af6fe2e0de4fd281d944854b250b..9fe7fc48ec0c306f2cbf14a7f4c013ac672157f5 100644
--- a/Applications/DataExplorer/VtkVis/VtkColorLookupTable.h
+++ b/Applications/DataExplorer/VtkVis/VtkColorLookupTable.h
@@ -82,7 +82,7 @@ protected:
VtkColorLookupTable();
/// Destructor
- ~VtkColorLookupTable();
+ ~VtkColorLookupTable() override;
private:
/// Interpolates values linearly.
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeColorByHeightFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositeColorByHeightFilter.h
index fd190650dbdc44052bc5713e4eb6a0a10701ba77..05e8788b2eee1db9a74da85169cdd6038983a052 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeColorByHeightFilter.h
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeColorByHeightFilter.h
@@ -23,11 +23,11 @@ class VtkCompositeColorByHeightFilter : public VtkCompositeFilter
{
public:
VtkCompositeColorByHeightFilter(vtkAlgorithm* inputAlgorithm);
- virtual ~VtkCompositeColorByHeightFilter() = default;
+ ~VtkCompositeColorByHeightFilter() override = default;
- virtual void init() override;
+ void init() override;
- virtual void SetUserProperty(QString name, QVariant value) override;
+ void SetUserProperty(QString name, QVariant value) override;
protected:
};
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeColormapToImageFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositeColormapToImageFilter.h
index 2b139b2f65153a1ced663c67fef8f6b617a30346..c2b69f90a47b8bc4decf0db1f658bd80d19bdd51 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeColormapToImageFilter.h
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeColormapToImageFilter.h
@@ -21,14 +21,13 @@ class VtkCompositeColormapToImageFilter : public VtkCompositeFilter
{
public:
VtkCompositeColormapToImageFilter(vtkAlgorithm* inputAlgorithm);
- virtual ~VtkCompositeColormapToImageFilter();
+ ~VtkCompositeColormapToImageFilter() override;
- virtual void init() override;
+ void init() override;
- virtual void SetUserProperty(QString name, QVariant value) override;
+ void SetUserProperty(QString name, QVariant value) override;
- virtual void SetUserVectorProperty(QString name,
- QList<QVariant> values) override;
+ void SetUserVectorProperty(QString name, QList<QVariant> values) override;
private:
};
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeContourFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositeContourFilter.h
index ee979efe806d21fd715d57167964a83b83169823..79747df7e6df00b2e7c77ae065b2a80753ec65b2 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeContourFilter.h
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeContourFilter.h
@@ -23,11 +23,11 @@ class VtkCompositeContourFilter : public VtkCompositeFilter
{
public:
VtkCompositeContourFilter(vtkAlgorithm* inputAlgorithm);
- virtual ~VtkCompositeContourFilter();
+ ~VtkCompositeContourFilter() override;
- virtual void init() override;
+ void init() override;
- virtual void SetUserProperty(QString name, QVariant value) override;
+ void SetUserProperty(QString name, QVariant value) override;
void SetUserVectorProperty(QString name, QList<QVariant> values) override;
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeElementSelectionFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositeElementSelectionFilter.h
index 65c9dec140bf0c13d07110477e681a65d2f8f253..72085bcfc7c1cf271a16796cedf497a1f5ab72a5 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeElementSelectionFilter.h
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeElementSelectionFilter.h
@@ -27,16 +27,16 @@ class VtkCompositeElementSelectionFilter : public VtkCompositeFilter
{
public:
VtkCompositeElementSelectionFilter(vtkAlgorithm* inputAlgorithm);
- virtual ~VtkCompositeElementSelectionFilter() = default;
+ ~VtkCompositeElementSelectionFilter() override = default;
- virtual void init();
+ void init() override;
// Sets the range for the quality measure (default is [0,1] but this may vary for area- and volume-metrics).
void setRange(double min_val, double max_val) { _range = std::make_pair(min_val, max_val); }
void setSelectionArray(const std::string &selection_name, const std::vector<double> &selection = std::vector<double>());
- virtual void SetUserVectorProperty(QString name, QList<QVariant> values);
+ void SetUserVectorProperty(QString name, QList<QVariant> values) override;
private:
/// Returns a colour lookup table optimised for quality measures
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositeFilter.h
index d475240b9194bf9f4e4acff4f36e7fe8e1e8ca6e..061977926d724873056d675e3ccb853f76fccc27 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeFilter.h
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeFilter.h
@@ -46,7 +46,7 @@ public:
VtkCompositeFilter(vtkAlgorithm* inputAlgorithm);
/// @brief Destructor.
- virtual ~VtkCompositeFilter();
+ ~VtkCompositeFilter() override;
/// @return the type of the data input.
/// Can be compared with
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.h
index 10545a299b3cc5df58427173d45d6d23e717f7af..7187f293f2ea11271772ce04fcacd9a5dfc65ccf 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.h
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.h
@@ -24,9 +24,9 @@ class VtkCompositeGeoObjectFilter : public VtkCompositeFilter
{
public:
VtkCompositeGeoObjectFilter(vtkAlgorithm* inputAlgorithm);
- virtual ~VtkCompositeGeoObjectFilter();
+ ~VtkCompositeGeoObjectFilter() override;
- virtual void init() override;
+ void init() override;
/// @brief Sets user properties.
void SetUserProperty(QString name, QVariant value) override
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeImageToCylindersFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositeImageToCylindersFilter.h
index 19ba34e4bb785ec721af07a9510c6c6a691e0d0a..d9377af952c2e2325d48e3f4149105939b772f2f 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeImageToCylindersFilter.h
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeImageToCylindersFilter.h
@@ -25,11 +25,11 @@ class VtkCompositeImageToCylindersFilter : public VtkCompositeFilter
{
public:
VtkCompositeImageToCylindersFilter(vtkAlgorithm* inputAlgorithm);
- virtual ~VtkCompositeImageToCylindersFilter();
+ ~VtkCompositeImageToCylindersFilter() override;
- virtual void init() override;
+ void init() override;
- virtual void SetUserProperty(QString name, QVariant value) override;
+ void SetUserProperty(QString name, QVariant value) override;
void SetUserVectorProperty(QString name, QList<QVariant> values) override;
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeLineToTubeFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositeLineToTubeFilter.h
index 6d4dda3ab49b40e9c7ad09e48f623790c5b62c17..11ab5d1d69ea0517a28283e5363a1f9c9f647eac 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeLineToTubeFilter.h
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeLineToTubeFilter.h
@@ -21,11 +21,11 @@ class VtkCompositeLineToTubeFilter : public VtkCompositeFilter
{
public:
VtkCompositeLineToTubeFilter(vtkAlgorithm* inputAlgorithm);
- virtual ~VtkCompositeLineToTubeFilter();
+ ~VtkCompositeLineToTubeFilter() override;
- virtual void init() override;
+ void init() override;
- virtual void SetUserProperty(QString name, QVariant value) override;
+ void SetUserProperty(QString name, QVariant value) override;
private:
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.h
index d3dce1d7d4342903e88b21589e0dcc746b718293..7c87da974414f2c67e053d6af3e71475701a9b8e 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.h
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.h
@@ -24,9 +24,9 @@ class VtkCompositeNodeSelectionFilter : public VtkCompositeFilter
{
public:
VtkCompositeNodeSelectionFilter(vtkAlgorithm* inputAlgorithm);
- virtual ~VtkCompositeNodeSelectionFilter();
+ ~VtkCompositeNodeSelectionFilter() override;
- virtual void init();
+ void init() override;
/// Sets the point indeces to be highlighted
void setSelectionArray(const std::vector<unsigned> &point_indeces);
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositePointToGlyphFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositePointToGlyphFilter.h
index 003f20d97984bcbb64c96f89f389f859c067237f..f2c9eba1f2668dfc618c2aa918f0f240c4aed7cc 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositePointToGlyphFilter.h
+++ b/Applications/DataExplorer/VtkVis/VtkCompositePointToGlyphFilter.h
@@ -23,11 +23,11 @@ class VtkCompositePointToGlyphFilter : public VtkCompositeFilter
{
public:
VtkCompositePointToGlyphFilter(vtkAlgorithm* inputAlgorithm);
- virtual ~VtkCompositePointToGlyphFilter();
+ ~VtkCompositePointToGlyphFilter() override;
- virtual void init() override;
+ void init() override;
- virtual void SetUserProperty(QString name, QVariant value) override;
+ void SetUserProperty(QString name, QVariant value) override;
private:
vtkSphereSource* _glyphSource;
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.h
index 779ff87fcce3032f1d3c4b06d2cd730f26512ff9..63570b3b79b442074823bd4d5380a5258766d3ca 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.h
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.h
@@ -23,11 +23,11 @@ class VtkCompositeTextureOnSurfaceFilter : public VtkCompositeFilter
{
public:
VtkCompositeTextureOnSurfaceFilter(vtkAlgorithm* inputAlgorithm);
- virtual ~VtkCompositeTextureOnSurfaceFilter();
+ ~VtkCompositeTextureOnSurfaceFilter() override;
- virtual void init() override;
+ void init() override;
- virtual void SetUserProperty(QString name, QVariant value) override;
+ void SetUserProperty(QString name, QVariant value) override;
private:
};
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeThresholdFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositeThresholdFilter.h
index aa7109ed3e7b860d6eea0cbd85591099252549c8..0d4017bd2e1ce78d89c5dc62ae83612dc16921d1 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeThresholdFilter.h
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeThresholdFilter.h
@@ -23,11 +23,11 @@ class VtkCompositeThresholdFilter : public VtkCompositeFilter
{
public:
VtkCompositeThresholdFilter(vtkAlgorithm* inputAlgorithm);
- virtual ~VtkCompositeThresholdFilter();
+ ~VtkCompositeThresholdFilter() override;
- virtual void init() override;
+ void init() override;
- virtual void SetUserProperty(QString name, QVariant value) override;
+ void SetUserProperty(QString name, QVariant value) override;
void SetUserVectorProperty(QString name, QList<QVariant> values) override;
diff --git a/Applications/DataExplorer/VtkVis/VtkConsoleOutputWindow.h b/Applications/DataExplorer/VtkVis/VtkConsoleOutputWindow.h
index 701987ef1a2902d78ee89a83300c4352851aa60b..c7689a6669c094aee2d6515d7f110a1dfda93123 100644
--- a/Applications/DataExplorer/VtkVis/VtkConsoleOutputWindow.h
+++ b/Applications/DataExplorer/VtkVis/VtkConsoleOutputWindow.h
@@ -23,11 +23,11 @@ public:
void PrintSelf(ostream& os, vtkIndent indent) override;
static VtkConsoleOutputWindow * New();
- virtual void DisplayText(const char*) override;
+ void DisplayText(const char*) override;
protected:
VtkConsoleOutputWindow();
- virtual ~VtkConsoleOutputWindow();
+ ~VtkConsoleOutputWindow() override;
private:
VtkConsoleOutputWindow(const VtkConsoleOutputWindow &); // Not implemented.
diff --git a/Applications/DataExplorer/VtkVis/VtkCustomInteractorStyle.h b/Applications/DataExplorer/VtkVis/VtkCustomInteractorStyle.h
index 5d4015608565927cad9a517b019ba8c222d7be5e..44d087f98a662319c6625a982e794180adfcc416 100644
--- a/Applications/DataExplorer/VtkVis/VtkCustomInteractorStyle.h
+++ b/Applications/DataExplorer/VtkVis/VtkCustomInteractorStyle.h
@@ -41,19 +41,19 @@ public:
vtkTypeMacro (VtkCustomInteractorStyle, vtkInteractorStyleTrackballCamera);
/// @brief Handles key press events.
- virtual void OnChar() override;
+ void OnChar() override;
/// @brief Handles key down events.
- virtual void OnKeyDown() override;
+ void OnKeyDown() override;
/// @brief Handles key up events.
- virtual void OnKeyUp() override;
+ void OnKeyUp() override;
/// @brief Handles left mouse button events (picking).
- virtual void OnLeftButtonDown() override;
+ void OnLeftButtonDown() override;
/// @brief Handles middle mouse button events (rotation point picking).
- virtual void OnRightButtonDown() override;
+ void OnRightButtonDown() override;
public slots:
void highlightActor(vtkProp3D* prop);
@@ -68,7 +68,7 @@ public slots:
protected:
VtkCustomInteractorStyle();
- virtual ~VtkCustomInteractorStyle();
+ ~VtkCustomInteractorStyle() override;
/// @brief The vtk object to pick.
vtkDataObject* _data;
diff --git a/Applications/DataExplorer/VtkVis/VtkGeoImageSource.h b/Applications/DataExplorer/VtkVis/VtkGeoImageSource.h
index 2b445096b251e074d93a65ffc4871007a6c554db..dd0d06cbad04452554826ec5bb8481c167b98db0 100644
--- a/Applications/DataExplorer/VtkVis/VtkGeoImageSource.h
+++ b/Applications/DataExplorer/VtkVis/VtkGeoImageSource.h
@@ -56,18 +56,17 @@ public:
/// @brief Returns the spacing between two pixels.
double getSpacing() const;
- virtual void SetUserProperty(QString name, QVariant value) override;
+ void SetUserProperty(QString name, QVariant value) override;
protected:
/// @brief Constructor.
VtkGeoImageSource();
/// @brief Destructor.
- virtual ~VtkGeoImageSource();
+ ~VtkGeoImageSource() override;
/// @brief Filter execution.
- virtual void SimpleExecute(vtkImageData* input,
- vtkImageData* output) override;
+ void SimpleExecute(vtkImageData* input, vtkImageData* output) override;
private:
VtkGeoImageSource(const VtkGeoImageSource&); // Not implemented.
diff --git a/Applications/DataExplorer/VtkVis/VtkImageDataToLinePolyDataFilter.h b/Applications/DataExplorer/VtkVis/VtkImageDataToLinePolyDataFilter.h
index 094679900911a48977e0d2828244f21ff136009f..d9a2da8887c970f88244d7ee25ce653a454aa42f 100644
--- a/Applications/DataExplorer/VtkVis/VtkImageDataToLinePolyDataFilter.h
+++ b/Applications/DataExplorer/VtkVis/VtkImageDataToLinePolyDataFilter.h
@@ -39,7 +39,7 @@ public:
ogsUserPropertyMacro(LengthScaleFactor,double);
/// @brief Sets a user property.
- virtual void SetUserProperty(QString name, QVariant value) override
+ void SetUserProperty(QString name, QVariant value) override
{
if (name.compare("LengthScaleFactor") == 0)
SetLengthScaleFactor(value.toDouble());
@@ -53,15 +53,14 @@ protected:
VtkImageDataToLinePolyDataFilter();
/// @brief Destructor.
- virtual ~VtkImageDataToLinePolyDataFilter();
+ ~VtkImageDataToLinePolyDataFilter() override;
/// @brief Sets input port to vtkImageData.
- virtual int FillInputPortInformation(int port,
- vtkInformation* info) override;
+ int FillInputPortInformation(int port, vtkInformation* info) override;
/// @brief Converts the image data to lines
- virtual int RequestData(vtkInformation* request, vtkInformationVector** inputVector,
- vtkInformationVector* outputVector) override;
+ int RequestData(vtkInformation* request, vtkInformationVector** inputVector,
+ vtkInformationVector* outputVector) override;
/// @brief The spacing of the image
double ImageSpacing;
diff --git a/Applications/DataExplorer/VtkVis/VtkPickCallback.h b/Applications/DataExplorer/VtkVis/VtkPickCallback.h
index baaaf9e8b9cfc7ac49bb8b63077c826353192773..5038fa7cbae3ea99e792b48757b7cdaa2d9e733c 100644
--- a/Applications/DataExplorer/VtkVis/VtkPickCallback.h
+++ b/Applications/DataExplorer/VtkVis/VtkPickCallback.h
@@ -32,7 +32,8 @@ class VtkPickCallback : public QObject, public vtkCommand
public:
static VtkPickCallback* New();
- void Execute(vtkObject* caller, unsigned long eventId, void* callData);
+ void Execute(vtkObject* caller, unsigned long eventId,
+ void* callData) override;
protected:
VtkPickCallback();
diff --git a/Applications/DataExplorer/VtkVis/VtkPointsSource.h b/Applications/DataExplorer/VtkVis/VtkPointsSource.h
index 797d5684ffef115106859125c14234d71c6c8696..410924c5c3206856f387d6316fca4f43c776150b 100644
--- a/Applications/DataExplorer/VtkVis/VtkPointsSource.h
+++ b/Applications/DataExplorer/VtkVis/VtkPointsSource.h
@@ -39,11 +39,11 @@ public:
/// Prints its data on a stream.
void PrintSelf(ostream& os, vtkIndent indent) override;
- virtual void SetUserProperty(QString name, QVariant value) override;
+ void SetUserProperty(QString name, QVariant value) override;
protected:
VtkPointsSource();
- ~VtkPointsSource() = default;
+ ~VtkPointsSource() override = default;
/// Computes the polygonal data object.
int RequestData(vtkInformation* request,
diff --git a/Applications/DataExplorer/VtkVis/VtkPolylinesSource.h b/Applications/DataExplorer/VtkVis/VtkPolylinesSource.h
index 689878e5e012e7352e951bb6aba18d02d6a5d15d..22a9508d92f69455ae4e266d706e914d52d2c0bb 100644
--- a/Applications/DataExplorer/VtkVis/VtkPolylinesSource.h
+++ b/Applications/DataExplorer/VtkVis/VtkPolylinesSource.h
@@ -42,11 +42,11 @@ public:
/// Prints its data on a stream.
void PrintSelf(ostream& os, vtkIndent indent) override;
- virtual void SetUserProperty(QString name, QVariant value) override;
+ void SetUserProperty(QString name, QVariant value) override;
protected:
VtkPolylinesSource();
- ~VtkPolylinesSource();
+ ~VtkPolylinesSource() override;
/// Computes the polygonal data object.
int RequestData(vtkInformation* request,
diff --git a/Applications/DataExplorer/VtkVis/VtkStationSource.h b/Applications/DataExplorer/VtkVis/VtkStationSource.h
index b4d3acd2907e7fff059352cc343404372e275c4e..da95c5e538253b4b2be4ee28286a268d9c117e75 100644
--- a/Applications/DataExplorer/VtkVis/VtkStationSource.h
+++ b/Applications/DataExplorer/VtkVis/VtkStationSource.h
@@ -50,7 +50,7 @@ public:
/// Prints its data on a stream.
void PrintSelf(ostream& os, vtkIndent indent) override;
- virtual void SetUserProperty(QString name, QVariant value) override;
+ void SetUserProperty(QString name, QVariant value) override;
protected:
VtkStationSource();
diff --git a/Applications/DataExplorer/VtkVis/VtkSurfacesSource.h b/Applications/DataExplorer/VtkVis/VtkSurfacesSource.h
index c79fc621b26c9f81ed1e98cfd95ece2977433003..d0c4ae6c83cb4bdcad878814f58d66570fcd1792 100644
--- a/Applications/DataExplorer/VtkVis/VtkSurfacesSource.h
+++ b/Applications/DataExplorer/VtkVis/VtkSurfacesSource.h
@@ -43,11 +43,11 @@ public:
*/
//ogsUserPropertyMacro(ColorBySurface,bool);
- virtual void SetUserProperty(QString name, QVariant value) override;
+ void SetUserProperty(QString name, QVariant value) override;
protected:
VtkSurfacesSource();
- ~VtkSurfacesSource() = default;
+ ~VtkSurfacesSource() override = default;
/// Computes the polygonal data object.
int RequestData(vtkInformation* request,
diff --git a/Applications/DataExplorer/VtkVis/VtkTextureOnSurfaceFilter.h b/Applications/DataExplorer/VtkVis/VtkTextureOnSurfaceFilter.h
index 718e2e073cf23b3f55b0590d9d82f3f1fc2c0a4b..c3aff14a3dfdf983356f7c4851933107ebd76ff8 100644
--- a/Applications/DataExplorer/VtkVis/VtkTextureOnSurfaceFilter.h
+++ b/Applications/DataExplorer/VtkVis/VtkTextureOnSurfaceFilter.h
@@ -48,11 +48,11 @@ public:
/// Sets the raster/image to be used as a texture map
void SetRaster(vtkImageAlgorithm* img, double x0, double y0, double scalingFactor);
- virtual void SetUserProperty(QString name, QVariant value) override;
+ void SetUserProperty(QString name, QVariant value) override;
protected:
VtkTextureOnSurfaceFilter();
- ~VtkTextureOnSurfaceFilter();
+ ~VtkTextureOnSurfaceFilter() override;
/// Copies the input data and calculates texture coordinates (this requires that SetRaster() has
/// been called before this method is executed.
diff --git a/Applications/DataExplorer/VtkVis/VtkVisImageItem.h b/Applications/DataExplorer/VtkVis/VtkVisImageItem.h
index e24a9098d9457133bcce14a1e94fc4225222b65c..984725de3300d4c4635a939d4aa0e9f6f2112395 100644
--- a/Applications/DataExplorer/VtkVis/VtkVisImageItem.h
+++ b/Applications/DataExplorer/VtkVis/VtkVisImageItem.h
@@ -45,19 +45,20 @@ public:
VtkVisImageItem(VtkCompositeFilter* compositeFilter, TreeItem* parentItem,
const QList<QVariant> data = QList<QVariant>());
- ~VtkVisImageItem();
+ ~VtkVisImageItem() override;
/// @brief Initializes vtkMapper and vtkActor necessary for visualization of
/// the item and sets the item's properties.
- void Initialize(vtkRenderer* renderer);
+ void Initialize(vtkRenderer* renderer) override;
- void setTranslation(double x, double y, double z) const;
+ void setTranslation(double x, double y, double z) const override;
- vtkAlgorithm* transformFilter() const;
+ vtkAlgorithm* transformFilter() const override;
protected:
/// Selects the appropriate VTK-Writer object and writes the object to a file with the given name.
- virtual int callVTKWriter(vtkAlgorithm* algorithm, const std::string &filename) const;
+ int callVTKWriter(vtkAlgorithm* algorithm,
+ const std::string& filename) const override;
void setVtkProperties(VtkAlgorithmProperties* vtkProps);
private:
diff --git a/Applications/DataExplorer/VtkVis/VtkVisPipeline.h b/Applications/DataExplorer/VtkVis/VtkVisPipeline.h
index fad5e1cfedebf70792b6aeb3ab51359254e8c895..40846f9846ddbede3e03a75992726bce82e10add 100644
--- a/Applications/DataExplorer/VtkVis/VtkVisPipeline.h
+++ b/Applications/DataExplorer/VtkVis/VtkVisPipeline.h
@@ -60,7 +60,8 @@ public:
VtkVisPipeline(vtkRenderer* renderer, QObject* parent = nullptr);
/// \brief Emits vtkVisPipelineChanged() and calls base class method.
- bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
+ bool setData(const QModelIndex& index, const QVariant& value,
+ int role = Qt::EditRole) override;
/// \brief Adds a light to the scene at the given coordinates.
void addLight(const GeoLib::Point &pos);
@@ -81,7 +82,7 @@ public:
/// is the given one.
QModelIndex getIndex(vtkProp3D* actor);
- Qt::ItemFlags flags( const QModelIndex &index ) const;
+ Qt::ItemFlags flags(const QModelIndex& index) const override;
/// \brief Loads a vtk object from the given file and adds it to the pipeline.
void loadFromFile(QString filename);
diff --git a/Applications/DataExplorer/VtkVis/VtkVisPipelineItem.h b/Applications/DataExplorer/VtkVis/VtkVisPipelineItem.h
index e0393d886a05c9e465ff6427d6de258811fd42c2..489bb4d091c36d7bdfb08c9619fe7ac70bc61228 100644
--- a/Applications/DataExplorer/VtkVis/VtkVisPipelineItem.h
+++ b/Applications/DataExplorer/VtkVis/VtkVisPipelineItem.h
@@ -56,7 +56,7 @@ public:
VtkVisPipelineItem(VtkCompositeFilter* compositeFilter, TreeItem* parentItem,
const QList<QVariant> data = QList<QVariant>());
- ~VtkVisPipelineItem();
+ ~VtkVisPipelineItem() override;
/// @brief Returns a VtkVisPipelineItem.
VtkVisPipelineItem* child(int row) const;
@@ -65,8 +65,8 @@ public:
/// the item and sets the item's properties.
virtual void Initialize(vtkRenderer* renderer) = 0;
- QVariant data(int column) const;
- bool setData(int column, const QVariant &value);
+ QVariant data(int column) const override;
+ bool setData(int column, const QVariant& value) override;
/// @brief Returns the algorithm object
vtkAlgorithm* algorithm() const { return _algorithm; }
diff --git a/Applications/DataExplorer/VtkVis/VtkVisPipelineView.h b/Applications/DataExplorer/VtkVis/VtkVisPipelineView.h
index 6f8c9e1580015f9bfd93cddb78d53bdf314455b6..64f8ecbef4b45c931ce12224b75f0063469b2b6f 100644
--- a/Applications/DataExplorer/VtkVis/VtkVisPipelineView.h
+++ b/Applications/DataExplorer/VtkVis/VtkVisPipelineView.h
@@ -43,17 +43,18 @@ public:
VtkVisPipelineView(QWidget* parent = nullptr);
/// @brief Overridden to set model specific header properties.
- virtual void setModel(QAbstractItemModel* model);
+ void setModel(QAbstractItemModel* model) override;
protected slots:
/// Emits itemSelected() signals when an items was selected.
- void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
+ void selectionChanged(const QItemSelection& selected,
+ const QItemSelection& deselected) override;
void selectItem(vtkProp3D* actor);
void selectItem(const QModelIndex &index);
private:
/// Creates a menu on right-clicking on an item.
- void contextMenuEvent(QContextMenuEvent* event);
+ void contextMenuEvent(QContextMenuEvent* event) override;
private slots:
/// Adds a color lookup table to the current scalar array of the selected pipeline item.
diff --git a/Applications/DataExplorer/VtkVis/VtkVisPointSetItem.h b/Applications/DataExplorer/VtkVis/VtkVisPointSetItem.h
index 3c5e37d15ea9ea398e3e46f1633a4a158200f9e8..d487f76dc3b34c53776be6030e4171b0dcc4d98b 100644
--- a/Applications/DataExplorer/VtkVis/VtkVisPointSetItem.h
+++ b/Applications/DataExplorer/VtkVis/VtkVisPointSetItem.h
@@ -49,31 +49,31 @@ public:
VtkVisPointSetItem(VtkCompositeFilter* compositeFilter, TreeItem* parentItem,
const QList<QVariant> data = QList<QVariant>());
- ~VtkVisPointSetItem();
+ ~VtkVisPointSetItem() override;
/// @brief Gets the last selected attribute.
- const QString GetActiveAttribute() const;
+ const QString GetActiveAttribute() const override;
/// @brief Get the scalar range for the active attribute
void GetRangeForActiveAttribute(double range[2]) const;
/// @brief Initializes vtkMapper and vtkActor necessary for visualization of
/// the item and sets the item's properties.
- void Initialize(vtkRenderer* renderer);
+ void Initialize(vtkRenderer* renderer) override;
- vtkAlgorithm* transformFilter() const;
+ vtkAlgorithm* transformFilter() const override;
/// @brief Sets the selected attribute array for the visualisation of the data set.
- void SetActiveAttribute(const QString& name);
+ void SetActiveAttribute(const QString& name) override;
/// @brief Scales the data in visualisation-space.
- void setScale(double x, double y, double z) const;
+ void setScale(double x, double y, double z) const override;
/// @brief Translates the item in visualisation-space.
- void setTranslation(double x, double y, double z) const;
+ void setTranslation(double x, double y, double z) const override;
/// @brief Enables / disables backface culling.
- void setBackfaceCulling(bool enable) const;
+ void setBackfaceCulling(bool enable) const override;
protected:
QVtkDataSetMapper* _mapper;
@@ -82,7 +82,8 @@ protected:
std::string _activeArrayName;
/// Selects the appropriate VTK-Writer object and writes the object to a file with the given name.
- virtual int callVTKWriter(vtkAlgorithm* algorithm, const std::string &filename) const;
+ int callVTKWriter(vtkAlgorithm* algorithm,
+ const std::string& filename) const override;
void SetScalarVisibility(bool on);
diff --git a/Applications/DataExplorer/mainwindow.h b/Applications/DataExplorer/mainwindow.h
index 8a72d833ffd44d67858f03941ba5e4680014de21..f1ce0b3d15151fea533c200ae4f7092fcc658bb5 100644
--- a/Applications/DataExplorer/mainwindow.h
+++ b/Applications/DataExplorer/mainwindow.h
@@ -52,7 +52,7 @@ public:
void loadFileOnStartUp(const QString &fileName);
protected:
- void closeEvent( QCloseEvent* event );
+ void closeEvent(QCloseEvent* event) override;
protected slots:
void showGeoDockWidget( bool show );
diff --git a/Applications/FileIO/CsvInterface.h b/Applications/FileIO/CsvInterface.h
index fe87228764eb1fba16c25439711dbb5e638683dc..2103e73306c32f866f9340314f5e29d72e325c8e 100644
--- a/Applications/FileIO/CsvInterface.h
+++ b/Applications/FileIO/CsvInterface.h
@@ -80,7 +80,7 @@ public:
}
/// Writes the CSV file.
- bool write();
+ bool write() override;
/**
* Reads 3D points from a CSV file. It is assumed that the file has a header
diff --git a/Applications/FileIO/Gmsh/GMSHAdaptiveMeshDensity.h b/Applications/FileIO/Gmsh/GMSHAdaptiveMeshDensity.h
index 3b3680eff7714da83d16ded14debf6afac51ce94..93de9473ba91d6f442b9aebef26ec632f21a185a 100644
--- a/Applications/FileIO/Gmsh/GMSHAdaptiveMeshDensity.h
+++ b/Applications/FileIO/Gmsh/GMSHAdaptiveMeshDensity.h
@@ -33,11 +33,11 @@ public:
GMSHAdaptiveMeshDensity(double pnt_density,
double station_density,
std::size_t max_pnts_per_leaf);
- virtual ~GMSHAdaptiveMeshDensity();
- void initialize(std::vector<GeoLib::Point const*> const& pnts);
- double getMeshDensityAtPoint(GeoLib::Point const* const pnt) const;
+ ~GMSHAdaptiveMeshDensity() override;
+ void initialize(std::vector<GeoLib::Point const*> const& pnts) override;
+ double getMeshDensityAtPoint(GeoLib::Point const* const pnt) const override;
void addPoints(std::vector<GeoLib::Point const*> const& pnts);
- double getMeshDensityAtStation(GeoLib::Point const* const) const;
+ double getMeshDensityAtStation(GeoLib::Point const* const) const override;
void getSteinerPoints (std::vector<GeoLib::Point*> & pnts,
std::size_t additional_levels = 0) const;
#ifndef NDEBUG
diff --git a/Applications/FileIO/Gmsh/GMSHFixedMeshDensity.h b/Applications/FileIO/Gmsh/GMSHFixedMeshDensity.h
index 7eb5bd887d86e941b42f71fd78e3ee05eaa85d88..a9b927c942c62a2380c161e74e6e66a32f0732c8 100644
--- a/Applications/FileIO/Gmsh/GMSHFixedMeshDensity.h
+++ b/Applications/FileIO/Gmsh/GMSHFixedMeshDensity.h
@@ -21,10 +21,10 @@ class GMSHFixedMeshDensity : public GMSHMeshDensityStrategy
{
public:
GMSHFixedMeshDensity(double mesh_density);
- void initialize(std::vector<GeoLib::Point const*> const& vec);
- double getMeshDensityAtPoint(GeoLib::Point const*const) const;
- double getMeshDensityAtStation(GeoLib::Point const*const) const;
- virtual ~GMSHFixedMeshDensity() = default;
+ void initialize(std::vector<GeoLib::Point const*> const& vec) override;
+ double getMeshDensityAtPoint(GeoLib::Point const* const) const override;
+ double getMeshDensityAtStation(GeoLib::Point const* const) const override;
+ ~GMSHFixedMeshDensity() override = default;
private:
double _mesh_density;
diff --git a/Applications/FileIO/Gmsh/GMSHInterface.h b/Applications/FileIO/Gmsh/GMSHInterface.h
index ef6a7dc5c59bd747718c4e1dbd9564930edc9c31..ae356a1a87da2976bf51da13f89b1985364c48f6 100644
--- a/Applications/FileIO/Gmsh/GMSHInterface.h
+++ b/Applications/FileIO/Gmsh/GMSHInterface.h
@@ -75,10 +75,10 @@ public:
GMSHInterface& operator=(GMSHInterface const&) = delete;
GMSHInterface& operator=(GMSHInterface &&) = delete;
- ~GMSHInterface();
+ ~GMSHInterface() override;
protected:
- bool write();
+ bool write() override;
private:
/**
diff --git a/Applications/FileIO/Gmsh/GMSHPoint.h b/Applications/FileIO/Gmsh/GMSHPoint.h
index f1a4f11c1d915ea9ab6bcdf04b589e334463b208..5de076664f9315e8bc272c59731c1798e9cdb572 100644
--- a/Applications/FileIO/Gmsh/GMSHPoint.h
+++ b/Applications/FileIO/Gmsh/GMSHPoint.h
@@ -21,7 +21,8 @@ class GMSHPoint final : public GeoLib::Point
{
public:
GMSHPoint(GeoLib::Point const& pnt, std::size_t id, double mesh_density);
- void write(std::ostream &os) const;
+ void write(std::ostream& os) const override;
+
private:
double _mesh_density;
};
diff --git a/Applications/FileIO/Gmsh/GMSHPolygonTree.h b/Applications/FileIO/Gmsh/GMSHPolygonTree.h
index 0ed605482b77af64948668c10a01329eb1daf743..dac4afa61abc6c44be4aec740f1091d3108f3724 100644
--- a/Applications/FileIO/Gmsh/GMSHPolygonTree.h
+++ b/Applications/FileIO/Gmsh/GMSHPolygonTree.h
@@ -37,7 +37,7 @@ public:
GMSHPolygonTree(GeoLib::PolygonWithSegmentMarker* polygon, GMSHPolygonTree * parent,
GeoLib::GEOObjects &geo_objs, std::string const& geo_name,
GMSHMeshDensityStrategy * mesh_density_strategy);
- virtual ~GMSHPolygonTree();
+ ~GMSHPolygonTree() override;
/** Mark the segments shared by several polygons. */
void markSharedSegments();
diff --git a/Applications/FileIO/XmlIO/Qt/XmlGspInterface.h b/Applications/FileIO/XmlIO/Qt/XmlGspInterface.h
index 6cd73a1d0d760062571bf81d3ec234b2371a1543..d7283805ece2aeb39ba1e88abf92d8090076d2b7 100644
--- a/Applications/FileIO/XmlIO/Qt/XmlGspInterface.h
+++ b/Applications/FileIO/XmlIO/Qt/XmlGspInterface.h
@@ -36,18 +36,21 @@ class XmlGspInterface : public BaseLib::IO::XMLInterface,
public:
XmlGspInterface(DataHolderLib::Project &project);
- virtual ~XmlGspInterface() = default;
+ ~XmlGspInterface() override = default;
/// Reads an xml-file containing a GeoSys project.
/// Project files currently cover only geo-, msh- and station-data. This will be expanded in the future.
- int readFile(const QString &fileName);
+ int readFile(const QString& fileName) override;
- bool readFile(std::string const& fname) { return readFile(QString(fname.c_str())) != 0; }
+ bool readFile(std::string const& fname) override
+ {
+ return readFile(QString(fname.c_str())) != 0;
+ }
int writeToFile(const std::string& filename);
protected:
- bool write();
+ bool write() override;
private:
std::string _filename;
diff --git a/Applications/FileIO/XmlIO/Qt/XmlNumInterface.h b/Applications/FileIO/XmlIO/Qt/XmlNumInterface.h
index 054717882d602f9e0c21f1e17b44209ba14055b7..18e260f49686166219fba8618a0e906089a7d430 100644
--- a/Applications/FileIO/XmlIO/Qt/XmlNumInterface.h
+++ b/Applications/FileIO/XmlIO/Qt/XmlNumInterface.h
@@ -25,18 +25,20 @@ class XmlNumInterface : public BaseLib::IO::XMLInterface, public BaseLib::IO::XM
public:
XmlNumInterface();
- virtual ~XmlNumInterface() = default;
+ ~XmlNumInterface() override = default;
- int readFile(QString const& fileName);
+ int readFile(QString const& fileName) override;
- bool readFile(std::string const& fname) { return readFile(QString(fname.c_str())) != 0; }
+ bool readFile(std::string const& fname) override
+ {
+ return readFile(QString(fname.c_str())) != 0;
+ }
protected:
void readLinearSolverConfiguration(QDomElement const& lin_root);
void readIterationScheme(QDomElement const& iteration_root);
void readConvergenceCriteria(QDomElement const& convergence_root);
- bool write();
-
+ bool write() override;
};
}
diff --git a/Applications/Utils/OGSFileConverter/FileListDialog.h b/Applications/Utils/OGSFileConverter/FileListDialog.h
index cfe7b07925073b353c2935d34391d5f1a35eb942..81783da7a5b0bffdb15d2bc7873056510f5d5e3f 100644
--- a/Applications/Utils/OGSFileConverter/FileListDialog.h
+++ b/Applications/Utils/OGSFileConverter/FileListDialog.h
@@ -37,7 +37,7 @@ public:
/// Constructor
FileListDialog(FileType input, FileType output, QWidget* parent = nullptr);
/// Destructor
- ~FileListDialog(void);
+ ~FileListDialog(void) override;
/// Returns list of all selected files
const QStringList getInputFileList() const { return _allFiles.stringList(); };
@@ -61,9 +61,8 @@ private slots:
void on_browseButton_pressed();
/// Instructions if the OK-Button has been pressed.
- void accept();
+ void accept() override;
/// Instructions if the Cancel-Button has been pressed.
- void reject();
-
+ void reject() override;
};
diff --git a/Applications/Utils/OGSFileConverter/OGSFileConverter.h b/Applications/Utils/OGSFileConverter/OGSFileConverter.h
index 99f6ed0227132266f047d9fe71e38b75558c8de5..af516b82d93a9a42e68a315e9cb59b8d34d74be6 100644
--- a/Applications/Utils/OGSFileConverter/OGSFileConverter.h
+++ b/Applications/Utils/OGSFileConverter/OGSFileConverter.h
@@ -28,7 +28,7 @@ public:
/// Constructor
OGSFileConverter(QWidget* parent = nullptr);
/// Destructor
- ~OGSFileConverter(void);
+ ~OGSFileConverter(void) override;
private:
/// Checks if a given file already exists
diff --git a/BaseLib/IO/XmlIO/XMLInterface.h b/BaseLib/IO/XmlIO/XMLInterface.h
index 065b1655cd55d43d2e369992d8e86ebcb82918ff..ba6ccc07f084afb657d2eb577829593b49d1b263 100644
--- a/BaseLib/IO/XmlIO/XMLInterface.h
+++ b/BaseLib/IO/XmlIO/XMLInterface.h
@@ -29,7 +29,7 @@ class XMLInterface : public BaseLib::IO::Writer
{
public:
XMLInterface();
- virtual ~XMLInterface() = default;
+ ~XMLInterface() override = default;
void setNameForExport(std::string const& name) { _exportName = name; }
virtual bool readFile(std::string const& fname) = 0;
diff --git a/BaseLib/LogogSimpleFormatter.h b/BaseLib/LogogSimpleFormatter.h
index eeaab28468e7aaa5018c7adc795b5f7c739fd030..98051eb2d0ffc045497a5f082b8f77e151bdd828 100644
--- a/BaseLib/LogogSimpleFormatter.h
+++ b/BaseLib/LogogSimpleFormatter.h
@@ -25,7 +25,7 @@ namespace BaseLib
**/
class LogogSimpleFormatter : public logog::FormatterMSVC
{
- virtual TOPIC_FLAGS GetTopicFlags(const logog::Topic& topic)
+ TOPIC_FLAGS GetTopicFlags(const logog::Topic& topic) override
{
return (logog::Formatter::GetTopicFlags(topic) &
~(TOPIC_FILE_NAME_FLAG | TOPIC_LINE_NUMBER_FLAG));
diff --git a/BaseLib/Subdivision.h b/BaseLib/Subdivision.h
index 7955e7ac1f484180b3fd8db1f6875d242d71b4da..625c1efe76800ea712466366a799cd71dfa46db1 100644
--- a/BaseLib/Subdivision.h
+++ b/BaseLib/Subdivision.h
@@ -41,7 +41,7 @@ public:
: _length(length), _n_subdivision(n_subdivision) {}
/// Returns a vector of subdivided points
- std::vector<double> operator()() const
+ std::vector<double> operator()() const override
{
std::vector<double> x;
x.reserve(_n_subdivision+1);
@@ -77,7 +77,7 @@ public:
: _length(L), _dL0(dL0), _max_dL(max_dL), _multiplier(multiplier) {}
/// Returns a vector of subdivided points
- std::vector<double> operator()() const
+ std::vector<double> operator()() const override
{
std::vector<double> vec_x;
diff --git a/BaseLib/TemplateLogogFormatterSuppressedGCC.h b/BaseLib/TemplateLogogFormatterSuppressedGCC.h
index 52730d867da576c7d8522588675aace9216f6985..0936631516223a3a4c6b5f8d1f2cbe59fa21be74 100644
--- a/BaseLib/TemplateLogogFormatterSuppressedGCC.h
+++ b/BaseLib/TemplateLogogFormatterSuppressedGCC.h
@@ -38,13 +38,14 @@ public:
TemplateLogogFormatterSuppressedGCC(MPI_Comm mpi_comm = MPI_COMM_WORLD);
#endif
- virtual TOPIC_FLAGS GetTopicFlags( const logog::Topic &topic )
+ TOPIC_FLAGS GetTopicFlags(const logog::Topic& topic) override
{
return ( logog::Formatter::GetTopicFlags( topic ) &
~( T_SUPPPRESS_TOPIC_FLAG ));
}
- virtual LOGOG_STRING &Format( const logog::Topic &topic, const logog::Target &target );
+ LOGOG_STRING& Format(const logog::Topic& topic,
+ const logog::Target& target) override;
private:
#ifdef USE_MPI
diff --git a/GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.h b/GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.h
index d94093d6827f295f1774f272027500ef40ff51d9..f2fdf6a682572d9be55d9a5b2a65d031b07103fb 100644
--- a/GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.h
+++ b/GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.h
@@ -36,14 +36,14 @@ class BoostXmlGmlInterface : public BaseLib::IO::XMLInterface
{
public:
BoostXmlGmlInterface(GeoLib::GEOObjects& geo_objs);
- virtual ~BoostXmlGmlInterface() = default;
+ ~BoostXmlGmlInterface() override = default;
/// Reads an xml-file containing OGS geometry
- bool readFile(const std::string &fname);
+ bool readFile(const std::string& fname) override;
protected:
/// Required method for writing geometry. This is not implemented here, use the Qt class for writing.
- bool write();
+ bool write() override;
private:
/// Reads GeoLib::Point-objects from an xml-file
diff --git a/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h b/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h
index 0f4d52bc3eaead39336948855d418e68a6b1b322..18aa35dab14e135107f7f10ea0256afe759566a0 100644
--- a/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h
+++ b/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h
@@ -35,15 +35,18 @@ class XmlGmlInterface : public BaseLib::IO::XMLInterface,
public:
XmlGmlInterface(GeoLib::GEOObjects& geo_objs);
- virtual ~XmlGmlInterface() = default;
+ ~XmlGmlInterface() override = default;
/// Reads an xml-file containing geometric object definitions into the GEOObjects used in the contructor
- int readFile(const QString &fileName);
+ int readFile(const QString& fileName) override;
- bool readFile(std::string const& fname) { return readFile(QString(fname.c_str())) != 0; }
+ bool readFile(std::string const& fname) override
+ {
+ return readFile(QString(fname.c_str())) != 0;
+ }
protected:
- bool write();
+ bool write() override;
private:
/// Reads GeoLib::Point-objects from an xml-file
diff --git a/GeoLib/IO/XmlIO/Qt/XmlStnInterface.h b/GeoLib/IO/XmlIO/Qt/XmlStnInterface.h
index c9e0bff0d8dca8b573d2b463ed5a10e59ed48ac1..5266a1301c85d87caea7022458fe0a1a367d0c5e 100644
--- a/GeoLib/IO/XmlIO/Qt/XmlStnInterface.h
+++ b/GeoLib/IO/XmlIO/Qt/XmlStnInterface.h
@@ -39,15 +39,18 @@ public:
XmlStnInterface(GeoLib::GEOObjects& geo_objs);
/// Reads an xml-file containing station object definitions into the GEOObjects used in the contructor (requires Qt)
- int readFile(const QString &fileName);
+ int readFile(const QString& fileName) override;
- bool readFile(std::string const& fname) { return readFile(QString(fname.c_str())) != 0; }
+ bool readFile(std::string const& fname) override
+ {
+ return readFile(QString(fname.c_str())) != 0;
+ }
/// Reads an xml-file using the RapidXML parser integrated in the source code (i.e. this function is usable without Qt)
int rapidReadFile(const std::string &fileName);
protected:
- bool write();
+ bool write() override;
private:
/// Reads GeoLib::Station- or StationBorehole-objects from an xml-file
diff --git a/GeoLib/Point.h b/GeoLib/Point.h
index 3d61d4ee2b1a2cbb3c0cb6d5c2c94370a63deaef..c0a8fd6a3e3102d82608eef18dac68aadd4b7e40 100644
--- a/GeoLib/Point.h
+++ b/GeoLib/Point.h
@@ -52,7 +52,7 @@ public:
{}
/// return a geometry type
- virtual GEOTYPE getGeoType() const {return GEOTYPE::POINT;}
+ GEOTYPE getGeoType() const override { return GEOTYPE::POINT; }
protected:
friend PointVec;
diff --git a/GeoLib/Polygon.h b/GeoLib/Polygon.h
index 08a7267f4b8741fdc882901864d54683d4c3a6a3..ed6593176dc631eb8bbfb0ba53a2e71a8003f393 100644
--- a/GeoLib/Polygon.h
+++ b/GeoLib/Polygon.h
@@ -54,7 +54,7 @@ public:
Polygon(Polygon const& other);
Polygon& operator=(Polygon const& rhs) = delete;
- virtual ~Polygon();
+ ~Polygon() override;
bool initialise ();
diff --git a/GeoLib/PolygonWithSegmentMarker.h b/GeoLib/PolygonWithSegmentMarker.h
index 6d91c215ad8a3ad5ee3cb5c4bb38bb1a4c8ad664..b42a46c2e261f0de9c425820046367767058f1b6 100644
--- a/GeoLib/PolygonWithSegmentMarker.h
+++ b/GeoLib/PolygonWithSegmentMarker.h
@@ -38,14 +38,14 @@ public:
* corresponding line segment.
* @see Polyline::addPoint()
*/
- virtual bool addPoint(std::size_t pnt_id) override;
+ bool addPoint(std::size_t pnt_id) override;
/**
* Method calls the @see Polyline::insertPoint() and initializes the inserted line
* segment with the same value the previous line segment had.
* @see Polyline::insertPoint()
*/
- virtual bool insertPoint(std::size_t pos, std::size_t pnt_id) override;
+ bool insertPoint(std::size_t pos, std::size_t pnt_id) override;
private:
std::vector<bool> _marker;
diff --git a/GeoLib/Polyline.h b/GeoLib/Polyline.h
index b754b38f9fdfebbe1350863aab5e6a1a9e3aa270..e71ce75a629b8d5148d82df34f790b210a78e5c0 100644
--- a/GeoLib/Polyline.h
+++ b/GeoLib/Polyline.h
@@ -101,11 +101,10 @@ public:
Polyline(const Polyline& ply);
Polyline& operator=(Polyline const& other) = delete;
- virtual ~Polyline() = default;
+ ~Polyline() override = default;
/// return a geometry type
- virtual GEOTYPE getGeoType() const {return GEOTYPE::POLYLINE;}
-
+ GEOTYPE getGeoType() const override { return GEOTYPE::POLYLINE; }
/** write the points to the stream */
void write(std::ostream &os) const;
diff --git a/GeoLib/PolylineWithSegmentMarker.h b/GeoLib/PolylineWithSegmentMarker.h
index a7f72b4da0d60c1d641ab86c4ab75c8deef617bf..a751a48c9114ff2c53f5b3a0e1b742f9e3eaabb9 100644
--- a/GeoLib/PolylineWithSegmentMarker.h
+++ b/GeoLib/PolylineWithSegmentMarker.h
@@ -44,14 +44,14 @@ public:
* corresponding line segment.
* @see Polyline::addPoint()
*/
- virtual bool addPoint(std::size_t pnt_id) override;
+ bool addPoint(std::size_t pnt_id) override;
/**
* Method calls the @see Polyline::insertPoint() and initializes the inserted line segment with the same
* value the previous line segment had.
* @see Polyline::insertPoint()
*/
- virtual bool insertPoint(std::size_t pos, std::size_t pnt_id) override;
+ bool insertPoint(std::size_t pos, std::size_t pnt_id) override;
private:
std::vector<bool> _marker;
diff --git a/GeoLib/Station.h b/GeoLib/Station.h
index aa131162090df24d7f00c5ea92c7677acf76cc31..05cf9e70bd47f864910507d0ebf1881537bd802c 100644
--- a/GeoLib/Station.h
+++ b/GeoLib/Station.h
@@ -65,7 +65,7 @@ public:
*/
Station(Station const& src);
- virtual ~Station();
+ ~Station() override;
/// Returns the name of the station.
std::string const& getName() const { return _name; }
diff --git a/GeoLib/StationBorehole.h b/GeoLib/StationBorehole.h
index 725d62c80f605eba399dae07c6a059031f1889fb..fbb2ea47140143d882f14c7d1ed3b093a21217c6 100644
--- a/GeoLib/StationBorehole.h
+++ b/GeoLib/StationBorehole.h
@@ -33,7 +33,7 @@ class StationBorehole : public Station
public:
/** constructor initialises the borehole with the given coordinates */
StationBorehole(double x = 0.0, double y = 0.0, double z = 0.0, const std::string &name = "");
- ~StationBorehole(void);
+ ~StationBorehole(void) override;
/// Creates a StationBorehole-object from a string (assuming the string has the right format)
static StationBorehole* createStation(const std::string &line);
diff --git a/GeoLib/Surface.h b/GeoLib/Surface.h
index 0dccba5e65b73941c9986a66dec807cc5e327b00..54f3a455cde56eb3bb4270d6f0c5659bf4ec4218 100644
--- a/GeoLib/Surface.h
+++ b/GeoLib/Surface.h
@@ -36,7 +36,7 @@ class Surface final : public GeoObject
public:
explicit Surface(const std::vector<Point*>& pnt_vec);
Surface(Surface const& src);
- ~Surface();
+ ~Surface() override;
Surface(Surface && src) = delete;
Surface& operator=(Surface const& src) = delete;
diff --git a/MaterialLib/Adsorption/Adsorption.h b/MaterialLib/Adsorption/Adsorption.h
index 685d6bbfc417d7a9f5737d1fb2adf735b810fcf7..2ab89082a4404b47e0cb80506d6992a490e01b0c 100644
--- a/MaterialLib/Adsorption/Adsorption.h
+++ b/MaterialLib/Adsorption/Adsorption.h
@@ -34,9 +34,11 @@ public:
double getEquilibriumLoading(const double p_Ads, const double T_Ads, const double M_Ads)
const override;
- virtual double getEnthalpy(const double p_Ads, const double T_Ads, const double M_Ads) const override;
- virtual double getReactionRate(const double p_Ads, const double T_Ads,
- const double M_Ads, const double loading) const override;
+ double getEnthalpy(const double p_Ads, const double T_Ads,
+ const double M_Ads) const override;
+ double getReactionRate(const double p_Ads, const double T_Ads,
+ const double M_Ads,
+ const double loading) const override;
/**
* @brief get_d_reaction_rate
* @param p_Ads
diff --git a/MaterialLib/Adsorption/Density100MPa.h b/MaterialLib/Adsorption/Density100MPa.h
index ecd5d099abf90d3b66afc1a8bd0d6ac6e1f9b021..6921c89c300e5fb8e4773ae0569d172ccde90c9b 100644
--- a/MaterialLib/Adsorption/Density100MPa.h
+++ b/MaterialLib/Adsorption/Density100MPa.h
@@ -17,10 +17,10 @@ namespace Adsorption
class Density100MPa : public AdsorptionReaction
{
public:
- double getAdsorbateDensity(const double T_Ads) const;
- double getAlphaT(const double T_Ads) const;
- double characteristicCurve(const double A) const;
- double dCharacteristicCurve(const double A) const;
+ double getAdsorbateDensity(const double T_Ads) const override;
+ double getAlphaT(const double T_Ads) const override;
+ double characteristicCurve(const double A) const override;
+ double dCharacteristicCurve(const double A) const override;
};
}
diff --git a/MaterialLib/Adsorption/DensityConst.h b/MaterialLib/Adsorption/DensityConst.h
index 97a20104426108fd716294111374a9237f9ef7be..1bc60c77b8d28af7f09ba48997547ec873669271 100644
--- a/MaterialLib/Adsorption/DensityConst.h
+++ b/MaterialLib/Adsorption/DensityConst.h
@@ -17,10 +17,10 @@ namespace Adsorption
class DensityConst : public AdsorptionReaction
{
public:
- double getAdsorbateDensity(const double T_Ads) const;
- double getAlphaT(const double T_Ads) const;
- double characteristicCurve(const double A) const;
- double dCharacteristicCurve(const double A) const;
+ double getAdsorbateDensity(const double T_Ads) const override;
+ double getAlphaT(const double T_Ads) const override;
+ double characteristicCurve(const double A) const override;
+ double dCharacteristicCurve(const double A) const override;
};
}
diff --git a/MaterialLib/Adsorption/DensityCook.h b/MaterialLib/Adsorption/DensityCook.h
index 35722161f6c64937a914b0d2ec34ae6d755aed91..b9215f8dc1ceb05027ffebf6d80cf77696370462 100644
--- a/MaterialLib/Adsorption/DensityCook.h
+++ b/MaterialLib/Adsorption/DensityCook.h
@@ -17,10 +17,10 @@ namespace Adsorption
class DensityCook : public AdsorptionReaction
{
public:
- double getAdsorbateDensity(const double T_Ads) const;
- double getAlphaT(const double T_Ads) const;
- double characteristicCurve(const double A) const;
- double dCharacteristicCurve(const double A) const;
+ double getAdsorbateDensity(const double T_Ads) const override;
+ double getAlphaT(const double T_Ads) const override;
+ double characteristicCurve(const double A) const override;
+ double dCharacteristicCurve(const double A) const override;
};
inline double rhoWaterDean(const double T_Ads)
diff --git a/MaterialLib/Adsorption/DensityDubinin.h b/MaterialLib/Adsorption/DensityDubinin.h
index a66bb696bb83bcab6645c41284f78a978635e303..5cbb239d561344f2ddfe7f5fb36ca2cac04000c6 100644
--- a/MaterialLib/Adsorption/DensityDubinin.h
+++ b/MaterialLib/Adsorption/DensityDubinin.h
@@ -17,10 +17,10 @@ namespace Adsorption
class DensityDubinin : public AdsorptionReaction
{
public:
- double getAdsorbateDensity(const double T_Ads) const;
- double getAlphaT(const double T_Ads) const;
- double characteristicCurve(const double A) const;
- double dCharacteristicCurve(const double A) const;
+ double getAdsorbateDensity(const double T_Ads) const override;
+ double getAlphaT(const double T_Ads) const override;
+ double characteristicCurve(const double A) const override;
+ double dCharacteristicCurve(const double A) const override;
};
}
diff --git a/MaterialLib/Adsorption/DensityHauer.h b/MaterialLib/Adsorption/DensityHauer.h
index 1bf9d1995c53b63cf9b9a19f65125c26c98131f4..5b47e5cec28365c7739fd7bb144c982dd4539fb9 100644
--- a/MaterialLib/Adsorption/DensityHauer.h
+++ b/MaterialLib/Adsorption/DensityHauer.h
@@ -18,10 +18,10 @@ namespace Adsorption
class DensityHauer : public AdsorptionReaction
{
public:
- double getAdsorbateDensity(const double T_Ads) const;
- double getAlphaT(const double T_Ads) const;
- double characteristicCurve(const double A) const;
- double dCharacteristicCurve(const double A) const;
+ double getAdsorbateDensity(const double T_Ads) const override;
+ double getAlphaT(const double T_Ads) const override;
+ double characteristicCurve(const double A) const override;
+ double dCharacteristicCurve(const double A) const override;
};
inline double rhoWaterHauer(const double T_Ads)
diff --git a/MaterialLib/Adsorption/DensityLegacy.h b/MaterialLib/Adsorption/DensityLegacy.h
index b75632a8393a5d55d3897f39b38e8eb3149dc366..a818e73f206340cd8d39c9289562a50c201640e6 100644
--- a/MaterialLib/Adsorption/DensityLegacy.h
+++ b/MaterialLib/Adsorption/DensityLegacy.h
@@ -17,10 +17,10 @@ namespace Adsorption
class DensityLegacy : public AdsorptionReaction
{
public:
- double getAdsorbateDensity(const double T_Ads) const;
- double getAlphaT(const double T_Ads) const;
- double characteristicCurve(const double A) const;
- double dCharacteristicCurve(const double A) const;
+ double getAdsorbateDensity(const double T_Ads) const override;
+ double getAlphaT(const double T_Ads) const override;
+ double characteristicCurve(const double A) const override;
+ double dCharacteristicCurve(const double A) const override;
};
}
diff --git a/MaterialLib/Adsorption/DensityMette.h b/MaterialLib/Adsorption/DensityMette.h
index 0ec144f1f57fbebc374b2e5f871448e199064f3d..27e4a702d21db2a376646bfc403951078b79e3e3 100644
--- a/MaterialLib/Adsorption/DensityMette.h
+++ b/MaterialLib/Adsorption/DensityMette.h
@@ -17,10 +17,10 @@ namespace Adsorption
class DensityMette : public AdsorptionReaction
{
public:
- double getAdsorbateDensity(const double T_Ads) const;
- double getAlphaT(const double T_Ads) const;
- double characteristicCurve(const double A) const;
- double dCharacteristicCurve(const double A) const;
+ double getAdsorbateDensity(const double T_Ads) const override;
+ double getAlphaT(const double T_Ads) const override;
+ double characteristicCurve(const double A) const override;
+ double dCharacteristicCurve(const double A) const override;
};
}
diff --git a/MaterialLib/Adsorption/DensityNunez.h b/MaterialLib/Adsorption/DensityNunez.h
index 7e4e4e71b8805ef8333247aa1a7ec33cff93f597..ad7e2a0c24f82dfaaa1b3301964364a834091363 100644
--- a/MaterialLib/Adsorption/DensityNunez.h
+++ b/MaterialLib/Adsorption/DensityNunez.h
@@ -17,10 +17,10 @@ namespace Adsorption
class DensityNunez : public AdsorptionReaction
{
public:
- double getAdsorbateDensity(const double T_Ads) const;
- double getAlphaT(const double T_Ads) const;
- double characteristicCurve(const double A) const;
- double dCharacteristicCurve(const double A) const;
+ double getAdsorbateDensity(const double T_Ads) const override;
+ double getAlphaT(const double T_Ads) const override;
+ double characteristicCurve(const double A) const override;
+ double dCharacteristicCurve(const double A) const override;
};
}
diff --git a/MaterialLib/FractureModels/LinearElasticIsotropic.h b/MaterialLib/FractureModels/LinearElasticIsotropic.h
index 2bc3037dac02979acd8c709d82465358a462e725..5ff80779689b1c3cae0a80aea8e42aaff48622e8 100644
--- a/MaterialLib/FractureModels/LinearElasticIsotropic.h
+++ b/MaterialLib/FractureModels/LinearElasticIsotropic.h
@@ -43,7 +43,7 @@ public:
struct MaterialStateVariables
: public FractureModelBase<DisplacementDim>::MaterialStateVariables
{
- void pushBackState() {}
+ void pushBackState() override {}
};
std::unique_ptr<
diff --git a/MaterialLib/SolidModels/LinearElasticIsotropic.h b/MaterialLib/SolidModels/LinearElasticIsotropic.h
index 9e6357f40f7e9b75d8b869e0d414fb0eb3a669cb..7bd96a7f28d470f1f5abcfea3c5a0cc237e3ab6c 100644
--- a/MaterialLib/SolidModels/LinearElasticIsotropic.h
+++ b/MaterialLib/SolidModels/LinearElasticIsotropic.h
@@ -56,7 +56,7 @@ public:
struct MaterialStateVariables
: public MechanicsBase<DisplacementDim>::MaterialStateVariables
{
- void pushBackState() {}
+ void pushBackState() override {}
};
std::unique_ptr<
diff --git a/MeshLib/Elements/TemplateElement.h b/MeshLib/Elements/TemplateElement.h
index 8ed60a5e55127187d0e1f778dc247abbd72ceb98..413f25cbe2fcc9108802064a9e46da9dd7e27f5c 100644
--- a/MeshLib/Elements/TemplateElement.h
+++ b/MeshLib/Elements/TemplateElement.h
@@ -60,51 +60,53 @@ public:
TemplateElement(const TemplateElement &e);
/// Destructor
- virtual ~TemplateElement() = default;
+ ~TemplateElement() override = default;
/// Returns a copy of this object.
- virtual Element* clone() const
- {
- return new TemplateElement(*this);
- }
-
- virtual Element* clone(Node** nodes, std::size_t id) const
+ Element* clone() const override { return new TemplateElement(*this); }
+ Element* clone(Node** nodes, std::size_t id) const override
{
return new TemplateElement(nodes, id);
}
/// Get dimension of the mesh element.
- unsigned getDimension() const { return dimension; }
-
+ unsigned getDimension() const override { return dimension; }
/// Returns the edge i of the element.
- const Element* getEdge(unsigned i) const { return ELEMENT_RULE::EdgeReturn::getEdge(this, i); }
+ const Element* getEdge(unsigned i) const override
+ {
+ return ELEMENT_RULE::EdgeReturn::getEdge(this, i);
+ }
/// Returns the face i of the element.
- const Element* getFace(unsigned i) const { return ELEMENT_RULE::getFace(this, i); }
+ const Element* getFace(unsigned i) const override
+ {
+ return ELEMENT_RULE::getFace(this, i);
+ }
/// Get the number of edges for this element.
- unsigned getNumberOfEdges() const { return ELEMENT_RULE::n_edges; }
-
+ unsigned getNumberOfEdges() const override { return ELEMENT_RULE::n_edges; }
/// Get the number of faces for this element.
- unsigned getNumberOfFaces() const { return ELEMENT_RULE::n_faces; }
-
+ unsigned getNumberOfFaces() const override { return ELEMENT_RULE::n_faces; }
/// Get the number of neighbors for this element.
- unsigned getNumberOfNeighbors() const { return ELEMENT_RULE::n_neighbors; }
+ unsigned getNumberOfNeighbors() const override
+ {
+ return ELEMENT_RULE::n_neighbors;
+ }
/// Get the number of linear nodes for this element.
- virtual unsigned getNumberOfBaseNodes() const { return n_base_nodes; }
-
+ unsigned getNumberOfBaseNodes() const override { return n_base_nodes; }
/// Get the number of all nodes for this element.
- virtual unsigned getNumberOfNodes() const { return n_all_nodes; }
-
+ unsigned getNumberOfNodes() const override { return n_all_nodes; }
/// Get the type of this element.
- virtual MeshElemType getGeomType() const { return ELEMENT_RULE::mesh_elem_type; }
+ MeshElemType getGeomType() const override
+ {
+ return ELEMENT_RULE::mesh_elem_type;
+ }
/// Get the FEM type of this element.
- virtual CellType getCellType() const { return ELEMENT_RULE::cell_type; }
-
+ CellType getCellType() const override { return ELEMENT_RULE::cell_type; }
/// Returns true if these two indices form an edge and false otherwise
- bool isEdge(unsigned idx1, unsigned idx2) const;
+ bool isEdge(unsigned idx1, unsigned idx2) const override;
/**
* \copydoc MeshLib::Element::isPntInElement()
@@ -112,7 +114,9 @@ public:
* This is actually calling the correct implementation of this function
* passing the element's nodes.
*/
- bool isPntInElement(MathLib::Point3d const& pnt, double eps = std::numeric_limits<double>::epsilon()) const
+ bool isPntInElement(
+ MathLib::Point3d const& pnt,
+ double eps = std::numeric_limits<double>::epsilon()) const override
{
return ELEMENT_RULE::isPntInElement(this->_nodes, pnt, eps);
}
@@ -120,22 +124,25 @@ public:
/**
* Tests if the element is geometrically valid.
*/
- virtual ElementErrorCode validate() const
+ ElementErrorCode validate() const override
{
return ELEMENT_RULE::validate(this);
}
/// Returns the ID of a face given an array of nodes.
- unsigned identifyFace(Node* nodes[3]) const
+ unsigned identifyFace(Node* nodes[3]) const override
{
return ELEMENT_RULE::identifyFace(this->_nodes, nodes);
}
/// Calculates the volume of a convex hexahedron by partitioning it into six tetrahedra.
- virtual double computeVolume() {return ELEMENT_RULE::computeVolume(this->_nodes);}
+ double computeVolume() override
+ {
+ return ELEMENT_RULE::computeVolume(this->_nodes);
+ }
/// Return a specific edge node.
- virtual inline Node* getEdgeNode(unsigned edge_id, unsigned node_id) const
+ inline Node* getEdgeNode(unsigned edge_id, unsigned node_id) const override
{
if (getNumberOfEdges()>0)
return const_cast<Node*>(this->_nodes[ELEMENT_RULE::edge_nodes[edge_id][node_id]]);
@@ -147,7 +154,7 @@ public:
* Checks if the node order of an element is correct by testing surface normals.
* For 1D elements this always returns true.
*/
- virtual bool testElementNodeOrder() const
+ bool testElementNodeOrder() const override
{
return ELEMENT_RULE::testElementNodeOrder(this);
}
diff --git a/MeshLib/IO/Legacy/MeshIO.h b/MeshLib/IO/Legacy/MeshIO.h
index 86646c47adfd8e3459b47e8544554464c6d4a0d1..9571e84f5e4c7c62d5ac4a0f7f7f80a156ab1d90 100644
--- a/MeshLib/IO/Legacy/MeshIO.h
+++ b/MeshLib/IO/Legacy/MeshIO.h
@@ -39,7 +39,7 @@ public:
/// Constructor.
MeshIO();
- virtual ~MeshIO() = default;
+ ~MeshIO() override = default;
/// Read mesh from file.
MeshLib::Mesh* loadMeshFromFile(const std::string& fileName);
@@ -49,7 +49,7 @@ public:
protected:
/// Write mesh to stream.
- bool write();
+ bool write() override;
private:
void writeElements(std::vector<MeshLib::Element*> const& ele_vec,
diff --git a/MeshLib/MeshGenerators/LayeredVolume.h b/MeshLib/MeshGenerators/LayeredVolume.h
index 34424ad9812a14105515c1a80ea3bb412c40e407..9557a930a5ee0505d2ee86f711e9909d9b76e922 100644
--- a/MeshLib/MeshGenerators/LayeredVolume.h
+++ b/MeshLib/MeshGenerators/LayeredVolume.h
@@ -32,7 +32,7 @@ class LayeredVolume : public LayeredMeshGenerator
{
public:
LayeredVolume() = default;
- ~LayeredVolume() = default;
+ ~LayeredVolume() override = default;
/**
* Constructs a subsurface representation of a mesh using only 2D elements
@@ -53,10 +53,10 @@ public:
* @result true if the subsurface representation has been created, false if
* there was an error
*/
- bool createRasterLayers(const MeshLib::Mesh &mesh,
- const std::vector<GeoLib::Raster const*> &rasters,
+ bool createRasterLayers(const MeshLib::Mesh& mesh,
+ const std::vector<GeoLib::Raster const*>& rasters,
double minimum_thickness,
- double noDataReplacementValue = 0.0);
+ double noDataReplacementValue = 0.0) override;
/// Returns the region attribute vector necessary for assigning region
/// attributes via TetGen
@@ -67,7 +67,9 @@ public:
private:
/// Adds another layer to the subsurface mesh
- void addLayerToMesh(const MeshLib::Mesh &mesh_layer, unsigned layer_id, GeoLib::Raster const& raster);
+ void addLayerToMesh(const MeshLib::Mesh& mesh_layer,
+ unsigned layer_id,
+ GeoLib::Raster const& raster) override;
/// Creates boundary surfaces between the mapped layers to make the volumes watertight
void addLayerBoundaries(const MeshLib::Mesh &layer, std::size_t nLayers);
diff --git a/MeshLib/MeshGenerators/MeshLayerMapper.h b/MeshLib/MeshGenerators/MeshLayerMapper.h
index 382826b405eb0b71e1c9ef0da19442710aec3c95..e82c48adbe2b121b38dbda7176453a07b9a953df 100644
--- a/MeshLib/MeshGenerators/MeshLayerMapper.h
+++ b/MeshLib/MeshGenerators/MeshLayerMapper.h
@@ -25,7 +25,7 @@ namespace MeshLib
class MeshLayerMapper : public LayeredMeshGenerator
{
public:
- virtual ~MeshLayerMapper() = default;
+ ~MeshLayerMapper() override = default;
/**
* Based on a 2D triangle-or quad mesh this method creates a 3D mesh with a given number of prism- or hex-layers
@@ -52,7 +52,7 @@ public:
bool createRasterLayers(MeshLib::Mesh const& mesh,
std::vector<GeoLib::Raster const*> const& rasters,
double minimum_thickness,
- double noDataReplacementValue = 0.0);
+ double noDataReplacementValue = 0.0) override;
/**
* Maps the elevation of nodes of a given 2D mesh according to the raster. At
@@ -66,7 +66,9 @@ public:
private:
/// Adds another layer to a subsurface mesh
- void addLayerToMesh(const MeshLib::Mesh &mesh_layer, unsigned layer_id, GeoLib::Raster const& raster);
+ void addLayerToMesh(const MeshLib::Mesh& mesh_layer,
+ unsigned layer_id,
+ GeoLib::Raster const& raster) override;
};
} // end namespace MeshLib
diff --git a/MeshLib/MeshQuality/AngleSkewMetric.h b/MeshLib/MeshQuality/AngleSkewMetric.h
index c7eee5a98e7fbd74f6a956c355bf812c8ecf7c3b..8cd75df309836fc0791ea3911e206970ed9b4c83 100644
--- a/MeshLib/MeshQuality/AngleSkewMetric.h
+++ b/MeshLib/MeshQuality/AngleSkewMetric.h
@@ -27,7 +27,7 @@ class AngleSkewMetric final : public ElementQualityMetric
public:
AngleSkewMetric(Mesh const& mesh);
- void calculateQuality();
+ void calculateQuality() override;
private:
double checkTriangle(Element const& elem) const;
diff --git a/MeshLib/MeshQuality/EdgeRatioMetric.h b/MeshLib/MeshQuality/EdgeRatioMetric.h
index 4ebb39482582e2301991ae4f6ff06c618d3efa75..e8c9a025c07c19960fd1f7e10b2c2bb79e2338a7 100644
--- a/MeshLib/MeshQuality/EdgeRatioMetric.h
+++ b/MeshLib/MeshQuality/EdgeRatioMetric.h
@@ -27,9 +27,9 @@ class EdgeRatioMetric : public ElementQualityMetric
{
public:
EdgeRatioMetric(Mesh const& mesh);
- virtual ~EdgeRatioMetric() = default;
+ ~EdgeRatioMetric() override = default;
- virtual void calculateQuality ();
+ void calculateQuality() override;
private:
double checkTriangle (MathLib::Point3d const& a,
diff --git a/MeshLib/MeshQuality/ElementSizeMetric.h b/MeshLib/MeshQuality/ElementSizeMetric.h
index 3387bfecae6932083fa63c29e6ea02c3fc15fd6e..6f1dadb4e15507adad7a6e88de99934754b1d2e3 100644
--- a/MeshLib/MeshQuality/ElementSizeMetric.h
+++ b/MeshLib/MeshQuality/ElementSizeMetric.h
@@ -26,9 +26,9 @@ class ElementSizeMetric : public ElementQualityMetric
{
public:
ElementSizeMetric(Mesh const& mesh);
- virtual ~ElementSizeMetric() = default;
+ ~ElementSizeMetric() override = default;
- virtual void calculateQuality ();
+ void calculateQuality() override;
private:
std::size_t calc1dQuality();
diff --git a/MeshLib/MeshQuality/RadiusEdgeRatioMetric.h b/MeshLib/MeshQuality/RadiusEdgeRatioMetric.h
index 2ee2e36c88a5452dbdb2afc75f22f25d17044237..f872557c4f6da53969c985f19a1f0f79e7ecea30 100644
--- a/MeshLib/MeshQuality/RadiusEdgeRatioMetric.h
+++ b/MeshLib/MeshQuality/RadiusEdgeRatioMetric.h
@@ -27,8 +27,8 @@ class RadiusEdgeRatioMetric : public ElementQualityMetric
{
public:
RadiusEdgeRatioMetric(Mesh const& mesh);
- virtual ~RadiusEdgeRatioMetric() = default;
+ ~RadiusEdgeRatioMetric() override = default;
- virtual void calculateQuality ();
+ void calculateQuality() override;
};
}
diff --git a/MeshLib/MeshQuality/SizeDifferenceMetric.h b/MeshLib/MeshQuality/SizeDifferenceMetric.h
index cf6c553da394412d69be55a4659910e4ebc98bc6..b2470c33166a7855d95cd3b53cda16e8d4065895 100644
--- a/MeshLib/MeshQuality/SizeDifferenceMetric.h
+++ b/MeshLib/MeshQuality/SizeDifferenceMetric.h
@@ -27,8 +27,8 @@ class SizeDifferenceMetric : public ElementQualityMetric
{
public:
SizeDifferenceMetric(Mesh const& mesh);
- virtual ~SizeDifferenceMetric() = default;
+ ~SizeDifferenceMetric() override = default;
- virtual void calculateQuality ();
+ void calculateQuality() override;
};
}
diff --git a/MeshLib/PropertyVector.h b/MeshLib/PropertyVector.h
index 3b33ab3e68f0216830189bfbf679dc2ff8111015..a7ed674afee0c57748ea4959ff2072651d0bed92 100644
--- a/MeshLib/PropertyVector.h
+++ b/MeshLib/PropertyVector.h
@@ -85,7 +85,7 @@ public:
}
PropertyVectorBase* clone(
- std::vector<std::size_t> const& exclude_positions) const
+ std::vector<std::size_t> const& exclude_positions) const override
{
auto* t(new PropertyVector<PROP_VAL_TYPE>(
_property_name, _mesh_item_type, _n_components));
@@ -144,7 +144,7 @@ class PropertyVector<T*> : public std::vector<std::size_t>,
friend class Properties;
public:
/// Destructor ensures the deletion of the heap-constructed objects.
- ~PropertyVector()
+ ~PropertyVector() override
{
for (auto v : _values)
delete [] v;
@@ -195,7 +195,8 @@ public:
return _n_components * std::vector<std::size_t>::size();
}
- PropertyVectorBase* clone(std::vector<std::size_t> const& exclude_positions) const
+ PropertyVectorBase* clone(
+ std::vector<std::size_t> const& exclude_positions) const override
{
// create new PropertyVector with modified mapping
PropertyVector<T*> *t(new PropertyVector<T*>
diff --git a/MeshLib/Vtk/VtkMeshNodalCoordinatesTemplate.h b/MeshLib/Vtk/VtkMeshNodalCoordinatesTemplate.h
index 350736b8f0b20ee31a819e9c7eb6f54fdad9a3b3..6aaa36d52258b277671594499b8518e0fb01e296 100644
--- a/MeshLib/Vtk/VtkMeshNodalCoordinatesTemplate.h
+++ b/MeshLib/Vtk/VtkMeshNodalCoordinatesTemplate.h
@@ -47,7 +47,7 @@ public:
vtkMappedDataArrayNewInstanceMacro(VtkMeshNodalCoordinatesTemplate<Scalar>);
#endif // vtk version
static VtkMeshNodalCoordinatesTemplate *New();
- virtual void PrintSelf(std::ostream &os, vtkIndent indent) override;
+ void PrintSelf(std::ostream& os, vtkIndent indent) override;
/// Pass the nodes from OGS mesh
void SetNodes(std::vector<MeshLib::Node*> const & nodes);
@@ -117,7 +117,7 @@ public:
protected:
VtkMeshNodalCoordinatesTemplate();
- ~VtkMeshNodalCoordinatesTemplate();
+ ~VtkMeshNodalCoordinatesTemplate() override;
const std::vector<MeshLib::Node*>* _nodes;
diff --git a/NumLib/DOF/SimpleMatrixVectorProvider.h b/NumLib/DOF/SimpleMatrixVectorProvider.h
index c288742d2009fb2dbe71f3853169b0f806b66152..8f4ade72e7d2a90fd87705cfa55860f5f3ddcaa5 100644
--- a/NumLib/DOF/SimpleMatrixVectorProvider.h
+++ b/NumLib/DOF/SimpleMatrixVectorProvider.h
@@ -57,7 +57,7 @@ public:
void releaseMatrix(GlobalMatrix const& A) override;
- ~SimpleMatrixVectorProvider();
+ ~SimpleMatrixVectorProvider() override;
private:
template<bool do_search, typename... Args>
diff --git a/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator.h b/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator.h
index a5f58e2910bc59c252a9e8475fa05cf4e02fb5d0..aa8929267d47411a80203c52aec28ee973a1013e 100644
--- a/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator.h
+++ b/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator.h
@@ -71,7 +71,7 @@ public:
return _residuals;
}
- ~LocalLinearLeastSquaresExtrapolator()
+ ~LocalLinearLeastSquaresExtrapolator() override
{
NumLib::GlobalVectorProvider::provider.releaseVector(
_nodal_values);
diff --git a/NumLib/Function/LinearInterpolationAlongPolyline.h b/NumLib/Function/LinearInterpolationAlongPolyline.h
index 1e214df96f6fcc9329e2ad3c78dcb87e499c2616..db1143bbc0599ea41647073d93aab37eadac80a3 100644
--- a/NumLib/Function/LinearInterpolationAlongPolyline.h
+++ b/NumLib/Function/LinearInterpolationAlongPolyline.h
@@ -56,7 +56,7 @@ public:
* @return interpolated value. A default value is returned if the given point
* is not located on a polyline
*/
- double operator()(const MathLib::Point3d& pnt) const;
+ double operator()(const MathLib::Point3d& pnt) const override;
private:
/// construct an interpolation algorithm
diff --git a/NumLib/Function/LinearInterpolationOnSurface.h b/NumLib/Function/LinearInterpolationOnSurface.h
index 6529d273985fcddfde59937b39d24ad9de2d1df0..fb7c94f65d9c2556bee7d0b0430ae572d5ae9ab2 100644
--- a/NumLib/Function/LinearInterpolationOnSurface.h
+++ b/NumLib/Function/LinearInterpolationOnSurface.h
@@ -55,7 +55,7 @@ public:
* @return interpolated value. A default value is returned if the given point
* is not located on a surface
*/
- double operator()(const MathLib::Point3d& pnt) const;
+ double operator()(const MathLib::Point3d& pnt) const override;
private:
/// rotate a triangle to XY plane
diff --git a/NumLib/Function/TemplateSpatialFunction.h b/NumLib/Function/TemplateSpatialFunction.h
index 4f640cb5cc4f466d076afa4736fbf90aa2c25159..209007687927807e772eddff9fe35afee5a9165f 100644
--- a/NumLib/Function/TemplateSpatialFunction.h
+++ b/NumLib/Function/TemplateSpatialFunction.h
@@ -38,7 +38,7 @@ public:
* @param pnt a point object
* @return evaluated value
*/
- virtual double operator()(const MathLib::Point3d& pnt) const
+ double operator()(const MathLib::Point3d& pnt) const override
{
return _f(pnt.getCoords());
}
diff --git a/NumLib/ODESolver/MatrixTranslator.h b/NumLib/ODESolver/MatrixTranslator.h
index f4edf65943bf5aa0acfd6749b24ebefbdee25ec2..7565730d762354841c340e2d49c3b4a216a2b6a1 100644
--- a/NumLib/ODESolver/MatrixTranslator.h
+++ b/NumLib/ODESolver/MatrixTranslator.h
@@ -224,7 +224,7 @@ public:
{
}
- ~MatrixTranslatorCrankNicolson()
+ ~MatrixTranslatorCrankNicolson() override
{
NumLib::GlobalMatrixProvider::provider.releaseMatrix(
_M_bar);
diff --git a/NumLib/ODESolver/TimeDiscretization.h b/NumLib/ODESolver/TimeDiscretization.h
index ea6dd2ec6b641dba25dd623a56cfaabfcef434fd..0db170d920e23a839d14025ff862284e4f07e7d6 100644
--- a/NumLib/ODESolver/TimeDiscretization.h
+++ b/NumLib/ODESolver/TimeDiscretization.h
@@ -211,7 +211,7 @@ public:
{
}
- ~BackwardEuler()
+ ~BackwardEuler() override
{
NumLib::GlobalVectorProvider::provider.releaseVector(_x_old);
}
@@ -260,7 +260,7 @@ public:
{
}
- ~ForwardEuler()
+ ~ForwardEuler() override
{
NumLib::GlobalVectorProvider::provider.releaseVector(_x_old);
}
@@ -335,7 +335,7 @@ public:
{
}
- ~CrankNicolson()
+ ~CrankNicolson() override
{
NumLib::GlobalVectorProvider::provider.releaseVector(_x_old);
}
@@ -422,7 +422,7 @@ public:
_xs_old.reserve(num_steps);
}
- ~BackwardDifferentiationFormula()
+ ~BackwardDifferentiationFormula() override
{
for (auto* x : _xs_old)
NumLib::GlobalVectorProvider::provider.releaseVector(*x);
diff --git a/NumLib/ODESolver/TimeDiscretizedODESystem.h b/NumLib/ODESolver/TimeDiscretizedODESystem.h
index 4aa4fcb345c38dd4f268cf7dc2510c540f31d207..122803064fa1e68f4c411ae1a9b32dc296a19e25 100644
--- a/NumLib/ODESolver/TimeDiscretizedODESystem.h
+++ b/NumLib/ODESolver/TimeDiscretizedODESystem.h
@@ -84,7 +84,7 @@ public:
*/
explicit TimeDiscretizedODESystem(ODE& ode, TimeDisc& time_discretization);
- ~TimeDiscretizedODESystem();
+ ~TimeDiscretizedODESystem() override;
void assemble(const GlobalVector& x_new_timestep,
ProcessLib::StaggeredCouplingTerm const& coupling_term)
@@ -178,7 +178,7 @@ public:
*/
explicit TimeDiscretizedODESystem(ODE& ode, TimeDisc& time_discretization);
- ~TimeDiscretizedODESystem();
+ ~TimeDiscretizedODESystem() override;
void assemble(const GlobalVector& x_new_timestep,
ProcessLib::StaggeredCouplingTerm const& coupling_term)
diff --git a/NumLib/TimeStepping/Algorithms/IterationNumberBasedAdaptiveTimeStepping.h b/NumLib/TimeStepping/Algorithms/IterationNumberBasedAdaptiveTimeStepping.h
index b0c20f7e3801aa3765a00098eaf52171ac8aca2d..38058e29d314b10b0cacf9fa6a4ccabddbc7b936 100644
--- a/NumLib/TimeStepping/Algorithms/IterationNumberBasedAdaptiveTimeStepping.h
+++ b/NumLib/TimeStepping/Algorithms/IterationNumberBasedAdaptiveTimeStepping.h
@@ -84,25 +84,26 @@ public:
std::vector<double>
multiplier_vector);
- virtual ~IterationNumberBasedAdaptiveTimeStepping() = default;
+ ~IterationNumberBasedAdaptiveTimeStepping() override = default;
/// return the beginning of time steps
- virtual double begin() const {return _t_initial;}
-
+ double begin() const override { return _t_initial; }
/// return the end of time steps
- virtual double end() const {return _t_end;}
-
+ double end() const override { return _t_end; }
/// return current time step
- virtual const TimeStep getTimeStep() const;
+ const TimeStep getTimeStep() const override;
/// move to the next time step
- virtual bool next();
+ bool next() override;
/// return if the current step is accepted
- virtual bool accepted() const;
+ bool accepted() const override;
/// return a history of time step sizes
- virtual const std::vector<double>& getTimeStepSizeHistory() const {return this->_dt_vector;}
+ const std::vector<double>& getTimeStepSizeHistory() const override
+ {
+ return this->_dt_vector;
+ }
/// set the number of iterations
void setNIterations(std::size_t n_itr) {this->_iter_times = n_itr;}
diff --git a/ProcessLib/HeatConduction/HeatConductionProcess.h b/ProcessLib/HeatConduction/HeatConductionProcess.h
index ca7c77a8330ae39975bcc0c01cfa76fe1e80e5fb..55d2d7c151ae082a1b49a302cb0f7fc1858dbf6a 100644
--- a/ProcessLib/HeatConduction/HeatConductionProcess.h
+++ b/ProcessLib/HeatConduction/HeatConductionProcess.h
@@ -46,7 +46,7 @@ public:
const double delta_t) override;
// Get the solution of the previous time step.
- virtual GlobalVector* getPreviousTimeStepSolution() const override
+ GlobalVector* getPreviousTimeStepSolution() const override
{
return _x_previous_timestep.get();
}
diff --git a/ProcessLib/LIE/HydroMechanics/LocalAssembler/HydroMechanicsLocalAssemblerInterface.h b/ProcessLib/LIE/HydroMechanics/LocalAssembler/HydroMechanicsLocalAssemblerInterface.h
index 98dfcd584c3d8ea86113d6bdadf4601bc083eb3c..d7dc816721750cb9b21ce1d4be0c0adb1c66f8b0 100644
--- a/ProcessLib/LIE/HydroMechanics/LocalAssembler/HydroMechanicsLocalAssemblerInterface.h
+++ b/ProcessLib/LIE/HydroMechanics/LocalAssembler/HydroMechanicsLocalAssemblerInterface.h
@@ -55,15 +55,14 @@ public:
"implemented.");
}
- virtual void assembleWithJacobian(
- double const t,
- std::vector<double> const& local_x_,
- std::vector<double> const& local_xdot_,
- const double /*dxdot_dx*/, const double /*dx_dx*/,
- std::vector<double>& /*local_M_data*/,
- std::vector<double>& /*local_K_data*/,
- std::vector<double>& local_b_data,
- std::vector<double>& local_Jac_data) override
+ void assembleWithJacobian(double const t,
+ std::vector<double> const& local_x_,
+ std::vector<double> const& local_xdot_,
+ const double /*dxdot_dx*/, const double /*dx_dx*/,
+ std::vector<double>& /*local_M_data*/,
+ std::vector<double>& /*local_K_data*/,
+ std::vector<double>& local_b_data,
+ std::vector<double>& local_Jac_data) override
{
auto const local_dof_size = local_x_.size();
diff --git a/ProcessLib/LIE/HydroMechanics/LocalAssembler/HydroMechanicsLocalAssemblerMatrix.h b/ProcessLib/LIE/HydroMechanics/LocalAssembler/HydroMechanicsLocalAssemblerMatrix.h
index 1aed6ea753f88d7f7ba31b07b8e5c92c87604326..1854cb01d1fe08eb07f08d8ce0307806421e0915 100644
--- a/ProcessLib/LIE/HydroMechanics/LocalAssembler/HydroMechanicsLocalAssemblerMatrix.h
+++ b/ProcessLib/LIE/HydroMechanics/LocalAssembler/HydroMechanicsLocalAssemblerMatrix.h
@@ -63,12 +63,11 @@ public:
}
protected:
- virtual void assembleWithJacobianConcrete(
- double const t,
- Eigen::VectorXd const& local_x,
- Eigen::VectorXd const& local_x_dot,
- Eigen::VectorXd& local_rhs,
- Eigen::MatrixXd& local_Jac) override;
+ void assembleWithJacobianConcrete(double const t,
+ Eigen::VectorXd const& local_x,
+ Eigen::VectorXd const& local_x_dot,
+ Eigen::VectorXd& local_rhs,
+ Eigen::MatrixXd& local_Jac) override;
void assembleBlockMatricesWithJacobian(
double const t,
diff --git a/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerInterface.h b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerInterface.h
index c7f6dfd91aa5c0be76f7db875a2b4cd17585a283..9f3aaf7c43c3fc478bea1a9ec605c2d99e701a68 100644
--- a/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerInterface.h
+++ b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerInterface.h
@@ -40,16 +40,14 @@ public:
_local_J.resize(_local_u.size(), _local_u.size());
}
-
- virtual void assembleWithJacobian(
- double const t,
- std::vector<double> const& local_x_,
- std::vector<double> const& /*local_xdot*/,
- const double /*dxdot_dx*/, const double /*dx_dx*/,
- std::vector<double>& /*local_M_data*/,
- std::vector<double>& /*local_K_data*/,
- std::vector<double>& local_b_data,
- std::vector<double>& local_Jac_data) override
+ void assembleWithJacobian(double const t,
+ std::vector<double> const& local_x_,
+ std::vector<double> const& /*local_xdot*/,
+ const double /*dxdot_dx*/, const double /*dx_dx*/,
+ std::vector<double>& /*local_M_data*/,
+ std::vector<double>& /*local_K_data*/,
+ std::vector<double>& local_b_data,
+ std::vector<double>& local_Jac_data) override
{
auto const local_dof_size = local_x_.size();
diff --git a/ProcessLib/Parameter/Parameter.h b/ProcessLib/Parameter/Parameter.h
index da183f3e7cd520b22278b4bdf4805d7c5a31b05a..73c94cf78f255b2b31bf9153da8352a564627889 100644
--- a/ProcessLib/Parameter/Parameter.h
+++ b/ProcessLib/Parameter/Parameter.h
@@ -63,8 +63,7 @@ template <typename T>
struct Parameter : public ParameterBase
{
Parameter(std::string const& name_) : ParameterBase(name_) {}
-
- virtual ~Parameter() = default;
+ ~Parameter() override = default;
//! Returns the number of components this Parameter has at every position and
//! point in time.
diff --git a/ProcessLib/Process.h b/ProcessLib/Process.h
index 674c898b132d1d6a4e56fbb8359e6c1192c6984e..7898b304856d003082935455962186203471c63c 100644
--- a/ProcessLib/Process.h
+++ b/ProcessLib/Process.h
@@ -56,37 +56,33 @@ public:
/// Postprocessing after a complete timestep.
void postTimestep(GlobalVector const& x);
- void preIteration(const unsigned iter,
- GlobalVector const& x) override final;
+ void preIteration(const unsigned iter, GlobalVector const& x) final;
/// compute secondary variables for the coupled equations or for output.
void computeSecondaryVariable(const double t, GlobalVector const& x,
StaggeredCouplingTerm const& coupled_term);
- NumLib::IterationResult postIteration(GlobalVector const& x) override final;
+ NumLib::IterationResult postIteration(GlobalVector const& x) final;
void initialize();
void setInitialConditions(const double t, GlobalVector& x);
- MathLib::MatrixSpecifications getMatrixSpecifications()
- const override final;
+ MathLib::MatrixSpecifications getMatrixSpecifications() const final;
void assemble(const double t, GlobalVector const& x, GlobalMatrix& M,
GlobalMatrix& K, GlobalVector& b,
- StaggeredCouplingTerm const& coupling_term)
- override final;
+ StaggeredCouplingTerm const& coupling_term) final;
void assembleWithJacobian(const double t, GlobalVector const& x,
GlobalVector const& xdot, const double dxdot_dx,
const double dx_dx, GlobalMatrix& M,
GlobalMatrix& K, GlobalVector& b,
GlobalMatrix& Jac,
- StaggeredCouplingTerm const& coupling_term)
- override final;
+ StaggeredCouplingTerm const& coupling_term) final;
std::vector<NumLib::IndexValueVector<GlobalIndexType>> const*
- getKnownSolutions(double const t) const override final
+ getKnownSolutions(double const t) const final
{
return _boundary_conditions.getKnownSolutions(t);
}
diff --git a/ProcessLib/TES/TESLocalAssembler.h b/ProcessLib/TES/TESLocalAssembler.h
index f92efd53962d447e668ffecec97cdcf7cb04e631..a69e42750aa9651b568e17da8134255ef718264f 100644
--- a/ProcessLib/TES/TESLocalAssembler.h
+++ b/ProcessLib/TES/TESLocalAssembler.h
@@ -26,7 +26,7 @@ class TESLocalAssemblerInterface
public NumLib::ExtrapolatableElement
{
public:
- virtual ~TESLocalAssemblerInterface() = default;
+ ~TESLocalAssemblerInterface() override = default;
virtual bool checkBounds(std::vector<double> const& local_x,
std::vector<double> const& local_x_prev_ts) = 0;
diff --git a/Tests/BaseLib/TestQuicksort.cpp b/Tests/BaseLib/TestQuicksort.cpp
index 87e1947766a918dd2628845790775c4152f8fbfc..56f287f7c023b3421404dfdc6f2023aea3bc53b3 100644
--- a/Tests/BaseLib/TestQuicksort.cpp
+++ b/Tests/BaseLib/TestQuicksort.cpp
@@ -29,7 +29,7 @@ namespace ac = autocheck;
struct BaseLibQuicksort : public ::testing::Test
{
- virtual void SetUp()
+ void SetUp() override
{
cls.trivial([](const std::vector<int>& xs)
{
diff --git a/Tests/FileIO/TestCsvReader.cpp b/Tests/FileIO/TestCsvReader.cpp
index f869ff36d1194e4c2b15694ae27c7f3417018594..20899151201ffec07c2526638344c4fbc8056b83 100644
--- a/Tests/FileIO/TestCsvReader.cpp
+++ b/Tests/FileIO/TestCsvReader.cpp
@@ -41,10 +41,7 @@ public:
out.close();
}
- ~CsvInterfaceTest()
- {
- std::remove(_file_name.c_str());
- }
+ ~CsvInterfaceTest() override { std::remove(_file_name.c_str()); }
protected:
int _result;
diff --git a/Tests/GeoLib/IO/TestGLIReader.cpp b/Tests/GeoLib/IO/TestGLIReader.cpp
index 07ded9b7bff8ee35d0e3cfd8d8499cff5a3198e5..74e4069786702eed4db2fb5360caab09f111abfd 100644
--- a/Tests/GeoLib/IO/TestGLIReader.cpp
+++ b/Tests/GeoLib/IO/TestGLIReader.cpp
@@ -37,10 +37,7 @@ public:
gli_out.close();
}
- ~OGSIOVer4InterfaceTest()
- {
- std::remove(_gli_fname.c_str());
- }
+ ~OGSIOVer4InterfaceTest() override { std::remove(_gli_fname.c_str()); }
protected:
std::string _gli_fname;
diff --git a/Tests/GeoLib/TestOctTree.cpp b/Tests/GeoLib/TestOctTree.cpp
index 816862ea272f056246fcef0cc8e0fff5b158117d..420f286b6383c597fd193d707d9231b0d3e8c66b 100644
--- a/Tests/GeoLib/TestOctTree.cpp
+++ b/Tests/GeoLib/TestOctTree.cpp
@@ -21,7 +21,7 @@ public:
using VectorOfPoints = std::vector<GeoLib::Point*>;
GeoLibOctTree() = default;
- ~GeoLibOctTree()
+ ~GeoLibOctTree() override
{
for (auto p : ps_ptr) {
delete p;
diff --git a/Tests/GeoLib/TestPolygon.cpp b/Tests/GeoLib/TestPolygon.cpp
index 1dff53f6f7234df32bcf1f53e6cd82ccfbb2da11..5070f65c72b248caddf5c8616c7a529c5f841a43 100644
--- a/Tests/GeoLib/TestPolygon.cpp
+++ b/Tests/GeoLib/TestPolygon.cpp
@@ -64,7 +64,7 @@ public:
_polygon = new GeoLib::Polygon(ply);
}
- ~PolygonTest()
+ ~PolygonTest() override
{
delete _polygon;
for (auto & _pnt : _pnts)
diff --git a/Tests/GeoLib/TestSimplePolygonTree.cpp b/Tests/GeoLib/TestSimplePolygonTree.cpp
index cbef784f4da7c38813df189fd5df3270e279e8db..8ab47d9ae1ca979898b18727a7cb2e0815c5d4aa 100644
--- a/Tests/GeoLib/TestSimplePolygonTree.cpp
+++ b/Tests/GeoLib/TestSimplePolygonTree.cpp
@@ -86,7 +86,7 @@ public:
_p3 = new GeoLib::Polygon(ply3);
}
- ~CreatePolygonTreesTest()
+ ~CreatePolygonTreesTest() override
{
delete _p0;
delete _p1;
diff --git a/Tests/MeshLib/MeshProperties.cpp b/Tests/MeshLib/MeshProperties.cpp
index 9122dac48c0d0acba96f9fee2dac685fd13c7a00..8f4e8e5e99a3fb035117b8486c108471179bea77 100644
--- a/Tests/MeshLib/MeshProperties.cpp
+++ b/Tests/MeshLib/MeshProperties.cpp
@@ -26,11 +26,7 @@ public:
mesh = MeshLib::MeshGenerator::generateRegularHexMesh(1.0, mesh_size);
}
- ~MeshLibProperties()
- {
- delete mesh;
- }
-
+ ~MeshLibProperties() override { delete mesh; }
static std::size_t const mesh_size = 5;
MeshLib::Mesh * mesh;
};
diff --git a/Tests/MeshLib/TestBoundaryElementSearch.cpp b/Tests/MeshLib/TestBoundaryElementSearch.cpp
index ea2458c0913061f9a46c7c031fca4b646771094f..4ee32928d4758bb982755c2aad5d186786d5b422 100644
--- a/Tests/MeshLib/TestBoundaryElementSearch.cpp
+++ b/Tests/MeshLib/TestBoundaryElementSearch.cpp
@@ -47,7 +47,7 @@ public:
_hex_mesh(MeshGenerator::generateRegularHexMesh(_geometric_size, _number_of_subdivisions_per_direction))
{}
- ~MeshLibBoundaryElementSearchInSimpleHexMesh()
+ ~MeshLibBoundaryElementSearchInSimpleHexMesh() override
{
delete _hex_mesh;
}
diff --git a/Tests/MeshLib/TestLineMesh.cpp b/Tests/MeshLib/TestLineMesh.cpp
index a26af03765c91dd2c8a35bff5c36d6685b974ae2..82d0323f12d949a9b8a914263cc14b3e9dd5915b 100644
--- a/Tests/MeshLib/TestLineMesh.cpp
+++ b/Tests/MeshLib/TestLineMesh.cpp
@@ -22,11 +22,7 @@ class MeshLibLineMesh : public ::testing::Test
mesh = MeshLib::MeshGenerator::generateLineMesh(extent, mesh_size);
}
- ~MeshLibLineMesh()
- {
- delete mesh;
- }
-
+ ~MeshLibLineMesh() override { delete mesh; }
static std::size_t const mesh_size = 9;
double extent = 1.0;
MeshLib::Mesh const* mesh;
diff --git a/Tests/MeshLib/TestMeshNodeSearch.cpp b/Tests/MeshLib/TestMeshNodeSearch.cpp
index 007974c9bbeb7d51c99285c05bcadb85a80fda28..c5e5190182955e4c04b33e64623a92e5fef08949 100644
--- a/Tests/MeshLib/TestMeshNodeSearch.cpp
+++ b/Tests/MeshLib/TestMeshNodeSearch.cpp
@@ -34,10 +34,7 @@ public:
_quad_mesh(MeshGenerator::generateRegularQuadMesh(_geometric_size, _number_of_subdivisions_per_direction))
{}
- ~MeshLibMeshNodeSearchInSimpleQuadMesh()
- {
- delete _quad_mesh;
- }
+ ~MeshLibMeshNodeSearchInSimpleQuadMesh() override { delete _quad_mesh; }
protected:
const double _geometric_size;
@@ -53,10 +50,7 @@ public:
_hex_mesh(MeshGenerator::generateRegularHexMesh(_geometric_size, _number_of_subdivisions_per_direction))
{}
- ~MeshLibMeshNodeSearchInSimpleHexMesh()
- {
- delete _hex_mesh;
- }
+ ~MeshLibMeshNodeSearchInSimpleHexMesh() override { delete _hex_mesh; }
protected:
const double _geometric_size;
diff --git a/Tests/MeshLib/TestQuadMesh.cpp b/Tests/MeshLib/TestQuadMesh.cpp
index c64042441d404a84a049d4ab73f0b9d852bd9c7c..a2bcf5120d7b145a757dcec1d52f9bb3cedddb45 100644
--- a/Tests/MeshLib/TestQuadMesh.cpp
+++ b/Tests/MeshLib/TestQuadMesh.cpp
@@ -23,11 +23,7 @@ class MeshLibQuadMesh : public ::testing::Test
mesh = MeshLib::MeshGenerator::generateRegularQuadMesh(1.0, n_elements);
}
- ~MeshLibQuadMesh()
- {
- delete mesh;
- }
-
+ ~MeshLibQuadMesh() override { delete mesh; }
static std::size_t const n_elements = 4;
static std::size_t const n_nodes = n_elements + 1;
static std::size_t const elements_stride = n_elements - 1;
diff --git a/Tests/MeshLib/TestTriLineMesh.cpp b/Tests/MeshLib/TestTriLineMesh.cpp
index 5d636af3753458119e6afd3fb9eeea7caaf25bc3..13d38fd1261afb94e52ae6a03bf7c022fe9b2194 100644
--- a/Tests/MeshLib/TestTriLineMesh.cpp
+++ b/Tests/MeshLib/TestTriLineMesh.cpp
@@ -45,7 +45,7 @@ class MeshLibTriLineMesh : public ::testing::Test
mesh = new MeshLib::Mesh("M", nodes, elements);
}
- ~MeshLibTriLineMesh()
+ ~MeshLibTriLineMesh() override
{
/*std::remove_if(elements.begin(), elements.end(),
[](MeshLib::Element* e) { delete e; return true; });
diff --git a/Tests/MeshLib/TestVtkMappedMeshSource.cpp b/Tests/MeshLib/TestVtkMappedMeshSource.cpp
index deb5d6f879a07b64864653488dbdbc9bfa155b91..18dfde09c5bcd746d93147f8315a12d3afba4ef2 100644
--- a/Tests/MeshLib/TestVtkMappedMeshSource.cpp
+++ b/Tests/MeshLib/TestVtkMappedMeshSource.cpp
@@ -128,11 +128,7 @@ class InSituMesh : public ::testing::Test
material_id_properties->begin(), material_id_properties->end(), 1);
}
- ~InSituMesh()
- {
- delete mesh;
- }
-
+ ~InSituMesh() override { delete mesh; }
MeshLib::Mesh * mesh;
const std::size_t subdivisions = 5;
const double length = 1.0;
diff --git a/Tests/NumLib/LocalToGlobalIndexMapMultiComponent.cpp b/Tests/NumLib/LocalToGlobalIndexMapMultiComponent.cpp
index 6777e610a70191f831bcafd9c205f8bd55fc88ee..908d622f288a0fc514868759a43418e16196c8b4 100644
--- a/Tests/NumLib/LocalToGlobalIndexMapMultiComponent.cpp
+++ b/Tests/NumLib/LocalToGlobalIndexMapMultiComponent.cpp
@@ -71,7 +71,7 @@ public:
mesh_items_all_nodes->getIntersectionByNodes(nodes));
}
- ~NumLibLocalToGlobalIndexMapMultiDOFTest()
+ ~NumLibLocalToGlobalIndexMapMultiDOFTest() override
{
for (auto e : boundary_elements)
delete e;
diff --git a/Tests/NumLib/TestCoordinatesMapping.cpp b/Tests/NumLib/TestCoordinatesMapping.cpp
index 679552adab4c1a3478519eb576a12454e72949a1..e17a215119c75ca7e0fc5db7c31e45204144897e 100644
--- a/Tests/NumLib/TestCoordinatesMapping.cpp
+++ b/Tests/NumLib/TestCoordinatesMapping.cpp
@@ -81,7 +81,7 @@ public:
vec_nodes.push_back(e->getNode(i));
}
- virtual ~NumLibFemNaturalCoordinatesMappingTest()
+ ~NumLibFemNaturalCoordinatesMappingTest() override
{
for (auto itr = vec_nodes.begin(); itr != vec_nodes.end(); ++itr)
delete *itr;
diff --git a/Tests/NumLib/TestFe.cpp b/Tests/NumLib/TestFe.cpp
index 10a24912de9bbb72ecc0f348fd050780b7d9151f..13a71fefa27771f9c5b45044b2afdf73a8d0def2 100644
--- a/Tests/NumLib/TestFe.cpp
+++ b/Tests/NumLib/TestFe.cpp
@@ -135,11 +135,11 @@ class NumLibFemIsoTest : public ::testing::Test, public T::TestFeType
vec_nodes.push_back(e->getNode(i));
}
- virtual ~NumLibFemIsoTest()
+ ~NumLibFemIsoTest() override
{
- for (auto itr = vec_nodes.begin(); itr!=vec_nodes.end(); ++itr )
+ for (auto itr = vec_nodes.begin(); itr != vec_nodes.end(); ++itr)
delete *itr;
- for (auto itr = vec_eles.begin(); itr!=vec_eles.end(); ++itr )
+ for (auto itr = vec_eles.begin(); itr != vec_eles.end(); ++itr)
delete *itr;
}
diff --git a/Tests/NumLib/TestMeshComponentMap.cpp b/Tests/NumLib/TestMeshComponentMap.cpp
index ba7bef491e0caee2c90d5a3d63a32fc32013c0f1..469a8229fb704f10c577e46451df05ca1fa09455 100644
--- a/Tests/NumLib/TestMeshComponentMap.cpp
+++ b/Tests/NumLib/TestMeshComponentMap.cpp
@@ -38,7 +38,7 @@ class NumLibMeshComponentMapTest : public ::testing::Test
components.emplace_back(new MeshLib::MeshSubsets{nodesSubset});
}
- ~NumLibMeshComponentMapTest()
+ ~NumLibMeshComponentMapTest() override
{
delete cmap;
delete nodesSubset;