summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorPekka Vuorela <pvuorela@iki.fi>2025-12-04 11:30:44 +0200
committerPekka Vuorela <pvuorela@iki.fi>2025-12-11 11:27:20 +0200
commit15a73fae6aaffbedc287359fba119e57613a2ed1 (patch)
tree20179c05f2a2ea3db0977f833cdd727291fa712b /examples
parent2b166ddec7422518c266e74a84491eb05ba16d09 (diff)
Rename QMailMessageMetadata::content as contentCategory
The related functionality was confusing when setContent() didn't actually set any content but rather the type of it. Also there are other setContent() methods around that actually set the content. Then again calling this contentType() would have collided further in the inheritance tree by method returning a QMailMessageContentType which is referring to header fields. Thus switched this to a third distinct name. Old setter and getter names provided for backwards compatibility which should work at least for the very basic cases of setting and comparing type. Change-Id: I4c54548f3c2c85096fde64b3221e233dd3feefa3 Reviewed-by: Damien Caliste <dcaliste@free.fr> Reviewed-by: <matti.viljanen@kapsi.fi> Reviewed-by: Pekka Vuorela <pvuorela@iki.fi>
Diffstat (limited to 'examples')
-rw-r--r--examples/qtmail/browserwidget.cpp4
-rw-r--r--examples/qtmail/emailcomposer.cpp5
-rw-r--r--examples/qtmail/emailcomposer.h2
-rw-r--r--examples/qtmail/genericviewer.cpp25
-rw-r--r--examples/qtmail/genericviewer.h2
-rw-r--r--examples/qtmail/qmailcomposer.cpp4
-rw-r--r--examples/qtmail/qmailcomposer.h8
-rw-r--r--examples/qtmail/qmailviewer.cpp8
-rw-r--r--examples/qtmail/qmailviewer.h10
-rw-r--r--examples/qtmail/readmail.cpp4
-rw-r--r--examples/qtmail/readmail.h4
11 files changed, 39 insertions, 37 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;
};
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-14 18:51:00 +0000