From 9516f3b02f74f239ce2776abf7cf1147952065cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20Knau=C3=9F?= <sknauss@kde.org>
Date: Tue, 19 Jul 2016 14:46:23 +0200
Subject: new mimetreeparser interface

Reviewers: cmollekopf

Maniphest Tasks: T3208

Differential Revision: https://phabricator.kde.org/D2221
---
 framework/domain/mimetreeparser/interface.h | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'framework/domain/mimetreeparser/interface.h')

diff --git a/framework/domain/mimetreeparser/interface.h b/framework/domain/mimetreeparser/interface.h
index 82f88e73..8a0047ff 100644
--- a/framework/domain/mimetreeparser/interface.h
+++ b/framework/domain/mimetreeparser/interface.h
@@ -66,7 +66,7 @@ public:
 
     bool hasSubParts() const;
     QVector<Part::Ptr> subParts() const;
-    Part::Ptr parent() const;
+    Part *parent() const;
 
     virtual QVector<Signature> signatures() const;
     virtual QVector<Encryption> encryptions() const;
@@ -85,6 +85,8 @@ public:
 
     QByteArray content() const;
 
+    QByteArray charset() const;
+
     //Use default charset
     QString encodedContent() const;
 
@@ -162,8 +164,8 @@ public:
 
     ContentPart();
     virtual ~ContentPart();
-    
-    QVector<Content> content(Type ct) const;
+
+    QVector<Content::Ptr> content(Type ct) const;
 
     Types availableContents() const;
 
@@ -259,7 +261,6 @@ private:
     std::unique_ptr<CertPartPrivate> d;    
 };
 
-
 class Key
 {
     QString keyid() const;
@@ -309,7 +310,7 @@ public:
 
     Part::Ptr getPart(QUrl url);
 
-    //template <typename T> QVector<T::Ptr> collect<T>(Part start, std::function<bool(const Part &)> select, std::function<bool(const T::Ptr &)> filter) const;
+    template <typename T> QVector<typename T::Ptr> collect(const Part::Ptr &start, std::function<bool(const Part::Ptr &)> select, std::function<bool(const typename T::Ptr &)> filter) const;
     QVector<AttachmentPart::Ptr> collectAttachments(Part::Ptr start, std::function<bool(const Part::Ptr &)> select, std::function<bool(const AttachmentPart::Ptr &)> filter) const;
     ContentPart::Ptr collectContentPart(Part::Ptr start, std::function<bool(const Part::Ptr &)> select, std::function<bool(const ContentPart::Ptr &)> filter) const;
     ContentPart::Ptr collectContentPart(const Part::Ptr& start) const;
@@ -324,4 +325,5 @@ signals:
 
 private:
     std::unique_ptr<ParserPrivate> d;
-};
\ No newline at end of file
+};
+
-- 
cgit v1.2.3