Rename KItemListView::preferredColumnWidth() to preferredRoleColumnWidth()

diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp
index aa368bfef033be53d111745a8c672007e83c2b47..ab111b9129266c7eb5b272934a13b1a823db2205 100644 (file)
--- a/src/kitemviews/kfileitemlistview.cpp
+++ b/src/kitemviews/kfileitemlistview.cpp
@@ -193,7 +193,7 @@ QSizeF KFileItemListView::itemSizeHint(int index) const
     return QSize();
 }
 
     return QSize();
 }
 

-qreal KFileItemListView::preferredColumnWidth(int index, const QByteArray& role) const
+qreal KFileItemListView::preferredRoleColumnWidth(const QByteArray& role, int index) const

 {
     const KItemListStyleOption& option = styleOption();
 
 {
     const KItemListStyleOption& option = styleOption();
 

diff --git a/src/kitemviews/kfileitemlistview.h b/src/kitemviews/kfileitemlistview.h
index 43cb9e8db16c9825c01915d395474b97622af187..a94e2b6f5d67a982a60137cf2845852aa2bbbc74 100644 (file)
--- a/src/kitemviews/kfileitemlistview.h
+++ b/src/kitemviews/kfileitemlistview.h
@@ -78,7 +78,7 @@ public:
     virtual QSizeF itemSizeHint(int index) const;
 
     /** @reimp */
     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;
 
     /** @reimp */
     virtual QPixmap createDragPixmap(const QSet<int>& indexes) const;

diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp
index fdb68a1a4019df46b95bedf8c69d06292fc06613..7d1cd6e71707425817af076968b67e254d8a9810 100644 (file)
--- a/src/kitemviews/kitemlistview.cpp
+++ b/src/kitemviews/kitemlistview.cpp
@@ -514,10 +514,10 @@ QSizeF KItemListView::itemSizeHint(int index) const
     return itemSize();
 }
 
     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(role);

+    Q_UNUSED(index);

     return 100;
 }
 
     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);
         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);
             }
                 maxWidth = qMax(width, maxWidth);
                 widths.insert(visibleRole, maxWidth);
             }

diff --git a/src/kitemviews/kitemlistview.h b/src/kitemviews/kitemlistview.h
index 4026925856fcf3cbf5da64f69f3a30780a3dc4b0..9c42a6f3eb571d483a28f1c2dbe03ea72bdec03b 100644 (file)
--- a/src/kitemviews/kitemlistview.h
+++ b/src/kitemviews/kitemlistview.h
@@ -193,10 +193,10 @@ public:
     virtual QSizeF itemSizeHint(int index) const;
 
     /**
     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
 
     /**
      * If set to true, items having child-items can be expanded to show the child-items as