summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/tools/messageserver/servicehandler.cpp176
-rw-r--r--src/tools/messageserver/servicehandler.h85
2 files changed, 137 insertions, 124 deletions
diff --git a/src/tools/messageserver/servicehandler.cpp b/src/tools/messageserver/servicehandler.cpp
index a8314d76..a5558fca 100644
--- a/src/tools/messageserver/servicehandler.cpp
+++ b/src/tools/messageserver/servicehandler.cpp
@@ -539,9 +539,12 @@ ServiceHandler::ServiceHandler(QObject* parent)
::prepareAccounts();
if (QMailStore *store = QMailStore::instance()) {
- connect(store, SIGNAL(accountsAdded(QMailAccountIdList)), this, SLOT(accountsAdded(QMailAccountIdList)));
- connect(store, SIGNAL(accountsUpdated(QMailAccountIdList)), this, SLOT(accountsUpdated(QMailAccountIdList)));
- connect(store, SIGNAL(accountsRemoved(QMailAccountIdList)), this, SLOT(accountsRemoved(QMailAccountIdList)));
+ connect(store, &QMailStore::accountsAdded,
+ this, &ServiceHandler::onAccountsAdded);
+ connect(store, &QMailStore::accountsUpdated,
+ this, &ServiceHandler::onAccountsUpdated);
+ connect(store, &QMailStore::accountsRemoved,
+ this, &ServiceHandler::onAccountsRemoved);
// All necessary accounts now exist - create the service instances
registerAccountServices(store->queryAccounts());
@@ -794,12 +797,12 @@ void ServiceHandler::deregisterAccountService(const QMailAccountId &id, const QS
delete service;
}
-void ServiceHandler::accountsAdded(const QMailAccountIdList &ids)
+void ServiceHandler::onAccountsAdded(const QMailAccountIdList &ids)
{
registerAccountServices(ids);
}
-void ServiceHandler::accountsUpdated(const QMailAccountIdList &ids)
+void ServiceHandler::onAccountsUpdated(const QMailAccountIdList &ids)
{
// Only respond to updates that were generated by other processes
if (QMailStore::instance()->asynchronousEmission()) {
@@ -807,7 +810,7 @@ void ServiceHandler::accountsUpdated(const QMailAccountIdList &ids)
}
}
-void ServiceHandler::accountsRemoved(const QMailAccountIdList &ids)
+void ServiceHandler::onAccountsRemoved(const QMailAccountIdList &ids)
{
deregisterAccountServices(ids, QMailServiceAction::Status::ErrInternalStateReset, tr("Account removed"));
foreach (const QMailAccountId &id, ids) {
@@ -838,25 +841,25 @@ void ServiceHandler::registerAccountSource(const QMailAccountId &accountId, QMai
connect(source, SIGNAL(newMessagesAvailable()), this, SIGNAL(newMessagesAvailable()));
// if (service->usesConcurrentActions()) { // This can be uncommented to be stricter.
- connect(source, SIGNAL(messagesDeleted(QMailMessageIdList,quint64)), this, SLOT(messagesDeleted(QMailMessageIdList,quint64)));
- connect(source, SIGNAL(messagesCopied(QMailMessageIdList, quint64)), this, SLOT(messagesCopied(QMailMessageIdList, quint64)));
- connect(source, SIGNAL(messagesMoved(QMailMessageIdList, quint64)), this, SLOT(messagesMoved(QMailMessageIdList, quint64)));
- connect(source, SIGNAL(messagesFlagged(QMailMessageIdList, quint64)), this, SLOT(messagesFlagged(QMailMessageIdList, quint64)));
- connect(source, SIGNAL(messagesPrepared(QMailMessageIdList, quint64)), this, SLOT(messagesPrepared(QMailMessageIdList, quint64)));
- connect(source, SIGNAL(matchingMessageIds(QMailMessageIdList, quint64)), this, SLOT(matchingMessageIds(QMailMessageIdList, quint64)));
- connect(source, SIGNAL(remainingMessagesCount(uint, quint64)), this, SLOT(remainingMessagesCount(uint, quint64)));
- connect(source, SIGNAL(messagesCount(uint, quint64)), this, SLOT(messagesCount(uint, quint64)));
- connect(source, SIGNAL(protocolResponse(QString, QVariantMap, quint64)), this, SLOT(protocolResponse(QString, QVariantMap, quint64)));
+ connect(source, SIGNAL(messagesDeleted(QMailMessageIdList, quint64)), this, SLOT(emitMessagesDeleted(QMailMessageIdList, quint64)));
+ connect(source, SIGNAL(messagesCopied(QMailMessageIdList, quint64)), this, SLOT(emitMessagesCopied(QMailMessageIdList, quint64)));
+ connect(source, SIGNAL(messagesMoved(QMailMessageIdList, quint64)), this, SLOT(emitMessagesMoved(QMailMessageIdList, quint64)));
+ connect(source, SIGNAL(messagesFlagged(QMailMessageIdList, quint64)), this, SLOT(emitMessagesFlagged(QMailMessageIdList, quint64)));
+ connect(source, SIGNAL(messagesPrepared(QMailMessageIdList, quint64)), this, SLOT(emitMessagesPrepared(QMailMessageIdList, quint64)));
+ connect(source, SIGNAL(matchingMessageIds(QMailMessageIdList, quint64)), this, SLOT(emitMatchingMessageIds(QMailMessageIdList, quint64)));
+ connect(source, SIGNAL(remainingMessagesCount(uint, quint64)), this, SLOT(emitRemainingMessagesCount(uint, quint64)));
+ connect(source, SIGNAL(messagesCount(uint, quint64)), this, SLOT(emitMessagesCount(uint, quint64)));
+ connect(source, SIGNAL(protocolResponse(QString, QVariantMap, quint64)), this, SLOT(emitProtocolResponse(QString, QVariantMap, quint64)));
// } else {
- connect(source, SIGNAL(messagesDeleted(QMailMessageIdList)), this, SLOT(messagesDeleted(QMailMessageIdList)));
- connect(source, SIGNAL(messagesCopied(QMailMessageIdList)), this, SLOT(messagesCopied(QMailMessageIdList)));
- connect(source, SIGNAL(messagesMoved(QMailMessageIdList)), this, SLOT(messagesMoved(QMailMessageIdList)));
- connect(source, SIGNAL(messagesFlagged(QMailMessageIdList)), this, SLOT(messagesFlagged(QMailMessageIdList)));
- connect(source, SIGNAL(messagesPrepared(QMailMessageIdList)), this, SLOT(messagesPrepared(QMailMessageIdList)));
- connect(source, SIGNAL(matchingMessageIds(QMailMessageIdList)), this, SLOT(matchingMessageIds(QMailMessageIdList)));
- connect(source, SIGNAL(remainingMessagesCount(uint)), this, SLOT(remainingMessagesCount(uint)));
- connect(source, SIGNAL(messagesCount(uint)), this, SLOT(messagesCount(uint)));
- connect(source, SIGNAL(protocolResponse(QString, QVariantMap)), this, SLOT(protocolResponse(QString, QVariantMap)));
+ connect(source, SIGNAL(messagesDeleted(QMailMessageIdList)), this, SLOT(onMessagesDeleted(QMailMessageIdList)));
+ connect(source, SIGNAL(messagesCopied(QMailMessageIdList)), this, SLOT(onMessagesCopied(QMailMessageIdList)));
+ connect(source, SIGNAL(messagesMoved(QMailMessageIdList)), this, SLOT(onMessagesMoved(QMailMessageIdList)));
+ connect(source, SIGNAL(messagesFlagged(QMailMessageIdList)), this, SLOT(onMessagesFlagged(QMailMessageIdList)));
+ connect(source, SIGNAL(messagesPrepared(QMailMessageIdList)), this, SLOT(onMessagesPrepared(QMailMessageIdList)));
+ connect(source, SIGNAL(matchingMessageIds(QMailMessageIdList)), this, SLOT(onMatchingMessageIds(QMailMessageIdList)));
+ connect(source, SIGNAL(remainingMessagesCount(uint)), this, SLOT(onRemainingMessagesCount(uint)));
+ connect(source, SIGNAL(messagesCount(uint)), this, SLOT(onMessagesCount(uint)));
+ connect(source, SIGNAL(protocolResponse(QString, QVariantMap)), this, SLOT(onProtocolResponse(QString, QVariantMap)));
// }
}
@@ -875,14 +878,16 @@ void ServiceHandler::registerAccountSink(const QMailAccountId &accountId, QMailM
sinkService.insert(sink, service);
// if (service->usesConcurrentActions()) { // this can be uncommented to be stricter
- connect(sink, SIGNAL(messagesTransmitted(QMailMessageIdList, quint64)), this, SLOT(messagesTransmitted(QMailMessageIdList, quint64)));
+ connect(sink, SIGNAL(messagesTransmitted(QMailMessageIdList, quint64)),
+ this, SLOT(emitMessagesTransmitted(QMailMessageIdList, quint64)));
connect(sink, SIGNAL(messagesFailedTransmission(QMailMessageIdList, QMailServiceAction::Status::ErrorCode, quint64)),
- this, SLOT(messagesFailedTransmission(QMailMessageIdList, QMailServiceAction::Status::ErrorCode, quint64)));
+ this, SLOT(emitMessagesFailedTransmission(QMailMessageIdList, QMailServiceAction::Status::ErrorCode, quint64)));
// } else {
- connect(sink, SIGNAL(messagesTransmitted(QMailMessageIdList)), this, SLOT(messagesTransmitted(QMailMessageIdList)));
+ connect(sink, SIGNAL(messagesTransmitted(QMailMessageIdList)),
+ this, SLOT(onMessagesTransmitted(QMailMessageIdList)));
connect(sink, SIGNAL(messagesFailedTransmission(QMailMessageIdList, QMailServiceAction::Status::ErrorCode)),
- this, SLOT(messagesFailedTransmission(QMailMessageIdList, QMailServiceAction::Status::ErrorCode)));
+ this, SLOT(onMessagesFailedTransmission(QMailMessageIdList, QMailServiceAction::Status::ErrorCode)));
// }
}
@@ -898,22 +903,30 @@ QMailMessageSink *ServiceHandler::accountSink(const QMailAccountId &accountId) c
QMailMessageService *ServiceHandler::createService(const QString &name, const QMailAccountId &accountId)
{
QMailMessageService *service = QMailMessageServiceFactory::createService(name, accountId);
- connect(service, SIGNAL(connectivityChanged(QMailServiceAction::Connectivity)), this, SLOT(connectivityChanged(QMailServiceAction::Connectivity)));
- connect(service, SIGNAL(availabilityChanged(bool)), this, SLOT(availabilityChanged(bool)));
-
-
+ connect(service, &QMailMessageService::connectivityChanged,
+ this, &ServiceHandler::onConnectivityChanged);
+ connect(service, &QMailMessageService::availabilityChanged,
+ this, &ServiceHandler::onAvailabilityChanged);
if (service) {
// if (service->usesConcurrentActions()) { // this can be uncommented to be stricter
- connect(service, SIGNAL(activityChanged(QMailServiceAction::Activity, quint64)), this, SLOT(activityChanged(QMailServiceAction::Activity, quint64)));
- connect(service, SIGNAL(statusChanged(const QMailServiceAction::Status, quint64)), this, SLOT(statusChanged(const QMailServiceAction::Status, quint64)));
- connect(service, SIGNAL(progressChanged(uint, uint, quint64)), this, SLOT(progressChanged(uint, uint, quint64)));
- connect(service, SIGNAL(actionCompleted(bool, quint64)), this, SLOT(actionCompleted(bool, quint64)));
+ connect(service, SIGNAL(activityChanged(QMailServiceAction::Activity, quint64)),
+ this, SLOT(emitActivityChanged(QMailServiceAction::Activity, quint64)));
+ connect(service, SIGNAL(statusChanged(const QMailServiceAction::Status, quint64)),
+ this, SLOT(onStatusChanged(const QMailServiceAction::Status, quint64)));
+ connect(service, SIGNAL(progressChanged(uint, uint, quint64)),
+ this, SLOT(onProgressChanged(uint, uint, quint64)));
+ connect(service, SIGNAL(actionCompleted(bool, quint64)),
+ this, SLOT(onActionCompleted(bool, quint64)));
// } else {
- connect(service, SIGNAL(activityChanged(QMailServiceAction::Activity)), this, SLOT(activityChanged(QMailServiceAction::Activity)));
- connect(service, SIGNAL(statusChanged(const QMailServiceAction::Status)), this, SLOT(statusChanged(const QMailServiceAction::Status)));
- connect(service, SIGNAL(progressChanged(uint, uint)), this, SLOT(progressChanged(uint, uint)));
- connect(service, SIGNAL(actionCompleted(bool)), this, SLOT(actionCompleted(bool)));
+ connect(service, SIGNAL(activityChanged(QMailServiceAction::Activity)),
+ this, SLOT(onActivityChanged(QMailServiceAction::Activity)));
+ connect(service, SIGNAL(statusChanged(const QMailServiceAction::Status)),
+ this, SLOT(onStatusChanged(const QMailServiceAction::Status)));
+ connect(service, SIGNAL(progressChanged(uint, uint)),
+ this, SLOT(onProgressChanged(uint, uint)));
+ connect(service, SIGNAL(actionCompleted(bool)),
+ this, SLOT(onActionCompleted(bool)));
// }
}
@@ -2368,8 +2381,8 @@ void ServiceHandler::rollBackUpdates(quint64 action, const QMailAccountId &mailA
void ServiceHandler::moveToStandardFolder(quint64 action, const QMailMessageIdList& ids, quint64 standardFolder)
{
QMailDisconnected::moveToStandardFolder(ids, static_cast<QMailFolder::StandardFolder>(standardFolder));
- messagesMoved(ids, action);
- messagesFlagged(ids, action);
+ emitMessagesMoved(ids, action);
+ emitMessagesFlagged(ids, action);
emit storageActionCompleted(action);
emit activityChanged(action, QMailServiceAction::Successful);
@@ -2380,7 +2393,7 @@ void ServiceHandler::moveToStandardFolder(quint64 action, const QMailMessageIdLi
void ServiceHandler::moveToFolder(quint64 action, const QMailMessageIdList& ids, const QMailFolderId& folderId)
{
QMailDisconnected::moveToFolder(ids, folderId);
- messagesMoved(ids, action);
+ emitMessagesMoved(ids, action);
emit storageActionCompleted(action);
emit activityChanged(action, QMailServiceAction::Successful);
@@ -2391,7 +2404,7 @@ void ServiceHandler::moveToFolder(quint64 action, const QMailMessageIdList& ids,
void ServiceHandler::flagMessages(quint64 action, const QMailMessageIdList& ids, quint64 setMask, quint64 unsetMask)
{
QMailDisconnected::flagMessages(ids, setMask, unsetMask, "");
- messagesFlagged(ids, action);
+ emitMessagesFlagged(ids, action);
emit storageActionCompleted(action);
emit activityChanged(action, QMailServiceAction::Successful);
@@ -2691,7 +2704,7 @@ void ServiceHandler::listActions()
}
// concurrent actions
-void ServiceHandler::statusChanged(const QMailServiceAction::Status s, quint64 a)
+void ServiceHandler::onStatusChanged(const QMailServiceAction::Status s, quint64 a)
{
QMap<quint64, ActionData>::iterator it = mActiveActions.find(a);
if (it != mActiveActions.end()) {
@@ -2700,22 +2713,22 @@ void ServiceHandler::statusChanged(const QMailServiceAction::Status s, quint64 a
emit statusChanged(a, s);
}
-void ServiceHandler::availabilityChanged(bool b, quint64 a)
+void ServiceHandler::emitAvailabilityChanged(bool b, quint64 a)
{
emit availabilityChanged(a, b);
}
-void ServiceHandler::connectivityChanged(QMailServiceAction::Connectivity c, quint64 a)
+void ServiceHandler::emitConnectivityChanged(QMailServiceAction::Connectivity c, quint64 a)
{
emit connectivityChanged(a, c);
}
-void ServiceHandler::activityChanged(QMailServiceAction::Activity act, quint64 a)
+void ServiceHandler::emitActivityChanged(QMailServiceAction::Activity act, quint64 a)
{
emit activityChanged(a, act);
}
-void ServiceHandler::progressChanged(uint p, uint t, quint64 a)
+void ServiceHandler::onProgressChanged(uint p, uint t, quint64 a)
{
QMap<quint64, ActionData>::iterator it = mActiveActions.find(a);
if (it != mActiveActions.end()) {
@@ -2725,16 +2738,16 @@ void ServiceHandler::progressChanged(uint p, uint t, quint64 a)
emit progressChanged(a, p, t);
}
-void ServiceHandler::actionCompleted(bool success, quint64 action)
+void ServiceHandler::onActionCompleted(bool success, quint64 action)
{
qMailLog(Messaging) << "Action completed" << action << "result" << (success ? "success" : "failure");
QMailMessageService *service = qobject_cast<QMailMessageService*>(sender());
Q_ASSERT(service);
- actionCompleted(success, service, action);
+ handleActionCompleted(success, service, action);
}
-void ServiceHandler::actionCompleted(bool success, QMailMessageService *service, quint64 action)
+void ServiceHandler::handleActionCompleted(bool success, QMailMessageService *service, quint64 action)
{
qMailLog(Messaging) << "Action completed" << action << "result" << (success ? "success" : "failure");
QMap<quint64, ActionData>::iterator it = mActiveActions.find(action);
@@ -2830,58 +2843,58 @@ void ServiceHandler::actionCompleted(bool success, QMailMessageService *service,
QTimer::singleShot(0, this, SLOT(dispatchRequest()));
}
-void ServiceHandler::messagesTransmitted(const QMailMessageIdList& ml, quint64 a)
+void ServiceHandler::emitMessagesTransmitted(const QMailMessageIdList& ml, quint64 a)
{
emit messagesTransmitted(a, ml);
}
-void ServiceHandler::messagesFailedTransmission(const QMailMessageIdList& ml, QMailServiceAction::Status::ErrorCode err, quint64 a)
+void ServiceHandler::emitMessagesFailedTransmission(const QMailMessageIdList& ml, QMailServiceAction::Status::ErrorCode err, quint64 a)
{
emit messagesFailedTransmission(a, ml, err);
}
-void ServiceHandler::messagesDeleted(const QMailMessageIdList& ml, quint64 a)
+void ServiceHandler::emitMessagesDeleted(const QMailMessageIdList& ml, quint64 a)
{
emit messagesDeleted(a, ml);
}
-void ServiceHandler::messagesCopied(const QMailMessageIdList& ml, quint64 a)
+void ServiceHandler::emitMessagesCopied(const QMailMessageIdList& ml, quint64 a)
{
emit messagesCopied(a, ml);
}
-void ServiceHandler::messagesMoved(const QMailMessageIdList& ml, quint64 a)
+void ServiceHandler::emitMessagesMoved(const QMailMessageIdList& ml, quint64 a)
{
emit messagesMoved(a, ml);
}
-void ServiceHandler::messagesFlagged(const QMailMessageIdList& ml, quint64 a)
+void ServiceHandler::emitMessagesFlagged(const QMailMessageIdList& ml, quint64 a)
{
emit messagesFlagged(a, ml);
}
-void ServiceHandler::messagesPrepared(const QMailMessageIdList& ml, quint64 a)
+void ServiceHandler::emitMessagesPrepared(const QMailMessageIdList& ml, quint64 a)
{
Q_UNUSED(ml);
Q_UNUSED(a);
}
-void ServiceHandler::matchingMessageIds(const QMailMessageIdList& ml, quint64 a)
+void ServiceHandler::emitMatchingMessageIds(const QMailMessageIdList& ml, quint64 a)
{
emit matchingMessageIds(a, ml);
}
-void ServiceHandler::remainingMessagesCount(uint count, quint64 a)
+void ServiceHandler::emitRemainingMessagesCount(uint count, quint64 a)
{
emit remainingMessagesCount(a, count);
}
-void ServiceHandler::messagesCount(uint count, quint64 a)
+void ServiceHandler::emitMessagesCount(uint count, quint64 a)
{
emit messagesCount(a, count);
}
-void ServiceHandler::protocolResponse(const QString &response, const QVariantMap &data, quint64 a)
+void ServiceHandler::emitProtocolResponse(const QString &response, const QVariantMap &data, quint64 a)
{
emit protocolResponse(a, response, data);
}
@@ -2925,60 +2938,60 @@ bool ServiceHandler::dispatchProtocolRequest(quint64 action, const QByteArray &d
return true;
}
-void ServiceHandler::messagesDeleted(const QMailMessageIdList &messageIds)
+void ServiceHandler::onMessagesDeleted(const QMailMessageIdList &messageIds)
{
if (quint64 action = sourceAction(qobject_cast<QMailMessageSource*>(sender())))
emit messagesDeleted(action, messageIds);
}
-void ServiceHandler::messagesCopied(const QMailMessageIdList &messageIds)
+void ServiceHandler::onMessagesCopied(const QMailMessageIdList &messageIds)
{
if (quint64 action = sourceAction(qobject_cast<QMailMessageSource*>(sender())))
emit messagesCopied(action, messageIds);
}
-void ServiceHandler::messagesMoved(const QMailMessageIdList &messageIds)
+void ServiceHandler::onMessagesMoved(const QMailMessageIdList &messageIds)
{
if (quint64 action = sourceAction(qobject_cast<QMailMessageSource*>(sender())))
emit messagesMoved(action, messageIds);
}
-void ServiceHandler::messagesFlagged(const QMailMessageIdList &messageIds)
+void ServiceHandler::onMessagesFlagged(const QMailMessageIdList &messageIds)
{
if (quint64 action = sourceAction(qobject_cast<QMailMessageSource*>(sender())))
emit messagesFlagged(action, messageIds);
}
-void ServiceHandler::messagesPrepared(const QMailMessageIdList &messageIds)
+void ServiceHandler::onMessagesPrepared(const QMailMessageIdList &messageIds)
{
Q_UNUSED(messageIds)
}
-void ServiceHandler::matchingMessageIds(const QMailMessageIdList &messageIds)
+void ServiceHandler::onMatchingMessageIds(const QMailMessageIdList &messageIds)
{
if (quint64 action = sourceAction(qobject_cast<QMailMessageSource*>(sender())))
emit matchingMessageIds(action, messageIds);
}
-void ServiceHandler::remainingMessagesCount(uint count)
+void ServiceHandler::onRemainingMessagesCount(uint count)
{
if (quint64 action = sourceAction(qobject_cast<QMailMessageSource*>(sender())))
emit remainingMessagesCount(action, count);
}
-void ServiceHandler::messagesCount(uint count)
+void ServiceHandler::onMessagesCount(uint count)
{
if (quint64 action = sourceAction(qobject_cast<QMailMessageSource*>(sender())))
emit messagesCount(action, count);
}
-void ServiceHandler::protocolResponse(const QString &response, const QVariantMap &data)
+void ServiceHandler::onProtocolResponse(const QString &response, const QVariantMap &data)
{
if (quint64 action = sourceAction(qobject_cast<QMailMessageSource*>(sender())))
emit protocolResponse(action, response, data);
}
-void ServiceHandler::messagesTransmitted(const QMailMessageIdList &messageIds)
+void ServiceHandler::onMessagesTransmitted(const QMailMessageIdList &messageIds)
{
if (QMailMessageSink *sink = qobject_cast<QMailMessageSink*>(sender())) {
if (quint64 action = sinkAction(sink)) {
@@ -2989,7 +3002,7 @@ void ServiceHandler::messagesTransmitted(const QMailMessageIdList &messageIds)
}
}
-void ServiceHandler::messagesFailedTransmission(const QMailMessageIdList &messageIds, QMailServiceAction::Status::ErrorCode error)
+void ServiceHandler::onMessagesFailedTransmission(const QMailMessageIdList &messageIds, QMailServiceAction::Status::ErrorCode error)
{
if (QMailMessageSink *sink = qobject_cast<QMailMessageSink*>(sender())) {
if (quint64 action = sinkAction(sink)) {
@@ -2998,7 +3011,7 @@ void ServiceHandler::messagesFailedTransmission(const QMailMessageIdList &messag
}
}
-void ServiceHandler::availabilityChanged(bool available)
+void ServiceHandler::onAvailabilityChanged(bool available)
{
if (QMailMessageService *service = qobject_cast<QMailMessageService*>(sender())) {
if (available) {
@@ -3012,7 +3025,7 @@ void ServiceHandler::availabilityChanged(bool available)
}
}
-void ServiceHandler::connectivityChanged(QMailServiceAction::Connectivity connectivity)
+void ServiceHandler::onConnectivityChanged(QMailServiceAction::Connectivity connectivity)
{
if (QMailMessageService *service = qobject_cast<QMailMessageService*>(sender()))
if (quint64 action = serviceAction(service)) {
@@ -3021,7 +3034,7 @@ void ServiceHandler::connectivityChanged(QMailServiceAction::Connectivity connec
}
}
-void ServiceHandler::activityChanged(QMailServiceAction::Activity activity)
+void ServiceHandler::onActivityChanged(QMailServiceAction::Activity activity)
{
if (QMailMessageService *service = qobject_cast<QMailMessageService*>(sender()))
if (quint64 action = serviceAction(service)) {
@@ -3030,7 +3043,7 @@ void ServiceHandler::activityChanged(QMailServiceAction::Activity activity)
}
}
-void ServiceHandler::statusChanged(const QMailServiceAction::Status status)
+void ServiceHandler::onStatusChanged(const QMailServiceAction::Status status)
{
if (QMailMessageService *service = qobject_cast<QMailMessageService*>(sender()))
if (quint64 action = serviceAction(service)) {
@@ -3043,7 +3056,7 @@ void ServiceHandler::statusChanged(const QMailServiceAction::Status status)
}
}
-void ServiceHandler::progressChanged(uint progress, uint total)
+void ServiceHandler::onProgressChanged(uint progress, uint total)
{
if (QMailMessageService *service = qobject_cast<QMailMessageService*>(sender()))
if (quint64 action = serviceAction(service)) {
@@ -3057,11 +3070,11 @@ void ServiceHandler::progressChanged(uint progress, uint total)
}
}
-void ServiceHandler::actionCompleted(bool success)
+void ServiceHandler::onActionCompleted(bool success)
{
if (QMailMessageService *service = qobject_cast<QMailMessageService*>(sender())) {
if (quint64 action = serviceAction(service)) {
- actionCompleted(success, service, action);
+ handleActionCompleted(success, service, action);
return;
}
}
@@ -3185,4 +3198,3 @@ uint qHash(QPointer<QMailMessageService> service)
{
return qHash(service.data());
}
-
diff --git a/src/tools/messageserver/servicehandler.h b/src/tools/messageserver/servicehandler.h
index db553933..cf8c7c0a 100644
--- a/src/tools/messageserver/servicehandler.h
+++ b/src/tools/messageserver/servicehandler.h
@@ -155,48 +155,47 @@ signals:
void retrievalReady(quint64 action);
private slots:
- void statusChanged(const QMailServiceAction::Status);
- void statusChanged(const QMailServiceAction::Status, quint64);
- void availabilityChanged(bool);
- void availabilityChanged(bool, quint64);
- void connectivityChanged(QMailServiceAction::Connectivity);
- void connectivityChanged(QMailServiceAction::Connectivity, quint64);
- void activityChanged(QMailServiceAction::Activity);
- void activityChanged(QMailServiceAction::Activity, quint64);
- void progressChanged(uint, uint );
- void progressChanged(uint, uint, quint64);
- void actionCompleted(bool);
- void actionCompleted(bool, quint64);
- void actionCompleted(bool, QMailMessageService *, quint64);
-
- void messagesTransmitted(const QMailMessageIdList&);
- void messagesTransmitted(const QMailMessageIdList&, quint64);
- void messagesFailedTransmission(const QMailMessageIdList&, QMailServiceAction::Status::ErrorCode);
- void messagesFailedTransmission(const QMailMessageIdList&, QMailServiceAction::Status::ErrorCode, quint64);
-
- void messagesDeleted(const QMailMessageIdList&);
- void messagesDeleted(const QMailMessageIdList& , quint64);
- void messagesCopied(const QMailMessageIdList&);
- void messagesCopied(const QMailMessageIdList&, quint64);
- void messagesMoved(const QMailMessageIdList&);
- void messagesMoved(const QMailMessageIdList&, quint64);
- void messagesFlagged(const QMailMessageIdList&);
- void messagesFlagged(const QMailMessageIdList&, quint64);
- void messagesPrepared(const QMailMessageIdList&);
- void messagesPrepared(const QMailMessageIdList&, quint64);
- void matchingMessageIds(const QMailMessageIdList&);
- void matchingMessageIds(const QMailMessageIdList&, quint64);
- void remainingMessagesCount(uint count);
- void remainingMessagesCount(uint count, quint64);
- void messagesCount(uint count);
- void messagesCount(uint count, quint64);
-
- void protocolResponse(const QString &response, const QVariantMap &data);
- void protocolResponse(const QString &response, const QVariantMap &data, quint64);
-
- void accountsAdded(const QMailAccountIdList &);
- void accountsUpdated(const QMailAccountIdList &);
- void accountsRemoved(const QMailAccountIdList &);
+ void onStatusChanged(const QMailServiceAction::Status);
+ void onStatusChanged(const QMailServiceAction::Status, quint64);
+ void onAvailabilityChanged(bool);
+ void emitAvailabilityChanged(bool, quint64);
+ void onConnectivityChanged(QMailServiceAction::Connectivity);
+ void emitConnectivityChanged(QMailServiceAction::Connectivity, quint64);
+ void onActivityChanged(QMailServiceAction::Activity);
+ void emitActivityChanged(QMailServiceAction::Activity, quint64);
+ void onProgressChanged(uint, uint );
+ void onProgressChanged(uint, uint, quint64);
+ void onActionCompleted(bool);
+ void onActionCompleted(bool, quint64);
+
+ void onMessagesTransmitted(const QMailMessageIdList&);
+ void emitMessagesTransmitted(const QMailMessageIdList&, quint64);
+ void onMessagesFailedTransmission(const QMailMessageIdList&, QMailServiceAction::Status::ErrorCode);
+ void emitMessagesFailedTransmission(const QMailMessageIdList&, QMailServiceAction::Status::ErrorCode, quint64);
+
+ void onMessagesDeleted(const QMailMessageIdList&);
+ void emitMessagesDeleted(const QMailMessageIdList& , quint64);
+ void onMessagesCopied(const QMailMessageIdList&);
+ void emitMessagesCopied(const QMailMessageIdList&, quint64);
+ void onMessagesMoved(const QMailMessageIdList&);
+ void emitMessagesMoved(const QMailMessageIdList&, quint64);
+ void onMessagesFlagged(const QMailMessageIdList&);
+ void emitMessagesFlagged(const QMailMessageIdList&, quint64);
+ void onMessagesPrepared(const QMailMessageIdList&);
+ void emitMessagesPrepared(const QMailMessageIdList&, quint64);
+ void onMatchingMessageIds(const QMailMessageIdList&);
+ void emitMatchingMessageIds(const QMailMessageIdList&, quint64);
+ void onRemainingMessagesCount(uint count);
+ void emitRemainingMessagesCount(uint count, quint64);
+ void onMessagesCount(uint count);
+ void emitMessagesCount(uint count, quint64);
+
+ void onProtocolResponse(const QString &response, const QVariantMap &data);
+ void emitProtocolResponse(const QString &response, const QVariantMap &data, quint64);
+
+ void onAccountsAdded(const QMailAccountIdList &);
+ void onAccountsUpdated(const QMailAccountIdList &);
+ void onAccountsRemoved(const QMailAccountIdList &);
void continueSearch();
@@ -213,6 +212,8 @@ private:
Count = 2
};
+ void handleActionCompleted(bool, QMailMessageService *, quint64);
+
void searchMessages(quint64 action, const QMailMessageKey &filter, const QString &bodyText,
QMailSearchAction::SearchSpecification spec, quint64 limit, const QMailMessageSortKey &sort,
ServiceHandler::SearchType searchType);
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-23 22:17:25 +0000