diff options
| author | Kate Alhola <kate.alhola@nokia.com> | 2010-03-25 22:18:34 +0200 |
|---|---|---|
| committer | Don Sanders <don.sanders@nokia.com> | 2010-03-29 21:44:36 +1000 |
| commit | a368ab3b4291d6371f6d294c7680cfc7c0243097 (patch) | |
| tree | d9abced05a4644e8a15908f003c0094a8d8edc21 /src/messaging/qmessagestore_maemo.cpp | |
| parent | e0a26f3e458b94a13c5ad86f0e31e821d71bc40d (diff) | |
queryMessages API added
Fixes: MOBILITY-692
queryMessages not working for SMS messages on Fremantle platform
Diffstat (limited to 'src/messaging/qmessagestore_maemo.cpp')
| -rw-r--r-- | src/messaging/qmessagestore_maemo.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/messaging/qmessagestore_maemo.cpp b/src/messaging/qmessagestore_maemo.cpp index 0fa18abb16..82daa3d1f4 100644 --- a/src/messaging/qmessagestore_maemo.cpp +++ b/src/messaging/qmessagestore_maemo.cpp @@ -101,9 +101,7 @@ QMessageStore::QMessageStore(QObject *parent) { Q_ASSERT(d_ptr != 0); Q_ASSERT(d_ptr->q_ptr == 0); // QMessageStore should be singleton - qDebug() << "QMessageStore::QMessageStore"; // d_ptr->initialize(this); - qDebug() << "QMessageStore::QMessageStore exit"; } QMessageStore::~QMessageStore() @@ -133,6 +131,7 @@ QMessageIdList QMessageStore::queryMessages(const QMessageFilter &filter, const bool isSorted = false; messageIds = ModestEngine::instance()->queryMessagesSync(filter, sortOrder, limit, offset, isFiltered, isSorted); + messageIds += d_ptr->p_ptr->el->filterAndOrderMessages(filter,sortOrder,QString(),QMessageDataComparator::MatchFlags()); if (!isFiltered) { MessagingHelper::filterMessages(messageIds, filter); } @@ -146,12 +145,14 @@ QMessageIdList QMessageStore::queryMessages(const QMessageFilter &filter, const QMessageIdList QMessageStore::queryMessages(const QMessageFilter &filter, const QString &body, QMessageDataComparator::MatchFlags matchFlags, const QMessageSortOrder &sortOrder, uint limit, uint offset) const { + QMessageIdList messageIds; bool isFiltered = false; bool isSorted = false; messageIds = ModestEngine::instance()->queryMessagesSync(filter, body, matchFlags, sortOrder, limit, offset, isFiltered, isSorted); + messageIds +=d_ptr->p_ptr->el->filterAndOrderMessages(filter,sortOrder,body,matchFlags); if (!isFiltered) { MessagingHelper::filterMessages(messageIds, filter); } @@ -349,7 +350,7 @@ QMessage QMessageStore::message(const QMessageId& id) const if (id.toString().startsWith("MO_")) { return ModestEngine::instance()->message(id); } else { - return d_ptr->p_ptr->el->getMessage(id); + return d_ptr->p_ptr->el->message(id); } } |