diff --git a/messageviewer/src/viewer/objecttreeparser.h b/messageviewer/src/viewer/objecttreeparser.h --- a/messageviewer/src/viewer/objecttreeparser.h +++ b/messageviewer/src/viewer/objecttreeparser.h @@ -289,12 +289,10 @@ NodeHelper *nodeHelper = 0, const Kleo::CryptoBackend::Protocol *protocol = 0, bool showOneMimePart = false, bool keepEncryptions = false, - bool includeSignatures = true, const AttachmentStrategy *attachmentStrategy = 0); explicit ObjectTreeParser(const ObjectTreeParser *topLevelParser, bool showOneMimePart = false, bool keepEncryptions = false, - bool includeSignatures = true, const AttachmentStrategy *attachmentStrategy = 0); virtual ~ObjectTreeParser(); @@ -347,9 +345,6 @@ bool keepEncryptions() const; void setKeepEncryptions(bool keep); - bool includeSignatures() const; - void setIncludeSignatures(bool include); - const AttachmentStrategy *attachmentStrategy() const; HtmlWriter *htmlWriter() const; @@ -509,7 +504,6 @@ bool mShowOnlyOneMimePart; bool mKeepEncryptions; - bool mIncludeSignatures; bool mHasPendingAsyncJobs; bool mAllowAsync; const AttachmentStrategy *mAttachmentStrategy; diff --git a/messageviewer/src/viewer/objecttreeparser.cpp b/messageviewer/src/viewer/objecttreeparser.cpp --- a/messageviewer/src/viewer/objecttreeparser.cpp +++ b/messageviewer/src/viewer/objecttreeparser.cpp @@ -146,16 +146,14 @@ ObjectTreeParser::ObjectTreeParser(const ObjectTreeParser *topLevelParser, bool showOnlyOneMimePart, bool keepEncryptions, - bool includeSignatures, const AttachmentStrategy *strategy) : mSource(topLevelParser->mSource), mNodeHelper(topLevelParser->mNodeHelper), mHtmlWriter(topLevelParser->mHtmlWriter), mTopLevelContent(topLevelParser->mTopLevelContent), mCryptoProtocol(topLevelParser->mCryptoProtocol), mShowOnlyOneMimePart(showOnlyOneMimePart), mKeepEncryptions(keepEncryptions), - mIncludeSignatures(includeSignatures), mHasPendingAsyncJobs(false), mAllowAsync(topLevelParser->mAllowAsync), mAttachmentStrategy(strategy), @@ -168,16 +166,14 @@ MessageViewer::NodeHelper *nodeHelper, const Kleo::CryptoBackend::Protocol *protocol, bool showOnlyOneMimePart, bool keepEncryptions, - bool includeSignatures, const AttachmentStrategy *strategy) : mSource(source), mNodeHelper(nodeHelper), mHtmlWriter(0), mTopLevelContent(0), mCryptoProtocol(protocol), mShowOnlyOneMimePart(showOnlyOneMimePart), mKeepEncryptions(keepEncryptions), - mIncludeSignatures(includeSignatures), mHasPendingAsyncJobs(false), mAllowAsync(false), mAttachmentStrategy(strategy), @@ -209,7 +205,6 @@ mCryptoProtocol(other.cryptoProtocol()), mShowOnlyOneMimePart(other.showOnlyOneMimePart()), mKeepEncryptions(other.keepEncryptions()), - mIncludeSignatures(other.includeSignatures()), mHasPendingAsyncJobs(other.hasPendingAsyncJobs()), mAllowAsync(other.allowAsync()), mAttachmentStrategy(other.attachmentStrategy()), @@ -3025,16 +3020,6 @@ mKeepEncryptions = keep; } -bool ObjectTreeParser::includeSignatures() const -{ - return mIncludeSignatures; -} - -void ObjectTreeParser::setIncludeSignatures(bool include) -{ - mIncludeSignatures = include; -} - const AttachmentStrategy *ObjectTreeParser::attachmentStrategy() const { return mAttachmentStrategy;