From b083f32a23d4d5a6d79e200aeb46ef9b7e9a5a26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 29 May 2019 10:11:42 +0200 Subject: [PATCH] Replace NULL by nullptr --- src/OpenMesh/Apps/Decimating/CmdOption.hh | 2 +- .../Apps/Decimating/decimaterviewer.cc | 6 ++-- .../Apps/QtViewer/MeshViewerWidget.cc | 4 +-- .../Apps/Subdivider/SubdivideWidget.cc | 2 +- src/OpenMesh/Apps/Subdivider/qtsubdivider.cc | 4 +-- .../Unsupported/IvViewer/SoOpenMeshSupport.hh | 4 +-- .../Apps/Unsupported/OsgViewer/meshviewer.cc | 6 ++-- .../Apps/Unsupported/OsgViewer/osgviewer.cc | 2 +- .../Streaming-qt4/Server/VDPMServerSession.cc | 2 +- .../Server/VDPMServerViewerWidget.cc | 2 +- .../Streaming/Server/VDPMServerSession.cc | 2 +- .../Server/VDPMServerViewerWidget.cc | 2 +- src/OpenMesh/Core/IO/IOManager.cc | 2 +- src/OpenMesh/Core/IO/OMFormat.cc | 10 +++--- src/OpenMesh/Core/IO/exporter/BaseExporter.hh | 2 +- src/OpenMesh/Core/IO/importer/BaseImporter.hh | 2 +- src/OpenMesh/Core/Mesh/BaseKernel.cc | 30 ++++++++-------- src/OpenMesh/Core/System/mostream.hh | 2 +- .../Core/Utils/AutoPropertyHandleT.hh | 2 +- src/OpenMesh/Core/Utils/Property.hh | 2 +- src/OpenMesh/Core/Utils/PropertyContainer.hh | 34 +++++++++---------- .../Tools/Decimater/BaseDecimaterT_impl.hh | 6 ++-- .../Tools/Decimater/DecimaterT_impl.hh | 2 +- src/OpenMesh/Tools/Decimater/ModBaseT.hh | 6 ++-- src/OpenMesh/Tools/Kernel_OSG/PropertyT.hh | 2 +- .../Adaptive/Composite/CompositeT.hh | 4 +-- .../Uniform/Composite/CompositeT.hh | 6 ++-- .../Tools/Subdivider/Uniform/SubdividerT.hh | 4 +-- src/OpenMesh/Tools/Utils/Gnuplot.cc | 4 +-- src/OpenMesh/Tools/Utils/conio.cc | 2 +- src/OpenMesh/Tools/VDPM/VHierarchyWindow.cc | 8 ++--- 31 files changed, 84 insertions(+), 84 deletions(-) diff --git a/src/OpenMesh/Apps/Decimating/CmdOption.hh b/src/OpenMesh/Apps/Decimating/CmdOption.hh index 978d32df..0861087d 100644 --- a/src/OpenMesh/Apps/Decimating/CmdOption.hh +++ b/src/OpenMesh/Apps/Decimating/CmdOption.hh @@ -74,7 +74,7 @@ public: operator T () const { return val_; } // operator const T& () const { return val_; } - operator T* () const { return is_valid() ? &val_ : NULL; } + operator T* () const { return is_valid() ? &val_ : nullptr; } private: diff --git a/src/OpenMesh/Apps/Decimating/decimaterviewer.cc b/src/OpenMesh/Apps/Decimating/decimaterviewer.cc index 042f97c6..5edaf767 100644 --- a/src/OpenMesh/Apps/Decimating/decimaterviewer.cc +++ b/src/OpenMesh/Apps/Decimating/decimaterviewer.cc @@ -68,7 +68,7 @@ int main(int argc, char **argv) if ( !QGLFormat::hasOpenGL() ) { QString msg = "System has no OpenGL support!"; - QMessageBox::critical( NULL, "OpenGL", msg + argv[1] ); + QMessageBox::critical( nullptr, "OpenGL", msg + argv[1] ); return -1; } @@ -103,7 +103,7 @@ int main(int argc, char **argv) QString msg = "Cannot read mesh from file:\n '"; msg += argv[optind]; msg += "'"; - QMessageBox::critical( NULL, w.windowTitle(), msg ); + QMessageBox::critical( nullptr, w.windowTitle(), msg ); return 1; } } @@ -118,7 +118,7 @@ int main(int argc, char **argv) msg += "- Mesh file didn't provide texture coordinates\n"; msg += "- Texture file does not exist\n"; msg += "- Texture file is not accessible.\n"; - QMessageBox::warning( NULL, w.windowTitle(), msg ); + QMessageBox::warning( nullptr, w.windowTitle(), msg ); } } diff --git a/src/OpenMesh/Apps/QtViewer/MeshViewerWidget.cc b/src/OpenMesh/Apps/QtViewer/MeshViewerWidget.cc index d85b9426..7385e596 100644 --- a/src/OpenMesh/Apps/QtViewer/MeshViewerWidget.cc +++ b/src/OpenMesh/Apps/QtViewer/MeshViewerWidget.cc @@ -63,7 +63,7 @@ MeshViewerWidget::MeshViewerWidget(QWidget* parent) : MeshViewerWidgetT QString msg = "Cannot read mesh from file:\n '"; msg += fname; msg += "'"; - QMessageBox::critical( NULL, windowTitle(), msg); + QMessageBox::critical( nullptr, windowTitle(), msg); } t.stop(); std::cout << "Loaded mesh in ~" << t.as_string() << std::endl; @@ -80,7 +80,7 @@ void MeshViewerWidget::open_texture_gui(QString fname) msg += "- Mesh file didn't provide texture coordinates\n"; msg += "- Texture file does not exist\n"; msg += "- Texture file is not accessible.\n"; - QMessageBox::warning( NULL, windowTitle(), msg ); + QMessageBox::warning( nullptr, windowTitle(), msg ); } } diff --git a/src/OpenMesh/Apps/Subdivider/SubdivideWidget.cc b/src/OpenMesh/Apps/Subdivider/SubdivideWidget.cc index 40220942..7434a8b9 100644 --- a/src/OpenMesh/Apps/Subdivider/SubdivideWidget.cc +++ b/src/OpenMesh/Apps/Subdivider/SubdivideWidget.cc @@ -87,7 +87,7 @@ using namespace OpenMesh::Subdivider; SubdivideWidget:: SubdivideWidget(QWidget* _parent, const char* _name) : QWidget(_parent), - timer_(NULL), animate_step_(0), max_animate_steps_(4), msecs_(0) + timer_(nullptr), animate_step_(0), max_animate_steps_(4), msecs_(0) { setWindowTitle( QString(_name) ); diff --git a/src/OpenMesh/Apps/Subdivider/qtsubdivider.cc b/src/OpenMesh/Apps/Subdivider/qtsubdivider.cc index fae98b26..665274dc 100644 --- a/src/OpenMesh/Apps/Subdivider/qtsubdivider.cc +++ b/src/OpenMesh/Apps/Subdivider/qtsubdivider.cc @@ -60,7 +60,7 @@ int main(int argc, char **argv) if ( !QGLFormat::hasOpenGL() ) { QString msg = "System has no OpenGL support!"; - QMessageBox::critical( NULL, "OpenGL", msg + argv[1], QMessageBox::Ok ); + QMessageBox::critical( nullptr, "OpenGL", msg + argv[1], QMessageBox::Ok ); return -1; } @@ -77,7 +77,7 @@ int main(int argc, char **argv) if ( ! w->open_mesh(argv[1]) ) { QString msg = "Cannot read mesh from file "; - QMessageBox::critical( NULL, argv[1], msg + argv[1], QMessageBox::Ok ); + QMessageBox::critical( nullptr, argv[1], msg + argv[1], QMessageBox::Ok ); return -1; } } diff --git a/src/OpenMesh/Apps/Unsupported/IvViewer/SoOpenMeshSupport.hh b/src/OpenMesh/Apps/Unsupported/IvViewer/SoOpenMeshSupport.hh index c323e0af..7c38018f 100644 --- a/src/OpenMesh/Apps/Unsupported/IvViewer/SoOpenMeshSupport.hh +++ b/src/OpenMesh/Apps/Unsupported/IvViewer/SoOpenMeshSupport.hh @@ -78,9 +78,9 @@ PRIVATE_NODE_TYPESYSTEM_SOURCE(_class_); \ SO_NODE_SOURCE_TEMPLATE \ unsigned int _class_::classinstances = 0; \ SO_NODE_SOURCE_TEMPLATE \ -const SoFieldData ** _class_::parentFieldData = NULL; \ +const SoFieldData ** _class_::parentFieldData = nullptr; \ SO_NODE_SOURCE_TEMPLATE \ -SoFieldData * _class_::fieldData = NULL; \ +SoFieldData * _class_::fieldData = nullptr; \ \ SO_NODE_SOURCE_TEMPLATE \ const SoFieldData ** \ diff --git a/src/OpenMesh/Apps/Unsupported/OsgViewer/meshviewer.cc b/src/OpenMesh/Apps/Unsupported/OsgViewer/meshviewer.cc index c35867b9..bd127bb1 100644 --- a/src/OpenMesh/Apps/Unsupported/OsgViewer/meshviewer.cc +++ b/src/OpenMesh/Apps/Unsupported/OsgViewer/meshviewer.cc @@ -78,7 +78,7 @@ int main(int argc, char **argv) if ( !QGLFormat::hasOpenGL() ) { QString msg = "System has no OpenGL support!"; - QMessageBox::critical( NULL, "OpenGL", msg + argv[1], 0 ); + QMessageBox::critical( nullptr, "OpenGL", msg + argv[1], 0 ); return -1; } @@ -115,7 +115,7 @@ int main(int argc, char **argv) QString msg = "Cannot read mesh from file:\n '"; msg += argv[optind]; msg += "'"; - QMessageBox::critical( NULL, w->caption(), msg, 0 ); + QMessageBox::critical( nullptr, w->caption(), msg, 0 ); return 1; } } @@ -130,7 +130,7 @@ int main(int argc, char **argv) msg += "- Mesh file didn't provide texture coordinates\n"; msg += "- Texture file does not exist\n"; msg += "- Texture file is not accessible.\n"; - QMessageBox::warning( NULL, w->caption(), msg, 0 ); + QMessageBox::warning( nullptr, w->caption(), msg, 0 ); } } diff --git a/src/OpenMesh/Apps/Unsupported/OsgViewer/osgviewer.cc b/src/OpenMesh/Apps/Unsupported/OsgViewer/osgviewer.cc index e7520abb..c23e7174 100644 --- a/src/OpenMesh/Apps/Unsupported/OsgViewer/osgviewer.cc +++ b/src/OpenMesh/Apps/Unsupported/OsgViewer/osgviewer.cc @@ -325,7 +325,7 @@ void mouse(int button, int state, int x, int y) { g.mgr->mouseButtonRelease(button, x, y); // if ( g.mode & FLYMODE ) -// glutIdleFunc(NULL); +// glutIdleFunc(nullptr); } else { diff --git a/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerSession.cc b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerSession.cc index e4af2fdc..b7ad1171 100644 --- a/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerSession.cc +++ b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerSession.cc @@ -64,7 +64,7 @@ set_vdpm(const char _vdpm_name[256]) } #endif vdpm_ = ((VDPMServerViewerWidget *) ((VDPMServerSocket *) parent())->parent())->get_vdpm(_vdpm_name); - if (vdpm_ == NULL) + if (vdpm_ == nullptr) return false; vhierarchy_ = &vdpm_->vhierarchy(); diff --git a/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerViewerWidget.cc b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerViewerWidget.cc index cad28022..3fdc6011 100644 --- a/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerViewerWidget.cc +++ b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerViewerWidget.cc @@ -72,7 +72,7 @@ get_vdpm(const char _vdpm_name[256]) } } - return NULL; + return nullptr; } void diff --git a/src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerSession.cc b/src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerSession.cc index fa47a34a..dac0b24a 100644 --- a/src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerSession.cc +++ b/src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerSession.cc @@ -64,7 +64,7 @@ set_vdpm(const char _vdpm_name[256]) } #endif vdpm_ = ((VDPMServerViewerWidget *) ((VDPMServerSocket *) parent())->parent())->get_vdpm(_vdpm_name); - if (vdpm_ == NULL) + if (vdpm_ == nullptr) return false; vhierarchy_ = &vdpm_->vhierarchy(); diff --git a/src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerViewerWidget.cc b/src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerViewerWidget.cc index 84eb92eb..2d4e0532 100644 --- a/src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerViewerWidget.cc +++ b/src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerViewerWidget.cc @@ -71,7 +71,7 @@ get_vdpm(const char _vdpm_name[256]) } } - return NULL; + return nullptr; } void diff --git a/src/OpenMesh/Core/IO/IOManager.cc b/src/OpenMesh/Core/IO/IOManager.cc index 454edb2a..8b3a4193 100644 --- a/src/OpenMesh/Core/IO/IOManager.cc +++ b/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; } diff --git a/src/OpenMesh/Core/IO/OMFormat.cc b/src/OpenMesh/Core/IO/OMFormat.cc index 6511e3e2..97175088 100644 --- a/src/OpenMesh/Core/IO/OMFormat.cc +++ b/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; } diff --git a/src/OpenMesh/Core/IO/exporter/BaseExporter.hh b/src/OpenMesh/Core/IO/exporter/BaseExporter.hh index 9903a851..86290720 100644 --- a/src/OpenMesh/Core/IO/exporter/BaseExporter.hh +++ b/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 diff --git a/src/OpenMesh/Core/IO/importer/BaseImporter.hh b/src/OpenMesh/Core/IO/importer/BaseImporter.hh index 3513e279..ff86dadd 100644 --- a/src/OpenMesh/Core/IO/importer/BaseImporter.hh +++ b/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; } diff --git a/src/OpenMesh/Core/Mesh/BaseKernel.cc b/src/OpenMesh/Core/Mesh/BaseKernel.cc index 1a375cec..1cdd9cf3 100644 --- a/src/OpenMesh/Core/Mesh/BaseKernel.cc +++ b/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); } diff --git a/src/OpenMesh/Core/System/mostream.hh b/src/OpenMesh/Core/System/mostream.hh index 5463750d..e774d7bc 100644 --- a/src/OpenMesh/Core/System/mostream.hh +++ b/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 diff --git a/src/OpenMesh/Core/Utils/AutoPropertyHandleT.hh b/src/OpenMesh/Core/Utils/AutoPropertyHandleT.hh index f9b157af..19afb46e 100644 --- a/src/OpenMesh/Core/Utils/AutoPropertyHandleT.hh +++ b/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) diff --git a/src/OpenMesh/Core/Utils/Property.hh b/src/OpenMesh/Core/Utils/Property.hh index cda3f9bf..b0b45b77 100644 --- a/src/OpenMesh/Core/Utils/Property.hh +++ b/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]; } diff --git a/src/OpenMesh/Core/Utils/PropertyContainer.hh b/src/OpenMesh/Core/Utils/PropertyContainer.hh index fd5a5fad..dcc9a3ac 100644 --- a/src/OpenMesh/Core/Utils/PropertyContainer.hh +++ b/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(_name); return BasePropHandleT(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*>(properties_[idx]) != NULL //check type + && dynamic_cast*>(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 PropertyT& property(BasePropHandleT _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 *> (properties_[_h.idx()]); #else PropertyT* p = dynamic_cast*>(properties_[_h.idx()]); - assert(p != NULL); + assert(p != nullptr); return *p; #endif } @@ -159,12 +159,12 @@ public: template const PropertyT& property(BasePropHandleT _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*>(properties_[_h.idx()]); #else PropertyT* p = dynamic_cast*>(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; } diff --git a/src/OpenMesh/Tools/Decimater/BaseDecimaterT_impl.hh b/src/OpenMesh/Tools/Decimater/BaseDecimaterT_impl.hh index 780dfa34..68d57b09 100644 --- a/src/OpenMesh/Tools/Decimater/BaseDecimaterT_impl.hh +++ b/src/OpenMesh/Tools/Decimater/BaseDecimaterT_impl.hh @@ -67,7 +67,7 @@ namespace Decimater { template BaseDecimaterT::BaseDecimaterT(Mesh& _mesh) : - mesh_(_mesh), cmodule_(NULL), initialized_(false), observer_(NULL) { + mesh_(_mesh), cmodule_(nullptr), initialized_(false), observer_(nullptr) { // default properties mesh_.request_vertex_status(); mesh_.request_edge_status(); @@ -249,8 +249,8 @@ bool BaseDecimaterT::initialize() { // priority module explicitly. // find the priority module: either the only non-binary module in the list, or "Quadric" - Module *quadric = NULL; - Module *pmodule = NULL; + Module *quadric = nullptr; + Module *pmodule = nullptr; for (ModuleListIterator m_it = all_modules_.begin(), m_end = all_modules_.end(); m_it != m_end; ++m_it) { if ((*m_it)->name() == "Quadric") diff --git a/src/OpenMesh/Tools/Decimater/DecimaterT_impl.hh b/src/OpenMesh/Tools/Decimater/DecimaterT_impl.hh index 7f61a777..e7211a0c 100644 --- a/src/OpenMesh/Tools/Decimater/DecimaterT_impl.hh +++ b/src/OpenMesh/Tools/Decimater/DecimaterT_impl.hh @@ -75,7 +75,7 @@ DecimaterT::DecimaterT(Mesh& _mesh) : #if (defined(_MSC_VER) && (_MSC_VER >= 1800)) || __cplusplus > 199711L || defined( __GXX_EXPERIMENTAL_CXX0X__ ) heap_(nullptr) #else - heap_(NULL) + heap_(nullptr) #endif { diff --git a/src/OpenMesh/Tools/Decimater/ModBaseT.hh b/src/OpenMesh/Tools/Decimater/ModBaseT.hh index d972cda6..71a006ee 100644 --- a/src/OpenMesh/Tools/Decimater/ModBaseT.hh +++ b/src/OpenMesh/Tools/Decimater/ModBaseT.hh @@ -90,14 +90,14 @@ public: public: /// Default constructor - ModHandleT() : mod_(NULL) {} + ModHandleT() : mod_(nullptr) {} /// Destructor ~ModHandleT() { /* don't delete mod_, since handle is not owner! */ } /// Check handle status /// \return \c true, if handle is valid, else \c false. - bool is_valid() const { return mod_ != NULL; } + bool is_valid() const { return mod_ != nullptr; } private: @@ -107,7 +107,7 @@ private: template friend class BaseDecimaterT; #endif - void clear() { mod_ = NULL; } + void clear() { mod_ = nullptr; } void init(Module* _m) { mod_ = _m; } Module* module() { return mod_; } diff --git a/src/OpenMesh/Tools/Kernel_OSG/PropertyT.hh b/src/OpenMesh/Tools/Kernel_OSG/PropertyT.hh index 47990e58..cd0680f9 100644 --- a/src/OpenMesh/Tools/Kernel_OSG/PropertyT.hh +++ b/src/OpenMesh/Tools/Kernel_OSG/PropertyT.hh @@ -108,7 +108,7 @@ public: // oPropertyT( const std::string& _name = "" ) - : BaseProperty(_name), data_(NULL) + : BaseProperty(_name), data_(nullptr) { data_ = property_t::create(); diff --git a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.hh b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.hh index 2d5d0c35..b9298263 100644 --- a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.hh +++ b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.hh @@ -148,7 +148,7 @@ public: /// Constructor explicit CompositeT(Mesh& _mesh) : subdiv_type_(0), - subdiv_rule_(NULL), /*first_rule_(NULL), last_rule_(NULL),*/ mesh_(_mesh) + subdiv_rule_(nullptr), /*first_rule_(nullptr), last_rule_(nullptr),*/ mesh_(_mesh) { } /// @@ -161,7 +161,7 @@ public: void cleanup(void) { subdiv_type_ = 0; - subdiv_rule_ = NULL; + subdiv_rule_ = nullptr; std::for_each(rule_sequence_.begin(), rule_sequence_.end(), DeleteRule() ); diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.hh b/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.hh index 3227ded9..f923e35c 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.hh @@ -96,8 +96,8 @@ public: public: - CompositeT(void) : parent_t(), p_mesh_(NULL) {} - explicit CompositeT(MeshType& _mesh) : parent_t(_mesh), p_mesh_(NULL) {}; + CompositeT(void) : parent_t(), p_mesh_(nullptr) {} + explicit CompositeT(MeshType& _mesh) : parent_t(_mesh), p_mesh_(nullptr) {}; virtual ~CompositeT() { } public: // inherited interface @@ -128,7 +128,7 @@ protected: // inherited interface #endif { assert( p_mesh_ == &_m ); - p_mesh_=NULL; + p_mesh_=nullptr; return true; } diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/SubdividerT.hh b/src/OpenMesh/Tools/Subdivider/Uniform/SubdividerT.hh index a27c038f..d39070f8 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/SubdividerT.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/SubdividerT.hh @@ -102,7 +102,7 @@ public: /// Constructor to be used with interface 1 (calls attach()) /// \see operator()( MeshType&, size_t ) - explicit SubdividerT( MeshType &_m ) : attached_(NULL) { attach(_m); } + explicit SubdividerT( MeshType &_m ) : attached_(nullptr) { attach(_m); } //@} @@ -157,7 +157,7 @@ public: /// \name Interface 2 if ( attached_ ) { cleanup( *attached_ ); - attached_ = NULL; + attached_ = nullptr; } } //@} diff --git a/src/OpenMesh/Tools/Utils/Gnuplot.cc b/src/OpenMesh/Tools/Utils/Gnuplot.cc index a70ca1ad..88e91607 100644 --- a/src/OpenMesh/Tools/Utils/Gnuplot.cc +++ b/src/OpenMesh/Tools/Utils/Gnuplot.cc @@ -38,7 +38,7 @@ # define access _access # define ACCESS_OK 0 # define PATH_SEP ";" -# define MKTEMP_AND_CHECK_FAILED(name) (_mktemp(name) == NULL) +# define MKTEMP_AND_CHECK_FAILED(name) (_mktemp(name) == nullptr) #else # define ACCESS_OK X_OK # define PATH_SEP ":" @@ -368,7 +368,7 @@ void Gnuplot::plot_x(vector d, const string &title) // //open temporary files for output #ifdef WIN32 - if ( _mktemp(name) == NULL) + if ( _mktemp(name) == nullptr) #else if ( mkstemp(name) == -1 ) #endif diff --git a/src/OpenMesh/Tools/Utils/conio.cc b/src/OpenMesh/Tools/Utils/conio.cc index 4d053893..9b0debf9 100644 --- a/src/OpenMesh/Tools/Utils/conio.cc +++ b/src/OpenMesh/Tools/Utils/conio.cc @@ -120,7 +120,7 @@ int kbhit(void) error += tcsetattr(0, TCSANOW, &Otty); tv.tv_sec = 0; tv.tv_usec = 100; /* insert at least a minimal delay */ - select(1, NULL, NULL, NULL, &tv); + select(1, nullptr, nullptr, nullptr, &tv); } return (error == 0 ? cnt : -1 ); } diff --git a/src/OpenMesh/Tools/VDPM/VHierarchyWindow.cc b/src/OpenMesh/Tools/VDPM/VHierarchyWindow.cc index 18d50558..4a97cda7 100644 --- a/src/OpenMesh/Tools/VDPM/VHierarchyWindow.cc +++ b/src/OpenMesh/Tools/VDPM/VHierarchyWindow.cc @@ -73,7 +73,7 @@ namespace VDPM { VHierarchyWindow:: VHierarchyWindow() : - vhierarchy_(NULL), buffer_(NULL),buffer_min_ (0), buffer_max_(0), current_pos_(0) , window_min_(0), window_max_(0), n_shift_(0) + vhierarchy_(nullptr), buffer_(nullptr),buffer_min_ (0), buffer_max_(0), current_pos_(0) , window_min_(0), window_max_(0), n_shift_(0) { } @@ -81,7 +81,7 @@ VHierarchyWindow() : VHierarchyWindow:: VHierarchyWindow(VHierarchy &_vhierarchy) : - vhierarchy_(&_vhierarchy),buffer_(NULL),buffer_min_ (0), buffer_max_(0), current_pos_(0) , window_min_(0), window_max_(0) ,n_shift_(0) + vhierarchy_(&_vhierarchy),buffer_(nullptr),buffer_min_ (0), buffer_max_(0), current_pos_(0) , window_min_(0), window_max_(0) ,n_shift_(0) { } @@ -89,7 +89,7 @@ VHierarchyWindow(VHierarchy &_vhierarchy) : VHierarchyWindow:: ~VHierarchyWindow(void) { - if (buffer_ != NULL) + if (buffer_ != nullptr) free(buffer_); } @@ -138,7 +138,7 @@ update_buffer(VHierarchyNodeHandle _node_handle) void VHierarchyWindow::init(VHierarchyNodeHandleContainer &_roots) { - if (buffer_ != NULL) + if (buffer_ != nullptr) free(buffer_); buffer_min_ = 0;