Merge branch 'KDE/4.10'

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

diff --git a/src/kitemviews/kstandarditemmodel.cpp b/src/kitemviews/kstandarditemmodel.cpp
index cde86af49ee1e6647e5826c3c5ffde6b0b99bf7b..dbf608c92734fc8fa9808849030499675425443c 100644 (file)
--- a/src/kitemviews/kstandarditemmodel.cpp
+++ b/src/kitemviews/kstandarditemmodel.cpp
@@ -43,7 +43,7 @@ void KStandardItemModel::insertItem(int index, KStandardItem* item)
         return;
     }
 
-    if (item && !m_indexesForItems.contains(item)) {
+    if (!m_indexesForItems.contains(item)) {
         item->m_model = this;
         m_items.insert(index, item);
         m_indexesForItems.insert(item, index);
@@ -63,7 +63,7 @@ void KStandardItemModel::insertItem(int index, KStandardItem* item)
 
 void KStandardItemModel::changeItem(int index, KStandardItem* item)
 {
-    if (index < 0 || index > count() || !item) {
+    if (index < 0 || index >= count() || !item) {
         delete item;
         return;
     }
@@ -195,7 +195,7 @@ QList<QPair<int, QVariant> > KStandardItemModel::groups() const
 {
     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;