Ensure that KItemListViewLayouter always has a size hint resolver

[dolphin.git] / src / kitemviews / private / kitemlistviewlayouter.h

diff --git a/src/kitemviews/private/kitemlistviewlayouter.h b/src/kitemviews/private/kitemlistviewlayouter.h
index a3b0893a1e0debb0089645b8f07299edebaed1e4..0efcab12b11c86d6374d0f102ab78a7df4cec748 100644 (file)
--- a/src/kitemviews/private/kitemlistviewlayouter.h
+++ b/src/kitemviews/private/kitemlistviewlayouter.h
@@ -50,7 +50,7 @@ class LIBDOLPHINPRIVATE_EXPORT KItemListViewLayouter : public QObject
     Q_OBJECT
 
 public:
-    KItemListViewLayouter(QObject* parent = 0);
+    KItemListViewLayouter(KItemListSizeHintResolver* sizeHintResolver, QObject* parent = 0);
     virtual ~KItemListViewLayouter();
 
     void setScrollOrientation(Qt::Orientation orientation);
@@ -103,9 +103,6 @@ public:
     void setModel(const KItemModelBase* model);
     const KItemModelBase* model() const;
 
-    void setSizeHintResolver(const KItemListSizeHintResolver* sizeHintResolver);
-    const KItemListSizeHintResolver* sizeHintResolver() const;
-
     /**
      * @return The first (at least partly) visible index. -1 is returned
      *         if the item count is 0.
@@ -205,7 +202,7 @@ private:
     QSizeF m_itemMargin;
     qreal m_headerHeight;
     const KItemModelBase* m_model;
-    const KItemListSizeHintResolver* m_sizeHintResolver;
+    KItemListSizeHintResolver* m_sizeHintResolver;
 
     qreal m_scrollOffset;
     qreal m_maximumScrollOffset;
@@ -220,6 +217,9 @@ private:
     qreal m_xPosInc;
     int m_columnCount;
 
+    QVector<qreal> m_rowOffsets;
+    QVector<qreal> m_columnOffsets;
+
     // Stores all item indexes that are the first item of a group.
     // Assures fast access for KItemListViewLayouter::isFirstGroupItem().
     QSet<int> m_groupItemIndexes;
@@ -227,7 +227,6 @@ private:
     qreal m_groupHeaderMargin;
 
     struct ItemInfo {
-        QPointF pos;
         int column;
         int row;
     };