Fix selection rect after porting from QFontMetrics::width()

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

diff --git a/src/kitemviews/kstandarditemmodel.cpp b/src/kitemviews/kstandarditemmodel.cpp
index 76b2ad09affd0b09049ea256119892850d7ebfeb..c40050c7e6e9505a4f155b13c7be76efc899536a 100644 (file)
--- a/src/kitemviews/kstandarditemmodel.cpp
+++ b/src/kitemviews/kstandarditemmodel.cpp
@@ -18,6 +18,7 @@
  ***************************************************************************/
 
 #include "kstandarditemmodel.h"
  ***************************************************************************/
 
 #include "kstandarditemmodel.h"

+

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


@@ -29,38 +30,110 @@ KStandardItemModel::KStandardItemModel(QObject* parent) :
 
 KStandardItemModel::~KStandardItemModel()
 {
 
 KStandardItemModel::~KStandardItemModel()
 {

+    qDeleteAll(m_items);
+    m_items.clear();
+    m_indexesForItems.clear();

 }
 
 void KStandardItemModel::insertItem(int index, KStandardItem* item)
 {
 }
 
 void KStandardItemModel::insertItem(int index, KStandardItem* item)
 {

-    if (!m_indexesForItems.contains(item) && !item->m_model) {
+    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);
         m_items.insert(index, item);
         m_indexesForItems.insert(item, index);

-        item->m_model = this;
+
+        // 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
         // TODO: no hierarchical items are handled yet

+
+        onItemInserted(index);
+        emit itemsInserted(KItemRangeList() << KItemRange(index, 1));

     }
 }
 
     }
 }
 

-void KStandardItemModel::appendItem(KStandardItem *item)
+void KStandardItemModel::changeItem(int index, KStandardItem* item)

 {
 {

-    insertItem(m_items.count(), item);
+    if (index < 0 || index >= count() || !item) {
+        delete item;
+        return;
+    }
+
+    item->m_model = this;
+
+    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 = nullptr;
+
+    m_items[index] = item;
+    m_indexesForItems.insert(item, index);
+
+    onItemChanged(index, changedRoles);
+    emit itemsChanged(KItemRangeList() << KItemRange(index, 1), changedRoles);

 }
 
 }
 

-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_indexesForItems.remove(item);

-        delete 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);
+
+        item->deleteLater();
+        item = nullptr;
+
+        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];
 }


@@ -70,6 +143,11 @@ int KStandardItemModel::index(const KStandardItem* item) const
     return m_indexesForItems.value(item, -1);
 }
 
     return m_indexesForItems.value(item, -1);
 }
 

+void KStandardItemModel::appendItem(KStandardItem *item)
+{
+    insertItem(m_items.count(), item);
+}
+

 int KStandardItemModel::count() const
 {
     return m_items.count();
 int KStandardItemModel::count() const
 {
     return m_items.count();


@@ -77,17 +155,18 @@ int KStandardItemModel::count() const
 
 QHash<QByteArray, QVariant> KStandardItemModel::data(int index) const
 {
 
 QHash<QByteArray, QVariant> KStandardItemModel::data(int index) const
 {

-    // TODO: Ugly hack
-    QHash<QByteArray, QVariant> values;
-    const KStandardItem* item = m_items[index];
-    values.insert("text", item->text());
-    values.insert("iconName", item->icon().name());
-    return values;
+    if (index >= 0 && index < count()) {
+        const KStandardItem* item = m_items[index];
+        if (item) {
+            return item->data();
+        }
+    }
+    return QHash<QByteArray, QVariant>();

 }
 
 bool KStandardItemModel::setData(int index, const QHash<QByteArray, QVariant>& values)
 {
 }
 
 bool KStandardItemModel::setData(int index, const QHash<QByteArray, QVariant>& values)
 {

-    Q_UNUSED(values);
+    Q_UNUSED(values)

     if (index < 0 || index >= count()) {
         return false;
     }
     if (index < 0 || index >= count()) {
         return false;
     }


@@ -95,34 +174,65 @@ 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);
-    return 0;
+    Q_UNUSED(indexes)
+    return nullptr;

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

-    Q_UNUSED(text);
-    Q_UNUSED(startFromIndex);
+    Q_UNUSED(text)
+    Q_UNUSED(startFromIndex)

     return -1;
 }
 
 bool KStandardItemModel::supportsDropping(int index) const
 {
     return -1;
 }
 
 bool KStandardItemModel::supportsDropping(int index) const
 {

-    Q_UNUSED(index);
+    Q_UNUSED(index)

     return false;
 }
 
 QString KStandardItemModel::roleDescription(const QByteArray& role) const
 {
     return false;
 }
 
 QString KStandardItemModel::roleDescription(const QByteArray& role) const
 {

-    Q_UNUSED(role);
+    Q_UNUSED(role)

     return QString();
 }
 
 QList<QPair<int, QVariant> > KStandardItemModel::groups() const
 {
     return QString();
 }
 
 QList<QPair<int, QVariant> > KStandardItemModel::groups() const
 {

-    return QList<QPair<int, QVariant> >();
+    QList<QPair<int, QVariant> > groups;
+
+    const QByteArray role = sortRole().isEmpty() ? "group" : sortRole();
+    bool isFirstGroupValue = true;
+    QString groupValue;
+    const int maxIndex = count() - 1;
+    for (int i = 0; i <= maxIndex; ++i) {
+        const QString newGroupValue = m_items.at(i)->dataValue(role).toString();
+        if (newGroupValue != groupValue || isFirstGroupValue) {
+            groupValue = newGroupValue;
+            groups.append(QPair<int, QVariant>(i, newGroupValue));
+            isFirstGroupValue = false;
+        }
+    }
+
+    return groups;
+}
+
+void KStandardItemModel::onItemInserted(int index)
+{
+    Q_UNUSED(index)
+}
+
+void KStandardItemModel::onItemChanged(int index, const QSet<QByteArray>& changedRoles)
+{
+    Q_UNUSED(index)
+    Q_UNUSED(changedRoles)
+}
+
+void KStandardItemModel::onItemRemoved(int index, KStandardItem* removedItem)
+{
+    Q_UNUSED(index)
+    Q_UNUSED(removedItem)

 }
 
 }
 

-#include "kstandarditemmodel.moc"