diff options
| author | Pekka Vuorela <pvuorela@iki.fi> | 2025-10-02 16:21:53 +0300 |
|---|---|---|
| committer | Pekka Vuorela <pvuorela@iki.fi> | 2025-10-06 10:54:28 +0300 |
| commit | 30eaefb0679bff6e52d1d3b3f620e11212150fba (patch) | |
| tree | c0dd3b4c34f111124f898fe7d2bd06dcf738dd54 | |
| parent | 3f1f655a44baed36f9601ec64db84af6a2ac5e91 (diff) | |
Remove unneeded typedef QMailMessageCountMap
Not used anywhere in the qmfclient side since commit d06d3db4dfdc6de
or so.
Change-Id: I64d341bf56b1e9a887566f06631958eee58677d0
Reviewed-by: <matti.viljanen@kapsi.fi>
Reviewed-by: Pekka Vuorela <pvuorela@iki.fi>
Reviewed-by: Damien Caliste <dcaliste@free.fr>
| -rw-r--r-- | src/libraries/qmfclient/qmailmessageserver.cpp | 2 | ||||
| -rw-r--r-- | src/libraries/qmfclient/qmailmessageserver.h | 6 | ||||
| -rw-r--r-- | src/libraries/qmfclient/qmailmessageset.h | 2 | ||||
| -rw-r--r-- | src/libraries/qmfclient/qmailserviceaction.cpp | 1 | ||||
| -rw-r--r-- | src/tools/messageserver/messageserver.cpp | 5 | ||||
| -rw-r--r-- | src/tools/messageserver/messageserver.h | 5 |
6 files changed, 7 insertions, 14 deletions
diff --git a/src/libraries/qmfclient/qmailmessageserver.cpp b/src/libraries/qmfclient/qmailmessageserver.cpp index 74b7dc7b..0dc73587 100644 --- a/src/libraries/qmfclient/qmailmessageserver.cpp +++ b/src/libraries/qmfclient/qmailmessageserver.cpp @@ -1081,8 +1081,6 @@ void QMailMessageServer::protocolRequest(quint64 action, const QMailAccountId &a d->protocolRequest(action, accountId, request, data); } -Q_IMPLEMENT_USER_METATYPE_TYPEDEF(QMailMessageCountMap, QMailMessageCountMap) - /*! \fn bool QMailMessageServer::connectionDown() diff --git a/src/libraries/qmfclient/qmailmessageserver.h b/src/libraries/qmfclient/qmailmessageserver.h index 89170cda..91ed6069 100644 --- a/src/libraries/qmfclient/qmailmessageserver.h +++ b/src/libraries/qmfclient/qmailmessageserver.h @@ -40,7 +40,6 @@ #include "qmailmessagesortkey.h" #include "qmailserviceaction.h" #include "qmailstore.h" -#include "qmailipc.h" #include <QMap> #include <QSharedDataPointer> @@ -49,8 +48,6 @@ class QMailMessageServerPrivate; -typedef QMap<QMailMessage::MessageType, int> QMailMessageCountMap; - class QMF_EXPORT QMailMessageServer : public QObject { Q_OBJECT @@ -161,7 +158,4 @@ private: QMailMessageServerPrivate* d; }; -Q_DECLARE_METATYPE(QMailMessageCountMap) -Q_DECLARE_USER_METATYPE_TYPEDEF(QMailMessageCountMap, QMailMessageCountMap) - #endif diff --git a/src/libraries/qmfclient/qmailmessageset.h b/src/libraries/qmfclient/qmailmessageset.h index 271896d4..a55e0c2b 100644 --- a/src/libraries/qmfclient/qmailmessageset.h +++ b/src/libraries/qmfclient/qmailmessageset.h @@ -247,7 +247,6 @@ public: QMailMessageSetModel(QObject *parent = Q_NULLPTR); virtual ~QMailMessageSetModel(); - int rowCount(const QModelIndex &parentIndex) const override; int columnCount(const QModelIndex &) const override; @@ -316,7 +315,6 @@ protected: virtual void removed(QMailMessageSet *child); virtual void updated(QMailMessageSet *child); - private: friend class QMailMessageSetContainer; friend class QMailMessageSet; diff --git a/src/libraries/qmfclient/qmailserviceaction.cpp b/src/libraries/qmfclient/qmailserviceaction.cpp index fe202659..c60286ae 100644 --- a/src/libraries/qmfclient/qmailserviceaction.cpp +++ b/src/libraries/qmfclient/qmailserviceaction.cpp @@ -39,6 +39,7 @@ #include "qmaildisconnected.h" #include "qmailnamespace.h" #include <qmailcontentmanager.h> + #include <QCoreApplication> #include <QPair> #include <QTimer> diff --git a/src/tools/messageserver/messageserver.cpp b/src/tools/messageserver/messageserver.cpp index 75ed8a13..337a9409 100644 --- a/src/tools/messageserver/messageserver.cpp +++ b/src/tools/messageserver/messageserver.cpp @@ -255,7 +255,7 @@ void MessageServer::reportNewCounts() { static QMap<QMailMessage::MessageType, QString> typeSignature(typeSignatureInit()); - QMailMessageCountMap newCounts; + MessageCountMap newCounts; foreach (const QMailMessage::MessageType &type, typeSignature.keys()) { newCounts[type] = newMessageCount(type); } @@ -270,7 +270,8 @@ void MessageServer::reportNewCounts() } // Request handling of the new message events - QMailMessageCountMap::const_iterator it = newCounts.begin(), end = newCounts.end(); + MessageCountMap::const_iterator it = newCounts.begin(), end = newCounts.end(); + for ( ; it != end; ++it) { QMailMessage::MessageType type(it.key()); if (it.value() != messageCounts[type]) { diff --git a/src/tools/messageserver/messageserver.h b/src/tools/messageserver/messageserver.h index c6e7fadf..25f4b7f3 100644 --- a/src/tools/messageserver/messageserver.h +++ b/src/tools/messageserver/messageserver.h @@ -45,6 +45,8 @@ class StoreHandler; class NewCountNotifier; class QMailMessageServerService; +typedef QMap<QMailMessage::MessageType, int> MessageCountMap; + class MessageServer : public QObject { Q_OBJECT @@ -94,7 +96,7 @@ private: ServiceHandler *handler; StoreHandler *storeHandler; - QMailMessageCountMap messageCounts; + MessageCountMap messageCounts; QMap<NewCountNotifier*, QMailMessage::MessageType> actionType; int newMessageTotal; @@ -114,7 +116,6 @@ private: static int sigintFd[2]; QSocketNotifier *snInt; #endif - }; #endif |