diff options
| author | Kate Alhola <kate.alhola@nokia.com> | 2010-03-30 23:13:12 +0300 |
|---|---|---|
| committer | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2010-03-31 11:49:17 +1000 |
| commit | bb61e7fdc45c60defa1968ffed4500e6b64d9bff (patch) | |
| tree | 023df83d145321be2b61cebea90338b6ab2ba864 /src/messaging/qmessagestore_maemo.cpp | |
| parent | 2e2c1fa18b1e198a4960bf6191c57772f2a784bb (diff) | |
pr1.2 fix, async queryMessages
Diffstat (limited to 'src/messaging/qmessagestore_maemo.cpp')
| -rw-r--r-- | src/messaging/qmessagestore_maemo.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/messaging/qmessagestore_maemo.cpp b/src/messaging/qmessagestore_maemo.cpp index 2c40928d10..57ad1fb82d 100644 --- a/src/messaging/qmessagestore_maemo.cpp +++ b/src/messaging/qmessagestore_maemo.cpp @@ -73,7 +73,7 @@ void QMessageStorePrivate::initialize(QMessageStore *store) { q_ptr = store; p_ptr = new QMessageStorePrivatePlatform(this, store); - p_ptr->el=new EventLoggerEngine(); + p_ptr->el= EventLoggerEngine::instance(); } void QMessageStorePrivate::messageNotification(QMessageStorePrivate::NotificationType type, const QMessageId& id, @@ -102,6 +102,9 @@ QMessageStore::QMessageStore(QObject *parent) Q_ASSERT(d_ptr != 0); Q_ASSERT(d_ptr->q_ptr == 0); // QMessageStore should be singleton // d_ptr->initialize(this); + // be sure that singletons are initialized + EventLoggerEngine::instance(); + TelepathyEngine::instance(); } QMessageStore::~QMessageStore() @@ -129,9 +132,13 @@ QMessageIdList QMessageStore::queryMessages(const QMessageFilter &filter, const bool isFiltered = false; 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()); + + // messageIds += d_ptr->p_ptr->el->filterAndOrderMessages(filter,sortOrder,QString(),QMessageDataComparator::MatchFlags()); + messageIds += EventLoggerEngine::instance()->filterAndOrderMessages(filter,sortOrder,QString(),QMessageDataComparator::MatchFlags()); + if (!isFiltered) { MessagingHelper::filterMessages(messageIds, filter); } @@ -151,7 +158,9 @@ QMessageIdList QMessageStore::queryMessages(const QMessageFilter &filter, const 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); + // messageIds +=d_ptr->p_ptr->el->filterAndOrderMessages(filter,sortOrder,body,matchFlags); + messageIds +=EventLoggerEngine::instance()->filterAndOrderMessages(filter,sortOrder,body,matchFlags); + if (!isFiltered) { MessagingHelper::filterMessages(messageIds, filter); } |