diff --git a/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp b/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp
index a68057aa93..d62934a60f 100644
--- a/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp
+++ b/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp
@@ -153,7 +153,7 @@ private:
     Py::Object approxSurface(const Py::Tuple& args, const Py::Dict& kwds)
     {
         PyObject *o;
-        PyObject *uvdirs = 0;
+        PyObject *uvdirs = nullptr;
         // spline parameters
         int uDegree = 3;
         int vDegree = 3;
@@ -172,7 +172,7 @@ private:
 
         static char* kwds_approx[] = {"Points", "UDegree", "VDegree", "NbUPoles", "NbVPoles",
                                       "Smooth", "Weight", "Grad", "Bend", "Curv",
-                                      "Iterations", "Correction", "PatchFactor","UVDirs", NULL};
+                                      "Iterations", "Correction", "PatchFactor","UVDirs", nullptr};
         if (!PyArg_ParseTupleAndKeywords(args.ptr(), kwds.ptr(), "O|iiiiO!ddddiO!dO!",kwds_approx,
                                         &o,&uDegree,&vDegree,&uPoles,&vPoles,
                                         &PyBool_Type,&smooth,&weight,&grad,&bend,&curv,
@@ -838,7 +838,7 @@ PyMOD_INIT_FUNC(ReverseEngineering)
     }
     catch(const Base::Exception& e) {
         PyErr_SetString(PyExc_ImportError, e.what());
-        PyMOD_Return(0);
+        PyMOD_Return(nullptr);
     }
 
     PyObject* mod = Reen::initModule();
diff --git a/src/Mod/ReverseEngineering/App/ApproxSurface.cpp b/src/Mod/ReverseEngineering/App/ApproxSurface.cpp
index f2f7480e06..dcd6708f29 100644
--- a/src/Mod/ReverseEngineering/App/ApproxSurface.cpp
+++ b/src/Mod/ReverseEngineering/App/ApproxSurface.cpp
@@ -559,8 +559,8 @@ ParameterCorrection::ParameterCorrection(unsigned usUOrder, unsigned usVOrder,
   , _usVOrder(usVOrder)
   , _usUCtrlpoints(usUCtrlpoints)
   , _usVCtrlpoints(usVCtrlpoints)
-  , _pvcPoints(0)
-  , _pvcUVParam(0)
+  , _pvcPoints(nullptr)
+  , _pvcUVParam(nullptr)
   , _vCtrlPntsOfSurf(0,usUCtrlpoints-1,0,usVCtrlpoints-1)
   , _vUKnots(0,usUCtrlpoints-usUOrder+1)
   , _vVKnots(0,usVCtrlpoints-usVOrder+1)
@@ -721,11 +721,11 @@ Handle(Geom_BSplineSurface) ParameterCorrection::CreateSurface(const TColgp_Arra
                                                                bool  bParaCor,
                                                                double fSizeFactor)
 {
-    if (_pvcPoints != NULL) {
+    if (_pvcPoints != nullptr) {
         delete _pvcPoints;
-        _pvcPoints = NULL;
+        _pvcPoints = nullptr;
         delete _pvcUVParam;
-        _pvcUVParam = NULL;
+        _pvcUVParam = nullptr;
     }
 
     _pvcPoints = new TColgp_Array1OfPnt(points.Lower(), points.Upper());
@@ -733,9 +733,9 @@ Handle(Geom_BSplineSurface) ParameterCorrection::CreateSurface(const TColgp_Arra
     _pvcUVParam = new TColgp_Array1OfPnt2d(points.Lower(), points.Upper());
 
     if (_usUCtrlpoints*_usVCtrlpoints > static_cast<unsigned>(_pvcPoints->Length()))
-        return NULL; // LGS under-determined
+        return nullptr; // LGS under-determined
     if (!DoInitialParameterCorrection(fSizeFactor))
-        return NULL;
+        return nullptr;
 
     // Generate the approximation plane as a B-spline area
     if (iIter < 0) {
@@ -783,8 +783,8 @@ BSplineParameterCorrection::BSplineParameterCorrection(unsigned usUOrder, unsign
 void BSplineParameterCorrection::Init()
 {
     // Initializations
-    _pvcUVParam       = NULL;
-    _pvcPoints        = NULL;
+    _pvcUVParam       = nullptr;
+    _pvcPoints        = nullptr;
     _clFirstMatrix.Init(0.0);
     _clSecondMatrix.Init(0.0);
     _clThirdMatrix.Init(0.0);
diff --git a/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp b/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp
index 9c2a1a9003..94cc7e1cca 100644
--- a/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp
+++ b/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp
@@ -70,7 +70,7 @@ PyMOD_INIT_FUNC(ReverseEngineeringGui)
 {
     if (!Gui::Application::Instance) {
         PyErr_SetString(PyExc_ImportError, "Cannot load Gui module in console application.");
-        PyMOD_Return(0);
+        PyMOD_Return(nullptr);
     }
 
     // load dependent module
@@ -79,7 +79,7 @@ PyMOD_INIT_FUNC(ReverseEngineeringGui)
     }
     catch(const Base::Exception& e) {
         PyErr_SetString(PyExc_ImportError, e.what());
-        PyMOD_Return(0);
+        PyMOD_Return(nullptr);
     }
 
     PyObject* mod = ReverseEngineeringGui::initModule();
diff --git a/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.cpp b/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.cpp
index c138ee39a1..fa92876fba 100644
--- a/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.cpp
+++ b/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.cpp
@@ -256,7 +256,7 @@ TaskFitBSplineSurface::TaskFitBSplineSurface(const App::DocumentObjectT& obj)
     widget = new FitBSplineSurfaceWidget(obj);
     taskbox = new Gui::TaskView::TaskBox(
         Gui::BitmapFactory().pixmap("actions/FitSurface"),
-        widget->windowTitle(), true, 0);
+        widget->windowTitle(), true, nullptr);
     taskbox->groupLayout()->addWidget(widget);
     Content.push_back(taskbox);
 }
diff --git a/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.h b/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.h
index 96a02bd15f..6a06585a5a 100644
--- a/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.h
+++ b/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.h
@@ -35,7 +35,7 @@ class FitBSplineSurfaceWidget : public QWidget
     Q_OBJECT
 
 public:
-    FitBSplineSurfaceWidget(const App::DocumentObjectT&, QWidget* parent = 0);
+    FitBSplineSurfaceWidget(const App::DocumentObjectT&, QWidget* parent = nullptr);
     ~FitBSplineSurfaceWidget();
 
     bool accept();
diff --git a/src/Mod/ReverseEngineering/Gui/Poisson.cpp b/src/Mod/ReverseEngineering/Gui/Poisson.cpp
index a2c0eeaaa3..41cc8f22e5 100644
--- a/src/Mod/ReverseEngineering/Gui/Poisson.cpp
+++ b/src/Mod/ReverseEngineering/Gui/Poisson.cpp
@@ -128,7 +128,7 @@ TaskPoisson::TaskPoisson(const App::DocumentObjectT& obj)
     widget = new PoissonWidget(obj);
     taskbox = new Gui::TaskView::TaskBox(
         Gui::BitmapFactory().pixmap("actions/FitSurface"),
-        widget->windowTitle(), true, 0);
+        widget->windowTitle(), true, nullptr);
     taskbox->groupLayout()->addWidget(widget);
     Content.push_back(taskbox);
 }
diff --git a/src/Mod/ReverseEngineering/Gui/Poisson.h b/src/Mod/ReverseEngineering/Gui/Poisson.h
index 8521c1de51..eb8e3ed9e7 100644
--- a/src/Mod/ReverseEngineering/Gui/Poisson.h
+++ b/src/Mod/ReverseEngineering/Gui/Poisson.h
@@ -35,7 +35,7 @@ class PoissonWidget : public QWidget
     Q_OBJECT
 
 public:
-    PoissonWidget(const App::DocumentObjectT&, QWidget* parent = 0);
+    PoissonWidget(const App::DocumentObjectT&, QWidget* parent = nullptr);
     ~PoissonWidget();
 
     bool accept();
diff --git a/src/Mod/ReverseEngineering/Gui/Segmentation.cpp b/src/Mod/ReverseEngineering/Gui/Segmentation.cpp
index 21b6e128c8..3f5bb501c7 100644
--- a/src/Mod/ReverseEngineering/Gui/Segmentation.cpp
+++ b/src/Mod/ReverseEngineering/Gui/Segmentation.cpp
@@ -256,7 +256,7 @@ TaskSegmentation::TaskSegmentation(Mesh::Feature* mesh)
 {
     widget = new Segmentation(mesh);
     taskbox = new Gui::TaskView::TaskBox(
-        QPixmap(), widget->windowTitle(), false, 0);
+        QPixmap(), widget->windowTitle(), false, nullptr);
     taskbox->groupLayout()->addWidget(widget);
     Content.push_back(taskbox);
 }
diff --git a/src/Mod/ReverseEngineering/Gui/Segmentation.h b/src/Mod/ReverseEngineering/Gui/Segmentation.h
index 4e1ae9644c..8c684b6074 100644
--- a/src/Mod/ReverseEngineering/Gui/Segmentation.h
+++ b/src/Mod/ReverseEngineering/Gui/Segmentation.h
@@ -41,7 +41,7 @@ class Segmentation : public QWidget
     Q_OBJECT
 
 public:
-    Segmentation(Mesh::Feature* mesh, QWidget* parent = 0, Qt::WindowFlags fl = Qt::WindowFlags());
+    Segmentation(Mesh::Feature* mesh, QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags());
     ~Segmentation();
     void accept();
 
diff --git a/src/Mod/ReverseEngineering/Gui/SegmentationManual.cpp b/src/Mod/ReverseEngineering/Gui/SegmentationManual.cpp
index 3176463659..ff3ce8ecfe 100644
--- a/src/Mod/ReverseEngineering/Gui/SegmentationManual.cpp
+++ b/src/Mod/ReverseEngineering/Gui/SegmentationManual.cpp
@@ -295,7 +295,7 @@ TaskSegmentationManual::TaskSegmentationManual()
 {
     widget = new SegmentationManual();
     taskbox = new Gui::TaskView::TaskBox(
-        QPixmap(), widget->windowTitle(), false, 0);
+        QPixmap(), widget->windowTitle(), false, nullptr);
     taskbox->groupLayout()->addWidget(widget);
     Content.push_back(taskbox);
 }
diff --git a/src/Mod/ReverseEngineering/Gui/SegmentationManual.h b/src/Mod/ReverseEngineering/Gui/SegmentationManual.h
index f7b7c0f0f4..86fcde49c9 100644
--- a/src/Mod/ReverseEngineering/Gui/SegmentationManual.h
+++ b/src/Mod/ReverseEngineering/Gui/SegmentationManual.h
@@ -43,7 +43,7 @@ class SegmentationManual : public QWidget
     Q_OBJECT
 
 public:
-    SegmentationManual(QWidget* parent = 0, Qt::WindowFlags fl = Qt::WindowFlags());
+    SegmentationManual(QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags());
     ~SegmentationManual();
     void reject();
     void createSegment();