diff options
36 files changed, 211 insertions, 174 deletions
diff --git a/examples/qtmail/browserwidget.cpp b/examples/qtmail/browserwidget.cpp index 64a0af8e..ab8ab82a 100644 --- a/examples/qtmail/browserwidget.cpp +++ b/examples/qtmail/browserwidget.cpp @@ -835,7 +835,8 @@ void BrowserWidget::displayHtml(const QMailMessage* mail) if (mail->partCount() > 0) { bodyText = renderMultipart(*mail); } else { - bodyText = (mail->content() == QMailMessage::PlainTextContent) ? formatText(mail->body().data()) : mail->body().data(); + bodyText = (mail->contentCategory() == QMailMessage::PlainTextContent) ? formatText(mail->body().data()) + : mail->body().data(); if (!mail->contentAvailable()) { QString trailer = @@ -1202,7 +1203,6 @@ QString BrowserWidget::handleReplies(const QString& txt) const QString BrowserWidget::buildParagraph(const QString& txt, const QString& prepend, bool preserveWs) const { Q_UNUSED(prepend); - QStringList out; QString input = encodeUrlAndMail( preserveWs ? txt : txt.simplified() ); if (preserveWs) diff --git a/examples/qtmail/emailcomposer.cpp b/examples/qtmail/emailcomposer.cpp index e6fc38d1..dbab373f 100644 --- a/examples/qtmail/emailcomposer.cpp +++ b/examples/qtmail/emailcomposer.cpp @@ -1201,9 +1201,10 @@ QList<QMailMessage::MessageType> EmailComposerInterface::messageTypes() const return QList<QMailMessage::MessageType>() << QMailMessage::Email; } -QList<QMailMessage::ContentType> EmailComposerInterface::contentTypes() const +QList<QMailMessage::ContentCategory> EmailComposerInterface::contentTypes() const { - return QList<QMailMessage::ContentType>() << QMailMessage::RichTextContent + return QList<QMailMessage::ContentCategory>() + << QMailMessage::RichTextContent << QMailMessage::PlainTextContent << QMailMessage::VCardContent << QMailMessage::MultipartContent; diff --git a/examples/qtmail/emailcomposer.h b/examples/qtmail/emailcomposer.h index 21b17c3c..7aed5b5e 100644 --- a/examples/qtmail/emailcomposer.h +++ b/examples/qtmail/emailcomposer.h @@ -68,7 +68,7 @@ public: virtual QString key() const; virtual QList<QMailMessage::MessageType> messageTypes() const; - virtual QList<QMailMessage::ContentType> contentTypes() const; + virtual QList<QMailMessage::ContentCategory> contentTypes() const; virtual QString name(QMailMessage::MessageType type) const; virtual QString displayName(QMailMessage::MessageType type) const; virtual QIcon displayIcon(QMailMessage::MessageType type) const; diff --git a/examples/qtmail/genericviewer.cpp b/examples/qtmail/genericviewer.cpp index 3a0cbb2f..d249c594 100644 --- a/examples/qtmail/genericviewer.cpp +++ b/examples/qtmail/genericviewer.cpp @@ -103,18 +103,19 @@ QMailViewerFactory::PresentationType GenericViewer::presentation() const return QMailViewerFactory::StandardPresentation; } -QList<QMailMessage::ContentType> GenericViewer::types() const -{ - return QList<QMailMessage::ContentType>() << QMailMessage::PlainTextContent - << QMailMessage::RichTextContent - << QMailMessage::ImageContent - << QMailMessage::AudioContent - << QMailMessage::VideoContent - << QMailMessage::MultipartContent - << QMailMessage::HtmlContent // temporary... - << QMailMessage::VCardContent // temporary... - << QMailMessage::VCalendarContent // temporary... - << QMailMessage::ICalendarContent; // temporary... +QList<QMailMessage::ContentCategory> GenericViewer::types() const +{ + return QList<QMailMessage::ContentCategory>() + << QMailMessage::PlainTextContent + << QMailMessage::RichTextContent + << QMailMessage::ImageContent + << QMailMessage::AudioContent + << QMailMessage::VideoContent + << QMailMessage::MultipartContent + << QMailMessage::HtmlContent // temporary... + << QMailMessage::VCardContent // temporary... + << QMailMessage::VCalendarContent // temporary... + << QMailMessage::ICalendarContent; // temporary... } bool GenericViewer::setMessage(const QMailMessage& mail) diff --git a/examples/qtmail/genericviewer.h b/examples/qtmail/genericviewer.h index 318e721e..907e2f4d 100644 --- a/examples/qtmail/genericviewer.h +++ b/examples/qtmail/genericviewer.h @@ -66,7 +66,7 @@ public: virtual void scrollToAnchor(const QString& a); virtual QString key() const; virtual QMailViewerFactory::PresentationType presentation() const; - virtual QList<QMailMessage::ContentType> types() const; + virtual QList<QMailMessage::ContentCategory> types() const; public slots: virtual bool setMessage(const QMailMessage& mail); diff --git a/examples/qtmail/qmailcomposer.cpp b/examples/qtmail/qmailcomposer.cpp index f911e176..ebc86c05 100644 --- a/examples/qtmail/qmailcomposer.cpp +++ b/examples/qtmail/qmailcomposer.cpp @@ -114,7 +114,7 @@ QList<QMailMessage::MessageType> QMailComposerInterface::messageTypes() const /*! Returns the content types created by the composer. */ -QList<QMailMessage::ContentType> QMailComposerInterface::contentTypes() const +QList<QMailMessage::ContentCategory> QMailComposerInterface::contentTypes() const { return composerInterface()->contentTypes(); } @@ -292,7 +292,7 @@ QString QMailComposerInterface::status() const /*! Returns a list of keys identifying classes that can compose messages of type \a type containing \a contentType content. */ -QStringList QMailComposerFactory::keys( QMailMessage::MessageType type , QMailMessage::ContentType contentType) +QStringList QMailComposerFactory::keys( QMailMessage::MessageType type , QMailMessage::ContentCategory contentType) { QStringList in; diff --git a/examples/qtmail/qmailcomposer.h b/examples/qtmail/qmailcomposer.h index f30f82a3..6743de04 100644 --- a/examples/qtmail/qmailcomposer.h +++ b/examples/qtmail/qmailcomposer.h @@ -58,11 +58,11 @@ public: virtual QString key() const = 0; virtual QList<QMailMessage::MessageType> messageTypes() const = 0; - virtual QList<QMailMessage::ContentType> contentTypes() const = 0; + virtual QList<QMailMessage::ContentCategory> contentTypes() const = 0; virtual QString name(QMailMessage::MessageType type) const = 0; virtual QString displayName(QMailMessage::MessageType type) const = 0; virtual QIcon displayIcon(QMailMessage::MessageType type) const = 0; - virtual bool isSupported(QMailMessage::MessageType t, QMailMessage::ContentType c = QMailMessage::NoContent) const + virtual bool isSupported(QMailMessage::MessageType t, QMailMessage::ContentCategory c = QMailMessage::NoContent) const { bool supportsMessageType(t == QMailMessage::AnyType || messageTypes().contains(t)); bool supportsContentType(c == QMailMessage::NoContent || contentTypes().contains(c)); @@ -100,14 +100,14 @@ class QMailComposerFactory public: // Yield the key for each interface supporting the supplied type static QStringList keys(QMailMessage::MessageType type = QMailMessage::AnyType, - QMailMessage::ContentType contentType = QMailMessage::NoContent); + QMailMessage::ContentCategory contentType = QMailMessage::NoContent); // Yield the default key for the supplied type static QString defaultKey( QMailMessage::MessageType type = QMailMessage::AnyType ); // Properties available for each interface static QList<QMailMessage::MessageType> messageTypes(const QString &key); - //static QList<QMailMessage::ContentType> contentTypes(const QString& key); + //static QList<QMailMessage::ContentCategory> contentTypes(const QString& key); static QString name(const QString &key, QMailMessage::MessageType type); static QString displayName(const QString &key, QMailMessage::MessageType type); static QIcon displayIcon(const QString &key, QMailMessage::MessageType type); diff --git a/examples/qtmail/qmailviewer.cpp b/examples/qtmail/qmailviewer.cpp index fddb4b93..ba8bdcf3 100644 --- a/examples/qtmail/qmailviewer.cpp +++ b/examples/qtmail/qmailviewer.cpp @@ -250,14 +250,14 @@ bool QMailViewerInterface::handleOutgoingMessages( const QMailMessageIdList &lis */ /*! - \fn bool QMailViewerInterface::isSupported(QMailMessage::ContentType t, QMailViewerFactory::PresentationType pres) const + \fn bool QMailViewerInterface::isSupported(QMailMessage::ContentCategory t, QMailViewerFactory::PresentationType pres) const Returns true if the viewer can present a message containing data of content type \a t, using the presentation type \a pres. */ /*! - \fn QList<QMailMessage::ContentType> QMailViewerInterface::types() const + \fn QList<QMailMessage::ContentCategory> QMailViewerInterface::types() const Returns a list of the content types that can be presented by this viewer component. */ @@ -306,7 +306,7 @@ void QMailViewerInterface::setResource(const QUrl& name, QVariant value) Returns a list of keys identifying classes that can display a message containing \a type content, using the presentation type \a pres. */ -QStringList QMailViewerFactory::keys(QMailMessage::ContentType type, PresentationType pres) +QStringList QMailViewerFactory::keys(QMailMessage::ContentCategory type, PresentationType pres) { QStringList in; @@ -320,7 +320,7 @@ QStringList QMailViewerFactory::keys(QMailMessage::ContentType type, Presentatio Returns the key identifying the first class found that can display message containing \a type content, using the presentation type \a pres. */ -QString QMailViewerFactory::defaultKey(QMailMessage::ContentType type, PresentationType pres) +QString QMailViewerFactory::defaultKey(QMailMessage::ContentCategory type, PresentationType pres) { QStringList list(QMailViewerFactory::keys(type, pres)); return (list.isEmpty() ? QString() : list.first()); diff --git a/examples/qtmail/qmailviewer.h b/examples/qtmail/qmailviewer.h index b2f662dd..93e73af2 100644 --- a/examples/qtmail/qmailviewer.h +++ b/examples/qtmail/qmailviewer.h @@ -63,11 +63,11 @@ public: }; // Yield the ID for each interface supporting the supplied type, where the - // value is interpreted as a ContentType value - static QStringList keys(QMailMessage::ContentType type = QMailMessage::UnknownContent, PresentationType pres = AnyPresentation); + // value is interpreted as a ContentCategory value + static QStringList keys(QMailMessage::ContentCategory type = QMailMessage::UnknownContent, PresentationType pres = AnyPresentation); // Yield the default ID for the supplied type - static QString defaultKey(QMailMessage::ContentType type = QMailMessage::UnknownContent, PresentationType pres = AnyPresentation); + static QString defaultKey(QMailMessage::ContentCategory type = QMailMessage::UnknownContent, PresentationType pres = AnyPresentation); // Use the interface identified by the supplied ID to create a viewer static QMailViewerInterface *create(const QString &key, QWidget *parent = nullptr); @@ -94,9 +94,9 @@ public: virtual QString key() const = 0; virtual QMailViewerFactory::PresentationType presentation() const = 0; - virtual QList<QMailMessage::ContentType> types() const = 0; + virtual QList<QMailMessage::ContentCategory> types() const = 0; - bool isSupported(QMailMessage::ContentType t, QMailViewerFactory::PresentationType pres) const + bool isSupported(QMailMessage::ContentCategory t, QMailViewerFactory::PresentationType pres) const { if ((pres != QMailViewerFactory::AnyPresentation) && (pres != presentation())) return false; diff --git a/examples/qtmail/readmail.cpp b/examples/qtmail/readmail.cpp index a5ddce11..c9551e17 100644 --- a/examples/qtmail/readmail.cpp +++ b/examples/qtmail/readmail.cpp @@ -246,7 +246,7 @@ void ReadMail::updateView(QMailViewerFactory::PresentationType type) } } - QMailMessage::ContentType content(mail.content()); + QMailMessage::ContentCategory content(mail.contentCategory()); if ((content == QMailMessage::NoContent) || (content == QMailMessage::UnknownContent)) { // Attempt to show the message as text, from the subject if necessary content = QMailMessage::PlainTextContent; @@ -480,7 +480,7 @@ QMailViewerInterface* ReadMail::currentViewer() const return currentView.top().first; } -QMailViewerInterface* ReadMail::viewer(QMailMessage::ContentType content, QMailViewerFactory::PresentationType type) +QMailViewerInterface* ReadMail::viewer(QMailMessage::ContentCategory content, QMailViewerFactory::PresentationType type) { ViewerMap::iterator it = contentViews.find(qMakePair(content, type)); if (it == contentViews.end()) { diff --git a/examples/qtmail/readmail.h b/examples/qtmail/readmail.h index def9a02e..4698c295 100644 --- a/examples/qtmail/readmail.h +++ b/examples/qtmail/readmail.h @@ -114,7 +114,7 @@ private: QMailViewerInterface* currentViewer() const; - QMailViewerInterface* viewer(QMailMessage::ContentType content, QMailViewerFactory::PresentationType type = QMailViewerFactory::StandardPresentation); + QMailViewerInterface* viewer(QMailMessage::ContentCategory content, QMailViewerFactory::PresentationType type = QMailViewerFactory::StandardPresentation); static QString displayName(const QMailMessage &); @@ -136,7 +136,7 @@ private: typedef QStack<QPair<QMailViewerInterface*, QString> > ViewerStack; ViewerStack currentView; - typedef QMap<QPair<QMailMessage::ContentType, QMailViewerFactory::PresentationType>, QMailViewerInterface*> ViewerMap; + typedef QMap<QPair<QMailMessage::ContentCategory, QMailViewerFactory::PresentationType>, QMailViewerInterface*> ViewerMap; ViewerMap contentViews; }; diff --git a/src/libraries/qmfclient/qmailinstantiations.cpp b/src/libraries/qmfclient/qmailinstantiations.cpp index 406d69de..f662df30 100644 --- a/src/libraries/qmfclient/qmailinstantiations.cpp +++ b/src/libraries/qmfclient/qmailinstantiations.cpp @@ -37,7 +37,7 @@ Q_IMPLEMENT_USER_METATYPE_ENUM(QMailMessageBody::TransferEncoding) Q_IMPLEMENT_USER_METATYPE_ENUM(QMailMessagePartContainer::MultipartType) Q_IMPLEMENT_USER_METATYPE_ENUM(QMailMessage::MessageType) -Q_IMPLEMENT_USER_METATYPE_ENUM(QMailMessage::ContentType) +Q_IMPLEMENT_USER_METATYPE_ENUM(QMailMessage::ContentCategory) Q_IMPLEMENT_USER_METATYPE_ENUM(QMailMessage::ResponseType) Q_IMPLEMENT_USER_METATYPE_ENUM(QMailMessage::AttachmentsAction) diff --git a/src/libraries/qmfclient/qmailmessage.cpp b/src/libraries/qmfclient/qmailmessage.cpp index bc04a92e..e860437f 100644 --- a/src/libraries/qmfclient/qmailmessage.cpp +++ b/src/libraries/qmfclient/qmailmessage.cpp @@ -6565,7 +6565,7 @@ static quint64 calendarCancellationFlag = 0; QMailMessageMetaDataPrivate::QMailMessageMetaDataPrivate() : _messageType(QMailMessage::None), _status(0), - _contentType(QMailMessage::UnknownContent), + _contentCategory(QMailMessage::UnknownContent), _size(0), _responseType(QMailMessage::NoResponse), _customFieldsModified(false), @@ -6613,9 +6613,9 @@ void QMailMessageMetaDataPrivate::setSize(uint size) updateMember(_size, size); } -void QMailMessageMetaDataPrivate::setContent(QMailMessage::ContentType type) +void QMailMessageMetaDataPrivate::setContentCategory(QMailMessage::ContentCategory type) { - updateMember(_contentType, type); + updateMember(_contentCategory, type); } void QMailMessageMetaDataPrivate::setSubject(const QString& s) @@ -6784,7 +6784,7 @@ void QMailMessageMetaDataPrivate::serialize(Stream &stream) const { stream << _messageType; stream << _status; - stream << _contentType; + stream << _contentCategory; stream << _parentAccountId; stream << _serverUid; stream << _size; @@ -6819,7 +6819,7 @@ void QMailMessageMetaDataPrivate::deserialize(Stream &stream) stream >> _messageType; stream >> _status; - stream >> _contentType; + stream >> _contentCategory; stream >> _parentAccountId; stream >> _serverUid; stream >> _size; @@ -7223,6 +7223,31 @@ const quint64 &QMailMessageMetaData::Todo = todoFlag; const quint64 &QMailMessageMetaData::NoNotification = noNotificationFlag; const quint64 &QMailMessageMetaData::CalendarCancellation = calendarCancellationFlag; + +/*! + \enum QMailMessageMetaData::ContentCategory + + This enum type is used to describe the content category of the message. + + \value UnknownContent Unknown content + \value NoContent Empty message + \value PlainTextContent Plain text + \value RichTextContent Rich text + \value HtmlContent HTML content + \value ImageContent Image content + \value AudioContent Audio content + \value VideoContent Video content + \value MultipartContent Multipart content + \value SmilContent SMIL content + \value VoicemailContent Voicemail content + \value VideomailContent Videomail content + \value VCardContent VCard content + \value VCalendarContent VCalendar content + \value ICalendarContent iCalendar content + \value DeliveryReportContent Delivery report content + \value UserContent User specific content +*/ + /*! Constructs an empty message meta data object. */ @@ -7617,20 +7642,18 @@ uint QMailMessageMetaData::indicativeSize() const /*! Returns the type of content contained within the message. */ -QMailMessage::ContentType QMailMessageMetaData::content() const +QMailMessage::ContentCategory QMailMessageMetaData::contentCategory() const { - return d->_contentType; + return d->_contentCategory; } /*! - \fn QMailMessageMetaData::setContent(QMailMessageMetaData::ContentType) - Sets the type of content contained within the message to \a type. It is the caller's responsibility to ensure that this value matches the actual content. */ -void QMailMessageMetaData::setContent(QMailMessage::ContentType type) +void QMailMessageMetaData::setContentCategory(ContentCategory type) { - d->setContent(type); + d->setContentCategory(type); } /*! diff --git a/src/libraries/qmfclient/qmailmessage.h b/src/libraries/qmfclient/qmailmessage.h index edd5bf39..90c37b8d 100644 --- a/src/libraries/qmfclient/qmailmessage.h +++ b/src/libraries/qmfclient/qmailmessage.h @@ -637,7 +637,7 @@ public: AnyType = Mms | Sms | Email | System | Instant }; - enum ContentType { + enum ContentCategory { UnknownContent = 0, NoContent = 1, PlainTextContent = 2, @@ -748,8 +748,18 @@ public: virtual uint indicativeSize() const; - virtual ContentType content() const; - virtual void setContent(ContentType type); + virtual ContentCategory contentCategory() const; + virtual void setContentCategory(ContentCategory type); + + Q_DECL_DEPRECATED_X("Use contentCategory()") ContentCategory content() const + { + return contentCategory(); + } + + Q_DECL_DEPRECATED_X("Use setContentCategory()") void setContent(ContentCategory type) + { + setContentCategory(type); + } virtual QMailFolderId previousParentFolderId() const; virtual void setPreviousParentFolderId(const QMailFolderId &id); @@ -862,7 +872,7 @@ public: typedef QPair<ChunkType, QByteArray> MessageChunk; using QMailMessageMetaData::MessageType; - using QMailMessageMetaData::ContentType; + using QMailMessageMetaData::ContentCategory; using QMailMessageMetaData::ResponseType; static QMailMessage fromRfc2822(const QByteArray &ba); @@ -997,7 +1007,7 @@ typedef QList<QMailMessage::MessageType> QMailMessageTypeList; Q_DECLARE_USER_METATYPE(QMailMessageBody::TransferEncoding) Q_DECLARE_USER_METATYPE(QMailMessagePartContainer::MultipartType) Q_DECLARE_USER_METATYPE(QMailMessage::MessageType) -Q_DECLARE_USER_METATYPE(QMailMessage::ContentType) +Q_DECLARE_USER_METATYPE(QMailMessage::ContentCategory) Q_DECLARE_USER_METATYPE(QMailMessage::ResponseType) Q_DECLARE_USER_METATYPE(QMailMessage::AttachmentsAction) diff --git a/src/libraries/qmfclient/qmailmessage_p.h b/src/libraries/qmfclient/qmailmessage_p.h index b34c5d33..422cebe4 100644 --- a/src/libraries/qmfclient/qmailmessage_p.h +++ b/src/libraries/qmfclient/qmailmessage_p.h @@ -322,7 +322,7 @@ public: void setParentAccountId(const QMailAccountId& id); void setServerUid(const QString &server); void setSize(uint size); - void setContent(QMailMessage::ContentType type); + void setContentCategory(QMailMessage::ContentCategory type); void setSubject(const QString& s); void setDate(const QMailTimeStamp& timeStamp); @@ -361,7 +361,7 @@ public: QMailMessage::MessageType _messageType; quint64 _status; - QMailMessage::ContentType _contentType; + QMailMessage::ContentCategory _contentCategory; QMailAccountId _parentAccountId; QString _serverUid; diff --git a/src/libraries/qmfclient/qmailmessagekey.cpp b/src/libraries/qmfclient/qmailmessagekey.cpp index f3bf1997..31f8541c 100644 --- a/src/libraries/qmfclient/qmailmessagekey.cpp +++ b/src/libraries/qmfclient/qmailmessagekey.cpp @@ -103,7 +103,7 @@ using namespace QMailKey; \value Size The size of the message. \value ParentAccountId The ID of the account the message was downloaded from. \value AncestorFolderIds The set of IDs of folders which are direct or indirect parents of this message. - \value ContentType The type of data contained within the message. + \value ContentCategory The type of data contained within the message. \value PreviousParentFolderId The parent folder ID this message was contained in, prior to moving to the current parent folder. \value ContentScheme The scheme used to store the content of the message. \value ContentIdentifier The identifier used to store the content of the message. @@ -747,25 +747,27 @@ QMailMessageKey QMailMessageKey::ancestorFolderIds(const QMailFolderKey &key, QM /*! Returns a key matching messages whose content type matches \a type, according to \a cmp. - \sa QMailMessage::content() + \sa QMailMessage::contentCategory() */ -QMailMessageKey QMailMessageKey::contentType(QMailMessageMetaData::ContentType type, QMailDataComparator::EqualityComparator cmp) +QMailMessageKey QMailMessageKey::contentCategory(QMailMessageMetaData::ContentCategory type, + QMailDataComparator::EqualityComparator cmp) { - return QMailMessageKey(ContentType, static_cast<int>(type), QMailKey::comparator(cmp)); + return QMailMessageKey(ContentCategory, static_cast<int>(type), QMailKey::comparator(cmp)); } /*! Returns a key matching messages whose content type is a member of \a types, according to \a cmp. - \sa QMailMessage::content() + \sa QMailMessage::contentCategory() */ -QMailMessageKey QMailMessageKey::contentType(const QList<QMailMessageMetaData::ContentType> &types, QMailDataComparator::InclusionComparator cmp) +QMailMessageKey QMailMessageKey::contentCategory(const QList<QMailMessageMetaData::ContentCategory> &types, + QMailDataComparator::InclusionComparator cmp) { QList<int> x; - foreach (QMailMessageMetaData::ContentType type, types) + foreach (QMailMessageMetaData::ContentCategory type, types) x.append(static_cast<int>(type)); - return QMailMessageKey(x, ContentType, QMailKey::comparator(cmp)); + return QMailMessageKey(x, ContentCategory, QMailKey::comparator(cmp)); } /*! diff --git a/src/libraries/qmfclient/qmailmessagekey.h b/src/libraries/qmfclient/qmailmessagekey.h index a4444db3..5cce560a 100644 --- a/src/libraries/qmfclient/qmailmessagekey.h +++ b/src/libraries/qmfclient/qmailmessagekey.h @@ -74,7 +74,7 @@ public: Size = (1 << 11), ParentAccountId = (1 << 12), AncestorFolderIds = (1 << 13), - ContentType = (1 << 14), + ContentCategory = (1 << 14), PreviousParentFolderId = (1 << 15), ContentScheme = (1 << 16), ContentIdentifier = (1 << 17), @@ -175,8 +175,8 @@ public: static QMailMessageKey ancestorFolderIds(const QMailFolderIdList &ids, QMailDataComparator::InclusionComparator cmp = QMailDataComparator::Includes); static QMailMessageKey ancestorFolderIds(const QMailFolderKey &key, QMailDataComparator::InclusionComparator cmp = QMailDataComparator::Includes); - static QMailMessageKey contentType(QMailMessageMetaData::ContentType type, QMailDataComparator::EqualityComparator cmp = QMailDataComparator::Equal); - static QMailMessageKey contentType(const QList<QMailMessageMetaData::ContentType> &types, QMailDataComparator::InclusionComparator cmp = QMailDataComparator::Includes); + static QMailMessageKey contentCategory(QMailMessageMetaData::ContentCategory type, QMailDataComparator::EqualityComparator cmp = QMailDataComparator::Equal); + static QMailMessageKey contentCategory(const QList<QMailMessageMetaData::ContentCategory> &types, QMailDataComparator::InclusionComparator cmp = QMailDataComparator::Includes); static QMailMessageKey previousParentFolderId(const QMailFolderId &id, QMailDataComparator::EqualityComparator cmp = QMailDataComparator::Equal); static QMailMessageKey previousParentFolderId(const QMailFolderIdList &ids, QMailDataComparator::InclusionComparator cmp = QMailDataComparator::Includes); diff --git a/src/libraries/qmfclient/qmailmessagesortkey.cpp b/src/libraries/qmfclient/qmailmessagesortkey.cpp index 24933806..bc1cef90 100644 --- a/src/libraries/qmfclient/qmailmessagesortkey.cpp +++ b/src/libraries/qmfclient/qmailmessagesortkey.cpp @@ -73,7 +73,7 @@ \value ServerUid The IMAP server UID of the message. \value ParentAccountId The ID of the account the mesasge was downloaded from. \value Size The size of the message. - \value ContentType The type of data contained within the message. + \value ContentCategory The type of data contained within the message. \value PreviousParentFolderId The parent folder ID this message was contained in, prior to moving to the current parent folder. \value CopyServerUid The server uid of the message this is a copy of \value ListId The name of the list @@ -327,11 +327,11 @@ QMailMessageSortKey QMailMessageSortKey::parentAccountId(Qt::SortOrder order) /*! Returns a key that sorts messages by their content types, according to \a order. - \sa QMailMessage::content() + \sa QMailMessage::contentCategory() */ -QMailMessageSortKey QMailMessageSortKey::contentType(Qt::SortOrder order) +QMailMessageSortKey QMailMessageSortKey::contentCategory(Qt::SortOrder order) { - return QMailMessageSortKey(ContentType, order); + return QMailMessageSortKey(ContentCategory, order); } /*! diff --git a/src/libraries/qmfclient/qmailmessagesortkey.h b/src/libraries/qmfclient/qmailmessagesortkey.h index a83fd639..60792f21 100644 --- a/src/libraries/qmfclient/qmailmessagesortkey.h +++ b/src/libraries/qmfclient/qmailmessagesortkey.h @@ -59,7 +59,7 @@ public: ServerUid, Size, ParentAccountId, - ContentType, + ContentCategory, PreviousParentFolderId, CopyServerUid, ListId, @@ -100,7 +100,7 @@ public: static QMailMessageSortKey serverUid(Qt::SortOrder order = Qt::AscendingOrder); static QMailMessageSortKey size(Qt::SortOrder order = Qt::AscendingOrder); static QMailMessageSortKey parentAccountId(Qt::SortOrder order = Qt::AscendingOrder); - static QMailMessageSortKey contentType(Qt::SortOrder order = Qt::AscendingOrder); + static QMailMessageSortKey contentCategory(Qt::SortOrder order = Qt::AscendingOrder); static QMailMessageSortKey previousParentFolderId(Qt::SortOrder order = Qt::AscendingOrder); static QMailMessageSortKey copyServerUid(Qt::SortOrder order = Qt::AscendingOrder); static QMailMessageSortKey restoreFolderId(Qt::SortOrder order = Qt::AscendingOrder); diff --git a/src/libraries/qmfclient/qmailstore.cpp b/src/libraries/qmfclient/qmailstore.cpp index bbb19b8f..b85f4a1e 100644 --- a/src/libraries/qmfclient/qmailstore.cpp +++ b/src/libraries/qmfclient/qmailstore.cpp @@ -1475,7 +1475,7 @@ QMailMessageMetaData QMailStore::dataToTransfer(const QMailMessageMetaData* mess metaData.setParentAccountId(message->parentAccountId()); metaData.setServerUid(message->serverUid()); metaData.setSize(message->size()); - metaData.setContent(message->content()); + metaData.setContentCategory(message->contentCategory()); metaData.setPreviousParentFolderId(message->previousParentFolderId()); metaData.setContentScheme(message->contentScheme()); metaData.setContentIdentifier(message->contentIdentifier()); diff --git a/src/libraries/qmfclient/qmailstore_p.cpp b/src/libraries/qmfclient/qmailstore_p.cpp index 7bd828d2..02d403dc 100644 --- a/src/libraries/qmfclient/qmailstore_p.cpp +++ b/src/libraries/qmfclient/qmailstore_p.cpp @@ -379,8 +379,8 @@ void QMailStorePrivate::updateMessageValues(const QMailMessageKey::Properties& p metaData->setSize(values.size()); break; - case QMailMessageKey::ContentType: - metaData->setContent(values.content()); + case QMailMessageKey::ContentCategory: + metaData->setContentCategory(values.contentCategory()); break; case QMailMessageKey::PreviousParentFolderId: @@ -1145,8 +1145,8 @@ void QMailStorePrivate::messagePropertiesRemotelyChanged(const QMailMessageIdLis metaData.setSize(data.size()); break; - case QMailMessageKey::ContentType: - metaData.setContent(data.content()); + case QMailMessageKey::ContentCategory: + metaData.setContentCategory(data.contentCategory()); break; case QMailMessageKey::PreviousParentFolderId: diff --git a/src/libraries/qmfclient/qmailstoresql_p.cpp b/src/libraries/qmfclient/qmailstoresql_p.cpp index bc68953d..b1546f76 100644 --- a/src/libraries/qmfclient/qmailstoresql_p.cpp +++ b/src/libraries/qmfclient/qmailstoresql_p.cpp @@ -323,7 +323,7 @@ public: QVariant size() const { return _data.size(); } - QVariant content() const { return static_cast<int>(_data.content()); } + QVariant contentCategory() const { return static_cast<int>(_data.contentCategory()); } QVariant previousParentFolderId() const { return _data.previousParentFolderId().toULongLong(); } @@ -409,9 +409,9 @@ public: return QMailStoreSql::extractValue<int>(_value); } - QMailMessage::ContentType content() const + QMailMessage::ContentCategory contentCategory() const { - return static_cast<QMailMessage::ContentType>(QMailStoreSql::extractValue<int>(_value)); + return static_cast<QMailMessage::ContentCategory>(QMailStoreSql::extractValue<int>(_value)); } QMailFolderId previousParentFolderId() const @@ -482,7 +482,7 @@ static QMailStoreSql::MessagePropertyMap messagePropertyMap() map.insert(QMailMessageKey::ParentAccountId, QLatin1String("parentaccountid")); map.insert(QMailMessageKey::ServerUid, QLatin1String("serveruid")); map.insert(QMailMessageKey::Size, QLatin1String("size")); - map.insert(QMailMessageKey::ContentType, QLatin1String("contenttype")); + map.insert(QMailMessageKey::ContentCategory, QLatin1String("contenttype")); map.insert(QMailMessageKey::PreviousParentFolderId, QLatin1String("previousparentfolderid")); map.insert(QMailMessageKey::ContentScheme, QLatin1String("mailfile")); map.insert(QMailMessageKey::ContentIdentifier, QLatin1String("mailfile")); @@ -703,7 +703,7 @@ static QMap<QMailMessageSortKey::Property, QMailMessageKey::Property> messageSor map.insert(QMailMessageSortKey::ParentAccountId, QMailMessageKey::ParentAccountId); map.insert(QMailMessageSortKey::ServerUid, QMailMessageKey::ServerUid); map.insert(QMailMessageSortKey::Size, QMailMessageKey::Size); - map.insert(QMailMessageSortKey::ContentType, QMailMessageKey::ContentType); + map.insert(QMailMessageSortKey::ContentCategory, QMailMessageKey::ContentCategory); map.insert(QMailMessageSortKey::PreviousParentFolderId, QMailMessageKey::PreviousParentFolderId); map.insert(QMailMessageSortKey::CopyServerUid, QMailMessageKey::CopyServerUid); map.insert(QMailMessageSortKey::ListId, QMailMessageKey::ListId); @@ -1152,9 +1152,9 @@ public: int size() const { return value<int>(QMailMessageKey::Size); } - QMailMessage::ContentType content() const + QMailMessage::ContentCategory contentCategory() const { - return static_cast<QMailMessage::ContentType>(value<int>(QMailMessageKey::ContentType, QMailMessage::UnknownContent)); + return static_cast<QMailMessage::ContentCategory>(value<int>(QMailMessageKey::ContentCategory, QMailMessage::UnknownContent)); } QMailFolderId previousParentFolderId() const { return QMailFolderId(value<quint64>(QMailMessageKey::PreviousParentFolderId)); } @@ -1369,7 +1369,7 @@ void appendWhereValues<QMailMessageKey::ArgumentType>(const QMailMessageKey::Arg values += extractor.size(); break; - case QMailMessageKey::ContentType: + case QMailMessageKey::ContentCategory: values += extractor.content(); break; @@ -2185,7 +2185,7 @@ QString whereClauseItem<QMailMessageKey>(const QMailMessageKey &key, const QMail case QMailMessageKey::TimeStamp: case QMailMessageKey::ReceptionTimeStamp: case QMailMessageKey::Size: - case QMailMessageKey::ContentType: + case QMailMessageKey::ContentCategory: case QMailMessageKey::ContentScheme: case QMailMessageKey::ContentIdentifier: case QMailMessageKey::ResponseType: @@ -2607,7 +2607,7 @@ const QMailMessageKey::Properties &QMailStoreSql::updatableMessageProperties() QMailMessageKey::ParentAccountId | QMailMessageKey::ServerUid | QMailMessageKey::Size | - QMailMessageKey::ContentType | + QMailMessageKey::ContentCategory | QMailMessageKey::PreviousParentFolderId | QMailMessageKey::ContentScheme | QMailMessageKey::ContentIdentifier | @@ -3480,8 +3480,8 @@ void QMailStoreSql::extractMessageMetaData(const QSqlRecord& r, metaData->setSize(messageRecord.size()); break; - case QMailMessageKey::ContentType: - metaData->setContent(messageRecord.content()); + case QMailMessageKey::ContentCategory: + metaData->setContentCategory(messageRecord.contentCategory()); break; case QMailMessageKey::PreviousParentFolderId: @@ -3745,8 +3745,8 @@ QVariantList QMailStoreSql::messageValues(const QMailMessageKey::Properties& pro values.append(extractor.size()); break; - case QMailMessageKey::ContentType: - values.append(extractor.content()); + case QMailMessageKey::ContentCategory: + values.append(extractor.contentCategory()); break; case QMailMessageKey::PreviousParentFolderId: @@ -6172,7 +6172,7 @@ QMailStoreSql::AttemptResult QMailStoreSql::attemptAddMessage(QMailMessageMetaDa values.insert(QLatin1String("mailfile"), ::contentUri(*metaData)); values.insert(QLatin1String("serveruid"), metaData->serverUid()); values.insert(QLatin1String("size"), metaData->size()); - values.insert(QLatin1String("contenttype"), static_cast<int>(metaData->content())); + values.insert(QLatin1String("contenttype"), static_cast<int>(metaData->contentCategory())); values.insert(QLatin1String("responseid"), metaData->inResponseTo().toULongLong()); values.insert(QLatin1String("responsetype"), metaData->responseType()); values.insert(QLatin1String("receivedstamp"), QMailTimeStamp(metaData->receivedDate()).toUTC()); diff --git a/src/libraries/qmfclient/support/qmailipc.cpp b/src/libraries/qmfclient/support/qmailipc.cpp index 57a8fa82..27fce766 100644 --- a/src/libraries/qmfclient/support/qmailipc.cpp +++ b/src/libraries/qmfclient/support/qmailipc.cpp @@ -107,7 +107,7 @@ const QDBusArgument &operator<<(QDBusArgument &argument, const QMailMessageMetaD argument.beginStructure(); argument << static_cast<int>(metadata.messageType()); argument << metadata.status(); // quint64 - argument << static_cast<int>(metadata.content()); + argument << static_cast<int>(metadata.contentCategory()); argument << metadata.parentAccountId(); // qmailaccountid argument << metadata.serverUid(); // string argument << metadata.size(); // uint @@ -157,7 +157,7 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, QMailMessageMetaD metadata.setStatus(uint64Val); argument >> intVal; - metadata.setContent(static_cast<QMailMessageMetaData::ContentType>(intVal)); + metadata.setContentCategory(static_cast<QMailMessageMetaData::ContentCategory>(intVal)); QMailAccountId accountId; argument >> accountId; diff --git a/src/libraries/qmfmessageserver/qmailmessageclassifier.cpp b/src/libraries/qmfmessageserver/qmailmessageclassifier.cpp index fcb718ff..b80d8fcf 100644 --- a/src/libraries/qmfmessageserver/qmailmessageclassifier.cpp +++ b/src/libraries/qmfmessageserver/qmailmessageclassifier.cpp @@ -43,7 +43,7 @@ type of content contained by a message. QMailMessageClassifier inspects a message to determine what type of content it contains, - according to the classification of \l{QMailMessageMetaData::ContentType}{QMailMessage::ContentType}. + according to the classification of \l{QMailMessageMetaData::ContentCategory}{QMailMessage::ContentCategory}. */ /*! @@ -58,9 +58,9 @@ QMailMessageClassifier::~QMailMessageClassifier() { } -static QMailMessage::ContentType fromContentType(const QMailMessageContentType& contentType) +static QMailMessage::ContentCategory fromContentType(const QMailMessageContentType &contentType) { - QMailMessage::ContentType content = QMailMessage::UnknownContent; + QMailMessage::ContentCategory content = QMailMessage::UnknownContent; if (contentType.matches("text", "html")) { content = QMailMessage::HtmlContent; @@ -86,17 +86,17 @@ static QMailMessage::ContentType fromContentType(const QMailMessageContentType& is currently set to \l{QMailMessageMetaData::UnknownContent}{QMailMessageMetaData::UnknownContent}. If the content type is determined, the message record is updated and true is returned. - \sa QMailMessageMetaData::setContent() + \sa QMailMessageMetaData::setContentCategory() */ bool QMailMessageClassifier::classifyMessage(QMailMessage *message) { - if (message && message->content() == QMailMessage::UnknownContent) { + if (message && message->contentCategory() == QMailMessage::UnknownContent) { QMailMessagePartContainer::MultipartType multipartType(message->multipartType()); QMailMessageContentType contentType(message->contentType()); // The content type is used to categorise the message more narrowly than // its transport categorisation - QMailMessage::ContentType content = QMailMessage::UnknownContent; + QMailMessage::ContentCategory content = QMailMessage::UnknownContent; switch (message->messageType()) { case QMailMessage::Sms: @@ -155,7 +155,7 @@ bool QMailMessageClassifier::classifyMessage(QMailMessage *message) } if (content != QMailMessage::UnknownContent) { - message->setContent(content); + message->setContentCategory(content); return true; } } diff --git a/src/plugins/messageservices/imap/imapclient.cpp b/src/plugins/messageservices/imap/imapclient.cpp index 52652235..a722ca52 100644 --- a/src/plugins/messageservices/imap/imapclient.cpp +++ b/src/plugins/messageservices/imap/imapclient.cpp @@ -910,7 +910,7 @@ void ImapClient::messageFetched(QMailMessage& mail, const QString &detachedFilen mail.setParentAccountId(existing.parentAccountId()); mail.setParentFolderId(existing.parentFolderId()); mail.setStatus(existing.status()); - mail.setContent(existing.content()); + mail.setContentCategory(existing.contentCategory()); mail.setReceivedDate(existing.receivedDate()); QMailDisconnected::copyPreviousFolder(existing, &mail); mail.setInResponseTo(existing.inResponseTo()); diff --git a/src/plugins/messageservices/imap/imapprotocol.cpp b/src/plugins/messageservices/imap/imapprotocol.cpp index 7d59b316..9c5f96cf 100644 --- a/src/plugins/messageservices/imap/imapprotocol.cpp +++ b/src/plugins/messageservices/imap/imapprotocol.cpp @@ -2079,7 +2079,7 @@ QStringList SearchMessageState::convertValue(const QVariant &value, const QMailM case QMailMessageKey::AncestorFolderIds: return QStringList(); break; - case QMailMessageKey::ContentType: + case QMailMessageKey::ContentCategory: break; case QMailMessageKey::PreviousParentFolderId: break; diff --git a/src/plugins/messageservices/pop/popclient.cpp b/src/plugins/messageservices/pop/popclient.cpp index 4c322071..e29e7d67 100644 --- a/src/plugins/messageservices/pop/popclient.cpp +++ b/src/plugins/messageservices/pop/popclient.cpp @@ -1162,7 +1162,7 @@ void PopClient::createMail() mail->setId(existing.id()); mail->setStatus(existing.status()); - mail->setContent(existing.content()); + mail->setContentCategory(existing.contentCategory()); QMailDisconnected::copyPreviousFolder(existing, mail); mail->setContentScheme(existing.contentScheme()); mail->setContentIdentifier(existing.contentIdentifier()); diff --git a/tests/tst_qmail_listmodels/tst_qmail_listmodels.cpp b/tests/tst_qmail_listmodels/tst_qmail_listmodels.cpp index 46493406..6d6abd20 100644 --- a/tests/tst_qmail_listmodels/tst_qmail_listmodels.cpp +++ b/tests/tst_qmail_listmodels/tst_qmail_listmodels.cpp @@ -146,7 +146,7 @@ void tst_QMail_ListModels::initTestCase() msg1.setStatus(QMailMessage::Read, true); msg1.setServerUid("sim:12345"); msg1.setSize(1 * 1024); - msg1.setContent(QMailMessage::PlainTextContent); + msg1.setContentCategory(QMailMessage::PlainTextContent); msg1.setCustomField("present", "true"); msg1.setCustomField("todo", "true"); QVERIFY(QMailStore::instance()->addMessage(&msg1)); @@ -165,7 +165,7 @@ void tst_QMail_ListModels::initTestCase() msg2.setStatus(QMailMessage::Read, false); msg2.setServerUid("inboxmsg21"); msg2.setSize(5 * 1024); - msg2.setContent(QMailMessage::PlainTextContent); + msg2.setContentCategory(QMailMessage::PlainTextContent); msg2.setCustomField("present", "true"); msg2.setBody(QMailMessageBody::fromData(m1,QMailMessageContentType("text/plain"),QMailMessageBody::QuotedPrintable)); QVERIFY(QMailStore::instance()->addMessage(&msg2)); diff --git a/tests/tst_qmail_sortkeys/tst_qmail_sortkeys.cpp b/tests/tst_qmail_sortkeys/tst_qmail_sortkeys.cpp index d5cedd4e..399c4968 100644 --- a/tests/tst_qmail_sortkeys/tst_qmail_sortkeys.cpp +++ b/tests/tst_qmail_sortkeys/tst_qmail_sortkeys.cpp @@ -268,7 +268,7 @@ void tst_QMail_SortKeys::initTestCase() message.setStatus(QMailMessage::Read, true); message.setServerUid("sim:12345"); message.setSize(1 * 1024); - message.setContent(QMailMessage::PlainTextContent); + message.setContentCategory(QMailMessage::PlainTextContent); message.setCustomField("present", "true"); message.setCustomField("todo", "true"); @@ -292,7 +292,7 @@ void tst_QMail_SortKeys::initTestCase() message.setStatus(QMailMessage::Read, false); message.setServerUid("inboxMessage1"); message.setSize(5 * 1024); - message.setContent(QMailMessage::PlainTextContent); + message.setContentCategory(QMailMessage::PlainTextContent); message.setCustomField("present", "true"); QVERIFY(QMailStore::instance()->addMessage(&message)); @@ -316,7 +316,7 @@ void tst_QMail_SortKeys::initTestCase() message.setStatus(QMailMessage::Sent, true); message.setServerUid("archivedMessage1"); message.setSize(15 * 1024); - message.setContent(QMailMessage::VideoContent); + message.setContentCategory(QMailMessage::VideoContent); message.setCustomField("present", "true"); QVERIFY(QMailStore::instance()->addMessage(&message)); @@ -345,7 +345,7 @@ void tst_QMail_SortKeys::initTestCase() message.setStatus(QMailMessage::Read, true); message.setServerUid("inboxMessage2"); message.setSize(5 * 1024); - message.setContent(QMailMessage::HtmlContent); + message.setContentCategory(QMailMessage::HtmlContent); message.setInResponseTo(inboxMessage1); message.setResponseType(QMailMessage::Forward); message.setCustomField("present", "true"); @@ -372,7 +372,7 @@ void tst_QMail_SortKeys::initTestCase() message.setStatus(QMailMessage::Read, false); message.setServerUid("savedMessage2"); message.setSize(5 * 1024); - message.setContent(QMailMessage::HtmlContent); + message.setContentCategory(QMailMessage::HtmlContent); message.setInResponseTo(archivedMessage1); message.setResponseType(QMailMessage::Reply); message.setCustomField("present", "true"); @@ -483,7 +483,7 @@ void tst_QMail_SortKeys::test_messagesortkey() QCOMPARE(ids.count(), allMessages.count()); ids = QMailStore::instance()->queryMessages(key, QMailMessageSortKey::parentAccountId()); QCOMPARE(ids.count(), allMessages.count()); - ids = QMailStore::instance()->queryMessages(key, QMailMessageSortKey::contentType()); + ids = QMailStore::instance()->queryMessages(key, QMailMessageSortKey::contentCategory()); QCOMPARE(ids.count(), allMessages.count()); ids = QMailStore::instance()->queryMessages(key, QMailMessageSortKey::previousParentFolderId()); QCOMPARE(ids.count(), allMessages.count()); diff --git a/tests/tst_qmaildisconnected/tst_qmaildisconnected.cpp b/tests/tst_qmaildisconnected/tst_qmaildisconnected.cpp index 75c9dfc9..dbdcb82c 100644 --- a/tests/tst_qmaildisconnected/tst_qmaildisconnected.cpp +++ b/tests/tst_qmaildisconnected/tst_qmaildisconnected.cpp @@ -267,7 +267,7 @@ void tst_QMailDisconnected::initTestCase() message.setStatus(QMailMessage::Read, true); message.setServerUid("sim:12345"); message.setSize(1 * 1024); - message.setContent(QMailMessage::PlainTextContent); + message.setContentCategory(QMailMessage::PlainTextContent); message.setCustomField("present", "true"); message.setCustomField("todo", "true"); @@ -291,7 +291,7 @@ void tst_QMailDisconnected::initTestCase() message.setStatus(QMailMessage::Read, false); message.setServerUid("inboxMessage1"); message.setSize(5 * 1024); - message.setContent(QMailMessage::PlainTextContent); + message.setContentCategory(QMailMessage::PlainTextContent); message.setCustomField("present", "true"); QVERIFY(QMailStore::instance()->addMessage(&message)); @@ -315,7 +315,7 @@ void tst_QMailDisconnected::initTestCase() message.setStatus(QMailMessage::Sent, true); message.setServerUid("archivedMessage1"); message.setSize(15 * 1024); - message.setContent(QMailMessage::VideoContent); + message.setContentCategory(QMailMessage::VideoContent); message.setCustomField("present", "true"); QVERIFY(QMailStore::instance()->addMessage(&message)); @@ -344,7 +344,7 @@ void tst_QMailDisconnected::initTestCase() message.setStatus(QMailMessage::Read, true); message.setServerUid("inboxMessage2"); message.setSize(5 * 1024); - message.setContent(QMailMessage::HtmlContent); + message.setContentCategory(QMailMessage::HtmlContent); message.setInResponseTo(inboxMessage1); message.setResponseType(QMailMessage::Forward); message.setCustomField("present", "true"); @@ -371,7 +371,7 @@ void tst_QMailDisconnected::initTestCase() message.setStatus(QMailMessage::Read, false); message.setServerUid("savedMessage2"); message.setSize(5 * 1024); - message.setContent(QMailMessage::HtmlContent); + message.setContentCategory(QMailMessage::HtmlContent); message.setInResponseTo(archivedMessage1); message.setResponseType(QMailMessage::Reply); message.setCustomField("present", "true"); diff --git a/tests/tst_qmailmessageset/tst_qmailmessageset.cpp b/tests/tst_qmailmessageset/tst_qmailmessageset.cpp index f57d275a..c63212d8 100644 --- a/tests/tst_qmailmessageset/tst_qmailmessageset.cpp +++ b/tests/tst_qmailmessageset/tst_qmailmessageset.cpp @@ -274,7 +274,7 @@ void tst_QMailMessageSet::initTestCase() message.setStatus(QMailMessage::Read, true); message.setServerUid("sim:12345"); message.setSize(1 * 1024); - message.setContent(QMailMessage::PlainTextContent); + message.setContentCategory(QMailMessage::PlainTextContent); message.setCustomField("present", "true"); message.setCustomField("todo", "true"); @@ -298,7 +298,7 @@ void tst_QMailMessageSet::initTestCase() message.setStatus(QMailMessage::Read, false); message.setServerUid("inboxMessage1"); message.setSize(5 * 1024); - message.setContent(QMailMessage::PlainTextContent); + message.setContentCategory(QMailMessage::PlainTextContent); message.setCustomField("present", "true"); QVERIFY(QMailStore::instance()->addMessage(&message)); @@ -322,7 +322,7 @@ void tst_QMailMessageSet::initTestCase() message.setStatus(QMailMessage::Sent, true); message.setServerUid("archivedMessage1"); message.setSize(15 * 1024); - message.setContent(QMailMessage::VideoContent); + message.setContentCategory(QMailMessage::VideoContent); message.setCustomField("present", "true"); QVERIFY(QMailStore::instance()->addMessage(&message)); @@ -351,7 +351,7 @@ void tst_QMailMessageSet::initTestCase() message.setStatus(QMailMessage::Read, true); message.setServerUid("inboxMessage2"); message.setSize(5 * 1024); - message.setContent(QMailMessage::HtmlContent); + message.setContentCategory(QMailMessage::HtmlContent); message.setInResponseTo(inboxMessage1); message.setResponseType(QMailMessage::Forward); message.setCustomField("present", "true"); @@ -378,7 +378,7 @@ void tst_QMailMessageSet::initTestCase() message.setStatus(QMailMessage::Read, false); message.setServerUid("savedMessage2"); message.setSize(5 * 1024); - message.setContent(QMailMessage::HtmlContent); + message.setContentCategory(QMailMessage::HtmlContent); message.setInResponseTo(archivedMessage1); message.setResponseType(QMailMessage::Reply); message.setCustomField("present", "true"); diff --git a/tests/tst_qmailserviceaction/tst_qmailserviceaction.cpp b/tests/tst_qmailserviceaction/tst_qmailserviceaction.cpp index f604a851..aa82f476 100644 --- a/tests/tst_qmailserviceaction/tst_qmailserviceaction.cpp +++ b/tests/tst_qmailserviceaction/tst_qmailserviceaction.cpp @@ -272,7 +272,7 @@ void tst_QMailServiceAction::initTestCase() message.setStatus(QMailMessage::Read, true); message.setServerUid("sim:12345"); message.setSize(1 * 1024); - message.setContent(QMailMessage::PlainTextContent); + message.setContentCategory(QMailMessage::PlainTextContent); message.setCustomField("present", "true"); message.setCustomField("todo", "true"); @@ -296,7 +296,7 @@ void tst_QMailServiceAction::initTestCase() message.setStatus(QMailMessage::Read, false); message.setServerUid("inboxMessage1"); message.setSize(5 * 1024); - message.setContent(QMailMessage::PlainTextContent); + message.setContentCategory(QMailMessage::PlainTextContent); message.setCustomField("present", "true"); QVERIFY(QMailStore::instance()->addMessage(&message)); @@ -320,7 +320,7 @@ void tst_QMailServiceAction::initTestCase() message.setStatus(QMailMessage::Sent, true); message.setServerUid("archivedMessage1"); message.setSize(15 * 1024); - message.setContent(QMailMessage::VideoContent); + message.setContentCategory(QMailMessage::VideoContent); message.setCustomField("present", "true"); QVERIFY(QMailStore::instance()->addMessage(&message)); @@ -349,7 +349,7 @@ void tst_QMailServiceAction::initTestCase() message.setStatus(QMailMessage::Read, true); message.setServerUid("inboxMessage2"); message.setSize(5 * 1024); - message.setContent(QMailMessage::HtmlContent); + message.setContentCategory(QMailMessage::HtmlContent); message.setInResponseTo(inboxMessage1); message.setResponseType(QMailMessage::Forward); message.setCustomField("present", "true"); @@ -376,7 +376,7 @@ void tst_QMailServiceAction::initTestCase() message.setStatus(QMailMessage::Read, false); message.setServerUid("savedMessage2"); message.setSize(5 * 1024); - message.setContent(QMailMessage::HtmlContent); + message.setContentCategory(QMailMessage::HtmlContent); message.setInResponseTo(archivedMessage1); message.setResponseType(QMailMessage::Reply); message.setCustomField("present", "true"); diff --git a/tests/tst_qmailstorageaction/tst_qmailstorageaction.cpp b/tests/tst_qmailstorageaction/tst_qmailstorageaction.cpp index c8950d07..9a8497a0 100644 --- a/tests/tst_qmailstorageaction/tst_qmailstorageaction.cpp +++ b/tests/tst_qmailstorageaction/tst_qmailstorageaction.cpp @@ -348,7 +348,7 @@ void tst_QMailStorageAction::initTestCase() message.setStatus(QMailMessage::Read, true); message.setServerUid("sim:12345"); message.setSize(1 * 1024); - message.setContent(QMailMessage::PlainTextContent); + message.setContentCategory(QMailMessage::PlainTextContent); message.setCustomField("present", "true"); message.setCustomField("todo", "true"); @@ -372,7 +372,7 @@ void tst_QMailStorageAction::initTestCase() message.setStatus(QMailMessage::Read, false); message.setServerUid("inboxMessage1"); message.setSize(5 * 1024); - message.setContent(QMailMessage::PlainTextContent); + message.setContentCategory(QMailMessage::PlainTextContent); message.setCustomField("present", "true"); QVERIFY(QMailStore::instance()->addMessage(&message)); @@ -396,7 +396,7 @@ void tst_QMailStorageAction::initTestCase() message.setStatus(QMailMessage::Sent, true); message.setServerUid("archivedMessage1"); message.setSize(15 * 1024); - message.setContent(QMailMessage::VideoContent); + message.setContentCategory(QMailMessage::VideoContent); message.setCustomField("present", "true"); QVERIFY(QMailStore::instance()->addMessage(&message)); @@ -425,7 +425,7 @@ void tst_QMailStorageAction::initTestCase() message.setStatus(QMailMessage::Read, true); message.setServerUid("inboxMessage2"); message.setSize(5 * 1024); - message.setContent(QMailMessage::HtmlContent); + message.setContentCategory(QMailMessage::HtmlContent); message.setInResponseTo(inboxMessage1); message.setResponseType(QMailMessage::Forward); message.setCustomField("present", "true"); @@ -452,7 +452,7 @@ void tst_QMailStorageAction::initTestCase() message.setStatus(QMailMessage::Read, false); message.setServerUid("savedMessage2"); message.setSize(5 * 1024); - message.setContent(QMailMessage::HtmlContent); + message.setContentCategory(QMailMessage::HtmlContent); message.setInResponseTo(archivedMessage1); message.setResponseType(QMailMessage::Reply); message.setCustomField("present", "true"); @@ -496,7 +496,7 @@ void tst_QMailStorageAction::test_storageaction_add() message.setStatus(QMailMessage::Read, false); message.setServerUid("savedMessage3"); message.setSize(5 * 1024); - message.setContent(QMailMessage::HtmlContent); + message.setContentCategory(QMailMessage::HtmlContent); message.setCustomField("present", "true"); messages << message; @@ -748,7 +748,7 @@ void tst_QMailStorageAction::test_storageaction_rollBackUpdates() message.setStatus(QMailMessage::Read, false); message.setServerUid("savedMessage5"); message.setSize(7 * 1024); - message.setContent(QMailMessage::HtmlContent); + message.setContentCategory(QMailMessage::HtmlContent); message.setCustomField("present", "true"); QVERIFY(QMailStore::instance()->addMessage(&message)); @@ -844,7 +844,7 @@ void tst_QMailStorageAction::test_storageaction_discardMessages() message.setStatus(QMailMessage::Read, false); message.setServerUid("savedMessage4"); message.setSize(6 * 1024); - message.setContent(QMailMessage::HtmlContent); + message.setContentCategory(QMailMessage::HtmlContent); message.setCustomField("present", "true"); QVERIFY(QMailStore::instance()->addMessage(&message)); diff --git a/tests/tst_qmailstorekeys/tst_qmailstorekeys.cpp b/tests/tst_qmailstorekeys/tst_qmailstorekeys.cpp index 0ab873d1..6891bc78 100644 --- a/tests/tst_qmailstorekeys/tst_qmailstorekeys.cpp +++ b/tests/tst_qmailstorekeys/tst_qmailstorekeys.cpp @@ -350,7 +350,7 @@ void tst_QMailStoreKeys::initTestCase() message.setStatus(QMailMessage::Read, true); message.setServerUid("sim:12345"); message.setSize(1 * 1024); - message.setContent(QMailMessage::PlainTextContent); + message.setContentCategory(QMailMessage::PlainTextContent); message.setCustomField("present", "true"); message.setCustomField("todo", "true"); @@ -374,7 +374,7 @@ void tst_QMailStoreKeys::initTestCase() message.setStatus(QMailMessage::Read, false); message.setServerUid("inboxMessage1"); message.setSize(5 * 1024); - message.setContent(QMailMessage::PlainTextContent); + message.setContentCategory(QMailMessage::PlainTextContent); message.setCustomField("present", "true"); QVERIFY(QMailStore::instance()->addMessage(&message)); @@ -398,7 +398,7 @@ void tst_QMailStoreKeys::initTestCase() message.setStatus(QMailMessage::Sent, true); message.setServerUid("archivedMessage1"); message.setSize(15 * 1024); - message.setContent(QMailMessage::VideoContent); + message.setContentCategory(QMailMessage::VideoContent); message.setCustomField("present", "true"); QVERIFY(QMailStore::instance()->addMessage(&message)); @@ -427,7 +427,7 @@ void tst_QMailStoreKeys::initTestCase() message.setStatus(QMailMessage::Read, true); message.setServerUid("inboxMessage2"); message.setSize(5 * 1024); - message.setContent(QMailMessage::HtmlContent); + message.setContentCategory(QMailMessage::HtmlContent); message.setInResponseTo(inboxMessage1); message.setResponseType(QMailMessage::Forward); message.setCustomField("present", "true"); @@ -454,7 +454,7 @@ void tst_QMailStoreKeys::initTestCase() message.setStatus(QMailMessage::Read, false); message.setServerUid("savedMessage2"); message.setSize(5 * 1024); - message.setContent(QMailMessage::HtmlContent); + message.setContentCategory(QMailMessage::HtmlContent); message.setInResponseTo(archivedMessage1); message.setResponseType(QMailMessage::Reply); message.setCustomField("present", "true"); @@ -2086,36 +2086,36 @@ void tst_QMailStoreKeys::messageAncestorFolderIds() void tst_QMailStoreKeys::messageContentType() { // ContentType equality - QCOMPARE(messageSet(QMailMessageKey::contentType(QMailMessage::PlainTextContent, Equal)), messageSet() << smsMessage << inboxMessage1); - QCOMPARE(messageSet(~QMailMessageKey::contentType(QMailMessage::PlainTextContent, Equal)), messageSet() << archivedMessage1 << inboxMessage2 << savedMessage2); - QCOMPARE(messageSet(QMailMessageKey::contentType(QMailMessage::HtmlContent, Equal)), messageSet() << inboxMessage2 << savedMessage2); - QCOMPARE(messageSet(~QMailMessageKey::contentType(QMailMessage::HtmlContent, Equal)), messageSet() << smsMessage << inboxMessage1 << archivedMessage1); - QCOMPARE(messageSet(QMailMessageKey::contentType(QMailMessage::VoicemailContent, Equal)), noMessages); - QCOMPARE(messageSet(~QMailMessageKey::contentType(QMailMessage::VoicemailContent, Equal)), allMessages); + QCOMPARE(messageSet(QMailMessageKey::contentCategory(QMailMessage::PlainTextContent, Equal)), messageSet() << smsMessage << inboxMessage1); + QCOMPARE(messageSet(~QMailMessageKey::contentCategory(QMailMessage::PlainTextContent, Equal)), messageSet() << archivedMessage1 << inboxMessage2 << savedMessage2); + QCOMPARE(messageSet(QMailMessageKey::contentCategory(QMailMessage::HtmlContent, Equal)), messageSet() << inboxMessage2 << savedMessage2); + QCOMPARE(messageSet(~QMailMessageKey::contentCategory(QMailMessage::HtmlContent, Equal)), messageSet() << smsMessage << inboxMessage1 << archivedMessage1); + QCOMPARE(messageSet(QMailMessageKey::contentCategory(QMailMessage::VoicemailContent, Equal)), noMessages); + QCOMPARE(messageSet(~QMailMessageKey::contentCategory(QMailMessage::VoicemailContent, Equal)), allMessages); // ContentType inequality - QCOMPARE(messageSet(QMailMessageKey::contentType(QMailMessage::PlainTextContent, NotEqual)), messageSet() << archivedMessage1 << inboxMessage2 << savedMessage2); - QCOMPARE(messageSet(~QMailMessageKey::contentType(QMailMessage::PlainTextContent, NotEqual)), messageSet() << smsMessage << inboxMessage1); - QCOMPARE(messageSet(QMailMessageKey::contentType(QMailMessage::HtmlContent, NotEqual)), messageSet() << smsMessage << inboxMessage1 << archivedMessage1); - QCOMPARE(messageSet(~QMailMessageKey::contentType(QMailMessage::HtmlContent, NotEqual)), messageSet() << inboxMessage2 << savedMessage2); - QCOMPARE(messageSet(QMailMessageKey::contentType(QMailMessage::VoicemailContent, NotEqual)), allMessages); - QCOMPARE(messageSet(~QMailMessageKey::contentType(QMailMessage::VoicemailContent, NotEqual)), noMessages); + QCOMPARE(messageSet(QMailMessageKey::contentCategory(QMailMessage::PlainTextContent, NotEqual)), messageSet() << archivedMessage1 << inboxMessage2 << savedMessage2); + QCOMPARE(messageSet(~QMailMessageKey::contentCategory(QMailMessage::PlainTextContent, NotEqual)), messageSet() << smsMessage << inboxMessage1); + QCOMPARE(messageSet(QMailMessageKey::contentCategory(QMailMessage::HtmlContent, NotEqual)), messageSet() << smsMessage << inboxMessage1 << archivedMessage1); + QCOMPARE(messageSet(~QMailMessageKey::contentCategory(QMailMessage::HtmlContent, NotEqual)), messageSet() << inboxMessage2 << savedMessage2); + QCOMPARE(messageSet(QMailMessageKey::contentCategory(QMailMessage::VoicemailContent, NotEqual)), allMessages); + QCOMPARE(messageSet(~QMailMessageKey::contentCategory(QMailMessage::VoicemailContent, NotEqual)), noMessages); // List inclusion - QCOMPARE(messageSet(QMailMessageKey::contentType(QList<QMailMessage::ContentType>())), noMessages); - QCOMPARE(messageSet(~QMailMessageKey::contentType(QList<QMailMessage::ContentType>())), allMessages); - QCOMPARE(messageSet(QMailMessageKey::contentType(QList<QMailMessage::ContentType>() << QMailMessage::VideoContent)), messageSet() << archivedMessage1); - QCOMPARE(messageSet(~QMailMessageKey::contentType(QList<QMailMessage::ContentType>() << QMailMessage::VideoContent)), messageSet() << smsMessage << inboxMessage1 << inboxMessage2 << savedMessage2); - QCOMPARE(messageSet(QMailMessageKey::contentType(QList<QMailMessage::ContentType>() << QMailMessage::VideoContent << QMailMessage::HtmlContent)), messageSet() << archivedMessage1 << inboxMessage2 << savedMessage2); - QCOMPARE(messageSet(~QMailMessageKey::contentType(QList<QMailMessage::ContentType>() << QMailMessage::VideoContent << QMailMessage::HtmlContent)), messageSet() << smsMessage << inboxMessage1); + QCOMPARE(messageSet(QMailMessageKey::contentCategory(QList<QMailMessage::ContentCategory>())), noMessages); + QCOMPARE(messageSet(~QMailMessageKey::contentCategory(QList<QMailMessage::ContentCategory>())), allMessages); + QCOMPARE(messageSet(QMailMessageKey::contentCategory(QList<QMailMessage::ContentCategory>() << QMailMessage::VideoContent)), messageSet() << archivedMessage1); + QCOMPARE(messageSet(~QMailMessageKey::contentCategory(QList<QMailMessage::ContentCategory>() << QMailMessage::VideoContent)), messageSet() << smsMessage << inboxMessage1 << inboxMessage2 << savedMessage2); + QCOMPARE(messageSet(QMailMessageKey::contentCategory(QList<QMailMessage::ContentCategory>() << QMailMessage::VideoContent << QMailMessage::HtmlContent)), messageSet() << archivedMessage1 << inboxMessage2 << savedMessage2); + QCOMPARE(messageSet(~QMailMessageKey::contentCategory(QList<QMailMessage::ContentCategory>() << QMailMessage::VideoContent << QMailMessage::HtmlContent)), messageSet() << smsMessage << inboxMessage1); // List exclusion - QCOMPARE(messageSet(QMailMessageKey::contentType(QList<QMailMessage::ContentType>(), Excludes)), allMessages); - QCOMPARE(messageSet(~QMailMessageKey::contentType(QList<QMailMessage::ContentType>(), Excludes)), noMessages); - QCOMPARE(messageSet(QMailMessageKey::contentType(QList<QMailMessage::ContentType>() << QMailMessage::VideoContent, Excludes)), messageSet() << smsMessage << inboxMessage1 << inboxMessage2 << savedMessage2); - QCOMPARE(messageSet(~QMailMessageKey::contentType(QList<QMailMessage::ContentType>() << QMailMessage::VideoContent, Excludes)), messageSet() << archivedMessage1); - QCOMPARE(messageSet(QMailMessageKey::contentType(QList<QMailMessage::ContentType>() << QMailMessage::VideoContent << QMailMessage::HtmlContent, Excludes)), messageSet() << smsMessage << inboxMessage1); - QCOMPARE(messageSet(~QMailMessageKey::contentType(QList<QMailMessage::ContentType>() << QMailMessage::VideoContent << QMailMessage::HtmlContent, Excludes)), messageSet() << archivedMessage1 << inboxMessage2 << savedMessage2); + QCOMPARE(messageSet(QMailMessageKey::contentCategory(QList<QMailMessage::ContentCategory>(), Excludes)), allMessages); + QCOMPARE(messageSet(~QMailMessageKey::contentCategory(QList<QMailMessage::ContentCategory>(), Excludes)), noMessages); + QCOMPARE(messageSet(QMailMessageKey::contentCategory(QList<QMailMessage::ContentCategory>() << QMailMessage::VideoContent, Excludes)), messageSet() << smsMessage << inboxMessage1 << inboxMessage2 << savedMessage2); + QCOMPARE(messageSet(~QMailMessageKey::contentCategory(QList<QMailMessage::ContentCategory>() << QMailMessage::VideoContent, Excludes)), messageSet() << archivedMessage1); + QCOMPARE(messageSet(QMailMessageKey::contentCategory(QList<QMailMessage::ContentCategory>() << QMailMessage::VideoContent << QMailMessage::HtmlContent, Excludes)), messageSet() << smsMessage << inboxMessage1); + QCOMPARE(messageSet(~QMailMessageKey::contentCategory(QList<QMailMessage::ContentCategory>() << QMailMessage::VideoContent << QMailMessage::HtmlContent, Excludes)), messageSet() << archivedMessage1 << inboxMessage2 << savedMessage2); } void tst_QMailStoreKeys::messagePreviousParentFolderId() diff --git a/tests/tst_qmailthread/tst_qmailthread.cpp b/tests/tst_qmailthread/tst_qmailthread.cpp index ae753c0e..2709c581 100644 --- a/tests/tst_qmailthread/tst_qmailthread.cpp +++ b/tests/tst_qmailthread/tst_qmailthread.cpp @@ -291,7 +291,7 @@ void tst_qmailthread::initTestCase() message.setStatus(QMailMessage::Read, true); message.setServerUid("sim:12345"); message.setSize(1 * 1024); - message.setContent(QMailMessage::PlainTextContent); + message.setContentCategory(QMailMessage::PlainTextContent); message.setCustomField("present", "true"); message.setCustomField("todo", "true"); @@ -315,7 +315,7 @@ void tst_qmailthread::initTestCase() message.setStatus(QMailMessage::Read, false); message.setServerUid("inboxMessage1"); message.setSize(5 * 1024); - message.setContent(QMailMessage::PlainTextContent); + message.setContentCategory(QMailMessage::PlainTextContent); message.setCustomField("present", "true"); QVERIFY(QMailStore::instance()->addMessage(&message)); @@ -339,7 +339,7 @@ void tst_qmailthread::initTestCase() message.setStatus(QMailMessage::Sent, true); message.setServerUid("archivedMessage1"); message.setSize(15 * 1024); - message.setContent(QMailMessage::VideoContent); + message.setContentCategory(QMailMessage::VideoContent); message.setCustomField("present", "true"); QVERIFY(QMailStore::instance()->addMessage(&message)); @@ -368,7 +368,7 @@ void tst_qmailthread::initTestCase() message.setStatus(QMailMessage::Read, true); message.setServerUid("inboxMessage2"); message.setSize(5 * 1024); - message.setContent(QMailMessage::HtmlContent); + message.setContentCategory(QMailMessage::HtmlContent); message.setInResponseTo(inboxMessage1); message.setResponseType(QMailMessage::Forward); message.setCustomField("present", "true"); @@ -395,7 +395,7 @@ void tst_qmailthread::initTestCase() message.setStatus(QMailMessage::Read, false); message.setServerUid("savedMessage2"); message.setSize(5 * 1024); - message.setContent(QMailMessage::HtmlContent); + message.setContentCategory(QMailMessage::HtmlContent); message.setInResponseTo(archivedMessage1); message.setResponseType(QMailMessage::Reply); message.setCustomField("present", "true"); diff --git a/tests/tst_storagemanager/tst_storagemanager.cpp b/tests/tst_storagemanager/tst_storagemanager.cpp index 7da2be70..48926590 100644 --- a/tests/tst_storagemanager/tst_storagemanager.cpp +++ b/tests/tst_storagemanager/tst_storagemanager.cpp @@ -160,7 +160,7 @@ void tst_StorageManager::initTestCase() msg1.setStatus(QMailMessage::Read, true); msg1.setServerUid("sim:12345"); msg1.setSize(1 * 1024); - msg1.setContent(QMailMessage::PlainTextContent); + msg1.setContentCategory(QMailMessage::PlainTextContent); msg1.setCustomField("present", "true"); msg1.setCustomField("todo", "true"); QVERIFY(QMailStore::instance()->addMessage(&msg1)); @@ -179,7 +179,7 @@ void tst_StorageManager::initTestCase() msg2.setStatus(QMailMessage::Read, false); msg2.setServerUid("inboxmsg21"); msg2.setSize(5 * 1024); - msg2.setContent(QMailMessage::PlainTextContent); + msg2.setContentCategory(QMailMessage::PlainTextContent); msg2.setCustomField("present", "true"); msg2.setBody(QMailMessageBody::fromData(mime1,QMailMessageContentType("multipart/digest"),QMailMessageBody::QuotedPrintable)); QVERIFY(QMailStore::instance()->addMessage(&msg2)); @@ -218,7 +218,7 @@ void tst_StorageManager::test_add() msg3.setStatus(QMailMessage::Read, false); msg3.setServerUid("inboxmsg22"); msg3.setSize(5 * 1024); - msg3.setContent(QMailMessage::PlainTextContent); + msg3.setContentCategory(QMailMessage::PlainTextContent); msg3.setCustomField("present", "true"); msg3.setBody(QMailMessageBody::fromData("plaintext",QMailMessageContentType("text/plain"),QMailMessageBody::QuotedPrintable)); msg3.setCustomField("qmf-detached-filename", "file1x2y-detached"); @@ -242,7 +242,7 @@ void tst_StorageManager::test_remove() msg4.setStatus(QMailMessage::Read, false); msg4.setServerUid("unique-inboxmsg22"); msg4.setSize(5 * 1024); - msg4.setContent(QMailMessage::PlainTextContent); + msg4.setContentCategory(QMailMessage::PlainTextContent); msg4.setCustomField("present", "true"); msg4.setBody(QMailMessageBody::fromData("plaintext",QMailMessageContentType("text/plain"),QMailMessageBody::QuotedPrintable)); msg4.setCustomField("qmf-detached-filename", "non-existent"); |