diff --git a/src/kitemviews/kitemlistview.h b/src/kitemviews/kitemlistview.h
--- a/src/kitemviews/kitemlistview.h
+++ b/src/kitemviews/kitemlistview.h
@@ -847,6 +847,7 @@
 KItemListWidgetCreator<T>::~KItemListWidgetCreator()
 {
     delete m_informant;
+    m_informant = nullptr;
 }
 
 template <class T>
diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp
--- a/src/kitemviews/kitemlistview.cpp
+++ b/src/kitemviews/kitemlistview.cpp
@@ -306,6 +306,7 @@
 {
     delete m_widgetCreator;
     m_widgetCreator = widgetCreator;
+    widgetCreator = nullptr;
 }
 
 KItemListWidgetCreatorBase* KItemListView::widgetCreator() const
@@ -320,6 +321,7 @@
 {
     delete m_groupHeaderCreator;
     m_groupHeaderCreator = groupHeaderCreator;
+    groupHeaderCreator = nullptr;
 }
 
 KItemListGroupHeaderCreatorBase* KItemListView::groupHeaderCreator() const
@@ -2707,6 +2709,7 @@
         widget->setVisible(false);
     } else {
         delete widget;
+        widget = nullptr;
     }
 }
 
@@ -2741,4 +2744,3 @@
     header->setOpacity(1.0);
     pushRecycleableWidget(header);
 }
-
diff --git a/src/kitemviews/kstandarditemmodel.cpp b/src/kitemviews/kstandarditemmodel.cpp
--- a/src/kitemviews/kstandarditemmodel.cpp
+++ b/src/kitemviews/kstandarditemmodel.cpp
@@ -39,6 +39,7 @@
 {
     if (index < 0 || index > count() || !item) {
         delete item;
+        item = nullptr;
         return;
     }
 
@@ -64,6 +65,7 @@
 {
     if (index < 0 || index >= count() || !item) {
         delete item;
+        item = nullptr;
         return;
     }
 
@@ -235,4 +237,3 @@
     Q_UNUSED(index);
     Q_UNUSED(removedItem);
 }
-
diff --git a/src/kitemviews/private/kdirectorycontentscounter.cpp b/src/kitemviews/private/kdirectorycontentscounter.cpp
--- a/src/kitemviews/private/kdirectorycontentscounter.cpp
+++ b/src/kitemviews/private/kdirectorycontentscounter.cpp
@@ -75,6 +75,7 @@
         // m_worker. deleteLater() would not work at all because the event loop
         // which would deliver the event to m_worker is not running any more.
         delete m_worker;
+        m_worker = nullptr;
     }
 }
 
diff --git a/src/kitemviews/private/kitemlistviewanimation.cpp b/src/kitemviews/private/kitemlistviewanimation.cpp
--- a/src/kitemviews/private/kitemlistviewanimation.cpp
+++ b/src/kitemviews/private/kitemlistviewanimation.cpp
@@ -186,6 +186,7 @@
 
         m_animation[type].remove(widget);
         delete propertyAnim;
+        propertyAnim = nullptr;
 
         emit finished(widget, type);
     }
@@ -233,4 +234,3 @@
     }
     Q_ASSERT(false);
 }
-
diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp
--- a/src/panels/folders/folderspanel.cpp
+++ b/src/panels/folders/folderspanel.cpp
@@ -62,6 +62,7 @@
         KItemListView* view = m_controller->view();
         m_controller->setView(nullptr);
         delete view;
+        view = nullptr;
     }
 }
 
@@ -366,4 +367,3 @@
 
     m_controller->view()->scrollToItem(index);
 }
-
diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp
--- a/src/panels/places/placesitem.cpp
+++ b/src/panels/places/placesitem.cpp
@@ -47,6 +47,7 @@
 PlacesItem::~PlacesItem()
 {
     delete m_signalHandler;
+    m_signalHandler = nullptr;
 }
 
 void PlacesItem::setUrl(const QUrl &url)
@@ -127,9 +128,13 @@
     }
 
     delete m_access;
+    m_access = nullptr;
     delete m_volume;
+    m_volume = nullptr;
     delete m_disc;
+    m_disc = nullptr;
     delete m_mtp;
+    m_mtp = nullptr;
 
     const QString udi = bookmark.metaDataItem(QStringLiteral("UDI"));
     if (udi.isEmpty()) {
diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp
--- a/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@@ -457,6 +457,7 @@
     }
 
     delete dialog;
+    dialog = nullptr;
 }
 
 void PlacesPanel::editEntry(int index)
@@ -480,6 +481,7 @@
     }
 
     delete dialog;
