From cfd0530b67acf3c9abb3c8c329745aa00fcdd5d5 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <github@naumov.de>
Date: Sat, 15 Apr 2017 16:54:02 +0200
Subject: [PATCH] Use default keyword for default ctors.
---
Applications/DataExplorer/Base/OGSError.cpp | 6 ++--
.../Base/QNonScalableGraphicsTextItem.cpp | 4 +--
.../DataExplorer/DataView/ColorTableModel.cpp | 4 +--
.../DataView/DataExplorerSettingsDialog.cpp | 4 +--
.../DataView/DiagramView/DetailWindow.cpp | 4 +--
.../DataView/DiagramView/DiagramList.cpp | 4 +--
.../DataView/DiagramView/QArrow.cpp | 4 +--
.../DataView/DiagramView/QGraphicsGrid.cpp | 4 +--
.../DataView/DirectConditionGenerator.h | 13 ++++---
.../DataView/ElementTreeModel.cpp | 4 +--
.../DataView/GeoOnMeshMappingDialog.cpp | 4 +--
.../DataExplorer/DataView/GeoTreeItem.h | 2 +-
.../DataExplorer/DataView/GeoTreeModel.cpp | 4 +--
.../DataExplorer/DataView/LicenseDialog.h | 3 +-
.../DataView/LinearEditDialog.cpp | 4 +--
.../DataView/MeshAnalysisDialog.cpp | 4 +--
.../DataView/MeshElementRemovalDialog.cpp | 4 +--
.../DataView/MeshLayerEditDialog.cpp | 4 +--
.../DataView/MeshQualitySelectionDialog.cpp | 4 +--
.../DataView/MeshValueEditDialog.cpp | 4 +--
.../DataExplorer/DataView/MshView.cpp | 4 +--
.../DataView/NetCdfConfigureDialog.cpp | 4 +--
.../DataExplorer/DataView/SaveMeshDialog.h | 2 +-
.../DataView/StationTreeModel.cpp | 4 +--
.../DataView/StratView/StratScene.cpp | 4 +--
.../DataView/SurfaceExtractionDialog.h | 2 +-
.../VtkVis/MeshFromRasterDialog.cpp | 6 +---
.../DataExplorer/VtkVis/QVtkDataSetMapper.cpp | 4 +--
.../VtkVis/VtkAlgorithmPropertyCheckbox.cpp | 4 +--
.../VtkVis/VtkAlgorithmPropertyLineEdit.cpp | 4 +--
.../VtkVis/VtkAlgorithmPropertyVectorEdit.cpp | 4 +--
.../VtkVis/VtkAppendArrayFilter.cpp | 8 ++---
.../DataExplorer/VtkVis/VtkBGImageSource.cpp | 4 +--
.../VtkVis/VtkColorByHeightFilter.cpp | 4 +--
.../VtkVis/VtkCompositeColorByHeightFilter.h | 2 +-
.../VtkCompositeColormapToImageFilter.cpp | 5 ++-
.../VtkVis/VtkCompositeContourFilter.cpp | 4 +--
.../VtkCompositeElementSelectionFilter.h | 2 +-
.../VtkVis/VtkCompositeGeoObjectFilter.cpp | 4 +--
.../VtkVis/VtkCompositeLineToTubeFilter.cpp | 4 +--
.../VtkCompositeTextureOnSurfaceFilter.cpp | 5 ++-
.../VtkVis/VtkCompositeThresholdFilter.cpp | 4 +--
.../VtkVis/VtkConsoleOutputWindow.cpp | 9 ++---
.../VtkImageDataToLinePolyDataFilter.cpp | 4 +--
.../DataExplorer/VtkVis/VtkPointsSource.h | 2 +-
.../VtkVis/VtkPolylinesSource.cpp | 4 +--
.../DataExplorer/VtkVis/VtkSurfacesSource.h | 2 +-
.../VtkVis/VtkTextureOnSurfaceFilter.cpp | 4 +--
.../FileIO/Gmsh/GMSHFixedMeshDensity.h | 2 +-
.../FileIO/Gmsh/GMSHMeshDensityStrategy.h | 2 +-
.../FileIO/XmlIO/Qt/XmlGspInterface.h | 2 +-
.../FileIO/XmlIO/Qt/XmlNumInterface.h | 2 +-
.../Utils/OGSFileConverter/FileListDialog.cpp | 4 +--
.../OGSFileConverter/OGSFileConverter.cpp | 4 +--
BaseLib/IO/Writer.h | 2 +-
BaseLib/IO/XmlIO/Qt/XMLQtInterface.h | 2 +-
BaseLib/IO/XmlIO/XMLInterface.h | 2 +-
BaseLib/Subdivision.h | 2 +-
GeoLib/AABB.h | 4 +--
GeoLib/GEOObjects.cpp | 4 +--
GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.h | 2 +-
GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h | 2 +-
GeoLib/Polyline.h | 2 +-
MaterialLib/Fluid/FluidProperty.h | 2 +-
.../FractureModels/FractureModelBase.h | 2 +-
MathLib/LinAlg/Eigen/EigenVector.h | 4 +--
MeshLib/Elements/TemplateElement.h | 2 +-
MeshLib/IO/Legacy/MeshIO.h | 2 +-
MeshLib/MeshEditing/MeshRevision.h | 2 +-
MeshLib/MeshGenerators/LayeredVolume.h | 35 +++++++++++++------
MeshLib/MeshQuality/EdgeRatioMetric.h | 2 +-
MeshLib/MeshQuality/ElementQualityMetric.h | 2 +-
MeshLib/MeshQuality/ElementSizeMetric.h | 2 +-
MeshLib/MeshQuality/MeshValidation.h | 2 +-
MeshLib/MeshQuality/RadiusEdgeRatioMetric.h | 2 +-
MeshLib/MeshQuality/SizeDifferenceMetric.h | 2 +-
MeshLib/Properties.h | 2 +-
.../Fem/FiniteElement/TemplateIsoparametric.h | 3 +-
NumLib/Function/ISpatialFunction.h | 2 +-
.../Algorithms/ITimeStepAlgorithm.h | 2 +-
...IterationNumberBasedAdaptiveTimeStepping.h | 2 +-
NumLib/TimeStepping/TimeStep.h | 9 +----
.../BoundaryCondition/BoundaryCondition.h | 2 +-
Tests/BaseLib/TestFunctional.cpp | 2 +-
Tests/GeoLib/TestOctTree.cpp | 4 +--
85 files changed, 123 insertions(+), 205 deletions(-)
diff --git a/Applications/DataExplorer/Base/OGSError.cpp b/Applications/DataExplorer/Base/OGSError.cpp
index 96d7b1471a2..8c2321f0c75 100644
--- a/Applications/DataExplorer/Base/OGSError.cpp
+++ b/Applications/DataExplorer/Base/OGSError.cpp
@@ -16,11 +16,9 @@
#include <QMessageBox>
#include <QString>
-OGSError::OGSError()
-{}
+OGSError::OGSError() = default;
-OGSError::~OGSError()
-{}
+OGSError::~OGSError() = default;
void OGSError::box(const QString &e)
{
diff --git a/Applications/DataExplorer/Base/QNonScalableGraphicsTextItem.cpp b/Applications/DataExplorer/Base/QNonScalableGraphicsTextItem.cpp
index 79c341135ce..05aa2ac61a8 100644
--- a/Applications/DataExplorer/Base/QNonScalableGraphicsTextItem.cpp
+++ b/Applications/DataExplorer/Base/QNonScalableGraphicsTextItem.cpp
@@ -36,9 +36,7 @@ QNonScalableGraphicsTextItem::QNonScalableGraphicsTextItem(const QString & text,
setFlag(QGraphicsItem::ItemIgnoresTransformations, true);
}
-QNonScalableGraphicsTextItem::~QNonScalableGraphicsTextItem()
-{
-}
+QNonScalableGraphicsTextItem::~QNonScalableGraphicsTextItem() = default;
/// Paints the text item.
void QNonScalableGraphicsTextItem::paint(QPainter* painter,
diff --git a/Applications/DataExplorer/DataView/ColorTableModel.cpp b/Applications/DataExplorer/DataView/ColorTableModel.cpp
index da9bf39b7f9..80964b20096 100644
--- a/Applications/DataExplorer/DataView/ColorTableModel.cpp
+++ b/Applications/DataExplorer/DataView/ColorTableModel.cpp
@@ -22,9 +22,7 @@ ColorTableModel::ColorTableModel( const std::map<std::string, DataHolderLib::Col
this->buildTable(colorLookupTable);
}
-ColorTableModel::~ColorTableModel()
-{
-}
+ColorTableModel::~ColorTableModel() = default;
int ColorTableModel::columnCount( const QModelIndex& parent /*= QModelIndex()*/ ) const
{
diff --git a/Applications/DataExplorer/DataView/DataExplorerSettingsDialog.cpp b/Applications/DataExplorer/DataView/DataExplorerSettingsDialog.cpp
index c7109edcd96..623b4b52d94 100644
--- a/Applications/DataExplorer/DataView/DataExplorerSettingsDialog.cpp
+++ b/Applications/DataExplorer/DataView/DataExplorerSettingsDialog.cpp
@@ -30,9 +30,7 @@ DataExplorerSettingsDialog::DataExplorerSettingsDialog(QDialog* parent) : QDialo
this->gmshPathEdit->setText(settings.value("DataExplorerGmshPath").toString());
}
-DataExplorerSettingsDialog::~DataExplorerSettingsDialog()
-{
-}
+DataExplorerSettingsDialog::~DataExplorerSettingsDialog() = default;
void DataExplorerSettingsDialog::on_gmshPathButton_clicked()
{
diff --git a/Applications/DataExplorer/DataView/DiagramView/DetailWindow.cpp b/Applications/DataExplorer/DataView/DiagramView/DetailWindow.cpp
index 0dbe53f5193..d2ae112c9e7 100644
--- a/Applications/DataExplorer/DataView/DiagramView/DetailWindow.cpp
+++ b/Applications/DataExplorer/DataView/DiagramView/DetailWindow.cpp
@@ -107,9 +107,7 @@ DetailWindow::DetailWindow(std::vector<std::size_t> data, QWidget* parent) : QWi
resizeWindow();
}
-DetailWindow::~DetailWindow()
-{
-}
+DetailWindow::~DetailWindow() = default;
void DetailWindow::on_closeButton_clicked()
{
diff --git a/Applications/DataExplorer/DataView/DiagramView/DiagramList.cpp b/Applications/DataExplorer/DataView/DiagramView/DiagramList.cpp
index 7739ccff7c7..1d0f320c8f1 100644
--- a/Applications/DataExplorer/DataView/DiagramView/DiagramList.cpp
+++ b/Applications/DataExplorer/DataView/DiagramView/DiagramList.cpp
@@ -28,9 +28,7 @@ DiagramList::DiagramList() : _maxX(0), _maxY(0), _minX(0), _minY(0), _xLabel("")
{
}
-DiagramList::~DiagramList()
-{
-}
+DiagramList::~DiagramList() = default;
float DiagramList::calcMinXValue()
{
diff --git a/Applications/DataExplorer/DataView/DiagramView/QArrow.cpp b/Applications/DataExplorer/DataView/DiagramView/QArrow.cpp
index 422b89cd511..f5ade2350d3 100644
--- a/Applications/DataExplorer/DataView/DiagramView/QArrow.cpp
+++ b/Applications/DataExplorer/DataView/DiagramView/QArrow.cpp
@@ -51,9 +51,7 @@ QArrow::QArrow(float l, float a, QPen &pen, QGraphicsItem* parent) : QGraphicsIt
_arrowPen = pen;
}
-QArrow::~QArrow()
-{
-}
+QArrow::~QArrow() = default;
double QArrow::calcCos(double angle)
{
diff --git a/Applications/DataExplorer/DataView/DiagramView/QGraphicsGrid.cpp b/Applications/DataExplorer/DataView/DiagramView/QGraphicsGrid.cpp
index 1d4aa4b8f69..1b22b24a9d1 100644
--- a/Applications/DataExplorer/DataView/DiagramView/QGraphicsGrid.cpp
+++ b/Applications/DataExplorer/DataView/DiagramView/QGraphicsGrid.cpp
@@ -129,9 +129,7 @@ QGraphicsGrid::QGraphicsGrid(int x,
_inside.setCosmetic(true);
}
-QGraphicsGrid::~QGraphicsGrid()
-{
-}
+QGraphicsGrid::~QGraphicsGrid() = default;
/// Returns the bounding rectangle of the grid.
QRectF QGraphicsGrid::boundingRect() const
diff --git a/Applications/DataExplorer/DataView/DirectConditionGenerator.h b/Applications/DataExplorer/DataView/DirectConditionGenerator.h
index 0985f0875a1..9872c344977 100644
--- a/Applications/DataExplorer/DataView/DirectConditionGenerator.h
+++ b/Applications/DataExplorer/DataView/DirectConditionGenerator.h
@@ -24,14 +24,17 @@ namespace MeshLib {
class DirectConditionGenerator
{
public:
- DirectConditionGenerator() {};
- ~DirectConditionGenerator() {};
+ DirectConditionGenerator() = default;
+ ~DirectConditionGenerator() = default;
- const std::vector< std::pair<std::size_t,double> >& directToSurfaceNodes(const MeshLib::Mesh &mesh, const std::string &filename);
+ const std::vector<std::pair<std::size_t, double>>& directToSurfaceNodes(
+ const MeshLib::Mesh& mesh, const std::string& filename);
- const std::vector< std::pair<std::size_t,double> >& directWithSurfaceIntegration(MeshLib::Mesh &mesh, const std::string &filename, double scaling);
+ const std::vector<std::pair<std::size_t, double>>&
+ directWithSurfaceIntegration(MeshLib::Mesh& mesh,
+ const std::string& filename, double scaling);
- int writeToFile(const std::string &name) const;
+ int writeToFile(const std::string& name) const;
private:
std::vector< std::pair<std::size_t,double> > _direct_values;
diff --git a/Applications/DataExplorer/DataView/ElementTreeModel.cpp b/Applications/DataExplorer/DataView/ElementTreeModel.cpp
index 5e184e87993..762edae0180 100644
--- a/Applications/DataExplorer/DataView/ElementTreeModel.cpp
+++ b/Applications/DataExplorer/DataView/ElementTreeModel.cpp
@@ -37,9 +37,7 @@ ElementTreeModel::ElementTreeModel( QObject* parent )
_rootItem = new TreeItem(rootData, nullptr);
}
-ElementTreeModel::~ElementTreeModel()
-{
-}
+ElementTreeModel::~ElementTreeModel() = default;
void ElementTreeModel::setElement(vtkUnstructuredGridAlgorithm const*const grid, const unsigned elem_index)
{
diff --git a/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.cpp b/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.cpp
index 93622e36d69..868444abc2f 100644
--- a/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.cpp
+++ b/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.cpp
@@ -30,9 +30,7 @@ GeoOnMeshMappingDialog::GeoOnMeshMappingDialog(
this->meshNameComboBox->addItem(QString::fromStdString(mesh_vec[i]->getName()));
}
-GeoOnMeshMappingDialog::~GeoOnMeshMappingDialog()
-{
-}
+GeoOnMeshMappingDialog::~GeoOnMeshMappingDialog() = default;
int GeoOnMeshMappingDialog::getDataSetChoice() const
{
diff --git a/Applications/DataExplorer/DataView/GeoTreeItem.h b/Applications/DataExplorer/DataView/GeoTreeItem.h
index 9d2f04299eb..2b18702bc47 100644
--- a/Applications/DataExplorer/DataView/GeoTreeItem.h
+++ b/Applications/DataExplorer/DataView/GeoTreeItem.h
@@ -38,7 +38,7 @@ public:
: TreeItem(data, parent), _item(item)
{
}
- ~GeoTreeItem() {}
+ ~GeoTreeItem() = 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.cpp b/Applications/DataExplorer/DataView/GeoTreeModel.cpp
index ac186f8326b..b43f5c2ce28 100644
--- a/Applications/DataExplorer/DataView/GeoTreeModel.cpp
+++ b/Applications/DataExplorer/DataView/GeoTreeModel.cpp
@@ -33,9 +33,7 @@ GeoTreeModel::GeoTreeModel( QObject* parent )
_rootItem = new GeoTreeItem(rootData, nullptr, nullptr);
}
-GeoTreeModel::~GeoTreeModel()
-{
-}
+GeoTreeModel::~GeoTreeModel() = default;
void GeoTreeModel::addPointList(QString geoName, GeoLib::PointVec const& pointVec)
{
diff --git a/Applications/DataExplorer/DataView/LicenseDialog.h b/Applications/DataExplorer/DataView/LicenseDialog.h
index e317bf44e90..582af9f6c02 100644
--- a/Applications/DataExplorer/DataView/LicenseDialog.h
+++ b/Applications/DataExplorer/DataView/LicenseDialog.h
@@ -26,7 +26,8 @@ class LicenseDialog : public QDialog, private Ui_License
public:
LicenseDialog(QDialog* parent = nullptr);
- ~LicenseDialog() {};
+ ~LicenseDialog() = default;
+ ;
private:
void setText();
diff --git a/Applications/DataExplorer/DataView/LinearEditDialog.cpp b/Applications/DataExplorer/DataView/LinearEditDialog.cpp
index 6cf1f8c4c28..34d2628fb71 100644
--- a/Applications/DataExplorer/DataView/LinearEditDialog.cpp
+++ b/Applications/DataExplorer/DataView/LinearEditDialog.cpp
@@ -45,9 +45,7 @@ void LinearEditDialog::setupDialog(const std::vector<std::size_t> &dis_nodes,
tableWidget->item(dis_nodes[i],0)->setText(QString::number(dis_values[i]));
}
-LinearEditDialog::~LinearEditDialog()
-{
-}
+LinearEditDialog::~LinearEditDialog() = default;
void LinearEditDialog::on_comboBox_currentIndexChanged(int index)
{
diff --git a/Applications/DataExplorer/DataView/MeshAnalysisDialog.cpp b/Applications/DataExplorer/DataView/MeshAnalysisDialog.cpp
index d6f149b15e7..dc3a9db2195 100644
--- a/Applications/DataExplorer/DataView/MeshAnalysisDialog.cpp
+++ b/Applications/DataExplorer/DataView/MeshAnalysisDialog.cpp
@@ -42,9 +42,7 @@ MeshAnalysisDialog::MeshAnalysisDialog(
this->zeroVolumeThreshold->setValidator (volume_threshold_validator);
}
-MeshAnalysisDialog::~MeshAnalysisDialog()
-{
-}
+MeshAnalysisDialog::~MeshAnalysisDialog() = default;
void MeshAnalysisDialog::on_startButton_pressed()
{
diff --git a/Applications/DataExplorer/DataView/MeshElementRemovalDialog.cpp b/Applications/DataExplorer/DataView/MeshElementRemovalDialog.cpp
index 660a8a6f66c..e1c792c793a 100644
--- a/Applications/DataExplorer/DataView/MeshElementRemovalDialog.cpp
+++ b/Applications/DataExplorer/DataView/MeshElementRemovalDialog.cpp
@@ -48,9 +48,7 @@ MeshElementRemovalDialog::MeshElementRemovalDialog(DataHolderLib::Project const&
}
}
-MeshElementRemovalDialog::~MeshElementRemovalDialog()
-{
-}
+MeshElementRemovalDialog::~MeshElementRemovalDialog() = default;
void MeshElementRemovalDialog::accept()
{
diff --git a/Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp b/Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp
index 77d9eb5fae8..d1b535a5d5a 100644
--- a/Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp
+++ b/Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp
@@ -64,9 +64,7 @@ MeshLayerEditDialog::MeshLayerEditDialog(const MeshLib::Mesh* mesh, QDialog* par
this->_layerSelectionLayout->setColumnStretch(2, 10);
}
-MeshLayerEditDialog::~MeshLayerEditDialog()
-{
-}
+MeshLayerEditDialog::~MeshLayerEditDialog() = default;
void MeshLayerEditDialog::nextButtonPressed()
{
diff --git a/Applications/DataExplorer/DataView/MeshQualitySelectionDialog.cpp b/Applications/DataExplorer/DataView/MeshQualitySelectionDialog.cpp
index 74c1c37c3e6..f65d2d502cd 100644
--- a/Applications/DataExplorer/DataView/MeshQualitySelectionDialog.cpp
+++ b/Applications/DataExplorer/DataView/MeshQualitySelectionDialog.cpp
@@ -27,9 +27,7 @@ MeshQualitySelectionDialog::MeshQualitySelectionDialog(QDialog* parent)
this->choiceEdges->toggle();
}
-MeshQualitySelectionDialog::~MeshQualitySelectionDialog()
-{
-}
+MeshQualitySelectionDialog::~MeshQualitySelectionDialog() = default;
void MeshQualitySelectionDialog::on_histogramCheckBox_toggled(bool is_checked) const
{
diff --git a/Applications/DataExplorer/DataView/MeshValueEditDialog.cpp b/Applications/DataExplorer/DataView/MeshValueEditDialog.cpp
index f9ca52af285..6f476a6cd87 100644
--- a/Applications/DataExplorer/DataView/MeshValueEditDialog.cpp
+++ b/Applications/DataExplorer/DataView/MeshValueEditDialog.cpp
@@ -26,9 +26,7 @@ MeshValueEditDialog::MeshValueEditDialog(MeshLib::Mesh* mesh, QDialog* parent)
this->replaceCheckBox->setEnabled(false);
}
-MeshValueEditDialog::~MeshValueEditDialog(void)
-{
-}
+MeshValueEditDialog::~MeshValueEditDialog(void) = default;
void MeshValueEditDialog::accept()
{
diff --git a/Applications/DataExplorer/DataView/MshView.cpp b/Applications/DataExplorer/DataView/MshView.cpp
index 61be12c0daf..ccec570c5a0 100644
--- a/Applications/DataExplorer/DataView/MshView.cpp
+++ b/Applications/DataExplorer/DataView/MshView.cpp
@@ -54,9 +54,7 @@ MshView::MshView( QWidget* parent /*= 0*/ )
//resizeRowsToContents();
}
-MshView::~MshView()
-{
-}
+MshView::~MshView() = default;
void MshView::updateView()
{
diff --git a/Applications/DataExplorer/DataView/NetCdfConfigureDialog.cpp b/Applications/DataExplorer/DataView/NetCdfConfigureDialog.cpp
index 13e089edd32..a01c02a499b 100644
--- a/Applications/DataExplorer/DataView/NetCdfConfigureDialog.cpp
+++ b/Applications/DataExplorer/DataView/NetCdfConfigureDialog.cpp
@@ -40,9 +40,7 @@ NetCdfConfigureDialog::NetCdfConfigureDialog(std::string const& fileName, QDialo
this->radioMesh->setChecked(true);
}
-NetCdfConfigureDialog::~NetCdfConfigureDialog()
-{
-}
+NetCdfConfigureDialog::~NetCdfConfigureDialog() = default;
// Instructions if the OK-Button has been pressed.
void NetCdfConfigureDialog::accept()
diff --git a/Applications/DataExplorer/DataView/SaveMeshDialog.h b/Applications/DataExplorer/DataView/SaveMeshDialog.h
index 425244b8961..fe86351d5d9 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() {}
+ ~SaveMeshDialog() = default;
private slots:
/// Selection of path to save file
diff --git a/Applications/DataExplorer/DataView/StationTreeModel.cpp b/Applications/DataExplorer/DataView/StationTreeModel.cpp
index 4020cdbd2d9..8eb5fae667c 100644
--- a/Applications/DataExplorer/DataView/StationTreeModel.cpp
+++ b/Applications/DataExplorer/DataView/StationTreeModel.cpp
@@ -34,9 +34,7 @@ StationTreeModel::StationTreeModel( QObject* parent )
_rootItem = new ModelTreeItem(rootData, nullptr, nullptr);
}
-StationTreeModel::~StationTreeModel()
-{
-}
+StationTreeModel::~StationTreeModel() = default;
/**
* Returns the model index of an item in the tree.
diff --git a/Applications/DataExplorer/DataView/StratView/StratScene.cpp b/Applications/DataExplorer/DataView/StratView/StratScene.cpp
index 698ce49999c..27c7d86b70f 100644
--- a/Applications/DataExplorer/DataView/StratView/StratScene.cpp
+++ b/Applications/DataExplorer/DataView/StratView/StratScene.cpp
@@ -63,9 +63,7 @@ StratScene::StratScene(GeoLib::StationBorehole* station,
(stratBarBounds.width() / 2));
}
-StratScene::~StratScene()
-{
-}
+StratScene::~StratScene() = default;
void StratScene::addDepthLabels(std::vector<GeoLib::Point*> profile, double offset)
{
diff --git a/Applications/DataExplorer/DataView/SurfaceExtractionDialog.h b/Applications/DataExplorer/DataView/SurfaceExtractionDialog.h
index 4a9327e3eba..13e7742d90c 100644
--- a/Applications/DataExplorer/DataView/SurfaceExtractionDialog.h
+++ b/Applications/DataExplorer/DataView/SurfaceExtractionDialog.h
@@ -32,7 +32,7 @@ class SurfaceExtractionDialog : public QDialog, private Ui_SurfaceExtraction
public:
SurfaceExtractionDialog(QDialog* parent = nullptr);
- ~SurfaceExtractionDialog() {}
+ ~SurfaceExtractionDialog() = default;
int getTolerance() const { return _tolerance; }
MathLib::Vector3 const& getNormal() const { return _dir; }
diff --git a/Applications/DataExplorer/VtkVis/MeshFromRasterDialog.cpp b/Applications/DataExplorer/VtkVis/MeshFromRasterDialog.cpp
index dffd5363bf0..9d4b1536f44 100644
--- a/Applications/DataExplorer/VtkVis/MeshFromRasterDialog.cpp
+++ b/Applications/DataExplorer/VtkVis/MeshFromRasterDialog.cpp
@@ -26,11 +26,7 @@ MeshFromRasterDialog::MeshFromRasterDialog(QDialog* parent)
this->mshNameEdit->setText("RasterDataMesh");
}
-
-MeshFromRasterDialog::~MeshFromRasterDialog()
-{
-}
-
+MeshFromRasterDialog::~MeshFromRasterDialog() = default;
void MeshFromRasterDialog::accept()
{
diff --git a/Applications/DataExplorer/VtkVis/QVtkDataSetMapper.cpp b/Applications/DataExplorer/VtkVis/QVtkDataSetMapper.cpp
index 6fbd18db23f..cc08997b3a0 100644
--- a/Applications/DataExplorer/VtkVis/QVtkDataSetMapper.cpp
+++ b/Applications/DataExplorer/VtkVis/QVtkDataSetMapper.cpp
@@ -23,9 +23,7 @@ QVtkDataSetMapper::QVtkDataSetMapper() : QObject(nullptr)
{
}
-QVtkDataSetMapper::~QVtkDataSetMapper()
-{
-}
+QVtkDataSetMapper::~QVtkDataSetMapper() = default;
void QVtkDataSetMapper::PrintSelf(ostream& os, vtkIndent indent)
{
diff --git a/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyCheckbox.cpp b/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyCheckbox.cpp
index 8b94191ded8..a568e0b2671 100644
--- a/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyCheckbox.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyCheckbox.cpp
@@ -27,9 +27,7 @@ VtkAlgorithmPropertyCheckbox::VtkAlgorithmPropertyCheckbox(const bool value,
connect(this, SIGNAL(stateChanged(int)), this, SLOT(setNewValue(int)));
}
-VtkAlgorithmPropertyCheckbox::~VtkAlgorithmPropertyCheckbox()
-{
-}
+VtkAlgorithmPropertyCheckbox::~VtkAlgorithmPropertyCheckbox() = default;
void VtkAlgorithmPropertyCheckbox::setNewValue( int state )
{
diff --git a/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyLineEdit.cpp b/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyLineEdit.cpp
index 8b38bb492d0..28e5be08ac9 100644
--- a/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyLineEdit.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyLineEdit.cpp
@@ -44,9 +44,7 @@ VtkAlgorithmPropertyLineEdit::VtkAlgorithmPropertyLineEdit(const QString& conten
connect(this, SIGNAL(editingFinished()), this, SLOT(setNewValue()));
}
-VtkAlgorithmPropertyLineEdit::~VtkAlgorithmPropertyLineEdit()
-{
-}
+VtkAlgorithmPropertyLineEdit::~VtkAlgorithmPropertyLineEdit() = default;
void VtkAlgorithmPropertyLineEdit::setNewValue()
{
diff --git a/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyVectorEdit.cpp b/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyVectorEdit.cpp
index 433e06cf8ed..a80e4847c88 100644
--- a/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyVectorEdit.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkAlgorithmPropertyVectorEdit.cpp
@@ -60,9 +60,7 @@ VtkAlgorithmPropertyVectorEdit::VtkAlgorithmPropertyVectorEdit( const QList<QStr
this->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
}
-VtkAlgorithmPropertyVectorEdit::~VtkAlgorithmPropertyVectorEdit()
-{
-}
+VtkAlgorithmPropertyVectorEdit::~VtkAlgorithmPropertyVectorEdit() = default;
void VtkAlgorithmPropertyVectorEdit::setNewValue()
{
diff --git a/Applications/DataExplorer/VtkVis/VtkAppendArrayFilter.cpp b/Applications/DataExplorer/VtkVis/VtkAppendArrayFilter.cpp
index 2c4ae55b674..76c39d92adb 100644
--- a/Applications/DataExplorer/VtkVis/VtkAppendArrayFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkAppendArrayFilter.cpp
@@ -29,13 +29,9 @@
vtkStandardNewMacro(VtkAppendArrayFilter);
-VtkAppendArrayFilter::VtkAppendArrayFilter()
-{
-}
+VtkAppendArrayFilter::VtkAppendArrayFilter() = default;
-VtkAppendArrayFilter::~VtkAppendArrayFilter()
-{
-}
+VtkAppendArrayFilter::~VtkAppendArrayFilter() = default;
void VtkAppendArrayFilter::PrintSelf( ostream& os, vtkIndent indent )
{
diff --git a/Applications/DataExplorer/VtkVis/VtkBGImageSource.cpp b/Applications/DataExplorer/VtkVis/VtkBGImageSource.cpp
index b5e55bbed71..844500b2454 100644
--- a/Applications/DataExplorer/VtkVis/VtkBGImageSource.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkBGImageSource.cpp
@@ -34,9 +34,7 @@ VtkBGImageSource::VtkBGImageSource() : _origin(0,0), _cellsize(1)
{
}
-VtkBGImageSource::~VtkBGImageSource()
-{
-}
+VtkBGImageSource::~VtkBGImageSource() = default;
void VtkBGImageSource::SetRaster(vtkImageAlgorithm *img, double x0, double y0, double scalingFactor)
{
diff --git a/Applications/DataExplorer/VtkVis/VtkColorByHeightFilter.cpp b/Applications/DataExplorer/VtkVis/VtkColorByHeightFilter.cpp
index 7b85f0b657e..6c4771cc976 100644
--- a/Applications/DataExplorer/VtkVis/VtkColorByHeightFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkColorByHeightFilter.cpp
@@ -37,9 +37,7 @@ VtkColorByHeightFilter::VtkColorByHeightFilter()
{
}
-VtkColorByHeightFilter::~VtkColorByHeightFilter()
-{
-}
+VtkColorByHeightFilter::~VtkColorByHeightFilter() = default;
void VtkColorByHeightFilter::PrintSelf( ostream& os, vtkIndent indent )
{
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeColorByHeightFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositeColorByHeightFilter.h
index 09a6254222a..fd190650dbd 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeColorByHeightFilter.h
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeColorByHeightFilter.h
@@ -23,7 +23,7 @@ class VtkCompositeColorByHeightFilter : public VtkCompositeFilter
{
public:
VtkCompositeColorByHeightFilter(vtkAlgorithm* inputAlgorithm);
- virtual ~VtkCompositeColorByHeightFilter() {}
+ virtual ~VtkCompositeColorByHeightFilter() = default;
virtual void init() override;
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeColormapToImageFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeColormapToImageFilter.cpp
index c204bb0b8a2..84ca60e8e73 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeColormapToImageFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeColormapToImageFilter.cpp
@@ -33,9 +33,8 @@ VtkCompositeColormapToImageFilter::VtkCompositeColormapToImageFilter( vtkAlgorit
this->init();
}
-VtkCompositeColormapToImageFilter::~VtkCompositeColormapToImageFilter()
-{
-}
+VtkCompositeColormapToImageFilter::~VtkCompositeColormapToImageFilter() =
+ default;
void VtkCompositeColormapToImageFilter::init()
{
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeContourFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeContourFilter.cpp
index e2182c5ac5e..2aa5fbacf66 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeContourFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeContourFilter.cpp
@@ -28,9 +28,7 @@ VtkCompositeContourFilter::VtkCompositeContourFilter( vtkAlgorithm* inputAlgorit
this->init();
}
-VtkCompositeContourFilter::~VtkCompositeContourFilter()
-{
-}
+VtkCompositeContourFilter::~VtkCompositeContourFilter() = default;
void VtkCompositeContourFilter::init()
{
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeElementSelectionFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositeElementSelectionFilter.h
index 12c9901ba70..65c9dec140b 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeElementSelectionFilter.h
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeElementSelectionFilter.h
@@ -27,7 +27,7 @@ class VtkCompositeElementSelectionFilter : public VtkCompositeFilter
{
public:
VtkCompositeElementSelectionFilter(vtkAlgorithm* inputAlgorithm);
- virtual ~VtkCompositeElementSelectionFilter() {}
+ virtual ~VtkCompositeElementSelectionFilter() = default;
virtual void init();
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.cpp
index 53b3cb87df2..3f8bcb6f4e2 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.cpp
@@ -55,9 +55,7 @@ VtkCompositeGeoObjectFilter::VtkCompositeGeoObjectFilter( vtkAlgorithm* inputAlg
}
}
-VtkCompositeGeoObjectFilter::~VtkCompositeGeoObjectFilter()
-{
-}
+VtkCompositeGeoObjectFilter::~VtkCompositeGeoObjectFilter() = default;
void VtkCompositeGeoObjectFilter::init()
{
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeLineToTubeFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeLineToTubeFilter.cpp
index e8903717456..72539abf248 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeLineToTubeFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeLineToTubeFilter.cpp
@@ -25,9 +25,7 @@ VtkCompositeLineToTubeFilter::VtkCompositeLineToTubeFilter( vtkAlgorithm* inputA
this->init();
}
-VtkCompositeLineToTubeFilter::~VtkCompositeLineToTubeFilter()
-{
-}
+VtkCompositeLineToTubeFilter::~VtkCompositeLineToTubeFilter() = default;
void VtkCompositeLineToTubeFilter::init()
{
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp
index 6861d716b29..e87948dbb0b 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp
@@ -39,9 +39,8 @@ VtkCompositeTextureOnSurfaceFilter::VtkCompositeTextureOnSurfaceFilter(
this->init();
}
-VtkCompositeTextureOnSurfaceFilter::~VtkCompositeTextureOnSurfaceFilter()
-{
-}
+VtkCompositeTextureOnSurfaceFilter::~VtkCompositeTextureOnSurfaceFilter() =
+ default;
void VtkCompositeTextureOnSurfaceFilter::init()
{
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeThresholdFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeThresholdFilter.cpp
index 798a0c65090..bdea9f34dc7 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeThresholdFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeThresholdFilter.cpp
@@ -27,9 +27,7 @@ VtkCompositeThresholdFilter::VtkCompositeThresholdFilter( vtkAlgorithm* inputAlg
this->init();
}
-VtkCompositeThresholdFilter::~VtkCompositeThresholdFilter()
-{
-}
+VtkCompositeThresholdFilter::~VtkCompositeThresholdFilter() = default;
void VtkCompositeThresholdFilter::init()
{
diff --git a/Applications/DataExplorer/VtkVis/VtkConsoleOutputWindow.cpp b/Applications/DataExplorer/VtkVis/VtkConsoleOutputWindow.cpp
index 33a13964855..125b180ae2a 100644
--- a/Applications/DataExplorer/VtkVis/VtkConsoleOutputWindow.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkConsoleOutputWindow.cpp
@@ -20,15 +20,10 @@
vtkStandardNewMacro(VtkConsoleOutputWindow);
//----------------------------------------------------------------------------
-VtkConsoleOutputWindow::VtkConsoleOutputWindow()
-{
-
-}
+VtkConsoleOutputWindow::VtkConsoleOutputWindow() = default;
//----------------------------------------------------------------------------
-VtkConsoleOutputWindow::~VtkConsoleOutputWindow()
-{
-}
+VtkConsoleOutputWindow::~VtkConsoleOutputWindow() = default;
//----------------------------------------------------------------------------
// Display text in the window, and translate the \n to \r\n.
diff --git a/Applications/DataExplorer/VtkVis/VtkImageDataToLinePolyDataFilter.cpp b/Applications/DataExplorer/VtkVis/VtkImageDataToLinePolyDataFilter.cpp
index e3b02d570c8..fa49a538b8c 100644
--- a/Applications/DataExplorer/VtkVis/VtkImageDataToLinePolyDataFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkImageDataToLinePolyDataFilter.cpp
@@ -33,9 +33,7 @@ VtkImageDataToLinePolyDataFilter::VtkImageDataToLinePolyDataFilter() :
this->SetLengthScaleFactor(1.0);
}
-VtkImageDataToLinePolyDataFilter::~VtkImageDataToLinePolyDataFilter()
-{
-}
+VtkImageDataToLinePolyDataFilter::~VtkImageDataToLinePolyDataFilter() = default;
void VtkImageDataToLinePolyDataFilter::PrintSelf(ostream& os, vtkIndent indent)
{
diff --git a/Applications/DataExplorer/VtkVis/VtkPointsSource.h b/Applications/DataExplorer/VtkVis/VtkPointsSource.h
index 0f1181da09f..797d5684ffe 100644
--- a/Applications/DataExplorer/VtkVis/VtkPointsSource.h
+++ b/Applications/DataExplorer/VtkVis/VtkPointsSource.h
@@ -43,7 +43,7 @@ public:
protected:
VtkPointsSource();
- ~VtkPointsSource() {}
+ ~VtkPointsSource() = default;
/// Computes the polygonal data object.
int RequestData(vtkInformation* request,
diff --git a/Applications/DataExplorer/VtkVis/VtkPolylinesSource.cpp b/Applications/DataExplorer/VtkVis/VtkPolylinesSource.cpp
index a68bb576aa8..3ba34340ffb 100644
--- a/Applications/DataExplorer/VtkVis/VtkPolylinesSource.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkPolylinesSource.cpp
@@ -45,9 +45,7 @@ VtkPolylinesSource::VtkPolylinesSource() : _polylines(nullptr)
GetProperties()->SetColor(c[0] / 255.0, c[1] / 255.0, c[2] / 255.0);
}
-VtkPolylinesSource::~VtkPolylinesSource()
-{
-}
+VtkPolylinesSource::~VtkPolylinesSource() = default;
void VtkPolylinesSource::PrintSelf( ostream& os, vtkIndent indent )
{
diff --git a/Applications/DataExplorer/VtkVis/VtkSurfacesSource.h b/Applications/DataExplorer/VtkVis/VtkSurfacesSource.h
index 03ab0ff1ea0..c79fc621b26 100644
--- a/Applications/DataExplorer/VtkVis/VtkSurfacesSource.h
+++ b/Applications/DataExplorer/VtkVis/VtkSurfacesSource.h
@@ -47,7 +47,7 @@ public:
protected:
VtkSurfacesSource();
- ~VtkSurfacesSource() {}
+ ~VtkSurfacesSource() = default;
/// Computes the polygonal data object.
int RequestData(vtkInformation* request,
diff --git a/Applications/DataExplorer/VtkVis/VtkTextureOnSurfaceFilter.cpp b/Applications/DataExplorer/VtkVis/VtkTextureOnSurfaceFilter.cpp
index dbb319e709f..9a087b47300 100644
--- a/Applications/DataExplorer/VtkVis/VtkTextureOnSurfaceFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkTextureOnSurfaceFilter.cpp
@@ -39,9 +39,7 @@ VtkTextureOnSurfaceFilter::VtkTextureOnSurfaceFilter() : _origin(.0f,.0f), _scal
{
}
-VtkTextureOnSurfaceFilter::~VtkTextureOnSurfaceFilter()
-{
-}
+VtkTextureOnSurfaceFilter::~VtkTextureOnSurfaceFilter() = default;
void VtkTextureOnSurfaceFilter::PrintSelf( ostream& os, vtkIndent indent )
{
diff --git a/Applications/FileIO/Gmsh/GMSHFixedMeshDensity.h b/Applications/FileIO/Gmsh/GMSHFixedMeshDensity.h
index fb4fb2bea08..7eb5bd887d8 100644
--- a/Applications/FileIO/Gmsh/GMSHFixedMeshDensity.h
+++ b/Applications/FileIO/Gmsh/GMSHFixedMeshDensity.h
@@ -24,7 +24,7 @@ public:
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() {}
+ virtual ~GMSHFixedMeshDensity() = default;
private:
double _mesh_density;
diff --git a/Applications/FileIO/Gmsh/GMSHMeshDensityStrategy.h b/Applications/FileIO/Gmsh/GMSHMeshDensityStrategy.h
index 3b14475dabf..c0725adfdfe 100644
--- a/Applications/FileIO/Gmsh/GMSHMeshDensityStrategy.h
+++ b/Applications/FileIO/Gmsh/GMSHMeshDensityStrategy.h
@@ -28,7 +28,7 @@ namespace GMSH
class GMSHMeshDensityStrategy
{
public:
- virtual ~GMSHMeshDensityStrategy() {}
+ virtual ~GMSHMeshDensityStrategy() = default;
virtual void initialize(std::vector<GeoLib::Point const*> const&) = 0;
virtual double getMeshDensityAtPoint(GeoLib::Point const*const) const = 0;
virtual double getMeshDensityAtStation(GeoLib::Point const*const) const = 0;
diff --git a/Applications/FileIO/XmlIO/Qt/XmlGspInterface.h b/Applications/FileIO/XmlIO/Qt/XmlGspInterface.h
index 720a1ad53a1..6cd73a1d0d7 100644
--- a/Applications/FileIO/XmlIO/Qt/XmlGspInterface.h
+++ b/Applications/FileIO/XmlIO/Qt/XmlGspInterface.h
@@ -36,7 +36,7 @@ class XmlGspInterface : public BaseLib::IO::XMLInterface,
public:
XmlGspInterface(DataHolderLib::Project &project);
- virtual ~XmlGspInterface() {}
+ virtual ~XmlGspInterface() = 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.
diff --git a/Applications/FileIO/XmlIO/Qt/XmlNumInterface.h b/Applications/FileIO/XmlIO/Qt/XmlNumInterface.h
index e4a10027469..054717882d6 100644
--- a/Applications/FileIO/XmlIO/Qt/XmlNumInterface.h
+++ b/Applications/FileIO/XmlIO/Qt/XmlNumInterface.h
@@ -25,7 +25,7 @@ class XmlNumInterface : public BaseLib::IO::XMLInterface, public BaseLib::IO::XM
public:
XmlNumInterface();
- virtual ~XmlNumInterface() {}
+ virtual ~XmlNumInterface() = default;
int readFile(QString const& fileName);
diff --git a/Applications/Utils/OGSFileConverter/FileListDialog.cpp b/Applications/Utils/OGSFileConverter/FileListDialog.cpp
index c3330d95102..9792fe0d32f 100644
--- a/Applications/Utils/OGSFileConverter/FileListDialog.cpp
+++ b/Applications/Utils/OGSFileConverter/FileListDialog.cpp
@@ -33,9 +33,7 @@ FileListDialog::FileListDialog(FileType input, FileType output, QWidget* parent)
this->listView->setModel(&_allFiles);
}
-FileListDialog::~FileListDialog()
-{
-}
+FileListDialog::~FileListDialog() = default;
void FileListDialog::on_addButton_pressed()
{
diff --git a/Applications/Utils/OGSFileConverter/OGSFileConverter.cpp b/Applications/Utils/OGSFileConverter/OGSFileConverter.cpp
index 3cc6ed57dda..1ee6b5a5ab8 100644
--- a/Applications/Utils/OGSFileConverter/OGSFileConverter.cpp
+++ b/Applications/Utils/OGSFileConverter/OGSFileConverter.cpp
@@ -35,9 +35,7 @@ OGSFileConverter::OGSFileConverter(QWidget* parent)
setupUi(this);
}
-OGSFileConverter::~OGSFileConverter()
-{
-}
+OGSFileConverter::~OGSFileConverter() = default;
void OGSFileConverter::convertGML2GLI(const QStringList &input, const QString &output) const
{
diff --git a/BaseLib/IO/Writer.h b/BaseLib/IO/Writer.h
index 0dabb332349..02f34fce013 100644
--- a/BaseLib/IO/Writer.h
+++ b/BaseLib/IO/Writer.h
@@ -32,7 +32,7 @@ class Writer
{
public:
Writer();
- virtual ~Writer() {}
+ virtual ~Writer() = default;
/// @brief Writes the object to a string.
std::string writeToString();
diff --git a/BaseLib/IO/XmlIO/Qt/XMLQtInterface.h b/BaseLib/IO/XmlIO/Qt/XMLQtInterface.h
index e290c064339..d941114cf0e 100644
--- a/BaseLib/IO/XmlIO/Qt/XMLQtInterface.h
+++ b/BaseLib/IO/XmlIO/Qt/XMLQtInterface.h
@@ -31,7 +31,7 @@ class XMLQtInterface
{
public:
XMLQtInterface(const std::string &schemaFile = "");
- virtual ~XMLQtInterface() {}
+ virtual ~XMLQtInterface() = default;
/// As QXMLStreamWriter seems currently unable to include style-file links into xml-files, this method will workaround this issue and include the stylefile link.
int insertStyleFileDefinition(const QString &fileName) const;
diff --git a/BaseLib/IO/XmlIO/XMLInterface.h b/BaseLib/IO/XmlIO/XMLInterface.h
index d8c8cbb9870..065b1655cd5 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() {}
+ virtual ~XMLInterface() = default;
void setNameForExport(std::string const& name) { _exportName = name; }
virtual bool readFile(std::string const& fname) = 0;
diff --git a/BaseLib/Subdivision.h b/BaseLib/Subdivision.h
index dbfa4c576e0..7955e7ac1f4 100644
--- a/BaseLib/Subdivision.h
+++ b/BaseLib/Subdivision.h
@@ -23,7 +23,7 @@ public:
/// Returns a vector of subdivided points
virtual std::vector<double> operator()() const = 0;
- virtual ~ISubdivision() {}
+ virtual ~ISubdivision() = default;
};
/**
diff --git a/GeoLib/AABB.h b/GeoLib/AABB.h
index 4abf643ff39..6842b06d968 100644
--- a/GeoLib/AABB.h
+++ b/GeoLib/AABB.h
@@ -70,9 +70,7 @@ public:
* copy constructor.
* @param src an axis aligned bounding box
* */
- AABB(AABB const& src) :
- _min_pnt(src._min_pnt), _max_pnt(src._max_pnt)
- {}
+ AABB(AABB const& src) = default;
/**
* Construction of object using input iterators. In contrast to give a vector
diff --git a/GeoLib/GEOObjects.cpp b/GeoLib/GEOObjects.cpp
index 7e67bd13835..87e3bf59c72 100644
--- a/GeoLib/GEOObjects.cpp
+++ b/GeoLib/GEOObjects.cpp
@@ -23,9 +23,7 @@
namespace GeoLib
{
-GEOObjects::GEOObjects()
-{
-}
+GEOObjects::GEOObjects() = default;
GEOObjects::~GEOObjects()
{
diff --git a/GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.h b/GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.h
index 9e478ba4285..d94093d6827 100644
--- a/GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.h
+++ b/GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.h
@@ -36,7 +36,7 @@ class BoostXmlGmlInterface : public BaseLib::IO::XMLInterface
{
public:
BoostXmlGmlInterface(GeoLib::GEOObjects& geo_objs);
- virtual ~BoostXmlGmlInterface() {}
+ virtual ~BoostXmlGmlInterface() = default;
/// Reads an xml-file containing OGS geometry
bool readFile(const std::string &fname);
diff --git a/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h b/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h
index 1f41bb3d948..0f4d52bc3ea 100644
--- a/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h
+++ b/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h
@@ -35,7 +35,7 @@ class XmlGmlInterface : public BaseLib::IO::XMLInterface,
public:
XmlGmlInterface(GeoLib::GEOObjects& geo_objs);
- virtual ~XmlGmlInterface() {}
+ virtual ~XmlGmlInterface() = default;
/// Reads an xml-file containing geometric object definitions into the GEOObjects used in the contructor
int readFile(const QString &fileName);
diff --git a/GeoLib/Polyline.h b/GeoLib/Polyline.h
index 5113d1e085f..b754b38f9fd 100644
--- a/GeoLib/Polyline.h
+++ b/GeoLib/Polyline.h
@@ -101,7 +101,7 @@ public:
Polyline(const Polyline& ply);
Polyline& operator=(Polyline const& other) = delete;
- virtual ~Polyline() {}
+ virtual ~Polyline() = default;
/// return a geometry type
virtual GEOTYPE getGeoType() const {return GEOTYPE::POLYLINE;}
diff --git a/MaterialLib/Fluid/FluidProperty.h b/MaterialLib/Fluid/FluidProperty.h
index 6ed6593373d..13b8a5dd779 100644
--- a/MaterialLib/Fluid/FluidProperty.h
+++ b/MaterialLib/Fluid/FluidProperty.h
@@ -27,7 +27,7 @@ class FluidProperty
public:
typedef std::array<double, PropertyVariableNumber> ArrayType;
- virtual ~FluidProperty() {}
+ virtual ~FluidProperty() = default;
/// Get model name.
virtual std::string getName() const = 0;
diff --git a/MaterialLib/FractureModels/FractureModelBase.h b/MaterialLib/FractureModels/FractureModelBase.h
index f82f126f850..80e211d1b91 100644
--- a/MaterialLib/FractureModels/FractureModelBase.h
+++ b/MaterialLib/FractureModels/FractureModelBase.h
@@ -58,7 +58,7 @@ public:
virtual std::unique_ptr<MaterialStateVariables>
createMaterialStateVariables() = 0;
- virtual ~FractureModelBase() {}
+ virtual ~FractureModelBase() = default;
/**
* Computation of the constitutive relation for specific material model.
diff --git a/MathLib/LinAlg/Eigen/EigenVector.h b/MathLib/LinAlg/Eigen/EigenVector.h
index d5c56e1f606..8266cdba9e3 100644
--- a/MathLib/LinAlg/Eigen/EigenVector.h
+++ b/MathLib/LinAlg/Eigen/EigenVector.h
@@ -33,14 +33,14 @@ public:
using IndexType = Eigen::SparseMatrix<double>::Index;
// TODO: preliminary
- EigenVector() {}
+ EigenVector() = default;
/// Constructor for initialization of the number of rows
/// @param length number of rows
explicit EigenVector(std::size_t length) : _vec(length) {}
/// copy constructor
- EigenVector(EigenVector const &src) : _vec(src._vec) {}
+ EigenVector(EigenVector const& src) = default;
/// return a vector length
std::size_t size() const { return _vec.size(); }
diff --git a/MeshLib/Elements/TemplateElement.h b/MeshLib/Elements/TemplateElement.h
index 1a69946aa18..8ed60a5e551 100644
--- a/MeshLib/Elements/TemplateElement.h
+++ b/MeshLib/Elements/TemplateElement.h
@@ -60,7 +60,7 @@ public:
TemplateElement(const TemplateElement &e);
/// Destructor
- virtual ~TemplateElement() {}
+ virtual ~TemplateElement() = default;
/// Returns a copy of this object.
virtual Element* clone() const
diff --git a/MeshLib/IO/Legacy/MeshIO.h b/MeshLib/IO/Legacy/MeshIO.h
index dca1fae9a54..86646c47adf 100644
--- a/MeshLib/IO/Legacy/MeshIO.h
+++ b/MeshLib/IO/Legacy/MeshIO.h
@@ -39,7 +39,7 @@ public:
/// Constructor.
MeshIO();
- virtual ~MeshIO() {}
+ virtual ~MeshIO() = default;
/// Read mesh from file.
MeshLib::Mesh* loadMeshFromFile(const std::string& fileName);
diff --git a/MeshLib/MeshEditing/MeshRevision.h b/MeshLib/MeshEditing/MeshRevision.h
index 6eb0c294b5e..33d7dc18a9d 100644
--- a/MeshLib/MeshEditing/MeshRevision.h
+++ b/MeshLib/MeshEditing/MeshRevision.h
@@ -41,7 +41,7 @@ public:
*/
MeshRevision(MeshLib::Mesh &mesh);
- virtual ~MeshRevision() {}
+ virtual ~MeshRevision() = default;
/**
* Collapsed all nodes with distance < eps but ignores elements
diff --git a/MeshLib/MeshGenerators/LayeredVolume.h b/MeshLib/MeshGenerators/LayeredVolume.h
index a96a1a64019..34424ad9812 100644
--- a/MeshLib/MeshGenerators/LayeredVolume.h
+++ b/MeshLib/MeshGenerators/LayeredVolume.h
@@ -31,24 +31,39 @@ namespace GeoLib {
class LayeredVolume : public LayeredMeshGenerator
{
public:
- LayeredVolume() {}
- ~LayeredVolume() {}
+ LayeredVolume() = default;
+ ~LayeredVolume() = default;
/**
- * Constructs a subsurface representation of a mesh using only 2D elements (i.e. layer boundaries are represented by surfaces)
- * @param mesh The 2D surface mesh that is used as a basis for the subsurface mesh
- * @param rasters Containing all the raster-data for the subsurface layers from bottom to top (starting with the bottom of the oldest layer and ending with the DEM)
- * @param minimum_thickness Minimum thickness of each of the newly created layers (i.e. nodes with a vertical distance smaller than this will be collapsed)
- * @param noDataReplacementValue Default z-coordinate if there are mesh nodes not located on the DEM raster (i.e. raster_paths[0])
- * @result true if the subsurface representation has been created, false if there was an error
+ * Constructs a subsurface representation of a mesh using only 2D elements
+ * (i.e. layer boundaries are represented by surfaces)
+ * @param mesh The 2D surface mesh that is used as a
+ * basis
+ * for the subsurface mesh
+ * @param rasters Containing all the raster-data for the
+ * subsurface layers from bottom to top (starting with the bottom of the
+ * oldest layer and ending with the DEM)
+ * @param minimum_thickness Minimum thickness of each of the newly
+ * created layers (i.e. nodes with a vertical distance smaller than this
+ * will
+ * be collapsed)
+ * @param noDataReplacementValue Default z-coordinate if there are mesh
+ * nodes
+ * not located on the DEM raster (i.e. raster_paths[0])
+ * @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,
double minimum_thickness,
double noDataReplacementValue = 0.0);
- /// Returns the region attribute vector necessary for assigning region attributes via TetGen
- std::vector<MeshLib::Node> getAttributePoints() { return _attribute_points; }
+ /// Returns the region attribute vector necessary for assigning region
+ /// attributes via TetGen
+ std::vector<MeshLib::Node> getAttributePoints()
+ {
+ return _attribute_points;
+ }
private:
/// Adds another layer to the subsurface mesh
diff --git a/MeshLib/MeshQuality/EdgeRatioMetric.h b/MeshLib/MeshQuality/EdgeRatioMetric.h
index f7198e88d92..4ebb3948258 100644
--- a/MeshLib/MeshQuality/EdgeRatioMetric.h
+++ b/MeshLib/MeshQuality/EdgeRatioMetric.h
@@ -27,7 +27,7 @@ class EdgeRatioMetric : public ElementQualityMetric
{
public:
EdgeRatioMetric(Mesh const& mesh);
- virtual ~EdgeRatioMetric () {}
+ virtual ~EdgeRatioMetric() = default;
virtual void calculateQuality ();
diff --git a/MeshLib/MeshQuality/ElementQualityMetric.h b/MeshLib/MeshQuality/ElementQualityMetric.h
index 3cc2607c541..90dd0deb904 100644
--- a/MeshLib/MeshQuality/ElementQualityMetric.h
+++ b/MeshLib/MeshQuality/ElementQualityMetric.h
@@ -34,7 +34,7 @@ class ElementQualityMetric
public:
ElementQualityMetric(Mesh const& mesh);
- virtual ~ElementQualityMetric () {}
+ virtual ~ElementQualityMetric() = default;
/// Calculates the quality metric for each element of the mesh
virtual void calculateQuality () = 0;
diff --git a/MeshLib/MeshQuality/ElementSizeMetric.h b/MeshLib/MeshQuality/ElementSizeMetric.h
index f7aa062f54c..3387bfecae6 100644
--- a/MeshLib/MeshQuality/ElementSizeMetric.h
+++ b/MeshLib/MeshQuality/ElementSizeMetric.h
@@ -26,7 +26,7 @@ class ElementSizeMetric : public ElementQualityMetric
{
public:
ElementSizeMetric(Mesh const& mesh);
- virtual ~ElementSizeMetric() {}
+ virtual ~ElementSizeMetric() = default;
virtual void calculateQuality ();
diff --git a/MeshLib/MeshQuality/MeshValidation.h b/MeshLib/MeshQuality/MeshValidation.h
index 391c226a2f5..b5d56c28671 100644
--- a/MeshLib/MeshQuality/MeshValidation.h
+++ b/MeshLib/MeshQuality/MeshValidation.h
@@ -33,7 +33,7 @@ public:
/// Constructor
/// \warning This might change the mesh when removing unused mesh nodes.
MeshValidation(MeshLib::Mesh &mesh);
- ~MeshValidation() {}
+ ~MeshValidation() = default;
/**
* Tests if elements are geometrically correct.
diff --git a/MeshLib/MeshQuality/RadiusEdgeRatioMetric.h b/MeshLib/MeshQuality/RadiusEdgeRatioMetric.h
index da9fc775685..2ee2e36c88a 100644
--- a/MeshLib/MeshQuality/RadiusEdgeRatioMetric.h
+++ b/MeshLib/MeshQuality/RadiusEdgeRatioMetric.h
@@ -27,7 +27,7 @@ class RadiusEdgeRatioMetric : public ElementQualityMetric
{
public:
RadiusEdgeRatioMetric(Mesh const& mesh);
- virtual ~RadiusEdgeRatioMetric() {}
+ virtual ~RadiusEdgeRatioMetric() = default;
virtual void calculateQuality ();
};
diff --git a/MeshLib/MeshQuality/SizeDifferenceMetric.h b/MeshLib/MeshQuality/SizeDifferenceMetric.h
index 399fd2385b5..cf6c553da39 100644
--- a/MeshLib/MeshQuality/SizeDifferenceMetric.h
+++ b/MeshLib/MeshQuality/SizeDifferenceMetric.h
@@ -27,7 +27,7 @@ class SizeDifferenceMetric : public ElementQualityMetric
{
public:
SizeDifferenceMetric(Mesh const& mesh);
- virtual ~SizeDifferenceMetric() {}
+ virtual ~SizeDifferenceMetric() = default;
virtual void calculateQuality ();
};
diff --git a/MeshLib/Properties.h b/MeshLib/Properties.h
index 9c10c6a5348..f4fb71be825 100644
--- a/MeshLib/Properties.h
+++ b/MeshLib/Properties.h
@@ -118,7 +118,7 @@ public:
Properties excludeCopyProperties(
std::vector<MeshItemType> const& exclude_mesh_item_types) const;
- Properties() {}
+ Properties() = default;
Properties(Properties const& properties);
diff --git a/NumLib/Fem/FiniteElement/TemplateIsoparametric.h b/NumLib/Fem/FiniteElement/TemplateIsoparametric.h
index a62e301d398..854c1e1f7f6 100644
--- a/NumLib/Fem/FiniteElement/TemplateIsoparametric.h
+++ b/NumLib/Fem/FiniteElement/TemplateIsoparametric.h
@@ -64,8 +64,7 @@ public:
: _ele(&e)
{
}
-
- ~TemplateIsoparametric() {}
+ ~TemplateIsoparametric() = default;
/// return current mesh element
const MeshElementType* getMeshElement() const {return _ele;}
diff --git a/NumLib/Function/ISpatialFunction.h b/NumLib/Function/ISpatialFunction.h
index 0d3b37ab76b..11159263eec 100644
--- a/NumLib/Function/ISpatialFunction.h
+++ b/NumLib/Function/ISpatialFunction.h
@@ -25,7 +25,7 @@ namespace NumLib
class ISpatialFunction
{
public:
- virtual ~ISpatialFunction(){}
+ virtual ~ISpatialFunction() = default;
/**
* return a value at the given point
diff --git a/NumLib/TimeStepping/Algorithms/ITimeStepAlgorithm.h b/NumLib/TimeStepping/Algorithms/ITimeStepAlgorithm.h
index 110aa331a5c..2dda10b913d 100644
--- a/NumLib/TimeStepping/Algorithms/ITimeStepAlgorithm.h
+++ b/NumLib/TimeStepping/Algorithms/ITimeStepAlgorithm.h
@@ -44,7 +44,7 @@ public:
/// return a history of time step sizes
virtual const std::vector<double>& getTimeStepSizeHistory() const = 0;
- virtual ~ITimeStepAlgorithm() {}
+ virtual ~ITimeStepAlgorithm() = default;
};
} //NumLib
diff --git a/NumLib/TimeStepping/Algorithms/IterationNumberBasedAdaptiveTimeStepping.h b/NumLib/TimeStepping/Algorithms/IterationNumberBasedAdaptiveTimeStepping.h
index fe2c3db2e7d..4ff96ac9a98 100644
--- a/NumLib/TimeStepping/Algorithms/IterationNumberBasedAdaptiveTimeStepping.h
+++ b/NumLib/TimeStepping/Algorithms/IterationNumberBasedAdaptiveTimeStepping.h
@@ -82,7 +82,7 @@ public:
const std::vector<std::size_t> &iter_times_vector,
const std::vector<double> &multiplier_vector);
- virtual ~IterationNumberBasedAdaptiveTimeStepping() {}
+ virtual ~IterationNumberBasedAdaptiveTimeStepping() = default;
/// return the beginning of time steps
virtual double begin() const {return _t_initial;}
diff --git a/NumLib/TimeStepping/TimeStep.h b/NumLib/TimeStepping/TimeStep.h
index 07c66d869a4..1a593a7035b 100644
--- a/NumLib/TimeStepping/TimeStep.h
+++ b/NumLib/TimeStepping/TimeStep.h
@@ -46,14 +46,7 @@ public:
: _previous(src._previous), _current(src._current), _dt(_current-_previous), _steps(src._steps) {}
/// copy a time step
- TimeStep &operator=(const TimeStep &src)
- {
- _previous = src._previous;
- _current = src._current;
- _dt = src._dt;
- _steps = src._steps;
- return *this;
- }
+ TimeStep& operator=(const TimeStep& src) = default;
/// return a time step incremented by the given time step size
TimeStep operator+(const double dt) const
diff --git a/ProcessLib/BoundaryCondition/BoundaryCondition.h b/ProcessLib/BoundaryCondition/BoundaryCondition.h
index ccf1b7ba364..161f9ad721b 100644
--- a/ProcessLib/BoundaryCondition/BoundaryCondition.h
+++ b/ProcessLib/BoundaryCondition/BoundaryCondition.h
@@ -69,7 +69,7 @@ public:
class BoundaryConditionBuilder
{
public:
- virtual ~BoundaryConditionBuilder() {}
+ virtual ~BoundaryConditionBuilder() = default;
virtual std::unique_ptr<BoundaryCondition> createBoundaryCondition(
const BoundaryConditionConfig& config,
diff --git a/Tests/BaseLib/TestFunctional.cpp b/Tests/BaseLib/TestFunctional.cpp
index 6c2b3a37811..9d00332a1bd 100644
--- a/Tests/BaseLib/TestFunctional.cpp
+++ b/Tests/BaseLib/TestFunctional.cpp
@@ -17,7 +17,7 @@ class A : private InstanceCounter<A>
{
public:
A(const double value) : _value(value) {}
- A(A const& other) : InstanceCounter(other), _value(other._value) {}
+ A(A const& other) = default;
A(A&& other) : InstanceCounter(std::move(other)), _value(other._value) {}
A& operator=(A const& other) { _value = other._value; return *this; }
A& operator=(A&& other) { _value = other._value; return *this; }
diff --git a/Tests/GeoLib/TestOctTree.cpp b/Tests/GeoLib/TestOctTree.cpp
index b2bd67de059..560fdd6d6eb 100644
--- a/Tests/GeoLib/TestOctTree.cpp
+++ b/Tests/GeoLib/TestOctTree.cpp
@@ -20,9 +20,7 @@ class GeoLibOctTree : public testing::Test
public:
typedef std::vector<GeoLib::Point*> VectorOfPoints;
- GeoLibOctTree()
- {}
-
+ GeoLibOctTree() = default;
~GeoLibOctTree()
{
for (auto p : ps_ptr) {
--
GitLab