Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 6f849b1b authored by Sandro Knauß's avatar Sandro Knauß

move AttachmentStrategy from MimeTreeParser -> MessageViewer

Reviewers: vkrause

Subscribers: #kde_pim

Tags: #kde_pim

Differential Revision: https://phabricator.kde.org/D8574
parent e5c508e5
......@@ -59,6 +59,7 @@ set(libmessageviewer_mailviewer_SRCS
)
set(libmessageviewer_viewer_SRCS
viewer/attachmentstrategy.cpp
viewer/csshelper.cpp
viewer/csshelperbase.cpp
viewer/editorwatcher.cpp
......@@ -274,6 +275,7 @@ ecm_generate_headers(MessageViewer_Camelcasescam_HEADERS
ecm_generate_headers(MessageViewer_Camelcaseviewer_HEADERS
HEADER_NAMES
AttachmentStrategy
Viewer
CSSHelperBase
CSSHelper
......
......@@ -23,10 +23,10 @@
#include <gpgme++/key.h>
#include <MimeTreeParser/AttachmentStrategy>
#include <MimeTreeParser/BodyPartFormatterFactory>
#include <MimeTreeParser/ObjectTreeSource>
#include <MessageViewer/AttachmentStrategy>
#include <MessageViewer/ObjectTreeEmptySource>
namespace MessageViewer {
......@@ -81,9 +81,9 @@ public:
mAttachmentStrategy = strategy;
}
const MimeTreeParser::AttachmentStrategy *attachmentStrategy() override
const AttachmentStrategy *attachmentStrategy() override
{
return MimeTreeParser::AttachmentStrategy::create(mAttachmentStrategy);
return AttachmentStrategy::create(mAttachmentStrategy);
}
bool autoImportKeys() const override
......
......@@ -30,10 +30,10 @@
#include "utils/iconnamecache.h"
#include "utils/mimetype.h"
#include "viewer/attachmentstrategy.h"
#include "viewer/csshelperbase.h"
#include "messagepartrenderermanager.h"
#include <MimeTreeParser/AttachmentStrategy>
#include <MimeTreeParser/BufferedHtmlWriter>
#include <MimeTreeParser/MessagePart>
#include <MimeTreeParser/ObjectTreeParser>
......@@ -309,13 +309,10 @@ QString processHtml(const QString &htmlSource, QString &extraHead)
return s;
}
DefaultRendererPrivate::DefaultRendererPrivate(const MessagePart::Ptr &msgPart, CSSHelperBase *cssHelper, HtmlWriter *writer, const MessagePartRendererFactory *rendererFactory, bool showOnlyOneMimePart)
: mMsgPart(msgPart)
, mCSSHelper(cssHelper)
DefaultRendererPrivate::DefaultRendererPrivate(CSSHelperBase *cssHelper, const MessagePartRendererFactory *rendererFactory)
: mCSSHelper(cssHelper)
, mRendererFactory(rendererFactory)
, mShowOnlyOneMimePart(showOnlyOneMimePart)
{
renderFactory(mMsgPart, writer);
}
DefaultRendererPrivate::~DefaultRendererPrivate()
......@@ -921,7 +918,7 @@ bool DefaultRendererPrivate::isHiddenHint(const MimeTreeParser::MessagePart::Ptr
return false;
}
const AttachmentStrategy *const as = msgPart->source()->attachmentStrategy();
const AttachmentStrategy *const as = mAttachmentStrategy;
const bool defaultHidden(as && as->defaultDisplay(content) == AttachmentStrategy::None);
auto preferredMode = source()->preferredMode();
bool isHtmlPreferred = (preferredMode == Util::Html) || (preferredMode == Util::MultipartHtml);
......@@ -968,7 +965,7 @@ MimeTreeParser::IconType MimeTreeParser::DefaultRendererPrivate::displayHint(con
if (!mp) {
return MimeTreeParser::IconType::NoIcon;
}
const AttachmentStrategy *const as = msgPart->source()->attachmentStrategy();
const AttachmentStrategy *const as = mAttachmentStrategy;
const bool defaultHidden(as && as->defaultDisplay(content) == AttachmentStrategy::None);
const bool showOnlyOneMimePart(mShowOnlyOneMimePart);
auto preferredMode = source()->preferredMode();
......@@ -1021,8 +1018,8 @@ MimeTreeParser::IconType MimeTreeParser::DefaultRendererPrivate::displayHint(con
return MimeTreeParser::NoIcon;
}
DefaultRenderer::DefaultRenderer(const MimeTreeParser::MessagePart::Ptr &msgPart, CSSHelperBase *cssHelper, MimeTreeParser::HtmlWriter *writer, bool showOnlyOneMimePart)
: d(new MimeTreeParser::DefaultRendererPrivate(msgPart, cssHelper, writer, MessagePartRendererFactory::instance(), showOnlyOneMimePart))
DefaultRenderer::DefaultRenderer(CSSHelperBase *cssHelper)
: d(new MimeTreeParser::DefaultRendererPrivate(cssHelper, MessagePartRendererFactory::instance()))
{
}
......@@ -1030,3 +1027,19 @@ DefaultRenderer::~DefaultRenderer()
{
delete d;
}
void DefaultRenderer::setShowOnlyOneMimePart(bool onlyOneMimePart)
{
d->mShowOnlyOneMimePart = onlyOneMimePart;
}
void DefaultRenderer::setAttachmentStrategy(const AttachmentStrategy *strategy)
{
d->mAttachmentStrategy = strategy;
}
void DefaultRenderer::render(const MimeTreeParser::MessagePart::Ptr &msgPart, MimeTreeParser::HtmlWriter *writer)
{
d->mMsgPart = msgPart;
d->renderFactory(d->mMsgPart, writer);
}
......@@ -30,14 +30,18 @@ typedef QSharedPointer<MessagePart> MessagePartPtr;
}
namespace MessageViewer {
class AttachmentStrategy;
class CSSHelperBase;
class DefaultRenderer
{
public:
DefaultRenderer(const MimeTreeParser::MessagePartPtr &msgPart, CSSHelperBase *cssHelder, MimeTreeParser::HtmlWriter *writer, bool showOnlyOneMimePart);
DefaultRenderer(CSSHelperBase *cssHelder);
~DefaultRenderer();
void setShowOnlyOneMimePart(bool onlyOneMimePart);
void setAttachmentStrategy(const AttachmentStrategy *strategy);
void render(const MimeTreeParser::MessagePartPtr &msgPart, MimeTreeParser::HtmlWriter *writer);
private:
MimeTreeParser::DefaultRendererPrivate *d;
};
......
......@@ -28,6 +28,7 @@ using namespace MimeTreeParser;
using namespace MessageViewer;
namespace MessageViewer {
class AttachmentStrategy;
class MessagePartRendererFactory;
class CSSHelperBase;
class HtmlWriter;
......@@ -37,7 +38,7 @@ namespace MimeTreeParser {
class DefaultRendererPrivate : public MessageViewer::RenderContext
{
public:
DefaultRendererPrivate(const MessagePart::Ptr &msgPart, CSSHelperBase *cssHelper, HtmlWriter *writer, const MessagePartRendererFactory *rendererFactory, bool showOnlyOneMimePart);
DefaultRendererPrivate(CSSHelperBase *cssHelper, const MessagePartRendererFactory *rendererFactory);
~DefaultRendererPrivate();
CSSHelperBase *cssHelper() const override;
......@@ -63,10 +64,11 @@ public:
bool isHiddenHint(const MimeTreeParser::MessagePart::Ptr &msgPart) override;
MimeTreeParser::IconType displayHint(const MimeTreeParser::MessagePart::Ptr &msgPart) override;
bool mShowOnlyOneMimePart;
bool mShowOnlyOneMimePart = false;
MessagePart::Ptr mMsgPart;
CSSHelperBase *mCSSHelper = nullptr;
const MessageViewer::MessagePartRendererFactory *mRendererFactory = nullptr;
const MessageViewer::AttachmentStrategy *mAttachmentStrategy = nullptr;
};
}
#endif
......@@ -33,16 +33,16 @@
#include "attachmentstrategy.h"
#include "nodehelper.h"
#include "utils/util.h"
#include <MimeTreeParser/NodeHelper>
#include <MimeTreeParser/Util>
#include <KMime/Content>
#include <QIcon>
#include "mimetreeparser_debug.h"
#include "messageviewer_debug.h"
using namespace MimeTreeParser;
using namespace MessageViewer;
static AttachmentStrategy::Display smartDisplay(KMime::Content *node)
{
......@@ -250,11 +250,11 @@ public:
Display defaultDisplay(KMime::Content *node) const override
{
if (NodeHelper::isInEncapsulatedMessage(node)) {
if (MimeTreeParser::NodeHelper::isInEncapsulatedMessage(node)) {
return smartDisplay(node);
}
if (!Util::labelForContent(node).isEmpty() && QIcon::hasThemeIcon(Util::iconNameForContent(node)) && !Util::isTypeBlacklisted(node)) {
if (!MimeTreeParser::Util::labelForContent(node).isEmpty() && QIcon::hasThemeIcon(MimeTreeParser::Util::iconNameForContent(node)) && !MimeTreeParser::Util::isTypeBlacklisted(node)) {
return None;
}
return smartDisplay(node);
......@@ -292,7 +292,7 @@ const AttachmentStrategy *AttachmentStrategy::create(Type type)
case HeaderOnly:
return headerOnly();
}
qCCritical(MIMETREEPARSER_LOG) << "Unknown attachment startegy ( type =="
qCCritical(MESSAGEVIEWER_LOG) << "Unknown attachment startegy ( type =="
<< (int)type << ") requested!";
return nullptr; // make compiler happy
}
......
......@@ -31,18 +31,18 @@
your version.
*/
#ifndef __MIMETREEPARSER_ATTACHMENTSTRATEGY_H__
#define __MIMETREEPARSER_ATTACHMENTSTRATEGY_H__
#ifndef __MESSAGEVIEWER_ATTACHMENTSTRATEGY_H__
#define __MESSAGEVIEWER_ATTACHMENTSTRATEGY_H__
#include "mimetreeparser_export.h"
#include "messageviewer_export.h"
class QString;
namespace KMime {
class Content;
}
namespace MimeTreeParser {
class MIMETREEPARSER_EXPORT AttachmentStrategy
namespace MessageViewer {
class MESSAGEVIEWER_EXPORT AttachmentStrategy
{
protected:
AttachmentStrategy();
......
......@@ -18,10 +18,10 @@
*/
#include "objecttreeemptysource.h"
#include "viewer/attachmentstrategy.h"
#include "viewer/viewer_p.h"
#include "viewer/csshelperbase.h"
#include <MimeTreeParser/AttachmentStrategy>
#include <MimeTreeParser/BodyPartFormatter>
#include <MimeTreeParser/BodyPartFormatterFactory>
......@@ -100,9 +100,9 @@ QString EmptySource::createMessageHeader(KMime::Message *message)
return QString(); //do nothing
}
const MimeTreeParser::AttachmentStrategy *EmptySource::attachmentStrategy()
const AttachmentStrategy *EmptySource::attachmentStrategy()
{
return MimeTreeParser::AttachmentStrategy::smart();
return AttachmentStrategy::smart();
}
MimeTreeParser::HtmlWriter *EmptySource::htmlWriter()
......@@ -142,5 +142,8 @@ bool EmptySource::isPrinting() const
void EmptySource::render(const MimeTreeParser::MessagePartPtr &msgPart, MimeTreeParser::HtmlWriter *htmlWriter, bool showOnlyOneMimePart)
{
DefaultRenderer(msgPart, cssHelper(), htmlWriter, showOnlyOneMimePart);
auto renderer = DefaultRenderer(cssHelper());
renderer.setShowOnlyOneMimePart(showOnlyOneMimePart);
renderer.setAttachmentStrategy(attachmentStrategy());
renderer.render(msgPart, htmlWriter);
}
......@@ -25,6 +25,7 @@
class QString;
namespace MessageViewer {
class AttachmentStrategy;
class CSSHelperBase;
/** An ObjectTreeSource that does not work on anything */
......@@ -43,7 +44,7 @@ public:
int levelQuote() const override;
const QTextCodec *overrideCodec() override;
QString createMessageHeader(KMime::Message *message) override;
const MimeTreeParser::AttachmentStrategy *attachmentStrategy() override;
virtual const AttachmentStrategy *attachmentStrategy();
MimeTreeParser::HtmlWriter *htmlWriter() override;
virtual CSSHelperBase *cssHelper();
......
......@@ -94,7 +94,7 @@ QString MailViewerSource::createMessageHeader(KMime::Message *message)
return mViewer->writeMsgHeader(message);
}
const MimeTreeParser::AttachmentStrategy *MailViewerSource::attachmentStrategy()
const AttachmentStrategy *MailViewerSource::attachmentStrategy()
{
return mViewer->attachmentStrategy();
}
......@@ -131,5 +131,8 @@ bool MailViewerSource::isPrinting() const
void MailViewerSource::render(const MimeTreeParser::MessagePartPtr &msgPart, MimeTreeParser::HtmlWriter *htmlWriter, bool showOnlyOneMimePart)
{
DefaultRenderer(msgPart, mViewer->cssHelper(), htmlWriter, showOnlyOneMimePart);
auto renderer = DefaultRenderer(mViewer->cssHelper());
renderer.setShowOnlyOneMimePart(showOnlyOneMimePart);
renderer.setAttachmentStrategy(attachmentStrategy());
renderer.render(msgPart, htmlWriter);
}
......@@ -25,6 +25,7 @@
class QString;
namespace MessageViewer {
class AttachmentStrategy;
class ViewerPrivate;
/** An ObjectTreeParser source working on a MailViewer object */
......@@ -41,7 +42,7 @@ public:
int levelQuote() const override;
const QTextCodec *overrideCodec() override;
QString createMessageHeader(KMime::Message *message) override;
const MimeTreeParser::AttachmentStrategy *attachmentStrategy() override;
const AttachmentStrategy *attachmentStrategy();
MimeTreeParser::HtmlWriter *htmlWriter() override;
bool autoImportKeys() const override;
......
......@@ -363,13 +363,13 @@ void Viewer::slotFind()
d->slotFind();
}
const MimeTreeParser::AttachmentStrategy *Viewer::attachmentStrategy() const
const AttachmentStrategy *Viewer::attachmentStrategy() const
{
Q_D(const Viewer);
return d->attachmentStrategy();
}
void Viewer::setAttachmentStrategy(const MimeTreeParser::AttachmentStrategy *strategy)
void Viewer::setAttachmentStrategy(const AttachmentStrategy *strategy)
{
Q_D(Viewer);
d->setAttachmentStrategy(strategy);
......
......@@ -36,10 +36,6 @@ class Item;
class ItemFetchJob;
}
namespace MimeTreeParser {
class AttachmentStrategy;
}
class KActionCollection;
class QAction;
class KToggleAction;
......@@ -57,6 +53,7 @@ class WebHitTestResult;
namespace MessageViewer {
class WebHitTestResult;
class AttachmentStrategy;
class HeaderStylePlugin;
class CSSHelper;
class ViewerPrivate;
......@@ -247,8 +244,8 @@ public:
* Initiates a delete, by sending a signal to delete the message item */
void deleteMessage();
const MimeTreeParser::AttachmentStrategy *attachmentStrategy() const;
void setAttachmentStrategy(const MimeTreeParser::AttachmentStrategy *strategy);
const AttachmentStrategy *attachmentStrategy() const;
void setAttachmentStrategy(const AttachmentStrategy *strategy);
QString overrideEncoding() const;
void setOverrideEncoding(const QString &encoding);
......
......@@ -106,6 +106,7 @@
#include "csshelper.h"
#include "settings/messageviewersettings.h"
#include "widgets/htmlstatusbar.h"
#include "viewer/attachmentstrategy.h"
#include "viewer/mimeparttree/mimetreemodel.h"
#include "viewer/urlhandlermanager.h"
#include "messageviewer/messageviewerutil.h"
......@@ -121,7 +122,6 @@
#include "widgets/submittedformwarningwidget.h"
#include <WebEngineViewer/LocalDataBaseManager>
#include <MimeTreeParser/AttachmentStrategy>
#include <MimeTreeParser/BodyPart>
#include <MimeTreeParser/HtmlWriter>
#include <MimeTreeParser/NodeHelper>
......@@ -1116,7 +1116,7 @@ void ViewerPrivate::readConfig()
mHeaderStyleMenuManager->readConfig();
}
setAttachmentStrategy(MimeTreeParser::AttachmentStrategy::create(MessageViewer::
setAttachmentStrategy(AttachmentStrategy::create(MessageViewer::
MessageViewerSettings::self()->
attachmentStrategy()));
KToggleAction *raction = actionForAttachmentStrategy(attachmentStrategy());
......@@ -1169,17 +1169,17 @@ void ViewerPrivate::writeConfig(bool sync)
}
}
const MimeTreeParser::AttachmentStrategy *ViewerPrivate::attachmentStrategy() const
const AttachmentStrategy *ViewerPrivate::attachmentStrategy() const
{
return mAttachmentStrategy;
}
void ViewerPrivate::setAttachmentStrategy(const MimeTreeParser::AttachmentStrategy *strategy)
void ViewerPrivate::setAttachmentStrategy(const AttachmentStrategy *strategy)
{
if (mAttachmentStrategy == strategy) {
return;
}
mAttachmentStrategy = strategy ? strategy : MimeTreeParser::AttachmentStrategy::smart();
mAttachmentStrategy = strategy ? strategy : AttachmentStrategy::smart();
update(MimeTreeParser::Force);
}
......@@ -1823,21 +1823,21 @@ void ViewerPrivate::showContextMenu(KMime::Content *content, const QPoint &pos)
}
KToggleAction *ViewerPrivate::actionForAttachmentStrategy(
const MimeTreeParser::AttachmentStrategy *as)
const AttachmentStrategy *as)
{
if (!mActionCollection) {
return nullptr;
}
QString actionName;
if (as == MimeTreeParser::AttachmentStrategy::iconic()) {
if (as == AttachmentStrategy::iconic()) {
actionName = QStringLiteral("view_attachments_as_icons");
} else if (as == MimeTreeParser::AttachmentStrategy::smart()) {
} else if (as == AttachmentStrategy::smart()) {
actionName = QStringLiteral("view_attachments_smart");
} else if (as == MimeTreeParser::AttachmentStrategy::inlined()) {
} else if (as == AttachmentStrategy::inlined()) {
actionName = QStringLiteral("view_attachments_inline");
} else if (as == MimeTreeParser::AttachmentStrategy::hidden()) {
} else if (as == AttachmentStrategy::hidden()) {
actionName = QStringLiteral("view_attachments_hide");
} else if (as == MimeTreeParser::AttachmentStrategy::headerOnly()) {
} else if (as == AttachmentStrategy::headerOnly()) {
actionName = QStringLiteral("view_attachments_headeronly");
}
......@@ -2284,27 +2284,27 @@ void ViewerPrivate::slotMimePartSelected(const QModelIndex &index)
void ViewerPrivate::slotIconicAttachments()
{
setAttachmentStrategy(MimeTreeParser::AttachmentStrategy::iconic());
setAttachmentStrategy(AttachmentStrategy::iconic());
}
void ViewerPrivate::slotSmartAttachments()
{
setAttachmentStrategy(MimeTreeParser::AttachmentStrategy::smart());
setAttachmentStrategy(AttachmentStrategy::smart());
}
void ViewerPrivate::slotInlineAttachments()
{
setAttachmentStrategy(MimeTreeParser::AttachmentStrategy::inlined());
setAttachmentStrategy(AttachmentStrategy::inlined());
}
void ViewerPrivate::slotHideAttachments()
{
setAttachmentStrategy(MimeTreeParser::AttachmentStrategy::hidden());
setAttachmentStrategy(AttachmentStrategy::hidden());
}
void ViewerPrivate::slotHeaderOnlyAttachments()
{
setAttachmentStrategy(MimeTreeParser::AttachmentStrategy::headerOnly());
setAttachmentStrategy(AttachmentStrategy::headerOnly());
}
void ViewerPrivate::attachmentView(KMime::Content *atmNode)
......
......@@ -66,7 +66,6 @@ class ShareServiceUrlManager;
}
namespace MimeTreeParser {
class AttachmentStrategy;
class HtmlWriter;
class ObjectTreeParser;
}
......@@ -78,6 +77,7 @@ class ZoomActionMenu;
class LocalDataBaseManager;
}
namespace MessageViewer {
class AttachmentStrategy;
class HeaderStylePlugin;
class CSSHelper;
class MailWebEngineView;
......@@ -289,8 +289,8 @@ public:
void writeConfig(bool withSync = true);
/** Get/set the message attachment strategy. */
const MimeTreeParser::AttachmentStrategy *attachmentStrategy() const;
void setAttachmentStrategy(const MimeTreeParser::AttachmentStrategy *strategy);
const AttachmentStrategy *attachmentStrategy() const;
void setAttachmentStrategy(const AttachmentStrategy *strategy);
/** Get selected override character encoding.
@return The encoding selected by the user or an empty string if auto-detection
......@@ -342,7 +342,7 @@ public:
void showContextMenu(KMime::Content *content, const QPoint &point);
KToggleAction *actionForAttachmentStrategy(const MimeTreeParser::AttachmentStrategy *);
KToggleAction *actionForAttachmentStrategy(const AttachmentStrategy *);
/** Read override codec from configuration */
void readGlobalOverrideCodec();
......@@ -607,7 +607,7 @@ public:
MailWebEngineView *mViewer = nullptr;
WebEngineViewer::FindBarWebEngineView *mFindBar = nullptr;
const MimeTreeParser::AttachmentStrategy *mAttachmentStrategy = nullptr;
const AttachmentStrategy *mAttachmentStrategy = nullptr;
QTimer mUpdateReaderWinTimer;
QTimer mResizeTimer;
QString mOverrideEncoding;
......
......@@ -27,7 +27,7 @@
#include <QTextEdit>
#include <QFile>
#include <MessageViewer/Viewer>
#include <MimeTreeParser/AttachmentStrategy>
#include <MessageViewer/AttachmentStrategy>
#include <QVBoxLayout>
TestJQuerySupportMailWebEngine::TestJQuerySupportMailWebEngine(QWidget *parent)
......@@ -38,7 +38,7 @@ TestJQuerySupportMailWebEngine::TestJQuerySupportMailWebEngine(QWidget *parent)
vboxLayout->addWidget(viewer);
viewer->setMessage(readAndParseMail(QStringLiteral("encapsulated-with-attachment.mbox")));
viewer->setPluginName(QStringLiteral("enterprise"));
viewer->setAttachmentStrategy(MimeTreeParser::AttachmentStrategy::headerOnly());
viewer->setAttachmentStrategy(MessageViewer::AttachmentStrategy::headerOnly());
mEditor = new QTextEdit(this);
mEditor->setAcceptRichText(false);
......
......@@ -22,7 +22,6 @@
#define MESSAGECORE_TESTS_UTIL_H
#include <gpgme++/key.h>
#include <MimeTreeParser/AttachmentStrategy>
#include <MimeTreeParser/BodyPartFormatter>
#include <MimeTreeParser/BodyPartFormatterFactory>
#include <MimeTreeParser/MessagePart>
......@@ -66,16 +65,6 @@ public:
mHtmlLoadExternal = loadExternal;
}
void setAttachmentStrategy(QString strategy)
{
mAttachmentStrategy = strategy;
}
const AttachmentStrategy *attachmentStrategy() override
{
return AttachmentStrategy::create(mAttachmentStrategy);
}
bool autoImportKeys() const override
{
return true;
......
......@@ -26,7 +26,6 @@ set(libmimetreeparser_main_SRCS
interfaces/htmlwriter.cpp
job/qgpgmejobexecutor.cpp
utils/util.cpp
attachmentstrategy.cpp
bodypartformatter.cpp
bodypartformatterfactory.cpp
cryptohelper.cpp
......@@ -52,7 +51,6 @@ set(mimetreeparser_temporaryfile_SRCS
ecm_generate_headers(MimeTreeParser_Camelcasemain_HEADERS
HEADER_NAMES
AttachmentStrategy
BodyPartFormatterFactory
Enums
MessagePart
......
......@@ -21,7 +21,6 @@
#include "utils.h"
#include "attachmentstrategy.h"
#include "objecttreeparser.h"
#include "messagepart.h"
......
......@@ -19,7 +19,6 @@
#include "texthtml.h"
#include "attachmentstrategy.h"
#include "objecttreeparser.h"
#include "messagepart.h"
......
......@@ -19,7 +19,6 @@
#include "textplain.h"
#include "attachmentstrategy.h"
#include "objecttreeparser.h"
#include "messagepart.h"
......
......@@ -49,7 +49,6 @@
#include "bodypartformatterfactory.h"
#include "bodypartformatterfactory_p.h"
#include "attachmentstrategy.h"
#include "objecttreeparser.h"
#include "messagepart.h"
......
......@@ -30,7 +30,6 @@ class QTextCodec;
namespace MimeTreeParser {
class HtmlWriter;
class AttachmentStrategy;
class BodyPartFormatterFactory;
class MessagePart;
typedef QSharedPointer<MessagePart> MessagePartPtr;
......@@ -74,9 +73,6 @@ public:
virtual QString createMessageHeader(KMime::Message *message) = 0;
/** Return the wanted attachment startegy */
virtual const AttachmentStrategy *attachmentStrategy() = 0;
/** Return the html write object */
virtual HtmlWriter *htmlWriter() = 0;
......
......@@ -19,7 +19,6 @@
#include "messagepart.h"
#include "mimetreeparser_debug.h"
#include "attachmentstrategy.h"
#include "cryptohelper.h"
#include "objecttreeparser.h"
#include "job/qgpgmejobexecutor.h"
......
......@@ -36,7 +36,6 @@
#include "objecttreeparser.h"
#include "attachmentstrategy.h"
#include "bodypartformatterfactory.h"
#include "nodehelper.h"
#include "messagepart.h"
......
......@@ -51,7 +51,6 @@ namespace MimeTreeParser {
class PartMetaData;
class ViewerPrivate;
class HtmlWriter;
class AttachmentStrategy;
class NodeHelper;
class MessagePart;
class MimeMessagePart;
......@@ -358,7 +357,6 @@ private:
bool mHasPendingAsyncJobs;
bool mAllowAsync;
const AttachmentStrategy *mAttachmentStrategy;
// DataUrl Icons cache
QString mCollapseIcon;
QString mExpandIcon;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment