Replace NULL by nullptr

src/OpenMesh/Core/IO/IOManager.cc

@@ -258,7 +258,7 @@ find_writer(const std::string& _format)
     if ((*it)->can_u_write(filename))
       return *it;
 
-  return NULL;
+  return nullptr;
 }
 
 

src/OpenMesh/Core/IO/OMFormat.cc

@@ -135,7 +135,7 @@ namespace OMFormat {
       default:
 	std::clog << "as_string(Chunk::Entity): Invalid value!";
     }
-    return NULL;
+    return nullptr;
   }
 
 
@@ -153,7 +153,7 @@ namespace OMFormat {
       case Chunk::Type_Custom:   return "Custom";
       case Chunk::Type_Topology: return "Topology";
     }
-    return NULL;
+    return nullptr;
   }
 
 
@@ -172,7 +172,7 @@ namespace OMFormat {
       case Chunk::Dim_7D: return "7D";
       case Chunk::Dim_8D: return "8D";
     }
-    return NULL;
+    return nullptr;
   }
 
 
@@ -187,7 +187,7 @@ namespace OMFormat {
       case Chunk::Integer_32 : return "32";
       case Chunk::Integer_64 : return "64";
     }
-    return NULL;
+    return nullptr;
   }
 
   const char *as_string(Chunk::Float_Size d)
@@ -198,7 +198,7 @@ namespace OMFormat {
       case Chunk::Float_64 : return "64";
       case Chunk::Float_128: return "128";
     }
-    return NULL;
+    return nullptr;
   }
 
 

src/OpenMesh/Core/IO/exporter/BaseExporter.hh

@@ -144,7 +144,7 @@ public:
   virtual OpenMesh::Attributes::StatusInfo  status(HalfedgeHandle _heh) const = 0;
 
   // get reference to base kernel
-  virtual const BaseKernel* kernel() { return 0; }
+  virtual const BaseKernel* kernel() { return nullptr; }
 
 
   // query number of faces, vertices, normals, texcoords

src/OpenMesh/Core/IO/importer/BaseImporter.hh

@@ -196,7 +196,7 @@ public:
   virtual void add_texture_information( int _id , std::string _name ) = 0;
 
   // get reference to base kernel
-  virtual BaseKernel* kernel() { return 0; }
+  virtual BaseKernel* kernel() { return nullptr; }
 
   virtual bool is_triangle_mesh()     const { return false; }
 

src/OpenMesh/Core/Mesh/BaseKernel.cc

@@ -64,27 +64,27 @@ void BaseKernel::property_stats(std::ostream& _ostr) const
   _ostr << vprops_.size() << " vprops:\n";
   for (it=vps.begin(); it!=vps.end(); ++it)
   {
-    *it == NULL ? (void)(_ostr << "[deleted]" << "\n") : (*it)->stats(_ostr);
+    *it == nullptr ? (void)(_ostr << "[deleted]" << "\n") : (*it)->stats(_ostr);
   }
   _ostr << hprops_.size() << " hprops:\n";
   for (it=hps.begin(); it!=hps.end(); ++it)
   {
-    *it == NULL ? (void)(_ostr << "[deleted]" << "\n") : (*it)->stats(_ostr);
+    *it == nullptr ? (void)(_ostr << "[deleted]" << "\n") : (*it)->stats(_ostr);
   }
   _ostr << eprops_.size() << " eprops:\n";
   for (it=eps.begin(); it!=eps.end(); ++it)
   {
-    *it == NULL ? (void)(_ostr << "[deleted]" << "\n") : (*it)->stats(_ostr);
+    *it == nullptr ? (void)(_ostr << "[deleted]" << "\n") : (*it)->stats(_ostr);
   }
   _ostr << fprops_.size() << " fprops:\n";
   for (it=fps.begin(); it!=fps.end(); ++it)
   {
-    *it == NULL ? (void)(_ostr << "[deleted]" << "\n") : (*it)->stats(_ostr);
+    *it == nullptr ? (void)(_ostr << "[deleted]" << "\n") : (*it)->stats(_ostr);
   }
   _ostr << mprops_.size() << " mprops:\n";
   for (it=mps.begin(); it!=mps.end(); ++it)
   {
-    *it == NULL ? (void)(_ostr << "[deleted]" << "\n") : (*it)->stats(_ostr);
+    *it == nullptr ? (void)(_ostr << "[deleted]" << "\n") : (*it)->stats(_ostr);
   }
 }
 
@@ -97,7 +97,7 @@ void BaseKernel::vprop_stats( std::string& _string ) const
   PropertyContainer::Properties::const_iterator it;
   const PropertyContainer::Properties& vps = vprops_.properties();
   for (it=vps.begin(); it!=vps.end(); ++it)
-    if ( *it == NULL )
+    if ( *it == nullptr )
       _string += "[deleted] \n";
     else {
       _string += (*it)->name();
@@ -113,7 +113,7 @@ void BaseKernel::hprop_stats( std::string& _string ) const
   PropertyContainer::Properties::const_iterator it;
   const PropertyContainer::Properties& hps = hprops_.properties();
   for (it=hps.begin(); it!=hps.end(); ++it)
-    if ( *it == NULL )
+    if ( *it == nullptr )
       _string += "[deleted] \n";
     else {
       _string += (*it)->name();
@@ -129,7 +129,7 @@ void BaseKernel::eprop_stats( std::string& _string ) const
   PropertyContainer::Properties::const_iterator it;
   const PropertyContainer::Properties& eps = eprops_.properties();
   for (it=eps.begin(); it!=eps.end(); ++it)
-    if ( *it == NULL )
+    if ( *it == nullptr )
       _string += "[deleted] \n";
     else {
       _string += (*it)->name();
@@ -144,7 +144,7 @@ void BaseKernel::fprop_stats( std::string& _string ) const
   PropertyContainer::Properties::const_iterator it;
   const PropertyContainer::Properties& fps = fprops_.properties();
   for (it=fps.begin(); it!=fps.end(); ++it)
-    if ( *it == NULL )
+    if ( *it == nullptr )
       _string += "[deleted] \n";
     else {
       _string += (*it)->name();
@@ -160,7 +160,7 @@ void BaseKernel::mprop_stats( std::string& _string ) const
   PropertyContainer::Properties::const_iterator it;
   const PropertyContainer::Properties& mps = mprops_.properties();
   for (it=mps.begin(); it!=mps.end(); ++it)
-    if ( *it == NULL )
+    if ( *it == nullptr )
       _string += "[deleted] \n";
     else {
       _string += (*it)->name();
@@ -178,7 +178,7 @@ void BaseKernel::vprop_stats(std::ostream& _ostr ) const
   PropertyContainer::Properties::const_iterator it;
   const PropertyContainer::Properties& vps = vprops_.properties();
   for (it=vps.begin(); it!=vps.end(); ++it)
-    *it == NULL ? (void)(_ostr << "[deleted]" << "\n") : (*it)->stats(_ostr);
+    *it == nullptr ? (void)(_ostr << "[deleted]" << "\n") : (*it)->stats(_ostr);
 
 }
 void BaseKernel::hprop_stats() const
@@ -190,7 +190,7 @@ void BaseKernel::hprop_stats(std::ostream& _ostr ) const
   PropertyContainer::Properties::const_iterator it;
   const PropertyContainer::Properties& hps = hprops_.properties();
   for (it=hps.begin(); it!=hps.end(); ++it)
-    *it == NULL ? (void)(_ostr << "[deleted]" << "\n") : (*it)->stats(_ostr);
+    *it == nullptr ? (void)(_ostr << "[deleted]" << "\n") : (*it)->stats(_ostr);
 
 }
 void BaseKernel::eprop_stats() const
@@ -202,7 +202,7 @@ void BaseKernel::eprop_stats(std::ostream& _ostr ) const
   PropertyContainer::Properties::const_iterator it;
   const PropertyContainer::Properties& eps = eprops_.properties();
   for (it=eps.begin(); it!=eps.end(); ++it)
-    *it == NULL ? (void)(_ostr << "[deleted]" << "\n") : (*it)->stats(_ostr);
+    *it == nullptr ? (void)(_ostr << "[deleted]" << "\n") : (*it)->stats(_ostr);
 
 }
 void BaseKernel::fprop_stats() const
@@ -214,7 +214,7 @@ void BaseKernel::fprop_stats(std::ostream& _ostr ) const
   PropertyContainer::Properties::const_iterator it;
   const PropertyContainer::Properties& fps = fprops_.properties();
   for (it=fps.begin(); it!=fps.end(); ++it)
-    *it == NULL ? (void)(_ostr << "[deleted]" << "\n") : (*it)->stats(_ostr);
+    *it == nullptr ? (void)(_ostr << "[deleted]" << "\n") : (*it)->stats(_ostr);
 
 }
 void BaseKernel::mprop_stats() const
@@ -226,7 +226,7 @@ void BaseKernel::mprop_stats(std::ostream& _ostr ) const
   PropertyContainer::Properties::const_iterator it;
   const PropertyContainer::Properties& mps = mprops_.properties();
   for (it=mps.begin(); it!=mps.end(); ++it)
-    *it == NULL ? (void)(_ostr << "[deleted]" << "\n") : (*it)->stats(_ostr);
+    *it == nullptr ? (void)(_ostr << "[deleted]" << "\n") : (*it)->stats(_ostr);
 
 }
 

src/OpenMesh/Core/System/mostream.hh

@@ -285,7 +285,7 @@ class mostream : public std::ostream
 public:
 
   /// Explicit constructor
-  explicit mostream() : std::ostream(NULL) { init(&streambuffer_); }
+  explicit mostream() : std::ostream(nullptr) { init(&streambuffer_); }
 
 
   /// Connect target to multiplexer

src/OpenMesh/Core/Utils/AutoPropertyHandleT.hh

@@ -70,7 +70,7 @@ protected:
 
 public:
   AutoPropertyHandleT()
