Revert initial retrieveMessageLists interface and implementation.2011W26_3

13 files changed, 1 insertions, 188 deletions

diff --git a/src/libraries/qmfclient/qmailaction.h b/src/libraries/qmfclient/qmailaction.h
index 571807cd..3c6ffad1 100644
--- a/src/libraries/qmfclient/qmailaction.h
+++ b/src/libraries/qmfclient/qmailaction.h
@@ -51,7 +51,6 @@ enum QMailServerRequestType
     TransmitMessagesRequestType,
     RetrieveFolderListRequestType,
     RetrieveMessageListRequestType,
-    RetrieveMessageListsRequestType,
     RetrieveMessagesRequestType,
     RetrieveMessagePartRequestType,
     RetrieveMessageRangeRequestType,
diff --git a/src/libraries/qmfclient/qmailmessageserver.cpp b/src/libraries/qmfclient/qmailmessageserver.cpp
index 4dce4e91..4132a928 100644
--- a/src/libraries/qmfclient/qmailmessageserver.cpp
+++ b/src/libraries/qmfclient/qmailmessageserver.cpp
@@ -68,8 +68,6 @@ signals:
     void retrieveFolderList(quint64, const QMailAccountId &accountId, const QMailFolderId &folderId, bool descending);
     void retrieveMessageList(quint64, const QMailAccountId &accountId, const QMailFolderId &folderId, uint minimum, const QMailMessageSortKey &sort);
 
-    void retrieveMessageLists(quint64, const QMailAccountId &accountId, const QMailFolderMinimumPairList & folderMinimums, const QMailMessageSortKey &sort);
-
     void retrieveMessages(quint64, const QMailMessageIdList &messageIds, QMailRetrievalAction::RetrievalSpecification spec);
     void retrieveMessagePart(quint64, const QMailMessagePart::Location &partLocation);
 
@@ -132,8 +130,6 @@ QMailMessageServerPrivate::QMailMessageServerPrivate(QMailMessageServer* parent)
                adaptor, MESSAGE(retrieveFolderList(quint64, QMailAccountId, QMailFolderId, bool)));
     connectIpc(this, SIGNAL(retrieveMessageList(quint64, QMailAccountId, QMailFolderId, uint, QMailMessageSortKey)),
                adaptor, MESSAGE(retrieveMessageList(quint64, QMailAccountId, QMailFolderId, uint, QMailMessageSortKey)));
