diff -r 4e54af54a4a1 -r 6c59112cfd31 emailservices/nmutilities/inc/nmcontacthistorymodel_p.h --- a/emailservices/nmutilities/inc/nmcontacthistorymodel_p.h Wed Sep 15 17:47:19 2010 +0300 +++ b/emailservices/nmutilities/inc/nmcontacthistorymodel_p.h Thu Sep 30 11:43:07 2010 +0300 @@ -48,7 +48,7 @@ class NmContactHistoryModelPrivate : public QObject { - enum nameOrder + enum NameOrder { LastNameFirstName = 0x0, LastNameCommaFirstName = 0x1, @@ -80,12 +80,13 @@ const QString &query); - int rowCount(const QModelIndex &parent) const; + int modelRowCount(const QModelIndex &parent) const; + int privateDataCount() const; QVariant data(const QModelIndex &index, int role) const; void refreshDataModel(); bool fillMruMatchList(); - QString obeyContactOrder(const QString &firstName, const QString &lastName); + QString obeyContactOrder(const QString &firstName, const QString &lastName) const; private: