--- a/src/hbwidgets/itemviews/hbabstractitemcontainer_p.h	Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbabstractitemcontainer_p.h	Fri May 14 16:09:54 2010 +0300
@@ -23,87 +23,99 @@
 **
 ****************************************************************************/
 
-#ifndef HBABSTRACTITEMCONTAINERPRIVATE_H
-#define HBABSTRACTITEMCONTAINERPRIVATE_H
+#ifndef HBABSTRACTITEMCONTAINER_P_H
+#define HBABSTRACTITEMCONTAINER_P_H
 
-#include "hbwidget_p.h"
-#include "hbabstractitemcontainer.h"
-#include "hbabstractviewitem.h"
+#include <hbwidget.h>
 
-#include <QPersistentModelIndex>
-
+class HbAbstractItemContainerPrivate;
+class QModelIndex;
 class HbAbstractViewItem;
 class HbAbstractItemView;
 
-#include <QHash>
-
-class HbAbstractItemContainerPrivate : public HbWidgetPrivate
+class HB_AUTOTEST_EXPORT HbAbstractItemContainer : public HbWidget
 {
-    Q_DECLARE_PUBLIC(HbAbstractItemContainer)
+    Q_OBJECT
 
 public:
+    explicit HbAbstractItemContainer(QGraphicsItem *parent = 0);
+    virtual ~HbAbstractItemContainer();
 
-    struct StateItem
-    {
-        QPersistentModelIndex index;
-        QMap<int,QVariant> state;
-    };
+    virtual void addItem(const QModelIndex &index, bool animate = false);
+    virtual void removeItem(const QModelIndex &index, bool animate = false);
+    virtual void removeItem(int pos, bool animate = false);
+    void removeItems();
+
+    HbAbstractViewItem* itemByIndex(const QModelIndex &index) const;
+    QList<HbAbstractViewItem *> items() const;
 
-    HbAbstractItemContainerPrivate();
-    virtual ~HbAbstractItemContainerPrivate();
+    virtual void reset();
+
+    HbAbstractItemView *itemView() const;
+    void setItemView(HbAbstractItemView *view);
 
-    QRectF itemBoundingRect(const QGraphicsItem *item) const;
+    virtual void setModelIndexes(const QModelIndex &startIndex = QModelIndex());
 
-    void firstAndLastVisibleBufferIndex(int& firstVisibleBufferIndex,
-        int& lastVisibleBufferIndex,
-        const QRectF &viewRect,
+    void firstAndLastVisibleModelIndex(
+        QModelIndex& firstVisibleModelIndex,
+        QModelIndex& lastVisibleModelIndex,
         bool fullyVisible = true) const;
 
-    bool visible(HbAbstractViewItem* item, const QRectF &viewRect, bool fullyVisible = true) const;
-
-    void deletePrototypes();
+    QList<HbAbstractViewItem *> itemPrototypes() const;
+    bool setItemPrototype(HbAbstractViewItem *prototype);
+    bool setItemPrototypes(const QList<HbAbstractViewItem *> &prototypes);
 
-    int findStateItem(const QModelIndex &index) const;
+    void setItemTransientState(const QModelIndex &index, QHash<QString,QVariant> state);
+    void setItemTransientStateValue(const QModelIndex &index, const QString &key, const QVariant &value);
 
-    void initPrototype(HbAbstractViewItem *prototype) const;
+    QMap<int,QVariant> itemState(const QModelIndex &index) const;
+    QHash<QString, QVariant> itemTransientState(const QModelIndex &index) const;
+
+    void removeItemTransientStates();
 
-    HbAbstractViewItem *createItem(const QModelIndex &index);
-    HbAbstractViewItem *itemPrototype(const QModelIndex& index) const;
+    void setItemRecycling(bool enabled);
+    bool itemRecycling() const;
+
+    virtual void setUniformItemSizes(bool enable);
+    bool uniformItemSizes() const;
+
+    virtual bool eventFilter(QObject *obj, QEvent *event);
 
-    virtual void updateItemBuffer();
-    void increaseBufferSize(int amount);
-    void decreaseBufferSize(int amount);
+    virtual void resizeContainer();
+
+signals:
 
-    HbAbstractViewItem* item(const QModelIndex &index) const;
+    void itemCreated(HbAbstractViewItem *item);
 
-    void doRemoveItem(HbAbstractViewItem *item, const QModelIndex &index, bool animate = false);
-
-    void deleteItem(HbAbstractViewItem *item, bool animate = false);
+protected:
 
-    virtual bool intoContainerBuffer(const QModelIndex &index) const; 
-    virtual int containerBufferIndexForModelIndex(const QModelIndex &index) const;
+    HbAbstractItemContainer(HbAbstractItemContainerPrivate &dd, QGraphicsItem *parent);
+
+    virtual void itemAdded(int index, HbAbstractViewItem *item, bool animate) = 0;
+    virtual void itemRemoved(HbAbstractViewItem *item, bool animate) = 0;
 
-    virtual qreal getDiffWithoutScrollareaCompensation(const QPointF &delta) const;
+    virtual void viewResized(const QSizeF &size) = 0;
+
+    virtual void setItemModelIndex(HbAbstractViewItem *item, const QModelIndex &index);
 
-    void restoreItemPosition(HbAbstractViewItem *item, const QPointF &position);
+    QVariant itemChange(GraphicsItemChange change, const QVariant & value) ;
 
-    void insertItem(HbAbstractViewItem *item, int pos, const QModelIndex &index, bool animate);
+    virtual QPointF recycleItems(const QPointF &delta);
 
-    mutable QList<HbAbstractViewItem*>  mPrototypes;
-    QList<StateItem> mItemStateList;
-    QHash<QPersistentModelIndex, QHash<QString, QVariant> > mItemStates;
+    void insertItem(int pos, const QModelIndex &index, bool animate = false);
 
-    QList<HbAbstractViewItem*>  mItems;
-    HbAbstractItemView *mItemView;
+    virtual int maxItemCount() const;
+
+    virtual bool event(QEvent *e);
 
-    int mBufferSize;
-    bool mItemRecycling;
+    virtual HbAbstractViewItem *createDefaultPrototype() const = 0;
 
-    bool mUniformItemSizes;
-    QPersistentModelIndex mFirstItemIndex;
-    static const int UpdateItemBufferEvent;
+private:
+    
+    Q_DECLARE_PRIVATE_D(d_ptr, HbAbstractItemContainer)
+    Q_DISABLE_COPY(HbAbstractItemContainer)
+
+    friend class HbAbstractItemView;
 };
 
-Q_DECLARE_METATYPE(HbAbstractItemContainerPrivate::StateItem)
-
-#endif /* HBABSTRACTITEMCONTAINERPRIVATE_H */
+#endif