FCL/sf/app/commonemail: comparison emailservices/nmutilities/src/nmcontacthistorymodel

equal deleted inserted replaced

-:4e54af54a4a1
+:6c59112cfd31
 * Description: Private implementation of Contact History Model API
 *
 */
 #include "emailmru.h"
+#include "emailtrace.h"
 #include "nmcontacthistorymodel_p.h"
 // --------------------------------------------------------------------------
 // Start of implementation (NmContactHistoryModelPrivate)
 // --------------------------------------------------------------------------
 NmContactHistoryModelPrivate::HistoryModelType enum.
 */
 NmContactHistoryModelPrivate::NmContactHistoryModelPrivate(
 const NmContactHistoryModelType modelType) :
 mType(modelType),
-mContactManager(0),
+mContactManager(NULL),
 mModelReady(false)
 {
+NM_FUNCTION;
 mContactManager = new QContactManager("symbian");
 mNameOrder = EmailMRU::nameOrder();
 }
 /*!
 Destructor of ContactHistoryModel
 */
 NmContactHistoryModelPrivate::~NmContactHistoryModelPrivate()
 {
+NM_FUNCTION;
 delete mContactManager;
 mPrivateItemList.clear();
 mModelItemList.clear();
 }
 Note:: QContactManager supports max. ten characters long queries.
 */
 void NmContactHistoryModelPrivate::queryDatabases(const QString& query)
 {
+NM_FUNCTION;
 mModelReady = false;
 // Clear contacts in the list
 mPrivateItemList.clear();
 mModelItemList.clear();
 mMruList.clear();
 mMruMatches.clear();
+mNameOrder = EmailMRU::nameOrder();
 // Modify search to suit our needs
 // Space must be removed, because it is understood as logigal AND
 // with QContactManager API
 QString modifiedQuery = query;
 int spcPosition = query.indexOf(" ");
 if ( spcPosition != -1 )
 {
 modifiedQuery = query.left(spcPosition);
 }
+// Get matching MRU items
 queryMruDatabase(modifiedQuery);
+// Populate mPrivateItemList with matching MRU items.
 populateListWithMruItems(modifiedQuery);
-if (mContactManager)
+// Get matching IDs from Contacts DB
-{
+QList<QContactLocalId> cnt_ids = queryContactDatabase(modifiedQuery);
-// Get matching IDs from Contacts DB
-QList<QContactLocalId> cnt_ids = queryContactDatabase(modifiedQuery);
+// Populate mPrivateItemList with contact items.
+populateListWithContactItems(cnt_ids, modifiedQuery);
-// Populate mPrivateItemList with contact items.
-populateListWithContactItems(cnt_ids, modifiedQuery);
-}
+#ifdef _DEBUG
-// Currently we will always emit 0 as completion code.
+for (int i = 0; i < mPrivateItemList.size(); i++)
+{
-//TODO: Will be removed, Debug Code.
+QSharedPointer<NmContactHistoryModelItemData> itemData = mPrivateItemList[i];
-for (int i = 0; i < mPrivateItemList.size(); i++)
-{
+QString dbgString = itemData->mItems[0].mItemText;
-QSharedPointer<NmContactHistoryModelItemData> itemData = mPrivateItemList[i];
+dbgString.append(" ");
+dbgString.append(itemData->mItems[1].mItemText);
-QString dbgString = itemData->mItems[0].mItemText;
-dbgString.append(" ");
+qDebug(dbgString.toLatin1());
-dbgString.append(itemData->mItems[1].mItemText);
+}
-qDebug(dbgString.toLatin1());
+#endif
-}
 emit queryCompleted(0);
 }
 /*!
 \sa queryDatabases( )
 */
 QList<QContactLocalId> NmContactHistoryModelPrivate::queryContactDatabase(
 const QString &query)
 {
+NM_FUNCTION;
 // Define filter
 QContactDetailFilter df;
 df.setDetailDefinitionName(QContactEmailAddress::DefinitionName,
 QContactEmailAddress::FieldEmailAddress );
 \sa queryDatabases( )
 */
 bool NmContactHistoryModelPrivate::queryMruDatabase(
 const QString &query)
 {
+NM_FUNCTION;
+bool rVal = false;
 if (mType == EmailAddressModel)
 {
 bool mruListFilled = fillMruMatchList();
 if (!mruListFilled)
 {
-return false;
+return rVal;
 }
 QHashIterator<QString, QString> i(mMruList);
 while (i.hasNext())
 }
 else if (name.contains(query, Qt::CaseInsensitive))
 {
 mMruMatches.insert(name, address);
 }
 }
-}
+rVal = true;
+}
-return true;
+return rVal;
 }
 /*!
 Internal helper function for queryDatabases()
 Not meant to be used alone.
 */
 void NmContactHistoryModelPrivate::populateListWithContactItems(
 const QList<QContactLocalId> cnt_ids,
 const QString &modifiedQuery)
 {
+NM_FUNCTION;
 int cntCount = cnt_ids.count();
 // Populate mPrivateItemList with contact items.
 for ( int cntIndex = 0; cntIndex < cntCount; cntIndex++)
 {
 QContactLocalId cid = cnt_ids.at( cntIndex );
 \sa queryDatabases( )
 */
 void NmContactHistoryModelPrivate::populateListWithMruItems(
 const QString &query)
 {
-QMapIterator<QString, QString> i(mMruMatches);
+NM_FUNCTION;
-while (i.hasNext())
+QMapIterator<QString, QString> mruMatch(mMruMatches);
-{
-i.next();
+while (mruMatch.hasNext())
+{
+mruMatch.next();
 // For Display name (ex. John Doe)
 NmContactHistoryModelSubItem itemSubItem1;
 // For Email address (ex. john.doe@company.com)
 NmContactHistoryModelSubItem itemSubItem2;
-itemSubItem1.mItemText = i.key();
+QString name = mruMatch.key();
-itemSubItem2.mItemText = i.value();
+QString address = mruMatch.value();
+itemSubItem1.mItemText = name;
+itemSubItem2.mItemText = address;
 // markup for first item.
-if( i.key().indexOf(query, 0, Qt::CaseInsensitive) == 0)
+if( name.indexOf(query, 0, Qt::CaseInsensitive) == 0)
 {
 itemSubItem1.mMatchingRanges.append(0);
 itemSubItem1.mMatchingRanges.append(query.length()-1);
 }
 QRegExp rx("[,\\s]", Qt::CaseInsensitive);
-bool separatorExists = i.key().contains(rx);
+bool separatorExists = name.contains(rx);
 if (separatorExists)
 {
-int indexLN = i.key().indexOf(",", 0, Qt::CaseInsensitive);
+int indexLN = name.indexOf(",", 0, Qt::CaseInsensitive);
 if (indexLN == -1)
 {
-indexLN = i.key().indexOf(" ", 0, Qt::CaseInsensitive);
+indexLN = name.indexOf(" ", 0, Qt::CaseInsensitive);
 }
 if (indexLN > 0)
 {
-int matchPos = i.key().indexOf(query, indexLN, Qt::CaseInsensitive);
+int matchPos = name.indexOf(query, indexLN, Qt::CaseInsensitive);
 if (matchPos > 0)
 {
 itemSubItem1.mMatchingRanges.append(matchPos);
 itemSubItem1.mMatchingRanges.append((matchPos+query.length())-1);
 }
 }
 }
 // markup for second item.
-if (itemSubItem2.mItemText.indexOf(query, 0, Qt::CaseInsensitive) == 0 )
+if (address.indexOf(query, 0, Qt::CaseInsensitive) == 0 )
 {
 itemSubItem2.mMatchingRanges.append(0);
 itemSubItem2.mMatchingRanges.append(query.length()-1);
 }
 \sa queryDatabases( )
 */
 void NmContactHistoryModelPrivate::refreshDataModel()
 {
+NM_FUNCTION;
 mModelItemList.clear();
 for (int cntIndex = 0;
 cntIndex < mPrivateItemList.count();
 cntIndex++)
 mModelReady = true;
 }
 /*!
-This is called by public class NmContactHistoryModel when rowcount() is requested
+This is called by public class NmContactHistoryModel when model row count is requested
 Not meant to be used alone.
 */
-int NmContactHistoryModelPrivate::rowCount(const QModelIndex &parent) const
+int NmContactHistoryModelPrivate::modelRowCount(const QModelIndex &parent) const
 {
+NM_FUNCTION;
 Q_UNUSED(parent);
 return mModelItemList.count();
 }
 /*!
+This is called by public class NmContactHistoryModel when private data count is required
+ie. When model isn't populated yet but data query is complete.
+Not meant to be used alone.
+*/
+int NmContactHistoryModelPrivate::privateDataCount() const
+{
+NM_FUNCTION;
+return mPrivateItemList.count();
+}
+/*!
 This is called by public class NmContactHistoryModel when data() is requested
 Not meant to be used alone.
 */
 QVariant NmContactHistoryModelPrivate::data(const QModelIndex &index, int role) const
 {
+NM_FUNCTION;
 if ( mModelReady )
 {
 if (!index.isValid() ||
 index.row() >= mModelItemList.count() ||
 index.row() < 0)
 {
 return QVariant();
 }
+else if (role == Qt::DisplayRole)
-if (role == Qt::DisplayRole)
 {
 QVariant v;
 NmContactHistoryModelItem i = mModelItemList.at(index.row());
 v.setValue(i);
 return v;
 \sa queryMruDatabase( )
 */
 bool NmContactHistoryModelPrivate::fillMruMatchList()
 {
-//TODO: Possible optimization, remove extra calls EmailMRU(), We need to get list only once.
+NM_FUNCTION;
 EmailMRU *mru = new EmailMRU();
+bool rVal = false;
 if (mru)
 {
 int addressCount = mru->entryCount();
 mMruList.insertMulti(key, value);
 }
 }
 delete mru;
-return true;
+rVal = true;
 }
 else
 {
-return false;
+rVal = false;
 }
+return rVal;
 }
 /*!
 This is called from populateListWithContactItems() when correct order of
 first name, last name setting is required
 \sa populateListWithContactItems( )
 \return concennated string formatted as contact setting specifies.
 */
 QString NmContactHistoryModelPrivate::obeyContactOrder(const QString &firstName,
-const QString &lastName)
+const QString &lastName) const
 {
+NM_FUNCTION;
 QString result;
 switch (mNameOrder)
 {
 case LastNameFirstName:

changeset 74	6c59112cfd31
parent 68	83cc6bae1de8
child 76	38bf5461e270