Merge branch 'Applications/18.04'

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

diff --git a/src/kitemviews/kstandarditemmodel.cpp b/src/kitemviews/kstandarditemmodel.cpp
index fbcda837042e90be24edfb4992a89811c7868c65..a4d42b5715a73162b25a090ae35125ca73644c55 100644 (file)
--- a/src/kitemviews/kstandarditemmodel.cpp
+++ b/src/kitemviews/kstandarditemmodel.cpp
@@ -19,7 +19,6 @@
 
 #include "kstandarditemmodel.h"
 
 
 #include "kstandarditemmodel.h"
 

-#include <KDebug>

 #include "kstandarditem.h"
 
 KStandardItemModel::KStandardItemModel(QObject* parent) :
 #include "kstandarditem.h"
 
 KStandardItemModel::KStandardItemModel(QObject* parent) :


@@ -38,10 +37,22 @@ KStandardItemModel::~KStandardItemModel()
 
 void KStandardItemModel::insertItem(int index, KStandardItem* item)
 {
 
 void KStandardItemModel::insertItem(int index, KStandardItem* item)
 {

-    if (item && !m_indexesForItems.contains(item)) {
+    if (index < 0 || index > count() || !item) {
+        delete item;
+        return;
+    }
+
+    if (!m_indexesForItems.contains(item)) {

         item->m_model = this;
         m_items.insert(index, item);
         m_indexesForItems.insert(item, index);
         item->m_model = this;
         m_items.insert(index, item);
         m_indexesForItems.insert(item, index);

+
+        // Inserting an item requires to update the indexes
+        // afterwards from m_indexesForItems.
+        for (int i = index + 1; i < m_items.count(); ++i) {
+            m_indexesForItems.insert(m_items[i], i);
+        }
+

         // TODO: no hierarchical items are handled yet
 
         onItemInserted(index);
         // TODO: no hierarchical items are handled yet
 
         onItemInserted(index);


@@ -51,40 +62,39 @@ void KStandardItemModel::insertItem(int index, KStandardItem* item)
 
 void KStandardItemModel::changeItem(int index, KStandardItem* item)
 {
 
 void KStandardItemModel::changeItem(int index, KStandardItem* item)
 {

-    if (item && index >= 0 && index < count()) {
-        item->m_model = this;
+    if (index < 0 || index >= count() || !item) {
+        delete item;
+        return;
+    }

 
 

-        QSet<QByteArray> changedRoles;
-
-        KStandardItem* oldItem = m_items[index];
-        const QHash<QByteArray, QVariant> oldData = oldItem->data();
-        const QHash<QByteArray, QVariant> newData = item->data();
-
-        // Determine which roles have been changed
-        QHashIterator<QByteArray, QVariant> it(oldData);
-        while (it.hasNext()) {
-            it.next();
-            const QByteArray role = it.key();
-            const QVariant oldValue = it.value();
-            if (newData.contains(role) && newData.value(role) != oldValue) {
-                changedRoles.insert(role);
-            }
-        }
+    item->m_model = this;

 
 

-        m_indexesForItems.remove(oldItem);
-        delete oldItem;
-        oldItem = 0;
+    QSet<QByteArray> changedRoles;

 
 

-        m_items[index] = item;
-        m_indexesForItems.insert(item, index);
+    KStandardItem* oldItem = m_items[index];
+    const QHash<QByteArray, QVariant> oldData = oldItem->data();
+    const QHash<QByteArray, QVariant> newData = item->data();

 
 

-        onItemChanged(index, changedRoles);
-        emit itemsChanged(KItemRangeList() << KItemRange(index, 1), changedRoles);
-    } else {
-        kWarning() << "No item available to replace on the given index" << index;
-        delete item;
-        item = 0;
+    // Determine which roles have been changed
+    QHashIterator<QByteArray, QVariant> it(oldData);
+    while (it.hasNext()) {
+        it.next();
+        const QByteArray role = it.key();
+        const QVariant oldValue = it.value();
+        if (newData.contains(role) && newData.value(role) != oldValue) {
+            changedRoles.insert(role);
+        }

     }
     }

+
+    m_indexesForItems.remove(oldItem);
+    delete oldItem;
+    oldItem = nullptr;
+
+    m_items[index] = item;
+    m_indexesForItems.insert(item, index);
+
+    onItemChanged(index, changedRoles);
+    emit itemsChanged(KItemRangeList() << KItemRange(index, 1), changedRoles);

 }
 
 void KStandardItemModel::removeItem(int index)
 }
 
 void KStandardItemModel::removeItem(int index)


@@ -93,19 +103,37 @@ void KStandardItemModel::removeItem(int index)
         KStandardItem* item = m_items[index];
         m_indexesForItems.remove(item);
         m_items.removeAt(index);
         KStandardItem* item = m_items[index];
         m_indexesForItems.remove(item);
         m_items.removeAt(index);

+
+        // Removing an item requires to update the indexes
+        // afterwards from m_indexesForItems.
+        for (int i = index; i < m_items.count(); ++i) {
+            m_indexesForItems.insert(m_items[i], i);
+        }
+
+        onItemRemoved(index, item);
+

         delete item;
         delete item;

-        item = 0;
+        item = nullptr;

 
 

-        onItemRemoved(index);

         emit itemsRemoved(KItemRangeList() << KItemRange(index, 1));
         emit itemsRemoved(KItemRangeList() << KItemRange(index, 1));

+

         // TODO: no hierarchical items are handled yet
     }
 }
 
         // TODO: no hierarchical items are handled yet
     }
 }
 

