diff --git a/Applications/DataExplorer/DataView/CondFromRasterDialog.h b/Applications/DataExplorer/DataView/CondFromRasterDialog.h index 01c52d0bef8b6e5d7bade92cfc02c75cd9f124e2..ade6924fd1da640fd7b39582a03634aa0ebaa645 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) override; + ~CondFromRasterDialog() override; private: const std::vector<MeshLib::Mesh*> _msh_vec; diff --git a/Applications/DataExplorer/DataView/DataExplorerSettingsDialog.h b/Applications/DataExplorer/DataView/DataExplorerSettingsDialog.h index 19b47bbb9f073f918082cac8dcc9c3812dcf3ca3..613e5bab35394bef6850f17fc57c4dcb194369f3 100644 --- a/Applications/DataExplorer/DataView/DataExplorerSettingsDialog.h +++ b/Applications/DataExplorer/DataView/DataExplorerSettingsDialog.h @@ -26,7 +26,7 @@ class DataExplorerSettingsDialog : public QDialog, private Ui_DataExplorerSettin public: DataExplorerSettingsDialog(QDialog* parent = nullptr); - ~DataExplorerSettingsDialog(void) override; + ~DataExplorerSettingsDialog() override; private slots: void on_gmshPathButton_clicked(); diff --git a/Applications/DataExplorer/DataView/DiagramView/DetailWindow.h b/Applications/DataExplorer/DataView/DiagramView/DetailWindow.h index 6a1cbf361c4fedc4476b2b555cd998d0b747d567..35ec29d2c4fff6c33aed2579636eb994bea4e609 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) override; + ~DetailWindow() 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 f51eeafdf3a13bdc23f2e0eae25302fa30bb73aa..0fe9041baa2ccf5d0b37aa55f05b8a93210578a8 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) override; + ~DiagramPrefsDialog() override; private: /** diff --git a/Applications/DataExplorer/DataView/GMSHPrefsDialog.h b/Applications/DataExplorer/DataView/GMSHPrefsDialog.h index e51799bf42c51b54d9269d79d4bb266bdf58a52c..79ea7a486422cf41973bbc7995b2d4ad6fbdf802 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) override; + ~GMSHPrefsDialog() override; private: std::vector<std::string> getSelectedObjects(QStringList list); diff --git a/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.h b/Applications/DataExplorer/DataView/GeoOnMeshMappingDialog.h index b3550e0aa976894f1df2631b3528d7f33fe54e87..18775962dd4c9b6c0c70b96b3ec1da5df73d0299 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) override; + ~GeoOnMeshMappingDialog() override; std::string const& getNewGeoName() const { return _new_geo_name; }; int getDataSetChoice() const; diff --git a/Applications/DataExplorer/DataView/LineEditDialog.h b/Applications/DataExplorer/DataView/LineEditDialog.h index cfff4ed027368a92915acda0dc1f5e4f18ce6064..cc6df5993a9141ef22aca8ea7735c8214ae2eda7 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) override; + ~LineEditDialog() override; private: std::vector<std::size_t> getSelectedIndeces(QStringList list); diff --git a/Applications/DataExplorer/DataView/LinearEditDialog.h b/Applications/DataExplorer/DataView/LinearEditDialog.h index a0adf57f660c5e99350dc3bdcea800f78af682f9..b74e144f882bf42a0c6909efb104fea51a9249fe 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) override; + ~LinearEditDialog() override; private: void setupDialog(const std::vector<std::size_t> &dis_nodes, const std::vector<double> &dis_values); diff --git a/Applications/DataExplorer/DataView/MergeGeometriesDialog.h b/Applications/DataExplorer/DataView/MergeGeometriesDialog.h index 2f11122dd0f987bb0fa2d614e07e4f5366eb5dd6..af81dd9b3a9e3230fc42af911e36fdfc26f7e4ee 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) override; + ~MergeGeometriesDialog() override; /// Returns a vector of selected geometries std::vector<std::string> const getSelectedGeometries() const; diff --git a/Applications/DataExplorer/DataView/MeshAnalysisDialog.h b/Applications/DataExplorer/DataView/MeshAnalysisDialog.h index eab67465004abcb5246c8796635295e0132295c8..0da4a578ba4b4f5a0fea93efa813556235a356b5 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) override; + ~MeshAnalysisDialog() 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 e2af34cbb75f0247e5f5a6acb41ae9ac631839f0..93b51d2248f249569b2c658133895ca336774c81 100644 --- a/Applications/DataExplorer/DataView/MeshElementRemovalDialog.h +++ b/Applications/DataExplorer/DataView/MeshElementRemovalDialog.h @@ -41,7 +41,7 @@ class MeshElementRemovalDialog : public QDialog, private Ui_MeshElementRemoval public: MeshElementRemovalDialog(DataHolderLib::Project const& project, QDialog* parent = nullptr); - ~MeshElementRemovalDialog(void) override; + ~MeshElementRemovalDialog() override; private slots: void on_boundingBoxCheckBox_toggled(bool is_checked); diff --git a/Applications/DataExplorer/DataView/MeshLayerEditDialog.h b/Applications/DataExplorer/DataView/MeshLayerEditDialog.h index 51f2daf6985bdaddc56ada01ba82290ca346285d..2d9511200046800370d6a50753e24108a12a99d9 100644 --- a/Applications/DataExplorer/DataView/MeshLayerEditDialog.h +++ b/Applications/DataExplorer/DataView/MeshLayerEditDialog.h @@ -41,7 +41,7 @@ class MeshLayerEditDialog : public QDialog, private Ui_MeshLayerEdit public: MeshLayerEditDialog(const MeshLib::Mesh* mesh, QDialog* parent = nullptr); - ~MeshLayerEditDialog(void) override; + ~MeshLayerEditDialog() override; private: void createMeshToolSelection(); diff --git a/Applications/DataExplorer/DataView/MeshValueEditDialog.h b/Applications/DataExplorer/DataView/MeshValueEditDialog.h index 66f1289f2c466b9289e6ec00cfdec81fbdce065e..c38791d73eac99e3ef0cd16832d8a778ac438b9e 100644 --- a/Applications/DataExplorer/DataView/MeshValueEditDialog.h +++ b/Applications/DataExplorer/DataView/MeshValueEditDialog.h @@ -33,7 +33,7 @@ public: /// Constructor for creating a new FEM condition. MeshValueEditDialog(MeshLib::Mesh* mesh, QDialog* parent = nullptr); - ~MeshValueEditDialog(void) override; + ~MeshValueEditDialog() override; private: MeshLib::Mesh* _mesh; diff --git a/Applications/DataExplorer/DataView/StratView/StratWindow.h b/Applications/DataExplorer/DataView/StratView/StratWindow.h index 92de0d186a29fe7ceac3f2e72f3d114f03f034ea..3e44de0bd8520c0f6e52dc874964581af20940b8 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) override { this->destroy(); } + ~StratWindow() override { this->destroy(); } private: /// Automatically resize window based on the measurements of the borehole. diff --git a/Applications/DataExplorer/NetCdfDialog/NetCdfConfigureDialog.h b/Applications/DataExplorer/NetCdfDialog/NetCdfConfigureDialog.h index fd93ee60f586e9285c511c0b4e2956cde92df211..eb23e363acdad4b2a823cc88c33dee7e4bbae0a7 100644 --- a/Applications/DataExplorer/NetCdfDialog/NetCdfConfigureDialog.h +++ b/Applications/DataExplorer/NetCdfDialog/NetCdfConfigureDialog.h @@ -35,7 +35,7 @@ class NetCdfConfigureDialog : public QDialog, private Ui_NetCdfConfigure public: NetCdfConfigureDialog(const std::string& fileName, QDialog* parent = nullptr); - ~NetCdfConfigureDialog(void) override; + ~NetCdfConfigureDialog() override; MeshLib::Mesh* getMesh() { return _currentMesh; }; std::string getName(); VtkGeoImageSource* getRaster() { return _currentRaster; }; diff --git a/Applications/DataExplorer/VtkVis/MeshFromRasterDialog.h b/Applications/DataExplorer/VtkVis/MeshFromRasterDialog.h index e54429201312ef498c046e1ab64a7189747657a0..0ea29d3eb33234b75bc945e0a3e2bd74d3bd59d6 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) override; + ~MeshFromRasterDialog() override; std::string getMeshName() const { return _mesh_name; } std::string getArrayName() const { return _array_name; } diff --git a/Applications/Utils/OGSFileConverter/FileListDialog.h b/Applications/Utils/OGSFileConverter/FileListDialog.h index 57b80b12adc1cfcc3d182ec181530fa449d4ee30..6cba6c274e00e66a02c8f7304235ad42540684ef 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) override; + ~FileListDialog() override; /// Returns list of all selected files const QStringList getInputFileList() const { return _allFiles.stringList(); }; diff --git a/Applications/Utils/OGSFileConverter/OGSFileConverter.h b/Applications/Utils/OGSFileConverter/OGSFileConverter.h index 47c1c607c835216c76eda2a63d8798c3b7279fed..54c1b883d2eed9c3aea9bb4a23d9f5d8df3c80df 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) override; + ~OGSFileConverter() override; private: /// Checks if a given file already exists diff --git a/GeoLib/StationBorehole.cpp b/GeoLib/StationBorehole.cpp index 0f6f154955e404cf935fa10485643a737f1d414a..bd6d00162fca9a54b45bf443f84b410ddef82b94 100644 --- a/GeoLib/StationBorehole.cpp +++ b/GeoLib/StationBorehole.cpp @@ -43,7 +43,7 @@ StationBorehole::StationBorehole(double x, _soilName.emplace_back(""); } -StationBorehole::~StationBorehole(void) +StationBorehole::~StationBorehole() { // deletes profile vector of borehole, starting at layer 1 // the first point is NOT deleted as it points to the station object itself diff --git a/GeoLib/StationBorehole.h b/GeoLib/StationBorehole.h index d8345ea8df7419f57dc47fc1d0d94af47e8db655..9297cef2a756672e407771a1139ff636d08adb84 100644 --- a/GeoLib/StationBorehole.h +++ b/GeoLib/StationBorehole.h @@ -36,7 +36,7 @@ public: double y = 0.0, double z = 0.0, const std::string& name = ""); - ~StationBorehole(void) override; + ~StationBorehole() 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/MathLib/Vector3.h b/MathLib/Vector3.h index 7b084776d03d97312ef2a07d6944878d9af4eae2..ca63af9a530d829db17dbf7a28c8768fd585ac51 100644 --- a/MathLib/Vector3.h +++ b/MathLib/Vector3.h @@ -130,16 +130,13 @@ public: } /// Returns the squared length - double getSqrLength(void) const + double getSqrLength() const { return this->_x[0]*this->_x[0] + this->_x[1]*this->_x[1] + this->_x[2]*this->_x[2]; } /// Returns the length - double getLength(void) const - { - return sqrt(getSqrLength()); - } + double getLength() const { return sqrt(getSqrLength()); } /** scalarProduct, implementation of scalar product, * sometimes called dot or inner product.