diff --git a/src/Mod/Mesh/App/Core/Grid.cpp b/src/Mod/Mesh/App/Core/Grid.cpp
index 4465cecdb2..6c87afb0a4 100644
--- a/src/Mod/Mesh/App/Core/Grid.cpp
+++ b/src/Mod/Mesh/App/Core/Grid.cpp
@@ -91,7 +91,7 @@ void MeshGrid::Rebuild (int iCtGridPerAxis)
 
 void MeshGrid::InitGrid ()
 {
-  assert(_pclMesh != nullptr);
+  assert(_pclMesh);
 
   unsigned long i, j;
 
diff --git a/src/Mod/Mesh/App/MeshPyImp.cpp b/src/Mod/Mesh/App/MeshPyImp.cpp
index e24949b7fd..eda2c9fcc9 100644
--- a/src/Mod/Mesh/App/MeshPyImp.cpp
+++ b/src/Mod/Mesh/App/MeshPyImp.cpp
@@ -79,14 +79,14 @@ int MeshPy::PyInit(PyObject* args, PyObject*)
         }
         else if (PyList_Check(pcObj)) {
             PyObject* ret = addFacets(args);
-            bool ok = (ret!=nullptr);
+            bool ok = (ret != nullptr);
             Py_XDECREF(ret);
             if (!ok)
                 return -1;
         }
         else if (PyTuple_Check(pcObj)) {
             PyObject* ret = addFacets(args);
-            bool ok = (ret!=nullptr);
+            bool ok = (ret != nullptr);
             Py_XDECREF(ret);
             if (!ok)
                 return -1;
diff --git a/src/Mod/Part/App/PartFeature.cpp b/src/Mod/Part/App/PartFeature.cpp
index b91065fc0e..daf29ae5d0 100644
--- a/src/Mod/Part/App/PartFeature.cpp
+++ b/src/Mod/Part/App/PartFeature.cpp
@@ -231,7 +231,7 @@ struct ShapeCache {
             return;
         if(strcmp(propName,"Shape")==0 
                 || strcmp(propName,"Group")==0 
-                || strstr(propName,"Touched")!=nullptr)
+                || strstr(propName,"Touched"))
             slotClear(obj);
     }
 
diff --git a/src/Mod/Part/Gui/TaskDimension.cpp b/src/Mod/Part/Gui/TaskDimension.cpp
index 8a7889744b..c50727d6bf 100644
--- a/src/Mod/Part/Gui/TaskDimension.cpp
+++ b/src/Mod/Part/Gui/TaskDimension.cpp
@@ -1464,7 +1464,7 @@ void PartGui::SteppedSelection::buildPixmaps()
 void PartGui::SteppedSelection::selectionSlot(bool checked)
 {
   QPushButton *sender = qobject_cast<QPushButton*>(QObject::sender());
-  assert(sender != nullptr);
+  assert(sender);
   std::vector<ButtonIconPairType>::iterator it;
   for (it = buttons.begin(); it != buttons.end(); ++it)
     if (it->first == sender)
diff --git a/src/Mod/Path/App/AppPathPy.cpp b/src/Mod/Path/App/AppPathPy.cpp
index 0f3505e3d5..44e0177596 100644
--- a/src/Mod/Path/App/AppPathPy.cpp
+++ b/src/Mod/Path/App/AppPathPy.cpp
@@ -407,7 +407,7 @@ private:
 
         try {
             bool need_arc_plane = arc_plane==Area::ArcPlaneAuto;
-            std::list<TopoDS_Shape> wires = Area::sortWires(shapes,start!=nullptr,&pstart,
+            std::list<TopoDS_Shape> wires = Area::sortWires(shapes, start != nullptr, &pstart,
                     &pend, nullptr, &arc_plane, PARAM_PY_FIELDS(PARAM_FARG,AREA_PARAMS_SORT));
             Py::List list;
             for(auto &wire : wires) {
diff --git a/src/Mod/Points/App/PointsGrid.cpp b/src/Mod/Points/App/PointsGrid.cpp
index 5e391dd35c..0f179ce94a 100644
--- a/src/Mod/Points/App/PointsGrid.cpp
+++ b/src/Mod/Points/App/PointsGrid.cpp
@@ -124,7 +124,7 @@ void PointsGrid::Rebuild (int iCtGridPerAxis)
 
 void PointsGrid::InitGrid ()
 {
-  assert(_pclPoints != nullptr);
+  assert(_pclPoints);
 
   unsigned long i, j;
 
diff --git a/src/Mod/Robot/App/kdl_cp/utilities/utility_io.cxx b/src/Mod/Robot/App/kdl_cp/utilities/utility_io.cxx
index a9bea12faf..f261c363fc 100644
--- a/src/Mod/Robot/App/kdl_cp/utilities/utility_io.cxx
+++ b/src/Mod/Robot/App/kdl_cp/utilities/utility_io.cxx
@@ -46,7 +46,7 @@ namespace KDL {
         count++;
         _check_istream(is);
     } while (ch!='\n');
-    if (countp!=nullptr) *countp = count;
+    if (countp) *countp = count;
     return ch;
 }
 
@@ -66,7 +66,7 @@ namespace KDL {
             break;
         }
     } while (true);
-    if (countp!=nullptr) *countp = count;
+    if (countp) *countp = count;
     ch = is.get();
     return ch;
 }
@@ -97,7 +97,7 @@ int _EatSpace( std::istream& is,int* countp=nullptr) {
             }
         }
     } while ((ch==' ')||(ch=='\n')||(ch=='\t'));
