summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-10-14 05:41:42 (GMT)
committerMontel Laurent <montel@kde.org>2016-10-14 05:41:42 (GMT)
commit52a1b2a62beaa95d9c7557062323d73daa667c52 (patch)
treed057b038ea605d2e391d1e012245a00cdcd55ad0
parent706ec225ece7d732615917cef2dd000de95690ce (diff)
Printing is never used. Remove it
-rw-r--r--CMakeLists.txt2
-rw-r--r--messageviewer/src/viewer/viewer_p.cpp1
-rw-r--r--mimetreeparser/src/viewer/objecttreeparser.cpp19
-rw-r--r--mimetreeparser/src/viewer/objecttreeparser.h4
4 files changed, 4 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e678b02..cd7a673 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(ECMQtDeclareLoggingCategory)
include(ECMAddTests)
-set(PIM_VERSION "5.3.74")
+set(PIM_VERSION "5.3.75")
set(MESSAGELIB_LIB_VERSION ${PIM_VERSION})
set(AKONADIMIME_LIB_VERSION "5.3.40")
diff --git a/messageviewer/src/viewer/viewer_p.cpp b/messageviewer/src/viewer/viewer_p.cpp
index 6df836e..c338041 100644
--- a/messageviewer/src/viewer/viewer_p.cpp
+++ b/messageviewer/src/viewer/viewer_p.cpp
@@ -988,7 +988,6 @@ void ViewerPrivate::parseContent(KMime::Content *content)
MailViewerSource otpSource(this);
MimeTreeParser::ObjectTreeParser otp(&otpSource, mNodeHelper, mMessage.data() != content /* show only single node */);
otp.setAllowAsync(!mPrinting);
- otp.setPrinting(mPrinting);
otp.parseObjectTree(content);
// TODO: Setting the signature state to nodehelper is not enough, it should actually
diff --git a/mimetreeparser/src/viewer/objecttreeparser.cpp b/mimetreeparser/src/viewer/objecttreeparser.cpp
index 414ad4e..dd3d6eb 100644
--- a/mimetreeparser/src/viewer/objecttreeparser.cpp
+++ b/mimetreeparser/src/viewer/objecttreeparser.cpp
@@ -72,8 +72,7 @@ ObjectTreeParser::ObjectTreeParser(const ObjectTreeParser *topLevelParser,
mShowOnlyOneMimePart(showOnlyOneMimePart),
mHasPendingAsyncJobs(false),
mAllowAsync(topLevelParser->mAllowAsync),
- mAttachmentStrategy(strategy),
- mPrinting(false)
+ mAttachmentStrategy(strategy)
{
init();
}
@@ -89,8 +88,7 @@ ObjectTreeParser::ObjectTreeParser(Interface::ObjectTreeSource *source,
mShowOnlyOneMimePart(showOnlyOneMimePart),
mHasPendingAsyncJobs(false),
mAllowAsync(false),
- mAttachmentStrategy(strategy),
- mPrinting(false)
+ mAttachmentStrategy(strategy)
{
init();
}
@@ -119,8 +117,7 @@ ObjectTreeParser::ObjectTreeParser(const ObjectTreeParser &other)
mHasPendingAsyncJobs(other.hasPendingAsyncJobs()),
mAllowAsync(other.allowAsync()),
mAttachmentStrategy(other.attachmentStrategy()),
- mDeleteNodeHelper(false), // TODO see above
- mPrinting(other.printing())
+ mDeleteNodeHelper(false)
{
}
@@ -206,16 +203,6 @@ MessagePartPtr ObjectTreeParser::parsedPart() const
return mParsedPart;
}
-void ObjectTreeParser::setPrinting(bool printing)
-{
- mPrinting = printing;
-}
-
-bool ObjectTreeParser::printing() const
-{
- return mPrinting;
-}
-
bool ObjectTreeParser::processType(KMime::Content *node, ProcessResult &processResult, const QByteArray &mediaType, const QByteArray &subType, Interface::MessagePartPtr &mpRet, bool onlyOneMimePart)
{
bool bRendered = false;
diff --git a/mimetreeparser/src/viewer/objecttreeparser.h b/mimetreeparser/src/viewer/objecttreeparser.h
index 8ebe3e8..335ffd2 100644
--- a/mimetreeparser/src/viewer/objecttreeparser.h
+++ b/mimetreeparser/src/viewer/objecttreeparser.h
@@ -337,9 +337,6 @@ public:
void parseObjectTree(KMime::Content *node);
MessagePartPtr parsedPart() const;
- void setPrinting(bool printing);
- bool printing() const;
-
private:
void extractNodeInfos(KMime::Content *curNode, bool isFirstTextPart);
void setPlainTextContent(QString plainTextContent);
@@ -392,7 +389,6 @@ private:
QString mCollapseIcon;
QString mExpandIcon;
bool mDeleteNodeHelper;
- bool mPrinting;
friend class PartNodeBodyPart;
friend class MessagePart;