Move the KVersionControlPlugin2 interface from konqlib to Dolphin and remove the...

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

diff --git a/src/kitemviews/private/kitemlistviewlayouter.h b/src/kitemviews/private/kitemlistviewlayouter.h
index da5bd1d7d9205ea20bb6112bf3e8ccb01919dae2..3f1cf68d45d7436101403133f66bfaecf97789d0 100644 (file)
--- a/src/kitemviews/private/kitemlistviewlayouter.h
+++ b/src/kitemviews/private/kitemlistviewlayouter.h
@@ -20,12 +20,13 @@
 #ifndef KITEMLISTVIEWLAYOUTER_H
 #define KITEMLISTVIEWLAYOUTER_H
 
-#include <libdolphin_export.h>
+#include "dolphin_export.h"
 
 #include <QObject>
 #include <QRectF>
 #include <QSet>
 #include <QSizeF>
+#include <QVector>
 
 class KItemModelBase;
 class KItemListSizeHintResolver;
@@ -44,12 +45,12 @@ class KItemListSizeHintResolver;
  * changing properties of the layouter is not expensive, only the
  * first read of a property can get expensive.
  */
-class LIBDOLPHINPRIVATE_EXPORT KItemListViewLayouter : public QObject
+class DOLPHIN_EXPORT KItemListViewLayouter : public QObject
 {
     Q_OBJECT
 
 public:
-    KItemListViewLayouter(QObject* parent = 0);
+    KItemListViewLayouter(KItemListSizeHintResolver* sizeHintResolver, QObject* parent = 0);
     virtual ~KItemListViewLayouter();
 
     void setScrollOrientation(Qt::Orientation orientation);
@@ -102,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.
@@ -164,6 +162,11 @@ public:
      */
     void markAsDirty();
 
+    inline int columnCount() const
+    {
+        return m_columnCount;
+    }
+
 #ifndef QT_NO_DEBUG
     /**
      * @return True if the layouter has been marked as dirty and hence has
@@ -199,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;
@@ -214,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;
@@ -221,11 +227,10 @@ private:
     qreal m_groupHeaderMargin;
 
     struct ItemInfo {
-        QRectF rect;
         int column;
         int row;
     };
-    QList<ItemInfo> m_itemInfos;
+    QVector<ItemInfo> m_itemInfos;
 
     friend class KItemListControllerTest;
 };