summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPekka Vuorela <pvuorela@iki.fi>2025-11-25 17:23:39 +0200
committerPekka Vuorela <pvuorela@iki.fi>2025-12-11 11:11:25 +0200
commit2b166ddec7422518c266e74a84491eb05ba16d09 (patch)
treeb8d48e94c58337d356151b38df449570afccbfd8
parent73553fb423497c561392e32432f9f0a82b0afb09 (diff)
Remove action streaming operators
Shouldn't be reasons anymore to have streaming operators on mail actions. Change-Id: I2de2e6bb810883c0da7260f0083d6a664801b372 Reviewed-by: Pekka Vuorela <pvuorela@iki.fi> Reviewed-by: Damien Caliste <dcaliste@free.fr> Reviewed-by: <matti.viljanen@kapsi.fi>
Diffstat
-rw-r--r--src/libraries/qmfclient/qmailaction.cpp42
-rw-r--r--src/libraries/qmfclient/qmailaction.h7
-rw-r--r--src/libraries/qmfclient/qmailinstantiations.cpp12
-rw-r--r--src/libraries/qmfclient/qmailserviceaction.cpp32
-rw-r--r--src/libraries/qmfclient/qmailserviceaction.h15
5 files changed, 16 insertions, 92 deletions
diff --git a/src/libraries/qmfclient/qmailaction.cpp b/src/libraries/qmfclient/qmailaction.cpp
index 85a06904..7d79bf08 100644
--- a/src/libraries/qmfclient/qmailaction.cpp
+++ b/src/libraries/qmfclient/qmailaction.cpp
@@ -44,12 +44,6 @@ public:
bool operator==(const QMailActionDataPrivate& other) const;
- template <typename Stream>
- void serialize(Stream &stream) const;
-
- template <typename Stream>
- void deserialize(Stream &stream);
-
QMailActionId _id;
QMailServerRequestType _requestType;
uint _current;
@@ -103,18 +97,6 @@ bool QMailActionDataPrivate::operator==(const QMailActionDataPrivate& other) con
&& _status.messageId == other._status.messageId);
}
-template <typename Stream>
-void QMailActionDataPrivate::serialize(Stream &stream) const
-{
- stream << _id << _requestType << _current << _total << _status;
-}
-
-template <typename Stream>
-void QMailActionDataPrivate::deserialize(Stream &stream)
-{
- stream >> _id >> _requestType >> _current >> _total >> _status;
-}
-
/*!
\class QMailActionData
\inmodule QmfClient
@@ -255,26 +237,6 @@ bool QMailActionData::operator!= (const QMailActionData& other) const
return !(d->operator==(*other.d));
}
-/*!
- \fn QMailActionData::serialize(Stream&) const
- \internal
-*/
-template <typename Stream>
-void QMailActionData::serialize(Stream &stream) const
-{
- d->serialize(stream);
-}
-
-/*!
- \fn QMailActionData::deserialize(Stream&)
- \internal
-*/
-template <typename Stream>
-void QMailActionData::deserialize(Stream &stream)
-{
- d->deserialize(stream);
-}
-
-Q_IMPLEMENT_USER_METATYPE_ENUM(QMailServerRequestType)
-Q_IMPLEMENT_USER_METATYPE(QMailActionData)
+Q_IMPLEMENT_USER_METATYPE_NO_OPERATORS(QMailServerRequestType)
+Q_IMPLEMENT_USER_METATYPE_NO_OPERATORS(QMailActionData)
Q_IMPLEMENT_USER_METATYPE_NO_OPERATORS(QMailActionDataList)
diff --git a/src/libraries/qmfclient/qmailaction.h b/src/libraries/qmfclient/qmailaction.h
index 3252db39..06d7eaaf 100644
--- a/src/libraries/qmfclient/qmailaction.h
+++ b/src/libraries/qmfclient/qmailaction.h
@@ -105,17 +105,14 @@ public:
const QMailActionData& operator=(const QMailActionData& other);
- template <typename Stream> void serialize(Stream &stream) const;
- template <typename Stream> void deserialize(Stream &stream);
-
private:
QSharedDataPointer<QMailActionDataPrivate> d;
};
typedef QList<QMailActionData> QMailActionDataList;
-Q_DECLARE_USER_METATYPE(QMailServerRequestType)
-Q_DECLARE_USER_METATYPE(QMailActionData)
+Q_DECLARE_METATYPE(QMailServerRequestType)
+Q_DECLARE_METATYPE(QMailActionData)
Q_DECLARE_METATYPE(QMailActionDataList)
#endif
diff --git a/src/libraries/qmfclient/qmailinstantiations.cpp b/src/libraries/qmfclient/qmailinstantiations.cpp
index 5fdb0de7..406d69de 100644
--- a/src/libraries/qmfclient/qmailinstantiations.cpp
+++ b/src/libraries/qmfclient/qmailinstantiations.cpp
@@ -50,12 +50,12 @@ Q_IMPLEMENT_USER_METATYPE_NO_OPERATORS(QMailMessageList)
Q_IMPLEMENT_USER_METATYPE_NO_OPERATORS(QMailMessageMetaDataList)
Q_IMPLEMENT_USER_METATYPE_NO_OPERATORS(QMailMessageTypeList)
-Q_IMPLEMENT_USER_METATYPE(QMailServiceAction::Status)
+Q_IMPLEMENT_USER_METATYPE_NO_OPERATORS(QMailServiceAction::Status)
-Q_IMPLEMENT_USER_METATYPE_ENUM(QMailServiceAction::Connectivity)
-Q_IMPLEMENT_USER_METATYPE_ENUM(QMailServiceAction::Activity)
-Q_IMPLEMENT_USER_METATYPE_ENUM(QMailServiceAction::Status::ErrorCode)
+Q_IMPLEMENT_USER_METATYPE_NO_OPERATORS(QMailServiceAction::Connectivity)
+Q_IMPLEMENT_USER_METATYPE_NO_OPERATORS(QMailServiceAction::Activity)
+Q_IMPLEMENT_USER_METATYPE_NO_OPERATORS(QMailServiceAction::Status::ErrorCode)
-Q_IMPLEMENT_USER_METATYPE_ENUM(QMailRetrievalAction::RetrievalSpecification)
+Q_IMPLEMENT_USER_METATYPE_NO_OPERATORS(QMailRetrievalAction::RetrievalSpecification)
-Q_IMPLEMENT_USER_METATYPE_ENUM(QMailSearchAction::SearchSpecification)
+Q_IMPLEMENT_USER_METATYPE_NO_OPERATORS(QMailSearchAction::SearchSpecification)
diff --git a/src/libraries/qmfclient/qmailserviceaction.cpp b/src/libraries/qmfclient/qmailserviceaction.cpp
index 5595c0ee..41d7998e 100644
--- a/src/libraries/qmfclient/qmailserviceaction.cpp
+++ b/src/libraries/qmfclient/qmailserviceaction.cpp
@@ -485,38 +485,6 @@ QMailServiceAction::Status& QMailServiceAction::Status::operator=(const QMailSer
}
/*!
- \fn QMailServiceAction::Status::serialize(Stream&) const
- \internal
-*/
-template <typename Stream>
-void QMailServiceAction::Status::serialize(Stream &stream) const
-{
- stream << errorCode;
- stream << text;
- stream << accountId;
- stream << folderId;
- stream << messageId;
-}
-
-template void QMailServiceAction::Status::serialize(QDataStream &) const;
-
-/*!
- \fn QMailServiceAction::Status::deserialize(Stream&)
- \internal
-*/
-template <typename Stream>
-void QMailServiceAction::Status::deserialize(Stream &stream)
-{
- stream >> errorCode;
- stream >> text;
- stream >> accountId;
- stream >> folderId;
- stream >> messageId;
-}
-
-template void QMailServiceAction::Status::deserialize(QDataStream &);
-
-/*!
\class QMailServiceAction
\inmodule QmfClient
diff --git a/src/libraries/qmfclient/qmailserviceaction.h b/src/libraries/qmfclient/qmailserviceaction.h
index c7f6927a..f081e456 100644
--- a/src/libraries/qmfclient/qmailserviceaction.h
+++ b/src/libraries/qmfclient/qmailserviceaction.h
@@ -105,9 +105,6 @@ public:
Status(const Status &other);
Status& operator=(const Status& other);
- template <typename Stream> void serialize(Stream &stream) const;
- template <typename Stream> void deserialize(Stream &stream);
-
ErrorCode errorCode;
QString text;
@@ -366,14 +363,14 @@ private:
};
-Q_DECLARE_USER_METATYPE(QMailServiceAction::Status)
+Q_DECLARE_METATYPE(QMailServiceAction::Status)
-Q_DECLARE_USER_METATYPE(QMailServiceAction::Connectivity)
-Q_DECLARE_USER_METATYPE(QMailServiceAction::Activity)
-Q_DECLARE_USER_METATYPE(QMailServiceAction::Status::ErrorCode)
+Q_DECLARE_METATYPE(QMailServiceAction::Connectivity)
+Q_DECLARE_METATYPE(QMailServiceAction::Activity)
+Q_DECLARE_METATYPE(QMailServiceAction::Status::ErrorCode)
-Q_DECLARE_USER_METATYPE(QMailRetrievalAction::RetrievalSpecification)
+Q_DECLARE_METATYPE(QMailRetrievalAction::RetrievalSpecification)
-Q_DECLARE_USER_METATYPE(QMailSearchAction::SearchSpecification)
+Q_DECLARE_METATYPE(QMailSearchAction::SearchSpecification)
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-14 20:58:54 +0000