Merge branch 'KDE/4.13'

[dolphin.git] / src / kitemviews / kitemlistview.h

diff --git a/src/kitemviews/kitemlistview.h b/src/kitemviews/kitemlistview.h
index 14360b02bb2d9bae20ed1f0c43a76bf31f356fce..cf6f27c03ce3a9a2403a4a82d2c4185d34ab66b5 100644 (file)
--- a/src/kitemviews/kitemlistview.h
+++ b/src/kitemviews/kitemlistview.h
@@ -194,12 +194,14 @@ public:
     int lastVisibleIndex() const;
 
     /**
     int lastVisibleIndex() const;
 
     /**

-     * @return Required size for the item with the index \p index.
-     *         The returned value might be larger than KItemListView::itemSize().
+     * @return Calculates the required size for all items in the model.
+     *         It might be larger than KItemListView::itemSize().

      *         In this case the layout grid will be stretched to assure an
      *         unclipped item.
      *         In this case the layout grid will be stretched to assure an
      *         unclipped item.

+     *         NOTE: the logical height (width) is actually the
+     *         width (height) if the scroll orientation is Qt::Vertical!

      */
      */

-    QSizeF itemSizeHint(int index) const;
+    void calculateItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint) 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


@@ -271,7 +273,7 @@ public:
      * @return Pixmap that is used for a drag operation based on the
      *         items given by \a indexes.
      */
      * @return Pixmap that is used for a drag operation based on the
      *         items given by \a indexes.
      */

-    virtual QPixmap createDragPixmap(const QSet<int>& indexes) const;
+    virtual QPixmap createDragPixmap(const KItemSet& indexes) const;

 
     /**
      * Lets the user edit the role \a role for item with the index \a index.
 
     /**
      * Lets the user edit the role \a role for item with the index \a index.


@@ -388,6 +390,9 @@ protected:
 
     QList<KItemListWidget*> visibleItemListWidgets() const;
 
 
     QList<KItemListWidget*> visibleItemListWidgets() const;
 

+    virtual void updateFont();
+    virtual void updatePalette();
+

 protected slots:
     virtual void slotItemsInserted(const KItemRangeList& itemRanges);
     virtual void slotItemsRemoved(const KItemRangeList& itemRanges);
 protected slots:
     virtual void slotItemsInserted(const KItemRangeList& itemRanges);
     virtual void slotItemsRemoved(const KItemRangeList& itemRanges);


@@ -400,7 +405,7 @@ protected slots:
     virtual void slotSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous);
     virtual void slotSortRoleChanged(const QByteArray& current, const QByteArray& previous);
     virtual void slotCurrentChanged(int current, int previous);
     virtual void slotSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous);
     virtual void slotSortRoleChanged(const QByteArray& current, const QByteArray& previous);
     virtual void slotCurrentChanged(int current, int previous);

-    virtual void slotSelectionChanged(const QSet<int>& current, const QSet<int>& previous);
+    virtual void slotSelectionChanged(const KItemSet& current, const KItemSet& previous);

 
 private slots:
     void slotAnimationFinished(QGraphicsWidget* widget,
 
 private slots:
     void slotAnimationFinished(QGraphicsWidget* widget,


@@ -802,7 +807,7 @@ public:
 
     virtual void recycle(KItemListWidget* widget);
 
 
     virtual void recycle(KItemListWidget* widget);
 

-    virtual QSizeF itemSizeHint(int index, const KItemListView* view) const = 0;
+    virtual void calculateItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const = 0;

 
     virtual qreal preferredRoleColumnWidth(const QByteArray& role,
                                            int index,
 
     virtual qreal preferredRoleColumnWidth(const QByteArray& role,
                                            int index,


@@ -821,7 +826,7 @@ public:
 
     virtual KItemListWidget* create(KItemListView* view);
 
 
     virtual KItemListWidget* create(KItemListView* view);
 

-    virtual QSizeF itemSizeHint(int index, const KItemListView* view) const;
+    virtual void calculateItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const;

 
     virtual qreal preferredRoleColumnWidth(const QByteArray& role,
                                            int index,
 
     virtual qreal preferredRoleColumnWidth(const QByteArray& role,
                                            int index,


@@ -854,9 +859,9 @@ KItemListWidget* KItemListWidgetCreator<T>::create(KItemListView* view)
 }
 
 template<class T>
 }
 
 template<class T>

-QSizeF KItemListWidgetCreator<T>::itemSizeHint(int index, const KItemListView* view) const
+void KItemListWidgetCreator<T>::calculateItemSizeHints(QVector<qreal>& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const

 {
 {

-    return m_informant->itemSizeHint(index, view);
+    return m_informant->calculateItemSizeHints(logicalHeightHints, logicalWidthHint, view);

 }
 
 template<class T>
 }
 
 template<class T>