From: Peter Penz <peter.penz19@gmail.com>
Date: Mon, 26 Mar 2012 20:18:54 +0000 (+0200)
Subject: Rename KItemListView::preferredColumnWidth() to preferredRoleColumnWidth()
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/8c986e22fd8fa34ea6c29ad2e88e08c2f9b34bf2

Rename KItemListView::preferredColumnWidth() to preferredRoleColumnWidth()
---

diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp
index aa368bfef..ab111b912 100644
--- a/src/kitemviews/kfileitemlistview.cpp
+++ b/src/kitemviews/kfileitemlistview.cpp
@@ -193,7 +193,7 @@ QSizeF KFileItemListView::itemSizeHint(int index) const
     return QSize();
 }
 
-qreal KFileItemListView::preferredColumnWidth(int index, const QByteArray& role) const
+qreal KFileItemListView::preferredRoleColumnWidth(const QByteArray& role, int index) const
 {
     const KItemListStyleOption& option = styleOption();
 
diff --git a/src/kitemviews/kfileitemlistview.h b/src/kitemviews/kfileitemlistview.h
index 43cb9e8db..a94e2b6f5 100644
--- a/src/kitemviews/kfileitemlistview.h
+++ b/src/kitemviews/kfileitemlistview.h
@@ -78,7 +78,7 @@ public:
     virtual QSizeF itemSizeHint(int index) const;
 
     /** @reimp */
-    virtual qreal preferredColumnWidth(int index, const QByteArray& role) const;
+    virtual qreal preferredRoleColumnWidth(const QByteArray& role, int index) const;
 
     /** @reimp */
     virtual QPixmap createDragPixmap(const QSet<int>& indexes) const;
diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp
index fdb68a1a4..7d1cd6e71 100644
--- a/src/kitemviews/kitemlistview.cpp
+++ b/src/kitemviews/kitemlistview.cpp
@@ -514,10 +514,10 @@ QSizeF KItemListView::itemSizeHint(int index) const
     return itemSize();
 }
 
-qreal KItemListView::preferredColumnWidth(int index, const QByteArray& role) const
+qreal KItemListView::preferredRoleColumnWidth(const QByteArray& role, int index) const
 {
-    Q_UNUSED(index);
     Q_UNUSED(role);
+    Q_UNUSED(index);
     return 100;
 }
 
@@ -1915,7 +1915,7 @@ QHash<QByteArray, qreal> KItemListView::preferredColumnWidths(const KItemRangeLi
         for (int i = startIndex; i <= endIndex; ++i) {
             foreach (const QByteArray& visibleRole, visibleRoles()) {
                 qreal maxWidth = widths.value(visibleRole, 0);
-                const qreal width = preferredColumnWidth(i, visibleRole);
+                const qreal width = preferredRoleColumnWidth(visibleRole, i);
                 maxWidth = qMax(width, maxWidth);
                 widths.insert(visibleRole, maxWidth);
             }
diff --git a/src/kitemviews/kitemlistview.h b/src/kitemviews/kitemlistview.h
index 402692585..9c42a6f3e 100644
--- a/src/kitemviews/kitemlistview.h
+++ b/src/kitemviews/kitemlistview.h
@@ -193,10 +193,10 @@ public:
     virtual QSizeF itemSizeHint(int index) const;
 
     /**
-     * @return The preferred column-width of the item with the index \a index
-     *         for the given \a role that is shown in the column.
+     * @return The preferred column-width of the given \a role for the item
+     *         with the index \a index.
      */
-    virtual qreal preferredColumnWidth(int index, const QByteArray& role) const;
+    virtual qreal preferredRoleColumnWidth(const QByteArray& role, int index) const;
 
     /**
      * If set to true, items having child-items can be expanded to show the child-items as