-    if (countp!=nullptr) *countp =  count;
+    if (countp) *countp =  count;
     return ch;
 }
 
@@ -189,7 +189,7 @@ void EatWord(std::istream& is,const char* delim,char* storage,int maxsize)
     p = storage;
     size=0;
     int count = 0;
-    while ((count==0)&&(strchr(delim,ch)==nullptr)) {
+    while ((count==0)&&(strchr(delim,ch) == nullptr)) {
         *p = (char) toupper(ch);
         ++p;
         if (size==maxsize) {
diff --git a/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp b/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp
index 58d6842f93..ee4085339b 100644
--- a/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp
+++ b/src/Mod/Robot/Gui/ViewProviderRobotObject.cpp
@@ -92,7 +92,7 @@ ViewProviderRobotObject::~ViewProviderRobotObject()
 
 void ViewProviderRobotObject::setDragger()
 {
-    assert(pcDragger==nullptr);
+    assert(!pcDragger);
     pcDragger = new SoJackDragger();
     pcDragger->addMotionCallback(sDraggerMotionCallback,this);
     pcTcpRoot->addChild(pcDragger);
diff --git a/src/Mod/Sketcher/App/GeometryFacade.cpp b/src/Mod/Sketcher/App/GeometryFacade.cpp
index 3aae5fd0e4..02352c9ec0 100644
--- a/src/Mod/Sketcher/App/GeometryFacade.cpp
+++ b/src/Mod/Sketcher/App/GeometryFacade.cpp
@@ -46,7 +46,7 @@ GeometryFacade::GeometryFacade(): Geo(nullptr), OwnerGeo(false), SketchGeoExtens
 GeometryFacade::GeometryFacade(const Part::Geometry * geometry, bool owner)
 : Geo(geometry), OwnerGeo(owner)
 {
-    assert(geometry != nullptr); // This should never be nullptr, as this constructor is protected
+    assert(geometry); // This should never be nullptr, as this constructor is protected
 
     initExtension();
 }
diff --git a/src/Mod/Sketcher/App/SketchObject.cpp b/src/Mod/Sketcher/App/SketchObject.cpp
index 69e6b398b1..469d0d2f96 100644
--- a/src/Mod/Sketcher/App/SketchObject.cpp
+++ b/src/Mod/Sketcher/App/SketchObject.cpp
@@ -7685,10 +7685,10 @@ std::string SketchObject::validateExpression(const App::ObjectIdentifier &path,
 
     auto deps = expr->getDeps();
     auto it = deps.find(this);
-    if(it!=deps.end()) {
+    if (it!=deps.end()) {
         auto it2 = it->second.find("Constraints");
-        if(it2 != it->second.end()) {
-            for(auto &oid : it2->second) {
+        if (it2 != it->second.end()) {
+            for (auto &oid : it2->second) {
                 const Constraint * constraint = Constraints.getConstraint(oid);
 
                 if (!constraint->isDriving)
@@ -7710,7 +7710,7 @@ double SketchObject::calculateAngleViaPoint(int GeoId1, int GeoId2, double px, d
     const Part::Geometry *p1=this->getGeometry(GeoId1);
     const Part::Geometry *p2=this->getGeometry(GeoId2);
 
-    if(p1!=nullptr && p2!=nullptr) {
+    if (p1 && p2) {
         int i1 = sk.addGeometry(this->getGeometry(GeoId1));
         int i2 = sk.addGeometry(this->getGeometry(GeoId2));
 
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp
index cf67d86d23..bc3b40b4a5 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp
+++ b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp
@@ -1430,7 +1430,7 @@ void TaskSketcherConstraints::slotConstraintsChanged(void)
     for (int i = 0; i <  ui->listWidgetConstraints->count(); ++i) {
         ConstraintItem * it = dynamic_cast<ConstraintItem*>(ui->listWidgetConstraints->item(i));
 
-        assert(it != nullptr);
+        assert(it);
 
         it->ConstraintNbr = i;
         it->value = QVariant();
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp
index 049a050ee7..01420ff0e9 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp
+++ b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp
@@ -470,7 +470,7 @@ void TaskSketcherElements::on_listWidgetElements_itemSelectionChanged(void)
     bool multipleconsecutiveselection=false; // shift type of selection in listWidget
 
     if (!inhibitSelectionUpdate) {
-        if(itf!=nullptr) {
+        if (itf) {
             switch(element){
             case 0:
                 itf->isLineSelected=!itf->isLineSelected;
diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
index a462354e76..8b2124ea6b 100644
--- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
+++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
@@ -352,7 +352,7 @@ void ViewProviderSketch::forceUpdateData()
 void ViewProviderSketch::activateHandler(DrawSketchHandler *newHandler)
 {
     assert(editCoinManager);
-    assert(sketchHandler == nullptr);
+    assert(!sketchHandler);
 
     sketchHandler = std::unique_ptr<DrawSketchHandler>(newHandler);
     Mode = STATUS_SKETCH_UseHandler;
diff --git a/src/Mod/Spreadsheet/App/PropertySheet.cpp b/src/Mod/Spreadsheet/App/PropertySheet.cpp
index cb49206e6d..b5c277704b 100644
--- a/src/Mod/Spreadsheet/App/PropertySheet.cpp
+++ b/src/Mod/Spreadsheet/App/PropertySheet.cpp
@@ -578,14 +578,14 @@ Cell * PropertySheet::nonNullCellAt(CellAddress address)
 void PropertySheet::setContent(CellAddress address, const char *value)
 {
     Cell * cell = nonNullCellAt(address);
-    assert(cell != nullptr);
+    assert(cell);
     cell->setContent(value);
 }
 
 void PropertySheet::setAlignment(CellAddress address, int _alignment)
 {
     Cell * cell = nonNullCellAt(address);
-    assert(cell != nullptr);
+    assert(cell);
     if (cell->address != address) //Reject alignment change for merged cell except top-left one
         return;
     cell->setAlignment(_alignment);
@@ -594,7 +594,7 @@ void PropertySheet::setAlignment(CellAddress address, int _alignment)
 void PropertySheet::setStyle(CellAddress address, const std::set<std::string> &_style)
 {
     Cell * cell = nonNullCellAt(address);
-    assert(cell != nullptr);
+    assert(cell);
     cell->setStyle(_style);
 }
 
@@ -608,14 +608,14 @@ void PropertySheet::setForeground(CellAddress address, const App::Color &color)
 void PropertySheet::setBackground(CellAddress address, const App::Color &color)
 {
     Cell * cell = nonNullCellAt(address);
-    assert(cell != nullptr);
+    assert(cell);
     cell->setBackground(color);
 }
 
 void PropertySheet::setDisplayUnit(CellAddress address, const std::string &unit)
 {
     Cell * cell = nonNullCellAt(address);
-    assert(cell != nullptr);
+    assert(cell);
     cell->setDisplayUnit(unit);
 }
 
@@ -627,7 +627,7 @@ void PropertySheet::setAlias(CellAddress address, const std::string &alias)
 
     const Cell * aliasedCell = getValueFromAlias(alias);
     Cell * cell = nonNullCellAt(address);
-    assert(cell != nullptr);
+    assert(cell);
 
     if(aliasedCell == cell)
         return;
@@ -671,14 +671,14 @@ void PropertySheet::setAlias(CellAddress address, const std::string &alias)
 void PropertySheet::setComputedUnit(CellAddress address, const Base::Unit &unit)
 {
     Cell * cell = nonNullCellAt(address);
-    assert(cell != nullptr);
+    assert(cell);
     cell->setComputedUnit(unit);
 }
 
 void PropertySheet::setSpans(CellAddress address, int rows, int columns)
 {
     Cell * cell = nonNullCellAt(address);
-    assert(cell != nullptr);
+    assert(cell);
     cell->setSpans(rows, columns);
 }
 
diff --git a/src/Mod/Spreadsheet/App/Sheet.cpp b/src/Mod/Spreadsheet/App/Sheet.cpp
index b7d0f7f780..4824e03300 100644
--- a/src/Mod/Spreadsheet/App/Sheet.cpp
+++ b/src/Mod/Spreadsheet/App/Sheet.cpp
@@ -384,7 +384,7 @@ Cell *Sheet::getNewCell(CellAddress address)
 
 void Sheet::setCell(const char * address, const char * contents)
 {
-    assert(address != nullptr && contents != nullptr);
+    assert(address && contents);
 
     setCell(CellAddress(address), contents);
 }
@@ -400,7 +400,7 @@ void Sheet::setCell(const char * address, const char * contents)
 
 void Sheet::setCell(CellAddress address, const char * value)
 {
-    assert(value != nullptr);
+    assert(value);
 
 
     if (*value == '\0') {
diff --git a/src/Mod/Spreadsheet/Gui/PropertiesDialog.cpp b/src/Mod/Spreadsheet/Gui/PropertiesDialog.cpp
index 00702f00cd..325cf9e797 100644
--- a/src/Mod/Spreadsheet/Gui/PropertiesDialog.cpp
+++ b/src/Mod/Spreadsheet/Gui/PropertiesDialog.cpp
@@ -52,7 +52,7 @@ PropertiesDialog::PropertiesDialog(Sheet *_sheet, const std::vector<Range> &_ran
 
     Cell * cell = sheet->getNewCell(*range);
 
-    assert(cell != nullptr);
+    assert(cell);
 
     (void)cell->getForeground(foregroundColor);
     (void)cell->getBackground(backgroundColor);
diff --git a/src/Mod/Spreadsheet/Gui/SheetTableView.cpp b/src/Mod/Spreadsheet/Gui/SheetTableView.cpp
index 3b1af956c4..86d8d36b57 100644
--- a/src/Mod/Spreadsheet/Gui/SheetTableView.cpp
+++ b/src/Mod/Spreadsheet/Gui/SheetTableView.cpp
@@ -308,7 +308,7 @@ QModelIndexList SheetTableView::selectedIndexesRaw() const
 
 void SheetTableView::insertRows()
 {
-    assert(sheet != nullptr);
+    assert(sheet);
 
     QModelIndexList rows = selectionModel()->selectedRows();
     std::vector<int> sortedRows;
@@ -345,7 +345,7 @@ void SheetTableView::insertRows()
 
 void SheetTableView::insertRowsAfter()
 {
-    assert(sheet != nullptr);
+    assert(sheet);
     const auto rows = selectionModel()->selectedRows();
     const auto & [min, max] = selectedMinMaxRows(rows);
     assert(max - min == rows.size() - 1);
@@ -359,7 +359,7 @@ void SheetTableView::insertRowsAfter()
 
 void SheetTableView::removeRows()
 {
-    assert(sheet != nullptr);
+    assert(sheet);
 
     QModelIndexList rows = selectionModel()->selectedRows();
     std::vector<int> sortedRows;
@@ -380,7 +380,7 @@ void SheetTableView::removeRows()
 
 void SheetTableView::insertColumns()
 {
-    assert(sheet != nullptr);
+    assert(sheet);
 
     QModelIndexList cols = selectionModel()->selectedColumns();
     std::vector<int> sortedColumns;
@@ -418,7 +418,7 @@ void SheetTableView::insertColumns()
 
 void SheetTableView::insertColumnsAfter()
 {
-    assert(sheet != nullptr);
+    assert(sheet);
     const auto columns = selectionModel()->selectedColumns();
     const auto& [min, max] = selectedMinMaxColumns(columns);
     assert(max - min == columns.size() - 1);
@@ -432,7 +432,7 @@ void SheetTableView::insertColumnsAfter()
 
 void SheetTableView::removeColumns()
 {
-    assert(sheet != nullptr);
+    assert(sheet);
 
     QModelIndexList cols = selectionModel()->selectedColumns();
     std::vector<int> sortedColumns;