--- a/phonebookengines/cntlistmodel/inc/cntlistmodel.h	Fri Jun 11 13:29:23 2010 +0300
+++ b/phonebookengines/cntlistmodel/inc/cntlistmodel.h	Wed Jun 23 18:02:44 2010 +0300
@@ -29,10 +29,9 @@
 QTM_USE_NAMESPACE
 
 class CntListModelData;
-class CntListModel;
 
 /*!
- * MobCntModel is a list model view for contacts database
+ * CntListModel is a list model view for contacts database
  * content. It will cache contacts database entries to be
  * displayed on the screen.
  *
@@ -43,16 +42,14 @@
 class CNTLISTMODEL_EXPORT CntListModel : public QAbstractListModel
 {
     Q_OBJECT
-    friend class TestMobCntModel;
+    friend class TestCntListModel;
 
 public:
     CntListModel(const QContactFilter& contactFilter = QContactFilter(),
-                const QList<QContactSortOrder>& contactSortOrders = QList<QContactSortOrder>(),
                 bool showMyCard = true,
                 QObject *parent = 0);
     CntListModel(QContactManager* manager,
                 const QContactFilter& contactFilter = QContactFilter(),
-                const QList<QContactSortOrder>& contactSortOrders = QList<QContactSortOrder>(),
                 bool showMyCard = true,
                 QObject *parent = 0);
     ~CntListModel();
@@ -62,20 +59,20 @@
     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(),
-                               const QList<QContactSortOrder>& contactSortOrders = QList<QContactSortOrder>());
-    void showMyCard(bool enabled);
-    bool myCardStatus() const;
-    QContactLocalId myCardId() const;
+	QContact contact(const QModelIndex &index) const;
+	QModelIndex indexOfContact(const QContact &contact) const;
+	QContactManager& contactManager() const;
+	void setFilter(const QContactFilter& contactFilter = QContactFilter());
+	void showMyCard(bool enabled);
+	bool myCardStatus() const;
+	QContactLocalId myCardId() const;
 	
 private:
     // Construction helpers
     int doConstruct();
     int initializeData();
     void updateContactIdsArray();
+    void setSortOrder();
 
     // Data manipulation
     QContact contact(int row) const;
@@ -85,17 +82,18 @@
     int rowId(const QContactLocalId &contactId) const;
     QVariant dataForDisplayRole(int row) const;
 
-protected slots:
+private slots:
     void handleAdded(const QList<QContactLocalId>& contactIds);
     void handleChanged(const QList<QContactLocalId>& contactIds);
     void handleRemoved(const QList<QContactLocalId>& contactIds);
     void handleMyCardChanged(const QContactLocalId& oldId, const QContactLocalId& newId);
     void handleContactInfoUpdated(QContactLocalId contactId);
+    void refreshModel();
 
 private:
     QSharedDataPointer<CntListModelData>  d;
-    HbIcon                               mDefaultIcon;
-    HbIcon                               mDefaultMyCardIcon;
+    HbIcon                               m_defaultIcon;
+    HbIcon                               m_defaultMyCardIcon;
 };
 
 #endif