diff --git a/CI/ci-cppcheck.sh b/CI/ci-cppcheck.sh index 43bc9824..ec39f140 100755 --- a/CI/ci-cppcheck.sh +++ b/CI/ci-cppcheck.sh @@ -18,7 +18,7 @@ echo -e "${NC}" echo "Please Wait ..." # Run cppcheck and output into file -cppcheck --enable=all . -I src -i Doc/ --force --suppress=unusedFunction --suppress=missingIncludeSystem --quiet -Umin -Umax -UBMPOSTFIX -DOPENMESHDLLEXPORT="" &> cppcheck.log +cppcheck --enable=all . --force --suppress=unusedFunction --suppress=missingIncludeSystem --quiet -Umin -Umax -UCTIME -UBMPOSTFIX -DOPENMESHDLLEXPORT="" -UPRIVATE_NODE_TYPESYSTEM_SOURCE -USO_NODE_ABSTRACT_SOURCE -USO_NODE_SOURCE -UCLOCK_REALTIME_HR -i src/OpenMesh/Apps/Unsupported/ -i Doc/ &> cppcheck.log echo -e "${OUTPUT}" echo "==============================================================================" @@ -38,7 +38,7 @@ echo "CPPCHECK Summary" echo "==============================================================================" echo -e "${NC}" -MAX_COUNT=6 +MAX_COUNT=0 if [ $COUNT -gt $MAX_COUNT ]; then echo -e ${WARNING} diff --git a/Doc/Tutorial/04-stl_algorithms/smooth_algo.hh b/Doc/Tutorial/04-stl_algorithms/smooth_algo.hh index b39fd82f..968cbd7b 100644 --- a/Doc/Tutorial/04-stl_algorithms/smooth_algo.hh +++ b/Doc/Tutorial/04-stl_algorithms/smooth_algo.hh @@ -13,7 +13,7 @@ public: public: // construct with a given mesh - SmootherT(Mesh& _mesh) + explicit SmootherT(Mesh& _mesh) : mesh_(_mesh) { mesh_.add_property( cog_ ); diff --git a/src/OpenMesh/Apps/Decimating/CmdOption.hh b/src/OpenMesh/Apps/Decimating/CmdOption.hh index 7a0d19b0..bbab79f4 100644 --- a/src/OpenMesh/Apps/Decimating/CmdOption.hh +++ b/src/OpenMesh/Apps/Decimating/CmdOption.hh @@ -56,7 +56,7 @@ public: typedef T value_type; - CmdOption(const T& _val) : val_(_val), valid_(true), enabled_(false) { } + explicit CmdOption(const T& _val) : val_(_val), valid_(true), enabled_(false) { } CmdOption() : val_(T()),valid_(false), enabled_(false) { } // has been set and has a value diff --git a/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh b/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh index c3caec9a..bb908a61 100644 --- a/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh +++ b/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh @@ -123,7 +123,7 @@ public: /// default constructor - DecimaterViewerWidget(QWidget* _parent=0) + explicit DecimaterViewerWidget(QWidget* _parent=0) : MeshViewerWidget(_parent), animate_(false), timer_(0), diff --git a/src/OpenMesh/Apps/QtViewer/MeshViewerWidget.hh b/src/OpenMesh/Apps/QtViewer/MeshViewerWidget.hh index 6addb705..7c8c1cd4 100644 --- a/src/OpenMesh/Apps/QtViewer/MeshViewerWidget.hh +++ b/src/OpenMesh/Apps/QtViewer/MeshViewerWidget.hh @@ -82,7 +82,7 @@ class MeshViewerWidget : public MeshViewerWidgetT Q_OBJECT public: /// default constructor - MeshViewerWidget(QWidget* parent=0) : MeshViewerWidgetT(parent) + explicit MeshViewerWidget(QWidget* parent=0) : MeshViewerWidgetT(parent) {} OpenMesh::IO::Options& options() { return _options; } const OpenMesh::IO::Options& options() const { return _options; } diff --git a/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/VDPMClientViewerWidget.cc b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/VDPMClientViewerWidget.cc index 7ce0864b..c328a872 100644 --- a/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/VDPMClientViewerWidget.cc +++ b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/VDPMClientViewerWidget.cc @@ -139,17 +139,15 @@ void VDPMClientViewerWidget::mesh_coloring() vEnd(mesh_.vertices_end()); VHierarchyNodeHandle node_handle; - float ratio; - unsigned char r, g, b; for (; vIt!=vEnd; ++vIt) { node_handle = mesh_.data(*vIt).vhierarchy_node_handle(); - ratio = vhierarchy_.node(node_handle).ratio(); + const float ratio = vhierarchy_.node(node_handle).ratio(); - r = (unsigned char) ((1.0f - ratio) * myYellow[0] + ratio * myBlue[0]); - g = (unsigned char) ((1.0f - ratio) * myYellow[1] + ratio * myBlue[1]); - b = (unsigned char) ((1.0f - ratio) * myYellow[2] + ratio * myBlue[2]); + const unsigned char r = (unsigned char) ((1.0f - ratio) * myYellow[0] + ratio * myBlue[0]); + const unsigned char g = (unsigned char) ((1.0f - ratio) * myYellow[1] + ratio * myBlue[1]); + const unsigned char b = (unsigned char) ((1.0f - ratio) * myYellow[2] + ratio * myBlue[2]); mesh_.set_color(*vIt, OpenMesh::Vec3uc(r,g,b)); } diff --git a/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/ServerSideVDPM.hh b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/ServerSideVDPM.hh index 7f05ac66..68804485 100644 --- a/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/ServerSideVDPM.hh +++ b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/ServerSideVDPM.hh @@ -77,7 +77,7 @@ private: public: - ServerSideVDPM() { clear(); } + ServerSideVDPM() :name_(""),tree_id_bits_(0) { clear(); } void clear(); const char* name() const { return name_; } diff --git a/src/OpenMesh/Apps/Unsupported/Streaming/Client/VDPMClientViewerWidget.cc b/src/OpenMesh/Apps/Unsupported/Streaming/Client/VDPMClientViewerWidget.cc index 29439336..0503f456 100644 --- a/src/OpenMesh/Apps/Unsupported/Streaming/Client/VDPMClientViewerWidget.cc +++ b/src/OpenMesh/Apps/Unsupported/Streaming/Client/VDPMClientViewerWidget.cc @@ -138,17 +138,15 @@ void VDPMClientViewerWidget::mesh_coloring() vEnd(mesh_.vertices_end()); VHierarchyNodeHandle node_handle; - float ratio; - unsigned char r, g, b; for (; vIt!=vEnd; ++vIt) { node_handle = mesh_.data(*vIt).vhierarchy_node_handle(); - ratio = vhierarchy_.node(node_handle).ratio(); + const float ratio = vhierarchy_.node(node_handle).ratio(); - r = (unsigned char) ((1.0f - ratio) * myYellow[0] + ratio * myBlue[0]); - g = (unsigned char) ((1.0f - ratio) * myYellow[1] + ratio * myBlue[1]); - b = (unsigned char) ((1.0f - ratio) * myYellow[2] + ratio * myBlue[2]); + const unsigned char r = (unsigned char) ((1.0f - ratio) * myYellow[0] + ratio * myBlue[0]); + const unsigned char g = (unsigned char) ((1.0f - ratio) * myYellow[1] + ratio * myBlue[1]); + const unsigned char b = (unsigned char) ((1.0f - ratio) * myYellow[2] + ratio * myBlue[2]); mesh_.set_color(*vIt, OpenMesh::Vec3uc(r,g,b)); } diff --git a/src/OpenMesh/Apps/Unsupported/Streaming/Server/ServerSideVDPM.hh b/src/OpenMesh/Apps/Unsupported/Streaming/Server/ServerSideVDPM.hh index 5f2b66e5..f20bda74 100644 --- a/src/OpenMesh/Apps/Unsupported/Streaming/Server/ServerSideVDPM.hh +++ b/src/OpenMesh/Apps/Unsupported/Streaming/Server/ServerSideVDPM.hh @@ -76,7 +76,7 @@ private: public: - ServerSideVDPM() { clear(); } + ServerSideVDPM(): name_(""),tree_id_bits_(0) { clear(); } void clear(); const char* name() const { return name_; } diff --git a/src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc b/src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc index 6fa32743..a73a672b 100644 --- a/src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc +++ b/src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc @@ -89,7 +89,7 @@ public: public: /// Constructor - ModBalancerT( D &_dec ) + explicit ModBalancerT( D &_dec ) : BaseModQ( _dec ), max_level_(0), n_roots_(0), n_vertices_(0) { diff --git a/src/OpenMesh/Core/IO/reader/PLYReader.cc b/src/OpenMesh/Core/IO/reader/PLYReader.cc index 107fafa7..618f347d 100644 --- a/src/OpenMesh/Core/IO/reader/PLYReader.cc +++ b/src/OpenMesh/Core/IO/reader/PLYReader.cc @@ -1062,7 +1062,7 @@ std::string get_property_name(std::string _string1, std::string _string2) { //----------------------------------------------------------------------------- -_PLYReader_::ValueType get_property_type(std::string _string1, std::string _string2) { +_PLYReader_::ValueType get_property_type(std::string& _string1, std::string& _string2) { if (_string1 == "float32" || _string2 == "float32") diff --git a/src/OpenMesh/Core/IO/reader/STLReader.cc b/src/OpenMesh/Core/IO/reader/STLReader.cc index 6dd8569b..b3c5af0a 100644 --- a/src/OpenMesh/Core/IO/reader/STLReader.cc +++ b/src/OpenMesh/Core/IO/reader/STLReader.cc @@ -176,7 +176,7 @@ class CmpVec { public: - CmpVec(float _eps=FLT_MIN) : eps_(_eps) {} + explicit CmpVec(float _eps=FLT_MIN) : eps_(_eps) {} bool operator()( const Vec3f& _v0, const Vec3f& _v1 ) const { diff --git a/src/OpenMesh/Core/IO/writer/OMWriter.cc b/src/OpenMesh/Core/IO/writer/OMWriter.cc index 964a5ebc..9c32282f 100644 --- a/src/OpenMesh/Core/IO/writer/OMWriter.cc +++ b/src/OpenMesh/Core/IO/writer/OMWriter.cc @@ -163,7 +163,7 @@ _OMWriter_::write(std::ostream& _os, BaseExporter& _be, Options _opt, std::strea #ifndef DOXY_IGNORE_THIS template struct Enabler { - Enabler( T& obj ) : obj_(obj) + explicit Enabler( T& obj ) : obj_(obj) {} ~Enabler() { obj_.enable(); } @@ -302,7 +302,8 @@ bool _OMWriter_::write_binary(std::ostream& _os, BaseExporter& _be, for (i=0, nF=header.n_faces_; i vhandles; FaceHandle fh; @@ -172,7 +172,7 @@ write_stla(const std::string& _filename, BaseExporter& _be, Options /* _opt */) for (i=0; i vhandles; FaceHandle fh; @@ -226,7 +226,7 @@ write_stla(std::ostream& _out, BaseExporter& _be, Options /* _opt */, std::strea for (i=0; i vhandles; FaceHandle fh; @@ -294,7 +294,7 @@ write_stlb(const std::string& _filename, BaseExporter& _be, Options /* _opt */) for (i=0; i vhandles; FaceHandle fh; @@ -366,7 +366,7 @@ write_stlb(std::ostream& _out, BaseExporter& _be, Options /* _opt */, std::strea for (i=0; i Inherited; - Tvv3(M& _mesh) : Inherited(_mesh) { Base::set_subdiv_type(3); }; + explicit Tvv3(M& _mesh) : Inherited(_mesh) { Base::set_subdiv_type(3); }; void raise(typename M::FaceHandle& _fh, state_t _target_state); void raise(typename M::VertexHandle& _vh, state_t _target_state); @@ -129,7 +129,7 @@ public: typedef RuleInterfaceT Inherited; - Tvv4(M& _mesh) : Inherited(_mesh) { Base::set_subdiv_type(4); }; + explicit Tvv4(M& _mesh) : Inherited(_mesh) { Base::set_subdiv_type(4); }; void raise(typename M::FaceHandle& _fh, state_t _target_state); void raise(typename M::VertexHandle& _vh, state_t _target_state); @@ -157,7 +157,7 @@ private: public: typedef RuleInterfaceT Inherited; - VF(M& _mesh) : Inherited(_mesh) {} + explicit VF(M& _mesh) : Inherited(_mesh) {} void raise(typename M::FaceHandle& _fh, state_t _target_state); MIPS_WARN_WA(Edge) @@ -179,7 +179,7 @@ private: public: typedef RuleInterfaceT Inherited; - FF(M& _mesh) : Inherited(_mesh) {} + explicit FF(M& _mesh) : Inherited(_mesh) {} void raise(typename M::FaceHandle& _fh, state_t _target_state); MIPS_WARN_WA(Vertex) // avoid warning @@ -201,7 +201,7 @@ private: public: typedef RuleInterfaceT Inherited; - FFc(M& _mesh) : Inherited(_mesh) {} + explicit FFc(M& _mesh) : Inherited(_mesh) {} void raise(typename M::FaceHandle& _fh, state_t _target_state); MIPS_WARN_WA(Vertex) // avoid warning @@ -223,7 +223,7 @@ private: public: typedef RuleInterfaceT Inherited; - FV(M& _mesh) : Inherited(_mesh) {} + explicit FV(M& _mesh) : Inherited(_mesh) {} void raise(typename M::VertexHandle& _vh, state_t _target_state); MIPS_WARN_WA(Face) // avoid warning @@ -245,7 +245,7 @@ private: public: typedef RuleInterfaceT Inherited; - FVc(M& _mesh) : Inherited(_mesh) { init_coeffs(50); } + explicit FVc(M& _mesh) : Inherited(_mesh) { init_coeffs(50); } void raise(typename M::VertexHandle& _vh, state_t _target_state); MIPS_WARN_WA(Face) // avoid warning @@ -282,7 +282,7 @@ public: typedef RuleInterfaceT Inherited; - VV(M& _mesh) : Inherited(_mesh) {} + explicit VV(M& _mesh) : Inherited(_mesh) {} void raise(typename M::VertexHandle& _vh, state_t _target_state); MIPS_WARN_WA(Face) // avoid warning @@ -304,7 +304,7 @@ private: public: typedef RuleInterfaceT Inherited; - VVc(M& _mesh) : Inherited(_mesh) {} + explicit VVc(M& _mesh) : Inherited(_mesh) {} void raise(typename M::VertexHandle& _vh, state_t _target_state); MIPS_WARN_WA(Face) // avoid warning @@ -326,7 +326,7 @@ private: public: typedef RuleInterfaceT Inherited; - VE(M& _mesh) : Inherited(_mesh) {} + explicit VE(M& _mesh) : Inherited(_mesh) {} void raise(typename M::EdgeHandle& _eh, state_t _target_state); MIPS_WARN_WA(Face ) // avoid warning @@ -348,7 +348,7 @@ private: public: typedef RuleInterfaceT Inherited; - VdE(M& _mesh) : Inherited(_mesh) {} + explicit VdE(M& _mesh) : Inherited(_mesh) {} void raise(typename M::EdgeHandle& _eh, state_t _target_state); MIPS_WARN_WA(Face ) // avoid warning @@ -370,7 +370,7 @@ private: public: typedef RuleInterfaceT Inherited; - VdEc(M& _mesh) : Inherited(_mesh) {} + explicit VdEc(M& _mesh) : Inherited(_mesh) {} void raise(typename M::EdgeHandle& _eh, state_t _target_state); MIPS_WARN_WA(Face ) // avoid warning @@ -392,7 +392,7 @@ private: public: typedef RuleInterfaceT Inherited; - EV(M& _mesh) : Inherited(_mesh) {} + explicit EV(M& _mesh) : Inherited(_mesh) {} void raise(typename M::VertexHandle& _vh, state_t _target_state); MIPS_WARN_WA(Face) // avoid warning @@ -415,7 +415,7 @@ public: typedef RuleInterfaceT Inherited; - EVc(M& _mesh) : Inherited(_mesh) { init_coeffs(50); } + explicit EVc(M& _mesh) : Inherited(_mesh) { init_coeffs(50); } void raise(typename M::VertexHandle& _vh, state_t _target_state); MIPS_WARN_WA(Face) // avoid warning @@ -451,7 +451,7 @@ private: public: typedef RuleInterfaceT Inherited; - EF(M& _mesh) : Inherited(_mesh) {} + explicit EF(M& _mesh) : Inherited(_mesh) {} void raise(typename M::FaceHandle& _fh, state_t _target_state); MIPS_WARN_WA(Edge ) // avoid warning @@ -473,7 +473,7 @@ private: public: typedef RuleInterfaceT Inherited; - FE(M& _mesh) : Inherited(_mesh) {} + explicit FE(M& _mesh) : Inherited(_mesh) {} void raise(typename M::EdgeHandle& _eh, state_t _target_state); MIPS_WARN_WA(Face ) // avoid warning @@ -495,7 +495,7 @@ private: public: typedef RuleInterfaceT Inherited; - EdE(M& _mesh) : Inherited(_mesh) {} + explicit EdE(M& _mesh) : Inherited(_mesh) {} void raise(typename M::EdgeHandle& _eh, state_t _target_state); MIPS_WARN_WA(Face ) // avoid warning @@ -517,7 +517,7 @@ private: public: typedef RuleInterfaceT Inherited; - EdEc(M& _mesh) : Inherited(_mesh) {} + explicit EdEc(M& _mesh) : Inherited(_mesh) {} void raise(typename M::EdgeHandle& _eh, state_t _target_state); MIPS_WARN_WA(Face ) // avoid warning diff --git a/src/Unittests/unittests_decimater.cc b/src/Unittests/unittests_decimater.cc index d24439ca..e02780a5 100644 --- a/src/Unittests/unittests_decimater.cc +++ b/src/Unittests/unittests_decimater.cc @@ -134,7 +134,7 @@ class UnittestObserver : public OpenMesh::Decimater::Observer size_t notifies_; size_t all_steps_; public: - UnittestObserver(size_t _steps) :Observer(_steps), notifies_(0), all_steps_(0) {} + explicit UnittestObserver(size_t _steps) :Observer(_steps), notifies_(0), all_steps_(0) {} void notify(size_t _step) { diff --git a/src/Unittests/unittests_mc_decimater.cc b/src/Unittests/unittests_mc_decimater.cc index 3a206c24..38b4808b 100644 --- a/src/Unittests/unittests_mc_decimater.cc +++ b/src/Unittests/unittests_mc_decimater.cc @@ -112,7 +112,7 @@ class UnittestObserver : public OpenMesh::Decimater::Observer size_t notifies_; size_t all_steps_; public: - UnittestObserver(size_t _steps) :Observer(_steps), notifies_(0), all_steps_(0) {} + explicit UnittestObserver(size_t _steps) :Observer(_steps), notifies_(0), all_steps_(0) {} void notify(size_t _step) { diff --git a/src/Unittests/unittests_mixed_decimater.cc b/src/Unittests/unittests_mixed_decimater.cc index cd892e44..15dc7d45 100644 --- a/src/Unittests/unittests_mixed_decimater.cc +++ b/src/Unittests/unittests_mixed_decimater.cc @@ -112,7 +112,7 @@ class UnittestObserver : public OpenMesh::Decimater::Observer size_t notifies_; size_t all_steps_; public: - UnittestObserver(size_t _steps) :Observer(_steps), notifies_(0), all_steps_(0) {} + explicit UnittestObserver(size_t _steps) :Observer(_steps), notifies_(0), all_steps_(0) {} void notify(size_t _step) { diff --git a/src/Unittests/unittests_tutorials.cc b/src/Unittests/unittests_tutorials.cc index 552fa614..4a7ac5ba 100644 --- a/src/Unittests/unittests_tutorials.cc +++ b/src/Unittests/unittests_tutorials.cc @@ -197,7 +197,7 @@ public: public: // construct with a given mesh - SmootherT(Mesh& _mesh) + explicit SmootherT(Mesh& _mesh) : mesh_(_mesh) { mesh_.add_property( cog_ );