Merge branch 'cpp_check_fixes' into 'master'

Fixed some cppcheck warnings

See merge request OpenMesh/OpenMesh!161

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}

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_ );

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

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),

src/OpenMesh/Apps/QtViewer/MeshViewerWidget.hh

@@ -82,7 +82,7 @@ class MeshViewerWidget : public MeshViewerWidgetT<MyMesh>
     Q_OBJECT
 public:
     /// default constructor
-    MeshViewerWidget(QWidget* parent=0) : MeshViewerWidgetT<MyMesh>(parent)
+    explicit MeshViewerWidget(QWidget* parent=0) : MeshViewerWidgetT<MyMesh>(parent)
     {}
     OpenMesh::IO::Options& options() { return _options; }
     const OpenMesh::IO::Options& options() const { return _options; }

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]);
+    const unsigned char r = (unsigned char) ((1.0f - ratio) * myYellow[0] + ratio * myBlue[0]);
-    g = (unsigned char) ((1.0f - ratio) * myYellow[1] + ratio * myBlue[1]);
+    const unsigned char 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 b = (unsigned char) ((1.0f - ratio) * myYellow[2] + ratio * myBlue[2]);
 
     mesh_.set_color(*vIt, OpenMesh::Vec3uc(r,g,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_; }

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]);
+    const unsigned char r = (unsigned char) ((1.0f - ratio) * myYellow[0] + ratio * myBlue[0]);
-    g = (unsigned char) ((1.0f - ratio) * myYellow[1] + ratio * myBlue[1]);
+    const unsigned char 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 b = (unsigned char) ((1.0f - ratio) * myYellow[2] + ratio * myBlue[2]);
 
     mesh_.set_color(*vIt, OpenMesh::Vec3uc(r,g,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_; }

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)
   {

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")
 

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
   {

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 <typename T> 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<nF; ++i)
     {
-      nV = _be.get_vhandles(FaceHandle(i), vhandles);
+      //nV = _be.get_vhandles(FaceHandle(i), vhandles);
+      _be.get_vhandles(FaceHandle(i), vhandles);
       if ( header.mesh_ == 'P' )
         bytes += store( _os, vhandles.size(), OMFormat::Chunk::Integer_16, swap );
 

src/OpenMesh/Core/IO/writer/STLWriter.cc

@@ -158,7 +158,7 @@ write_stla(const std::string& _filename, BaseExporter& _be, Options /* _opt */)
 
 
 
-  int i, nF(int(_be.n_faces())), nV;
+  int i, nF(int(_be.n_faces()));
   Vec3f  a, b, c, n;
   std::vector<VertexHandle> vhandles;
   FaceHandle fh;
@@ -172,7 +172,7 @@ write_stla(const std::string& _filename, BaseExporter& _be, Options /* _opt */)
   for (i=0; i<nF; ++i)
   {
     fh = FaceHandle(i);
-    nV = _be.get_vhandles(fh, vhandles);
+    const int nV = _be.get_vhandles(fh, vhandles);
 
     if (nV == 3)
     {
@@ -211,7 +211,7 @@ write_stla(std::ostream& _out, BaseExporter& _be, Options /* _opt */, std::strea
 {
   omlog() << "[STLWriter] : write ascii file\n";
 
-  int i, nF(int(_be.n_faces())), nV;
+  int i, nF(int(_be.n_faces()));
   Vec3f  a, b, c, n;
   std::vector<VertexHandle> vhandles;
   FaceHandle fh;
@@ -226,7 +226,7 @@ write_stla(std::ostream& _out, BaseExporter& _be, Options /* _opt */, std::strea
   for (i=0; i<nF; ++i)
   {
     fh = FaceHandle(i);
-    nV = _be.get_vhandles(fh, vhandles);
+    const int nV = _be.get_vhandles(fh, vhandles);
 
     if (nV == 3)
     {
@@ -273,7 +273,7 @@ write_stlb(const std::string& _filename, BaseExporter& _be, Options /* _opt */)
   }
 
 
-  int i, nF(int(_be.n_faces())), nV;
+  int i, nF(int(_be.n_faces()));
   Vec3f  a, b, c, n;
   std::vector<VertexHandle> vhandles;
   FaceHandle fh;
@@ -294,7 +294,7 @@ write_stlb(const std::string& _filename, BaseExporter& _be, Options /* _opt */)
   for (i=0; i<nF; ++i)
   {
     fh = FaceHandle(i);
-    nV = _be.get_vhandles(fh, vhandles);
+    const int nV = _be.get_vhandles(fh, vhandles);
 
     if (nV == 3)
     {
@@ -344,7 +344,7 @@ write_stlb(std::ostream& _out, BaseExporter& _be, Options /* _opt */, std::strea
   omlog() << "[STLWriter] : write binary file\n";
 
 
-  int i, nF(int(_be.n_faces())), nV;
+  int i, nF(int(_be.n_faces()));
   Vec3f  a, b, c, n;
   std::vector<VertexHandle> vhandles;
   FaceHandle fh;
@@ -366,7 +366,7 @@ write_stlb(std::ostream& _out, BaseExporter& _be, Options /* _opt */, std::strea
   for (i=0; i<nF; ++i)
   {
     fh = FaceHandle(i);
-    nV = _be.get_vhandles(fh, vhandles);
+    const int nV = _be.get_vhandles(fh, vhandles);
 
     if (nV == 3)
     {

src/OpenMesh/Examples/Tutorial04/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_ );

src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.hh

@@ -104,7 +104,7 @@ public:
 
   typedef RuleInterfaceT<M> 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<M> 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<M> 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<M> 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<M> 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<M> 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<M> 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<M> 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<M> 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<M> 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<M> 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<M> 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<M> 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<M> 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<M> 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<M> 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<M> 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<M> 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

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)
     {

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)
     {

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)
     {

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_ );