Commit d4d97885 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

port to qvector

parent f2ee59ac
cmake_minimum_required(VERSION 3.5)
set(PIM_VERSION "5.13.50")
set(PIM_VERSION "5.13.51")
if (POLICY CMP0053)
cmake_policy(SET CMP0053 NEW)
......
......@@ -377,12 +377,12 @@ void MessageFactoryNG::createForwardAsync()
job->start();
}
QPair< KMime::Message::Ptr, QList< KMime::Content * > > MessageFactoryNG::createAttachedForward(const Akonadi::Item::List &items)
QPair< KMime::Message::Ptr, QVector< KMime::Content * > > MessageFactoryNG::createAttachedForward(const Akonadi::Item::List &items)
{
// create forwarded message with original message as attachment
// remove headers that shouldn't be forwarded
KMime::Message::Ptr msg(new KMime::Message);
QList< KMime::Content * > attachments;
QVector< KMime::Content * > attachments;
const int numberOfItems(items.count());
if (numberOfItems >= 2) {
......@@ -415,7 +415,7 @@ QPair< KMime::Message::Ptr, QList< KMime::Content * > > MessageFactoryNG::create
applyCharset(msg);
//msg->assemble();
return QPair< KMime::Message::Ptr, QList< KMime::Content * > >(msg, QList< KMime::Content * >() << attachments);
return QPair< KMime::Message::Ptr, QVector< KMime::Content * > >(msg, QVector< KMime::Content * >() << attachments);
}
KMime::Content *MessageFactoryNG::createForwardAttachmentMessage(const KMime::Message::Ptr &fwdMsg)
......
......@@ -27,7 +27,7 @@
#include <Item>
#include <Collection>
#include <QVector>
#include <Akonadi/KMime/MessageStatus>
namespace KIdentityManagement {
......@@ -90,7 +90,7 @@ public:
* If no list is passed, use the original message passed in the MessageFactoryNG
* constructor.
*/
Q_REQUIRED_RESULT QPair< KMime::Message::Ptr, QList< KMime::Content * > > createAttachedForward(const Akonadi::Item::List &items = Akonadi::Item::List());
Q_REQUIRED_RESULT QPair< KMime::Message::Ptr, QVector< KMime::Content * > > createAttachedForward(const Akonadi::Item::List &items = Akonadi::Item::List());
/** Create a new message that is a redirect to this message, filling all
required header fields with the proper values. The returned message
......
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