From 63e1e3bc14b5538027471ee76b6e92d6425ecf0b Mon Sep 17 00:00:00 2001
From: Peter Penz <peter.penz19@gmail.com>
Date: Tue, 20 Sep 2011 15:19:11 +0200
Subject: Change signature of setVisibleRoles()

Simply use a QList<QByteArray> instead of QHash<QByteArray, int>.
---
 src/kitemviews/kfileitemlistwidget.cpp | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

(limited to 'src/kitemviews/kfileitemlistwidget.cpp')

diff --git a/src/kitemviews/kfileitemlistwidget.cpp b/src/kitemviews/kfileitemlistwidget.cpp
index d9a1cbfd1..a9193fbc7 100644
--- a/src/kitemviews/kfileitemlistwidget.cpp
+++ b/src/kitemviews/kfileitemlistwidget.cpp
@@ -199,7 +199,7 @@ void KFileItemListWidget::dataChanged(const QHash<QByteArray, QVariant>& current
 
     QSet<QByteArray> dirtyRoles;
     if (roles.isEmpty()) {
-        dirtyRoles = visibleRoles().keys().toSet();
+        dirtyRoles = visibleRoles().toSet();
         dirtyRoles.insert("iconPixmap");
         dirtyRoles.insert("iconName");
     } else {
@@ -213,33 +213,12 @@ void KFileItemListWidget::dataChanged(const QHash<QByteArray, QVariant>& current
     }
 }
 
-void KFileItemListWidget::visibleRolesChanged(const QHash<QByteArray, int>& current,
-                                              const QHash<QByteArray, int>& previous)
+void KFileItemListWidget::visibleRolesChanged(const QList<QByteArray>& current,
+                                              const QList<QByteArray>& previous)
 {
     KItemListWidget::visibleRolesChanged(current, previous);
+    m_sortedVisibleRoles = current;
     m_dirtyLayout = true;
-
-    // Cache the roles sorted into m_sortedVisibleRoles:
-    const int visibleRolesCount = current.count();
-    m_sortedVisibleRoles.clear();
-    m_sortedVisibleRoles.reserve(visibleRolesCount);
-    for (int i = 0; i < visibleRolesCount; ++i) {
-        m_sortedVisibleRoles.append(QByteArray());
-    }
-
-    QHashIterator<QByteArray, int> it(current);
-    while (it.hasNext()) {
-        it.next();
-
-        const int index = it.value();
-        if (index < 0 || index >= visibleRolesCount || !m_sortedVisibleRoles.at(index).isEmpty()) {
-            kWarning() << "The visible roles have an invalid sort order.";
-            break;
-        }
-
-        const QByteArray& role = it.key();
-        m_sortedVisibleRoles[index] = role;
-    }
 }
 
 void KFileItemListWidget::visibleRolesSizesChanged(const QHash<QByteArray, QSizeF>& current,
-- 
cgit v1.3