Wrap QMessageStore with QMessageManager.

In order to provide a consistent interface with other components
of QtMobility that provide a central data manager interface, the
existing QMessageStore interface is now private, and replaced in
the public interface by the QMessageManager class.

The new class provides exactly the same interface as the old class
excpet that it is instantiated as a handle rather than accessed as
a singleton.  Internally the handle object can be instantiated as
needed, but in documentation or examples the class should be treated
as if it were potentially expensive to create and destroy; this will
give a consistent form of use for all Q{x}Manager classes between
the various QtMobility projects.

The old QMessageStore class is still used internally by the
QMessageManager, so the latter class need not be reimplemented for
multiple platforms.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/messaging/qmessagestore_maemo.cpp b/src/messaging/qmessagestore_maemo.cpp
index a7c9278a93..ca48d0fb7c 100644
--- a/src/messaging/qmessagestore_maemo.cpp
+++ b/src/messaging/qmessagestore_maemo.cpp
@@ -91,7 +91,7 @@ QMessageStore* QMessageStore::instance()
     return d->q_ptr;
 }
 
-QMessageStore::ErrorCode QMessageStore::lastError() const
+QMessageManager::ErrorCode QMessageManager::lastError() const
 {
     return NotYetImplemented;
 }
@@ -159,7 +159,7 @@ bool QMessageStore::removeMessage(const QMessageId& id, RemovalOption option)
     return false; // stub
 }
 
-bool QMessageStore::removeMessages(const QMessageFilter& filter, QMessageStore::RemovalOption option)
+bool QMessageStore::removeMessages(const QMessageFilter& filter, QMessageManager::RemovalOption option)
 {
     Q_UNUSED(filter)
     Q_UNUSED(option)
@@ -196,13 +196,13 @@ QMessageAccount QMessageStore::account(const QMessageAccountId& id) const
     return QMessageAccount(); // stub
 }
 
-QMessageStore::NotificationFilterId QMessageStore::registerNotificationFilter(const QMessageFilter &filter)
+QMessageManager::NotificationFilterId QMessageStore::registerNotificationFilter(const QMessageFilter &filter)
 {
     Q_UNUSED(filter)
     return 0; // stub
 }
 
-void QMessageStore::unregisterNotificationFilter(NotificationFilterId notificationFilterId)
+void QMessageStore::unregisterNotificationFilter(QMessageManager::NotificationFilterId notificationFilterId)
 {
     Q_UNUSED(notificationFilterId)
 }