diff -r 4fa04caf0f43 -r 1cdcc61142d2 hgwidgets_plat/hgcacheproxymodel_api/inc/hgdataprovidermodel.h --- a/hgwidgets_plat/hgcacheproxymodel_api/inc/hgdataprovidermodel.h Fri Jun 11 14:43:11 2010 +0300 +++ b/hgwidgets_plat/hgcacheproxymodel_api/inc/hgdataprovidermodel.h Thu Jun 24 12:59:29 2010 +0300 @@ -13,7 +13,7 @@ * * Description: * -* Version : %version: 8 % +* Version : %version: 11 % */ #ifndef HGDATAPROVIDERMODEL_H_ #define HGDATAPROVIDERMODEL_H_ @@ -79,13 +79,14 @@ void newItem(QPair< QVariant, int > item, bool silent = true); void insertItem(int pos, QList< QPair< QVariant, int > >* list = NULL, bool silent = true); void insertItem(int pos, QPair< QVariant, int > item, bool silent = true); + void clearItem(int pos, bool silent = false); private: void doInsertItem(int pos, QList< QPair< QVariant, int > >* list, bool silent); protected: - void removeItem(int pos); - void removeItems(int pos, int size); + void removeItem(int pos, bool silent = false); + void removeItems(int pos, int size, bool silent = false); virtual QVariant defaultIcon() const = 0; inline bool containsRole(int idx, int role) const; @@ -93,10 +94,20 @@ public: void resetModel(); - + + enum HgDataProviderIconMode { + HgDataProviderIconHbIcon, + HgDataProviderIconQIcon, + HgDataProviderIconQImage, + HgDataProviderIconQPixmap + }; + + void setIconMode(HgDataProviderIconMode mode); + HgDataProviderIconMode iconMode(); + protected: virtual void doResetModel() {}; - virtual QVariant getData(int idx, int role) const {return QVariant(); }; + virtual QVariant getData(int idx, int role) const {Q_UNUSED(idx); Q_UNUSED(role); return QVariant(); }; // helpers fot emits protected: @@ -123,6 +134,7 @@ QMutex mQPixmapsLock; QMutex mDataLock; HgDataProviderModelObserver *mObserver; + HgDataProviderIconMode mIconMode; }; inline bool HgDataProviderModel::isIndexValid(int idx) const