+void KStandardItemModel::clear()
+{
+    int size = m_items.size();
+    m_items.clear();
+    m_indexesForItems.clear();
+
+    emit itemsRemoved(KItemRangeList() << KItemRange(0, size));
+}
+

 KStandardItem* KStandardItemModel::item(int index) const
 {
     if (index < 0 || index >= m_items.count()) {
 KStandardItem* KStandardItemModel::item(int index) const
 {
     if (index < 0 || index >= m_items.count()) {

-        return 0;
+        return nullptr;

     }
     return m_items[index];
 }
     }
     return m_items[index];
 }


@@ -146,10 +174,10 @@ bool KStandardItemModel::setData(int index, const QHash<QByteArray, QVariant>& v
     return true;
 }
 
     return true;
 }
 

-QMimeData* KStandardItemModel::createMimeData(const QSet<int>& indexes) const
+QMimeData* KStandardItemModel::createMimeData(const KItemSet& indexes) const

 {
     Q_UNUSED(indexes);
 {
     Q_UNUSED(indexes);

-    return 0;
+    return nullptr;

 }
 
 int KStandardItemModel::indexForKeyboardSearch(const QString& text, int startFromIndex) const
 }
 
 int KStandardItemModel::indexForKeyboardSearch(const QString& text, int startFromIndex) const


@@ -175,7 +203,7 @@ QList<QPair<int, QVariant> > KStandardItemModel::groups() const
 {
     QList<QPair<int, QVariant> > groups;
 
 {
     QList<QPair<int, QVariant> > groups;
 

-    const QByteArray role = sortRole();
+    const QByteArray role = sortRole().isEmpty() ? "group" : sortRole();

     bool isFirstGroupValue = true;
     QString groupValue;
     const int maxIndex = count() - 1;
     bool isFirstGroupValue = true;
     QString groupValue;
     const int maxIndex = count() - 1;


@@ -202,10 +230,9 @@ void KStandardItemModel::onItemChanged(int index, const QSet<QByteArray>& change
     Q_UNUSED(changedRoles);
 }
 
     Q_UNUSED(changedRoles);
 }
 

-void KStandardItemModel::onItemRemoved(int index)
+void KStandardItemModel::onItemRemoved(int index, KStandardItem* removedItem)

 {
     Q_UNUSED(index);
 {
     Q_UNUSED(index);

+    Q_UNUSED(removedItem);

 }
 
 }
 

-
-#include "kstandarditemmodel.moc"