diff -r 2a11b5b00470 -r fd64c38c277d phonebookengines/mobcntmodel/inc/mobcntmodel.h --- a/phonebookengines/mobcntmodel/inc/mobcntmodel.h Fri May 14 15:42:23 2010 +0300 +++ b/phonebookengines/mobcntmodel/inc/mobcntmodel.h Thu May 27 12:45:19 2010 +0300 @@ -30,7 +30,6 @@ class MobCntModelData; class MobCntModel; -class MobCntIconManager; /*! * MobCntModel is a list model view for contacts database @@ -47,58 +46,55 @@ friend class TestMobCntModel; public: - MobCntModel(const QContactFilter& contactFilter = QContactFilter(), + MobCntModel(const QContactFilter& contactFilter = QContactFilter(), + const QList& contactSortOrders = QList(), + bool showMyCard = true, + QObject *parent = 0); + MobCntModel(QContactManager* manager, + const QContactFilter& contactFilter = QContactFilter(), const QList& contactSortOrders = QList(), bool showMyCard = true, QObject *parent = 0); - MobCntModel(QContactManager* manager, - const QContactFilter& contactFilter = QContactFilter(), - const QList& contactSortOrders = QList(), - bool showMyCard = true, - QObject *parent = 0); - ~MobCntModel(); + ~MobCntModel(); public: // from QAbstractTableModel/QAbstractItemModel - QVariant data(const QModelIndex &index, int role) const; - int rowCount(const QModelIndex &parent = QModelIndex()) const; + QVariant data(const QModelIndex &index, int role) const; + int rowCount(const QModelIndex &parent = QModelIndex()) const; public: - QContact contact(const QModelIndex &index) const; - QModelIndex indexOfContact(const QContact &contact) const; - QContactManager& contactManager() const; - void setFilterAndSortOrder(const QContactFilter& contactFilter = QContactFilter(), + QContact contact(const QModelIndex &index) const; + QModelIndex indexOfContact(const QContact &contact) const; + QContactManager& contactManager() const; + void setFilterAndSortOrder(const QContactFilter& contactFilter = QContactFilter(), const QList& contactSortOrders = QList()); - void showMyCard(bool enabled); - bool myCardStatus() const; - QContactLocalId myCardId() const; + void showMyCard(bool enabled); + bool myCardStatus() const; + QContactLocalId myCardId() const; private: - // Construction helpers - int doConstruct(); - int initializeData(); - void updateContactIdsArray(); - - // Data manipulation - QContact contact(int row) const; + // Construction helpers + int doConstruct(); + int initializeData(); + void updateContactIdsArray(); - // Utility - bool validRowId(int row) const; - int rowId(const QContactLocalId &contactId) const; - QVariant dataForDisplayRole(int row) const; - QList< QList > findIndexes(const QList& contactIds); + // Data manipulation + QContact contact(int row) const; -public slots: - void updateContactIcon(int index); + // Utility + bool validRowId(int row) const; + int rowId(const QContactLocalId &contactId) const; + QVariant dataForDisplayRole(int row) const; + QList< QList > findIndexes(const QList& contactIds); protected slots: - void handleAdded(const QList& contactIds); - void handleChanged(const QList& contactIds); - void handleRemoved(const QList& contactIds); - void handleMyCardChanged(const QContactLocalId& oldId, const QContactLocalId& newId); + void handleAdded(const QList& contactIds); + void handleChanged(const QList& contactIds); + void handleRemoved(const QList& contactIds); + void handleMyCardChanged(const QContactLocalId& oldId, const QContactLocalId& newId); + void handleContactInfoUpdated(QContactLocalId contactId); private: QSharedDataPointer d; - MobCntIconManager *mIconManager; HbIcon mDefaultIcon; HbIcon mDefaultMyCardIcon; };