Fix rubber band not going away after right-click

[dolphin.git] / src / kitemviews / kstandarditemmodel.cpp

diff --git a/src/kitemviews/kstandarditemmodel.cpp b/src/kitemviews/kstandarditemmodel.cpp
index 25288e50f1de2b0d41e0f4859c23a37d276dbb58..d7307c0bdd40d56030fa0adc1ba047739818b7dd 100644 (file)
--- a/src/kitemviews/kstandarditemmodel.cpp
+++ b/src/kitemviews/kstandarditemmodel.cpp
@@ -20,8 +20,7 @@
 #include "kstandarditemmodel.h"
 
 #include "kstandarditem.h"
-#include <QSet>
-#include <QByteArray>
+
 KStandardItemModel::KStandardItemModel(QObject* parent) :
     KItemModelBase(parent),
     m_items(),
@@ -89,7 +88,7 @@ void KStandardItemModel::changeItem(int index, KStandardItem* item)
 
     m_indexesForItems.remove(oldItem);
     delete oldItem;
-    oldItem = 0;
+    oldItem = nullptr;
 
     m_items[index] = item;
     m_indexesForItems.insert(item, index);
@@ -113,8 +112,8 @@ void KStandardItemModel::removeItem(int index)
 
         onItemRemoved(index, item);
 
-        delete item;
-        item = 0;
+        item->deleteLater();
+        item = nullptr;
 
         emit itemsRemoved(KItemRangeList() << KItemRange(index, 1));
 
@@ -134,7 +133,7 @@ void KStandardItemModel::clear()
 KStandardItem* KStandardItemModel::item(int index) const
 {
     if (index < 0 || index >= m_items.count()) {
-        return 0;
+        return nullptr;
     }
     return m_items[index];
 }
@@ -178,7 +177,7 @@ bool KStandardItemModel::setData(int index, const QHash<QByteArray, QVariant>& v
 QMimeData* KStandardItemModel::createMimeData(const KItemSet& indexes) const
 {
     Q_UNUSED(indexes);
-    return 0;
+    return nullptr;
 }
 
 int KStandardItemModel::indexForKeyboardSearch(const QString& text, int startFromIndex) const