diff options
| author | Marko Minkkinen <marko.minkkinen@digia.com> | 2010-02-24 19:21:55 +0200 |
|---|---|---|
| committer | Marko Minkkinen <marko.minkkinen@digia.com> | 2010-02-24 19:21:55 +0200 |
| commit | a9010cc80ed38b73acf4ba76452da82ea55d091a (patch) | |
| tree | efc8d9bf0844c4ff1144e355dfee2155f119f36d /src/messaging/maemohelpers.cpp | |
| parent | 61124664098e6497071d95816d5f13e4a9e11d3e (diff) | |
Account handling fixes and Folder handling support
Diffstat (limited to 'src/messaging/maemohelpers.cpp')
| -rw-r--r-- | src/messaging/maemohelpers.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/messaging/maemohelpers.cpp b/src/messaging/maemohelpers.cpp index ad369ec98e..b24799e6d5 100644 --- a/src/messaging/maemohelpers.cpp +++ b/src/messaging/maemohelpers.cpp @@ -103,8 +103,10 @@ bool MessagingHelper::accountLessThan(const QMessageAccountId accountId1, const void MessagingHelper::orderAccounts(QMessageAccountIdList& accountIds, const QMessageAccountSortOrder &sortOrder) { - messagingHelper()->m_AccountSortOrder = (QMessageAccountSortOrder*)&sortOrder; - qSort(accountIds.begin(), accountIds.end(), MessagingHelper::accountLessThan); + if (!sortOrder.isEmpty()) { + messagingHelper()->m_AccountSortOrder = (QMessageAccountSortOrder*)&sortOrder; + qSort(accountIds.begin(), accountIds.end(), MessagingHelper::accountLessThan); + } } void MessagingHelper::applyOffsetAndLimitToAccountIdList(QMessageAccountIdList& accountIds, int limit, int offset) @@ -163,8 +165,10 @@ bool MessagingHelper::folderLessThan(const QMessageFolderId folderId1, const QMe void MessagingHelper::orderFolders(QMessageFolderIdList& folderIds, const QMessageFolderSortOrder &sortOrder) { - messagingHelper()->m_FolderSortOrder = (QMessageFolderSortOrder*)&sortOrder; - qSort(folderIds.begin(), folderIds.end(), MessagingHelper::folderLessThan); + if (!sortOrder.isEmpty()) { + messagingHelper()->m_FolderSortOrder = (QMessageFolderSortOrder*)&sortOrder; + qSort(folderIds.begin(), folderIds.end(), MessagingHelper::folderLessThan); + } } void MessagingHelper::applyOffsetAndLimitToFolderIdList(QMessageFolderIdList& folderIds, int limit, int offset) @@ -223,8 +227,10 @@ bool MessagingHelper::messageLessThan(const QMessageId messageId1, const QMessag void MessagingHelper::orderMessages(QMessageIdList& messageIds, const QMessageSortOrder &sortOrder) { - messagingHelper()->m_MessageSortOrder = (QMessageSortOrder*)&sortOrder; - qSort(messageIds.begin(), messageIds.end(), MessagingHelper::messageLessThan); + if (!sortOrder.isEmpty()) { + messagingHelper()->m_MessageSortOrder = (QMessageSortOrder*)&sortOrder; + qSort(messageIds.begin(), messageIds.end(), MessagingHelper::messageLessThan); + } } void MessagingHelper::applyOffsetAndLimitToMessageIdList(QMessageIdList& messageIds, int limit, int offset) |