-  : m_(NULL), own_property_(false)
+  : m_(nullptr), own_property_(false)
   {}
   
   AutoPropertyHandleT(const Self& _other)

src/OpenMesh/Core/Utils/Property.hh

@@ -434,7 +434,7 @@ public:
 
   const value_type* data() const {
       if( data_.empty() )
-	  return 0;
+	  return nullptr;
 
       return (value_type*) &data_[0];
   }

src/OpenMesh/Core/Utils/PropertyContainer.hh

@@ -102,8 +102,8 @@ public:
   {
     Properties::iterator p_it=properties_.begin(), p_end=properties_.end();
     int idx=0;
-    for ( ; p_it!=p_end && *p_it!=NULL; ++p_it, ++idx ) {};
-    if (p_it==p_end) properties_.push_back(NULL);
+    for ( ; p_it!=p_end && *p_it!=nullptr; ++p_it, ++idx ) {};
+    if (p_it==p_end) properties_.push_back(nullptr);
     properties_[idx] = new PropertyT<T>(_name);
     return BasePropHandleT<T>(idx);
   }
@@ -115,11 +115,11 @@ public:
     Properties::const_iterator p_it = properties_.begin();
     for (int idx=0; p_it != properties_.end(); ++p_it, ++idx)
     {
-      if (*p_it != NULL &&
+      if (*p_it != nullptr &&
          (*p_it)->name() == _name  //skip deleted properties
 // Skip type check
 #ifndef OM_FORCE_STATIC_CAST
-          && dynamic_cast<PropertyT<T>*>(properties_[idx]) != NULL //check type
+          && dynamic_cast<PropertyT<T>*>(properties_[idx]) != nullptr //check type
 #endif
          )
       {
@@ -134,23 +134,23 @@ public:
     Properties::const_iterator p_it = properties_.begin();
     for (int idx=0; p_it != properties_.end(); ++p_it, ++idx)
     {
-      if (*p_it != NULL && (*p_it)->name() == _name) //skip deleted properties
+      if (*p_it != nullptr && (*p_it)->name() == _name) //skip deleted properties
       {
         return *p_it;
       }
     }
-    return NULL;
+    return nullptr;
   }
 
   template <class T> PropertyT<T>& property(BasePropHandleT<T> _h)
   {
     assert(_h.idx() >= 0 && _h.idx() < (int)properties_.size());
-    assert(properties_[_h.idx()] != NULL);
+    assert(properties_[_h.idx()] != nullptr);
 #ifdef OM_FORCE_STATIC_CAST
     return *static_cast  <PropertyT<T>*> (properties_[_h.idx()]);
 #else
     PropertyT<T>* p = dynamic_cast<PropertyT<T>*>(properties_[_h.idx()]);
-    assert(p != NULL);
+    assert(p != nullptr);
     return *p;
 #endif
   }
@@ -159,12 +159,12 @@ public:
   template <class T> const PropertyT<T>& property(BasePropHandleT<T> _h) const
   {
     assert(_h.idx() >= 0 && _h.idx() < (int)properties_.size());
-    assert(properties_[_h.idx()] != NULL);
+    assert(properties_[_h.idx()] != nullptr);
 #ifdef OM_FORCE_STATIC_CAST
     return *static_cast<PropertyT<T>*>(properties_[_h.idx()]);
 #else
     PropertyT<T>* p = dynamic_cast<PropertyT<T>*>(properties_[_h.idx()]);
-    assert(p != NULL);
+    assert(p != nullptr);
     return *p;
 #endif
   }
@@ -174,7 +174,7 @@ public:
   {
     assert(_h.idx() >= 0 && _h.idx() < (int)properties_.size());
     delete properties_[_h.idx()];
-    properties_[_h.idx()] = NULL;
+    properties_[_h.idx()] = nullptr;
   }
 
 
@@ -281,8 +281,8 @@ protected: // generic add/get
   {
     Properties::iterator p_it=properties_.begin(), p_end=properties_.end();
     size_t idx=0;
-    for (; p_it!=p_end && *p_it!=NULL; ++p_it, ++idx) {};
-    if (p_it==p_end) properties_.push_back(NULL);
+    for (; p_it!=p_end && *p_it!=nullptr; ++p_it, ++idx) {};
+    if (p_it==p_end) properties_.push_back(nullptr);
     properties_[idx] = _bp;
     return idx;
   }
@@ -290,18 +290,18 @@ protected: // generic add/get
   BaseProperty& _property( size_t _idx )
   {
     assert( _idx < properties_.size());
-    assert( properties_[_idx] != NULL);
+    assert( properties_[_idx] != nullptr);
     BaseProperty *p = properties_[_idx];
-    assert( p != NULL );
+    assert( p != nullptr );
     return *p;
   }
 
   const BaseProperty& _property( size_t _idx ) const
   {
     assert( _idx < properties_.size());
-    assert( properties_[_idx] != NULL);
+    assert( properties_[_idx] != nullptr);
     BaseProperty *p = properties_[_idx];
-    assert( p != NULL );
+    assert( p != nullptr );
     return *p;
   }