Places Panel fixes

Implement adding, editing and removing of entries. Note that the
result currently is still not stored in bookmarks.xml (this needs
to wait until the hiding is implemented in the model).

2 files changed, 54 insertions, 8 deletions

diff --git a/src/kitemviews/kstandarditemmodel.cpp b/src/kitemviews/kstandarditemmodel.cpp
index 897267df6..04749b9b5 100644
--- a/src/kitemviews/kstandarditemmodel.cpp
+++ b/src/kitemviews/kstandarditemmodel.cpp
@@ -18,6 +18,8 @@
  ***************************************************************************/
 
 #include "kstandarditemmodel.h"
+
+#include <KDebug>
 #include "kstandarditem.h"
 
 KStandardItemModel::KStandardItemModel(QObject* parent) :
@@ -29,6 +31,9 @@ KStandardItemModel::KStandardItemModel(QObject* parent) :
 
 KStandardItemModel::~KStandardItemModel()
 {
+    qDeleteAll(m_items);
+    m_items.clear();
+    m_indexesForItems.clear();
 }
 
 void KStandardItemModel::insertItem(int index, KStandardItem* item)
@@ -43,18 +48,56 @@ void KStandardItemModel::insertItem(int index, KStandardItem* item)
     }
 }
 
+void KStandardItemModel::replaceItem(int index, KStandardItem* item)
+{
+    if (index >= 0 && index < count()) {
+        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);
+            }
+        }
+
+        m_indexesForItems.remove(oldItem);
+        delete oldItem;
+        oldItem = 0;
+
+        m_items[index] = item;
+        m_indexesForItems.insert(item, index);
+
+        emit itemsChanged(KItemRangeList() << KItemRange(index, 1), changedRoles);
+    } else {
+        kWarning() << "No item available to replace on the given index" << index;
+        delete item;
+        item = 0;
+    }
+}
+
 void KStandardItemModel::appendItem(KStandardItem *item)
 {
     insertItem(m_items.count(), item);
 }
 
-void KStandardItemModel::removeItem(KStandardItem* item)
+void KStandardItemModel::removeItem(int index)
 {
-    const int index = m_indexesForItems.value(item, -1);
-    if (index >= 0) {
-        m_items.removeAt(index);
+    if (index >= 0 && index < count()) {
+        KStandardItem* item = m_items[index];
         m_indexesForItems.remove(item);
+        m_items.removeAt(index);
         delete item;
+        item = 0;
+
+        emit itemsRemoved(KItemRangeList() << KItemRange(index, 1));
         // TODO: no hierarchical items are handled yet
     }
 }
@@ -79,9 +122,11 @@ int KStandardItemModel::count() const
 
 QHash<QByteArray, QVariant> KStandardItemModel::data(int index) const
 {
-    const KStandardItem* item = m_items[index];
-    if (item) {
-        return item->data();
+    if (index >= 0 && index < count()) {
+        const KStandardItem* item = m_items[index];
+        if (item) {
+            return item->data();
+        }
     }
     return QHash<QByteArray, QVariant>();
 }
diff --git a/src/kitemviews/kstandarditemmodel.h b/src/kitemviews/kstandarditemmodel.h
index 01d2d4d76..5cf60085b 100644
--- a/src/kitemviews/kstandarditemmodel.h
+++ b/src/kitemviews/kstandarditemmodel.h
@@ -44,8 +44,9 @@ public:
     virtual ~KStandardItemModel();
 
     void insertItem(int index, KStandardItem* item);
+    void replaceItem(int index, KStandardItem* item);
     void appendItem(KStandardItem* item);
-    void removeItem(KStandardItem* item);
+    void removeItem(int index);
     KStandardItem* item(int index) const;
     int index(const KStandardItem* item) const;