+    dialog = nullptr;
 }
 
 void PlacesPanel::selectClosestItem()
diff --git a/src/tests/dolphinsearchboxtest.cpp b/src/tests/dolphinsearchboxtest.cpp
--- a/src/tests/dolphinsearchboxtest.cpp
+++ b/src/tests/dolphinsearchboxtest.cpp
@@ -43,6 +43,7 @@
 void DolphinSearchBoxTest::cleanup()
 {
     delete m_searchBox;
+    m_searchBox = nullptr;
 }
 
 /**
diff --git a/src/tests/kfileitemmodeltest.cpp b/src/tests/kfileitemmodeltest.cpp
--- a/src/tests/kfileitemmodeltest.cpp
+++ b/src/tests/kfileitemmodeltest.cpp
@@ -1642,6 +1642,7 @@
     selection.insert(1);
     QMimeData* mimeData = m_model->createMimeData(selection);
     delete mimeData;
+    mimeData = nullptr;
 }
 
 void KFileItemModelTest::testCollapseFolderWhileLoading()
diff --git a/src/tests/placesitemmodeltest.cpp b/src/tests/placesitemmodeltest.cpp
--- a/src/tests/placesitemmodeltest.cpp
+++ b/src/tests/placesitemmodeltest.cpp
@@ -712,6 +712,7 @@
     m_model->dropMimeDataBefore(m_model->count() - 1, dropData);
     urls.move(0, 4);
     delete dropData;
+    dropData = nullptr;
 
     QTRY_COMPARE(itemsInsertedSpy.count(), 1);
     QTRY_COMPARE(itemsRemovedSpy.count(), 1);
@@ -740,6 +741,7 @@
     m_model->dropMimeDataBefore(0, dropData);
     urls.move(4, 0);
     delete dropData;
+    dropData = nullptr;
 
     QTRY_COMPARE(itemsInsertedSpy.count(), 1);
     QTRY_COMPARE(itemsRemovedSpy.count(), 1);
@@ -779,6 +781,7 @@
     CHECK_PLACES_URLS(urls);
 
     delete m_model;
+    m_model = nullptr;
     m_model = new PlacesItemModel();
     QTRY_COMPARE(m_model->count(), urls.count());
     CHECK_PLACES_URLS(urls);
@@ -807,6 +810,7 @@
     QTRY_COMPARE(placesUrls(newModel).count(QStringLiteral("search:/videos")), 1);
     QTRY_COMPARE(urls, placesUrls(newModel));
     delete newModel;
+    newModel = nullptr;
 }
 
 void PlacesItemModelTest::renameAfterCreation()
diff --git a/src/trash/dolphintrash.cpp b/src/trash/dolphintrash.cpp
--- a/src/trash/dolphintrash.cpp
+++ b/src/trash/dolphintrash.cpp
@@ -48,6 +48,7 @@
 Trash::~Trash()
 {
     delete m_trashDirLister;
+    m_trashDirLister = nullptr;
 }
 
 Trash &Trash::instance()
@@ -79,4 +80,3 @@
     KConfig trashConfig(QStringLiteral("trashrc"), KConfig::SimpleConfig);
     return (trashConfig.group("Status").readEntry("Empty", true));
 }
-
diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -996,6 +996,7 @@
     }
 
     delete menu;
+    menu = nullptr;
 }
 
 void DolphinView::slotHeaderColumnWidthChangeFinished(const QByteArray& role, qreal current)
diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -578,6 +578,7 @@
     QPointer<ViewPropertiesDialog> dialog = new ViewPropertiesDialog(m_currentView);
     dialog->exec();
     delete dialog;
+    dialog = nullptr;
 }
 
 void DolphinViewActionHandler::slotProperties()
diff --git a/src/views/tooltips/tooltipmanager.cpp b/src/views/tooltips/tooltipmanager.cpp
--- a/src/views/tooltips/tooltipmanager.cpp
+++ b/src/views/tooltips/tooltipmanager.cpp
@@ -83,6 +83,7 @@
     // item for 200 milliseconds. This prevents a lot of useless preview jobs and
     // meta data retrieval, when passing rapidly over a lot of items.
     delete m_fileMetaDataWidget;
+    m_fileMetaDataWidget = nullptr;
     m_fileMetaDataWidget = new DolphinFileMetaDataWidget();
     connect(m_fileMetaDataWidget, &DolphinFileMetaDataWidget::metaDataRequestFinished,
             this, &ToolTipManager::slotMetaDataRequestFinished);
@@ -209,4 +210,3 @@
     m_tooltipWidget->showBelow(m_itemRect, m_fileMetaDataWidget, m_transientParent);
     m_toolTipRequested = false;
 }
-