* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch

* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 1 insertions, 17 deletions

diff --git a/kmail/attachmentcollector.h b/kmail/attachmentcollector.h
index 52454e8d..e7449607 100644
--- a/kmail/attachmentcollector.h
+++ b/kmail/attachmentcollector.h
@@ -40,20 +40,7 @@ namespace KMail {
 
   class AttachmentCollector {
   public:
-    AttachmentCollector()
-      : mDiveIntoEncryptions( true ),
-	mDiveIntoSignatures( true ),
-	mDiveIntoMessages( false ) {}
-
-    void setDiveIntoEncryptions( bool dive ) {
-      mDiveIntoEncryptions = dive;
-    }
-    void setDiveIntoSignatures( bool dive ) {
-      mDiveIntoSignatures = dive;
-    }
-    void setDiveIntoMessages( bool dive ) {
-      mDiveIntoMessages = dive;
-    }
+    AttachmentCollector() {}
 
     void collectAttachmentsFrom( partNode * node );
 
@@ -61,9 +48,6 @@ namespace KMail {
 
   private:
     std::vector<partNode*> mAttachments;
-    bool mDiveIntoEncryptions : 1;
-    bool mDiveIntoSignatures  : 1;
-    bool mDiveIntoMessages    : 1;
 
   private: // disabled
     AttachmentCollector( const AttachmentCollector & );