-    connectIpc(this, SIGNAL(retrieveMessageLists(quint64, const QMailAccountId &, const QMailFolderMinimumPairList &, const QMailMessageSortKey &)),
-               adaptor, MESSAGE(retrieveMessageLists(quint64, const QMailAccountId &, const QMailFolderMinimumPairList &, const QMailMessageSortKey &)));
     connectIpc(this, SIGNAL(retrieveMessages(quint64, QMailMessageIdList, QMailRetrievalAction::RetrievalSpecification)),
                adaptor, MESSAGE(retrieveMessages(quint64, QMailMessageIdList, QMailRetrievalAction::RetrievalSpecification)));
     connectIpc(this, SIGNAL(retrieveMessagePart(quint64, QMailMessagePart::Location)),
@@ -547,12 +543,6 @@ void QMailMessageServer::retrieveMessageList(quint64 action, const QMailAccountI
     emit d->retrieveMessageList(action, accountId, folderId, minimum, sort);
 }
 
-void QMailMessageServer::retrieveMessageLists(quint64 action, const QMailAccountId &accountId, const QMailFolderMinimumPairList & folderMinimums, const QMailMessageSortKey &sort)
-{
-    emit d->retrieveMessageLists(action, accountId, folderMinimums, sort);
-}
-
-
 /*!
     Requests that the message server retrieve data regarding the messages identified by \a messageIds.  
 
@@ -861,8 +851,6 @@ void QMailMessageServer::listActions()
     emit d->listActions();
 }
 
-Q_IMPLEMENT_USER_METATYPE_TYPEDEF(QMailFolderMinimumPairList, QMailFolderMinimumPairList)
-
 /*!
     Requests that the MessageServer forward the protocol-specific request \a request
     to the QMailMessageSource configured for the account identified by \a accountId.
@@ -875,6 +863,5 @@ void QMailMessageServer::protocolRequest(quint64 action, const QMailAccountId &a
 
 Q_IMPLEMENT_USER_METATYPE_TYPEDEF(QMailMessageCountMap, QMailMessageCountMap)
 
-
 #include "qmailmessageserver.moc"
 
diff --git a/src/libraries/qmfclient/qmailmessageserver.h b/src/libraries/qmfclient/qmailmessageserver.h
index b91feea3..a36c0eee 100644
--- a/src/libraries/qmfclient/qmailmessageserver.h
+++ b/src/libraries/qmfclient/qmailmessageserver.h
@@ -53,15 +53,12 @@
 #include <QSharedDataPointer>
 #include <QString>
 #include <QStringList>
-#include <QPair>
 #include "qmailipc.h"
 
 class QMailMessageServerPrivate;
 
 typedef QMap<QMailMessage::MessageType, int> QMailMessageCountMap;
 
-typedef QList< QPair<QMailFolderId, uint> > QMailFolderMinimumPairList; // We need to use a type without a comma in it, to please the marashalling macros..
-
 class QMF_EXPORT QMailMessageServer : public QObject
 {
     Q_OBJECT
@@ -121,7 +118,6 @@ public slots:
 
     void retrieveFolderList(quint64, const QMailAccountId &accountId, const QMailFolderId &folderId, bool descending);
     void retrieveMessageList(quint64, const QMailAccountId &accountId, const QMailFolderId &folderId, uint minimum, const QMailMessageSortKey &sort);
-    void retrieveMessageLists(quint64 action, const QMailAccountId &accountId, const QMailFolderMinimumPairList & folderMinimums, const QMailMessageSortKey &sort);
 
     void retrieveMessages(quint64, const QMailMessageIdList &messageIds, QMailRetrievalAction::RetrievalSpecification spec);
     void retrieveMessagePart(quint64, const QMailMessagePart::Location &partLocation);
@@ -166,7 +162,4 @@ private:
 Q_DECLARE_METATYPE(QMailMessageCountMap)
 Q_DECLARE_USER_METATYPE_TYPEDEF(QMailMessageCountMap, QMailMessageCountMap)
 
-Q_DECLARE_METATYPE(QMailFolderMinimumPairList)
-Q_DECLARE_USER_METATYPE_TYPEDEF(QMailFolderMinimumPairList, QMailFolderMinimumPairList)
-
 #endif
diff --git a/src/libraries/qmfclient/qmailserviceaction.cpp b/src/libraries/qmfclient/qmailserviceaction.cpp
index 0436d9a0..a449eac1 100644
--- a/src/libraries/qmfclient/qmailserviceaction.cpp
+++ b/src/libraries/qmfclient/qmailserviceaction.cpp
@@ -749,12 +749,6 @@ void QMailRetrievalActionPrivate::retrieveMessageList(const QMailAccountId &acco
     retrieveMessageListHelper(accountId, folderId, minimum, sort);
 }
 
-void QMailRetrievalActionPrivate::retrieveMessageLists(const QMailAccountId &accountId, const QList< QPair<QMailFolderId, uint> > & folderMinimums, const QMailMessageSortKey &sort)
-{
-    Q_ASSERT(_pendingActions.empty());
-    _server->retrieveMessageLists(newAction(), accountId, folderMinimums, sort);
-}
-
 void QMailRetrievalActionPrivate::retrieveMessages(const QMailMessageIdList &messageIds, QMailRetrievalAction::RetrievalSpecification spec)
 {
     _server->retrieveMessages(newAction(), messageIds, spec);
@@ -943,10 +937,6 @@ void QMailRetrievalAction::retrieveMessageList(const QMailAccountId &accountId,
 {
     impl(this)->retrieveMessageList(accountId, folderId, minimum, sort);
 }
-void QMailRetrievalAction::retrieveMessageLists(const QMailAccountId &accountId, const QList< QPair<QMailFolderId, uint> > & folderMinimums, const QMailMessageSortKey &sort)
-{
-    impl(this)->retrieveMessageLists(accountId, folderMinimums, sort);
-}
 
 /*!
     Requests that the message server retrieve data regarding the messages identified by \a messageIds.  
diff --git a/src/libraries/qmfclient/qmailserviceaction.h b/src/libraries/qmfclient/qmailserviceaction.h
index 070fc045..6231ec9b 100644
--- a/src/libraries/qmfclient/qmailserviceaction.h
+++ b/src/libraries/qmfclient/qmailserviceaction.h
@@ -179,7 +179,6 @@ public:
 public slots:
     void retrieveFolderList(const QMailAccountId &accountId, const QMailFolderId &folderId, bool descending = true);
     void retrieveMessageList(const QMailAccountId &accountId, const QMailFolderId &folderId, uint minimum = 0, const QMailMessageSortKey &sort = QMailMessageSortKey());
-    void retrieveMessageLists(const QMailAccountId &accountId, const QList< QPair<QMailFolderId, uint> > & folderMinimums, const QMailMessageSortKey &sort = QMailMessageSortKey());
 
     void retrieveMessages(const QMailMessageIdList &messageIds, RetrievalSpecification spec = MetaData);
     void retrieveMessagePart(const QMailMessagePart::Location &partLocation);
diff --git a/src/libraries/qmfclient/qmailserviceaction_p.h b/src/libraries/qmfclient/qmailserviceaction_p.h
index 891b93f3..6359a19f 100644
--- a/src/libraries/qmfclient/qmailserviceaction_p.h
+++ b/src/libraries/qmfclient/qmailserviceaction_p.h
@@ -152,7 +152,6 @@ public:
     void retrieveFolderList(const QMailAccountId &accountId, const QMailFolderId &folderId, bool descending);
     void retrieveMessageListHelper(const QMailAccountId &accountId, const QMailFolderId &folderId, uint minimum, const QMailMessageSortKey &sort);
     void retrieveMessageList(const QMailAccountId &accountId, const QMailFolderId &folderId, uint minimum, const QMailMessageSortKey &sort);
-    void retrieveMessageLists(const QMailAccountId &accountId, const QList< QPair<QMailFolderId, uint> > & folderMinimums, const QMailMessageSortKey &sort);
 
     void retrieveMessages(const QMailMessageIdList &messageIds, QMailRetrievalAction::RetrievalSpecification spec);
     void retrieveMessagePart(const QMailMessagePart::Location &partLocation);
diff --git a/src/libraries/qmfmessageserver/qmailmessageservice.cpp b/src/libraries/qmfmessageserver/qmailmessageservice.cpp
index d7c6d61a..fa8ffb34 100644
--- a/src/libraries/qmfmessageserver/qmailmessageservice.cpp
+++ b/src/libraries/qmfmessageserver/qmailmessageservice.cpp
@@ -495,16 +495,6 @@ bool QMailMessageSource::retrieveMessageList(const QMailAccountId &accountId, co
     return false;
 }
 
-bool QMailMessageSource::retrieveMessageLists(const QMailAccountId &accountId, const QList< QPair<QMailFolderId, uint> > &folderMinimums, const QMailMessageSortKey &sort)
-{
-    Q_UNUSED(accountId)
-    Q_UNUSED(folderMinimums)
-    Q_UNUSED(sort)
-
-    notImplemented();
-    return false;
-}
-
 /*!
     Invoked by the message server to initiate a message retrieval operation.
 
@@ -1495,17 +1485,6 @@ bool QMailMessageSource::retrieveMessageList(const QMailAccountId &accountId, co
     return false;
 }
 
-bool QMailMessageSource::retrieveMessageLists(const QMailAccountId &accountId, const QList< QPair<QMailFolderId, uint> > & folderMinimums, const QMailMessageSortKey &sort, quint64 action)
-{
-    Q_UNUSED(accountId)
-    Q_UNUSED(folderMinimums)
-    Q_UNUSED(sort)
-    Q_UNUSED(action)
-
-    notImplemented(action);
-    return false;
-}
-
 bool QMailMessageSource::retrieveMessages(const QMailMessageIdList &messageIds, QMailRetrievalAction::RetrievalSpecification spec, quint64 action)
 {
     Q_UNUSED(messageIds)
diff --git a/src/libraries/qmfmessageserver/qmailmessageservice.h b/src/libraries/qmfmessageserver/qmailmessageservice.h
index 8251e372..09e137f4 100644
--- a/src/libraries/qmfmessageserver/qmailmessageservice.h
+++ b/src/libraries/qmfmessageserver/qmailmessageservice.h
@@ -130,9 +130,6 @@ public slots:
     virtual bool retrieveMessageList(const QMailAccountId &accountId, const QMailFolderId &folderId, uint minimum, const QMailMessageSortKey &sort);
     virtual bool retrieveMessageList(const QMailAccountId &accountId, const QMailFolderId &folderId, uint minimum, const QMailMessageSortKey &sort, quint64 action);
 
-    virtual bool retrieveMessageLists(const QMailAccountId &accountId, const QList< QPair<QMailFolderId, uint> > &folderMinimums, const QMailMessageSortKey &sort);
-    virtual bool retrieveMessageLists(const QMailAccountId &accountId, const QList< QPair<QMailFolderId, uint> > &folderMinimums, const QMailMessageSortKey &sort, quint64 action);
-
     virtual bool retrieveMessages(const QMailMessageIdList &messageIds, QMailRetrievalAction::RetrievalSpecification spec);
     virtual bool retrieveMessages(const QMailMessageIdList &messageIds, QMailRetrievalAction::RetrievalSpecification spec, quint64 action);
     virtual bool retrieveMessagePart(const QMailMessagePart::Location &partLocation);
@@ -179,8 +176,6 @@ public slots:
     virtual bool protocolRequest(const QMailAccountId &accountId, const QString &request, const QVariant &data);
     virtual bool protocolRequest(const QMailAccountId &accountId, const QString &request, const QVariant &data, quint64 action);
 
-    virtual bool supportsRetrieveMessageLists() { return false; }
-
 signals:
     void newMessagesAvailable();
     void newMessagesAvailable(quint64 action);
diff --git a/src/tools/messageserver/mailmessageclient.cpp b/src/tools/messageserver/mailmessageclient.cpp
index b9de56c0..ddcbefcd 100644
--- a/src/tools/messageserver/mailmessageclient.cpp
+++ b/src/tools/messageserver/mailmessageclient.cpp
@@ -108,8 +108,6 @@ MailMessageClient::MailMessageClient(QObject* parent)
                this, SIGNAL(retrieveFolderList(quint64, QMailAccountId, QMailFolderId, bool)));
     connectIpc(adaptor, MESSAGE(retrieveMessageList(quint64, QMailAccountId, QMailFolderId, uint, QMailMessageSortKey)),
                this, SIGNAL(retrieveMessageList(quint64, QMailAccountId, QMailFolderId, uint, QMailMessageSortKey)));
-    connectIpc(adaptor, MESSAGE(retrieveMessageLists(quint64, QMailAccountId, QMailFolderMinimumPairList, QMailMessageSortKey)),
-               this, SIGNAL(retrieveMessageLists(quint64, QMailAccountId, QMailFolderMinimumPairList, QMailMessageSortKey)));
     connectIpc(adaptor, MESSAGE(retrieveMessages(quint64, QMailMessageIdList, QMailRetrievalAction::RetrievalSpecification)),
                this, SIGNAL(retrieveMessages(quint64, QMailMessageIdList, QMailRetrievalAction::RetrievalSpecification)));
     connectIpc(adaptor, MESSAGE(retrieveMessagePart(quint64, QMailMessagePart::Location)),
diff --git a/src/tools/messageserver/mailmessageclient.h b/src/tools/messageserver/mailmessageclient.h
index b2bba00d..43616425 100644
--- a/src/tools/messageserver/mailmessageclient.h
+++ b/src/tools/messageserver/mailmessageclient.h
@@ -71,7 +71,6 @@ signals:
 
     void retrieveFolderList(quint64, const QMailAccountId &accountId, const QMailFolderId &folderId, bool descending);
     void retrieveMessageList(quint64, const QMailAccountId &accountId, const QMailFolderId &folderId, uint minimum, const QMailMessageSortKey &sort);
-    void retrieveMessageLists(quint64, const QMailAccountId &accountId, const QMailFolderMinimumPairList &folderMinimums, const QMailMessageSortKey &sort);
 
     void retrieveMessages(quint64, const QMailMessageIdList &messageIds, QMailRetrievalAction::RetrievalSpecification spec);
     void retrieveMessagePart(quint64, const QMailMessagePart::Location &partLocation);
diff --git a/src/tools/messageserver/messageserver.cpp b/src/tools/messageserver/messageserver.cpp
index 5000fe83..5796e1be 100644
--- a/src/tools/messageserver/messageserver.cpp
+++ b/src/tools/messageserver/messageserver.cpp
@@ -165,8 +165,6 @@ MessageServer::MessageServer(QObject *parent)
                 handler, SLOT(retrieveFolderList(quint64, QMailAccountId, QMailFolderId, bool)));
         connect(client, SIGNAL(retrieveMessageList(quint64, QMailAccountId, QMailFolderId, uint, QMailMessageSortKey)),
                 handler, SLOT(retrieveMessageList(quint64, QMailAccountId, QMailFolderId, uint, QMailMessageSortKey)));
-        connect(client, SIGNAL(retrieveMessageLists(quint64, QMailAccountId, QMailFolderMinimumPairList, QMailMessageSortKey)),
-                handler, SLOT(retrieveMessageLists(quint64, QMailAccountId, QMailFolderMinimumPairList, QMailMessageSortKey)));
         connect(client, SIGNAL(retrieveMessages(quint64, QMailMessageIdList, QMailRetrievalAction::RetrievalSpecification)),
                 handler, SLOT(retrieveMessages(quint64, QMailMessageIdList, QMailRetrievalAction::RetrievalSpecification)));
         connect(client, SIGNAL(retrieveMessagePart(quint64, QMailMessagePart::Location)),
diff --git a/src/tools/messageserver/servicehandler.cpp b/src/tools/messageserver/servicehandler.cpp
index 4e2ee764..b1d79703 100644
--- a/src/tools/messageserver/servicehandler.cpp
+++ b/src/tools/messageserver/servicehandler.cpp
@@ -978,21 +978,6 @@ quint64 ServiceHandler::serviceAction(QMailMessageService *service) const
     return 0;
 }
 
-void ServiceHandler::subMessageListsCompleted(quint64 action)
-{
-    QMap<quint64, LocalActionCompletionInfo>::iterator it(localActions.find(action));
-
-    if (it != localActions.end())
-    {
-        LocalActionCompletionInfo & ci = it.value();
-
-        emit progressChanged(ci.rootAction, ci.progress, ci.total);
-        localActions.erase(it);
-    } else {
-        qWarning() << "Could not find localAction: " << action;
-    }
-}
-
 void ServiceHandler::enqueueRequest(quint64 action, const QByteArray &data, const QSet<QMailMessageService*> &services, RequestServicer servicer, CompletionSignal completion, QMailServerRequestType description, const QSet<QMailMessageService*> &preconditions)
 {
     QSet<QPointer<QMailMessageService> > safeServices;
@@ -1408,75 +1393,6 @@ bool ServiceHandler::dispatchRetrieveMessageList(quint64 action, const QByteArra
     return true;
 }
 
-void ServiceHandler::retrieveMessageLists(quint64 action, const QMailAccountId &accountId, const QMailFolderMinimumPairList &folderMinimums, const QMailMessageSortKey &sort)
-{
-    QSet<QMailMessageService*> sources(sourceServiceSet(accountId));
-    if (sources.isEmpty()) {
-        reportFailure(action, QMailServiceAction::Status::ErrNoConnection, tr("Unable to retrieve message list for unconfigured account"));
-    } else {
-        if (QMailMessageSource *source = accountSource(accountId)) {
-
-            if (source->supportsRetrieveMessageLists()) {
-                enqueueRequest(action, serialize(accountId, folderMinimums, sort), sources, &ServiceHandler::dispatchRetrieveMessageLists, &ServiceHandler::retrievalCompleted, RetrieveMessageListRequestType);
-            } else {
-                // TODO: remove this after all plugins support retrieveMessageLists
-
-                QList< QPair<QMailFolderId, uint> >::const_iterator it(folderMinimums.begin());
-
-                int i(0);
-                while (it != folderMinimums.end()) {
-                    QPair<QMailFolderId, uint> const& folderMin = *it;
-
-                    bool at_last = ++it == folderMinimums.end();
-
-                    quint64 actionId(at_last ? action : newLocalActionId());
-
-                    CompletionSignal completion(at_last ? &ServiceHandler::retrievalCompleted : &ServiceHandler::subMessageListsCompleted);
-
-                    if (!at_last) {
-                        LocalActionCompletionInfo ci;
-                        ci.rootAction = action;
-                        ci.progress = ++i;
-                        ci.total = folderMinimums.size();
-
-                        localActions.insert(actionId, ci);
-                    }
-                    enqueueRequest(actionId, serialize(accountId, folderMin.first, folderMin.second, sort), sources, &ServiceHandler::dispatchRetrieveMessageList, completion, RetrieveMessageListRequestType);
-                }
-            }
-        } else {
-            reportFailure(action, QMailServiceAction::Status::ErrFrameworkFault, tr("Unable to locate source for account"), accountId);
-        }
-    }
-}
-
-bool ServiceHandler::dispatchRetrieveMessageLists(quint64 action, const QByteArray &data)
-{
-    QMailAccountId accountId;
-    QList< QPair<QMailFolderId, uint> > folderMinimums;
-    QMailMessageSortKey sort;
-
-    deserialize(data, folderMinimums, sort);
-
-    if (QMailMessageSource *source = accountSource(accountId)) {
-        bool success(sourceService.value(source)->usesConcurrentActions()
-                            ? source->retrieveMessageLists(accountId, folderMinimums, sort, action)
-                            : source->retrieveMessageLists(accountId, folderMinimums, sort));
-        if (success) {
-            // This account is now retrieving
-            setRetrievalInProgress(accountId, true);
-        } else {
-            qWarning() << "Unable to service request to retrieve message lists for account:" << accountId;
-            return false;
-        }
-    } else {
-        reportFailure(action, QMailServiceAction::Status::ErrFrameworkFault, tr("Unable to locate source for account"), accountId);
-        return false;
-    }
-
-    return true;
-}
-
 void ServiceHandler::retrieveMessages(quint64 action, const QMailMessageIdList &messageIds, QMailRetrievalAction::RetrievalSpecification spec)
 {
     QMap<QMailAccountId, QMailMessageIdList> messageLists(accountMessages(messageIds));
@@ -2638,10 +2554,6 @@ void ServiceHandler::activityChanged(QMailServiceAction::Activity activity)
     if (QMailMessageService *service = qobject_cast<QMailMessageService*>(sender()))
         if (quint64 action = serviceAction(service)) {
             updateAction(action);
-            QMap<quint64, LocalActionCompletionInfo>::iterator it(localActions.find(action));
-            if (it != localActions.end()) {
-                action = it.value().rootAction;
-            }
             emit activityChanged(action, activity);
         }
 }
@@ -2651,12 +2563,6 @@ void ServiceHandler::statusChanged(const QMailServiceAction::Status status)
     if (QMailMessageService *service = qobject_cast<QMailMessageService*>(sender()))
         if (quint64 action = serviceAction(service)) {
             updateAction(action);
-            if (status.errorCode == status.ErrNoError) {
-                QMap<quint64, LocalActionCompletionInfo>::iterator it(localActions.find(action));
-                if (it != localActions.end()) {
-                    action = it.value().rootAction;
-                }
-            }
             reportFailure(action, status);
         }
 }
@@ -2665,25 +2571,8 @@ void ServiceHandler::progressChanged(uint progress, uint total)
 {
     if (QMailMessageService *service = qobject_cast<QMailMessageService*>(sender()))
         if (quint64 action = serviceAction(service)) {
-
             updateAction(action);
-
-            QMap<quint64, LocalActionCompletionInfo>::iterator it(localActions.find(action));
-            if (it != localActions.end()) {
-                LocalActionCompletionInfo & ci = it.value();
-
-                int major_done = ci.progress - 1;
-                int major_total = ci.total;
-
-                // result = (major_done + (progress / total)) / major_total
-                // but integer division will lose information so lets go multiple the num and denom by total:
-                // result = (total * major_done + progress) / (total * major_total)
-
-                int new_progress = total * major_done + progress;
-                int new_total = total * major_total;
-                emit progressChanged(ci.rootAction, new_progress, new_total);
-            } else
-                emit progressChanged(action, progress, total);
+            emit progressChanged(action, progress, total);
         }
 }
 
diff --git a/src/tools/messageserver/servicehandler.h b/src/tools/messageserver/servicehandler.h
index 366904c7..d939f2ef 100644
--- a/src/tools/messageserver/servicehandler.h
+++ b/src/tools/messageserver/servicehandler.h
@@ -69,7 +69,6 @@ public slots:
     void transmitMessages(quint64 action, const QMailAccountId &accountId);
     void retrieveFolderList(quint64, const QMailAccountId &accountId, const QMailFolderId &folderId, bool descending);
     void retrieveMessageList(quint64, const QMailAccountId &accountId, const QMailFolderId &folderId, uint minimum, const QMailMessageSortKey &sort);
-    void retrieveMessageLists(quint64, const QMailAccountId &accountId, const QMailFolderMinimumPairList &folderMinimums, const QMailMessageSortKey &sort);
     void retrieveMessages(quint64, const QMailMessageIdList &messageIds, QMailRetrievalAction::RetrievalSpecification spec);
     void retrieveMessagePart(quint64, const QMailMessagePart::Location &partLocation);
     void retrieveMessageRange(quint64, const QMailMessageId &messageId, uint minimum);
@@ -220,8 +219,6 @@ private:
     typedef bool (ServiceHandler::*RequestServicer)(quint64, const QByteArray &);
     typedef void (ServiceHandler::*CompletionSignal)(quint64);
 
-    void subMessageListsCompleted(quint64 action);
-
     void enqueueRequest(quint64 action, const QByteArray &data, const QSet<QMailMessageService*> &services, RequestServicer servicer, CompletionSignal completion, QMailServerRequestType description, const QSet<QMailMessageService*> &preconditions = QSet<QMailMessageService*>());
 
     bool dispatchPrepareMessages(quint64 action, const QByteArray& data);
@@ -229,7 +226,6 @@ private:
     bool dispatchRetrieveFolderListAccount(quint64, const QByteArray &data);
     bool dispatchRetrieveFolderList(quint64, const QByteArray &data);
     bool dispatchRetrieveMessageList(quint64, const QByteArray &data);
-    bool dispatchRetrieveMessageLists(quint64, const QByteArray &data);
     bool dispatchRetrieveMessages(quint64, const QByteArray &data);
     bool dispatchRetrieveMessagePart(quint64, const QByteArray &data);
     bool dispatchRetrieveMessageRange(quint64, const QByteArray &data);
@@ -267,14 +263,6 @@ private:
 
     QSet<QMailMessageService*> mUnavailableServices;
 
-    struct LocalActionCompletionInfo {
-        quint64 rootAction;
-        int progress;
-        int total;
-    };
-
-    QMap<quint64, LocalActionCompletionInfo> localActions;
-
     class ActionData
     {
     public: