From 8cffe1c3b999eac13057c6d384171ef2d3fd4b40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 28 May 2019 14:22:36 +0200 Subject: [PATCH] cppcheck --- src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh | 4 ++-- src/OpenMesh/Apps/ProgViewer/ProgViewerWidget.hh | 2 +- src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT.hh | 4 ++-- src/OpenMesh/Core/IO/reader/OBJReader.hh | 4 ++-- src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.hh | 2 +- src/OpenMesh/Tools/Smoother/LaplaceSmootherT.hh | 2 +- .../Tools/Subdivider/Adaptive/Composite/CompositeT.hh | 2 +- .../Tools/Subdivider/Adaptive/Composite/RuleInterfaceT.hh | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh b/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh index 3da9a6c9..6069ca3b 100644 --- a/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh +++ b/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh @@ -144,7 +144,7 @@ public: public: // inherited - bool open_mesh(const char* _filename, OpenMesh::IO::Options _opt) + bool open_mesh(const char* _filename, OpenMesh::IO::Options _opt) override { bool rc; @@ -170,7 +170,7 @@ protected slots: protected: - virtual void keyPressEvent(QKeyEvent* _event); + virtual void keyPressEvent(QKeyEvent* _event) override; private: diff --git a/src/OpenMesh/Apps/ProgViewer/ProgViewerWidget.hh b/src/OpenMesh/Apps/ProgViewer/ProgViewerWidget.hh index 84d6a94f..dfd22070 100644 --- a/src/OpenMesh/Apps/ProgViewer/ProgViewerWidget.hh +++ b/src/OpenMesh/Apps/ProgViewer/ProgViewerWidget.hh @@ -94,7 +94,7 @@ public: public: /// default constructor - ProgViewerWidget(QWidget* _parent=0) + explicit ProgViewerWidget(QWidget* _parent=0) : MeshViewerWidget(_parent), n_base_vertices_(0), n_base_faces_(0), diff --git a/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT.hh b/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT.hh index deb9600a..fcf6762d 100644 --- a/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT.hh +++ b/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT.hh @@ -117,7 +117,7 @@ public: protected: /// inherited drawing method - virtual void draw_scene(const std::string& _draw_mode); + virtual void draw_scene(const std::string& _draw_mode) override; protected: @@ -171,7 +171,7 @@ protected: // Strip support protected: // inherited - virtual void keyPressEvent( QKeyEvent* _event); + virtual void keyPressEvent( QKeyEvent* _event) override; protected: diff --git a/src/OpenMesh/Core/IO/reader/OBJReader.hh b/src/OpenMesh/Core/IO/reader/OBJReader.hh index e7f60d5c..2de77bc4 100644 --- a/src/OpenMesh/Core/IO/reader/OBJReader.hh +++ b/src/OpenMesh/Core/IO/reader/OBJReader.hh @@ -105,7 +105,7 @@ private: { public: - Material() { cleanup(); } + Material():Tr_(0),index_Kd_(0) { cleanup(); } void cleanup() { @@ -137,7 +137,7 @@ private: void set_Tr( float t ) { Tr_=t; Tr_is_set_=true; } - void set_map_Kd( std::string _name, int _index_Kd ) + void set_map_Kd( const std::string& _name, int _index_Kd ) { map_Kd_ = _name, index_Kd_ = _index_Kd; map_Kd_is_set_ = true; }; const Vec3f& Kd( void ) const { return Kd_; } diff --git a/src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.hh b/src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.hh index ee7e8900..d4a52c29 100644 --- a/src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.hh +++ b/src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.hh @@ -79,7 +79,7 @@ private: public: - JacobiLaplaceSmootherT( Mesh& _mesh ) : LaplaceSmootherT(_mesh) {} + explicit JacobiLaplaceSmootherT( Mesh& _mesh ) : LaplaceSmootherT(_mesh) {} // override: alloc umbrellas void smooth(unsigned int _n); diff --git a/src/OpenMesh/Tools/Smoother/LaplaceSmootherT.hh b/src/OpenMesh/Tools/Smoother/LaplaceSmootherT.hh index 32e8cfca..c50ec078 100644 --- a/src/OpenMesh/Tools/Smoother/LaplaceSmootherT.hh +++ b/src/OpenMesh/Tools/Smoother/LaplaceSmootherT.hh @@ -83,7 +83,7 @@ public: typedef typename SmootherT::EdgeHandle EdgeHandle; - LaplaceSmootherT( Mesh& _mesh ); + explicit LaplaceSmootherT( Mesh& _mesh ); virtual ~LaplaceSmootherT(); diff --git a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.hh b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.hh index bb341216..779dc282 100644 --- a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.hh +++ b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.hh @@ -146,7 +146,7 @@ public: public: /// Constructor - CompositeT(Mesh& _mesh) + explicit CompositeT(Mesh& _mesh) : subdiv_type_(0), subdiv_rule_(NULL), /*first_rule_(NULL), last_rule_(NULL),*/ mesh_(_mesh) { } diff --git a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RuleInterfaceT.hh b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RuleInterfaceT.hh index da9f8227..90139af3 100644 --- a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RuleInterfaceT.hh +++ b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RuleInterfaceT.hh @@ -118,7 +118,7 @@ public: protected: /// Default constructor - RuleInterfaceT(Mesh& _mesh) : mesh_(_mesh) {}; + RuleInterfaceT(Mesh& _mesh) : mesh_(_mesh),prev_rule_(nullptr),subdiv_rule_(nullptr),subdiv_type_(0),number_(0),n_rules_(0) {}; public: