diff options
| author | Don Sanders <don.sanders@nokia.com> | 2009-11-13 20:00:02 +1000 |
|---|---|---|
| committer | Don Sanders <don.sanders@nokia.com> | 2009-11-13 20:00:02 +1000 |
| commit | c403de828fa6279e1edc3d266efb1ee999b46401 (patch) | |
| tree | 91488f4deed11b7fa9b3843fb1ae586875969b93 /src/messaging/qmessagestore_maemo.cpp | |
| parent | a759cc365ec2957eb24c9b908b92a65f420de306 (diff) | |
| parent | 5957db9e6dc13f650ff13c773015e54acfd581fc (diff) | |
Merge git@scm.dev.nokia.troll.no:qtmobility/qtm-messaging
Conflicts:
src/messaging/qmessagestore_symbian_p.h
Diffstat (limited to 'src/messaging/qmessagestore_maemo.cpp')
| -rw-r--r-- | src/messaging/qmessagestore_maemo.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/messaging/qmessagestore_maemo.cpp b/src/messaging/qmessagestore_maemo.cpp index 487b75d5f4..6bda1c772d 100644 --- a/src/messaging/qmessagestore_maemo.cpp +++ b/src/messaging/qmessagestore_maemo.cpp @@ -113,7 +113,6 @@ QMessageIdList QMessageStore::queryMessages(const QMessageFilter &filter, const return QMessageIdList(); // stub } -#ifdef QMESSAGING_OPTIONAL_FOLDER QMessageFolderIdList QMessageStore::queryFolders(const QMessageFolderFilter &filter, const QMessageFolderOrdering &ordering, uint limit, uint offset) const { Q_UNUSED(filter) @@ -122,7 +121,6 @@ QMessageFolderIdList QMessageStore::queryFolders(const QMessageFolderFilter &fil Q_UNUSED(offset) return QMessageFolderIdList(); // stub } -#endif QMessageAccountIdList QMessageStore::queryAccounts(const QMessageAccountFilter &filter, const QMessageAccountOrdering &ordering, uint limit, uint offset) const { @@ -139,13 +137,11 @@ int QMessageStore::countMessages(const QMessageFilter& filter) const return 0; // stub } -#ifdef QMESSAGING_OPTIONAL_FOLDER int QMessageStore::countFolders(const QMessageFolderFilter& filter) const { Q_UNUSED(filter) return 0; // stub } -#endif int QMessageStore::countAccounts(const QMessageAccountFilter& filter) const { @@ -185,13 +181,11 @@ QMessage QMessageStore::message(const QMessageId& id) const return QMessage(); // stub } -#ifdef QMESSAGING_OPTIONAL_FOLDER QMessageFolder QMessageStore::folder(const QMessageFolderId& id) const { Q_UNUSED(id) return QMessageFolder(); // stub } -#endif QMessageAccount QMessageStore::account(const QMessageAccountId& id) const { |