Commit c5d6aac5 authored by Laurent Montel's avatar Laurent Montel 😁

Adapt to new api

parent d1bf69d7
...@@ -65,7 +65,7 @@ find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widget ...@@ -65,7 +65,7 @@ find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widget
set(LIBGRAVATAR_VERSION_LIB "5.5.40") set(LIBGRAVATAR_VERSION_LIB "5.5.40")
set(MAILCOMMON_LIB_VERSION_LIB "5.5.43") set(MAILCOMMON_LIB_VERSION_LIB "5.5.43")
set(KDEPIM_APPS_LIB_VERSION_LIB "5.5.40") set(KDEPIM_APPS_LIB_VERSION_LIB "5.5.40")
set(MESSAGELIB_LIB_VERSION_LIB "5.5.48") set(MESSAGELIB_LIB_VERSION_LIB "5.5.49")
set(LIBKLEO_LIB_VERSION_LIB "5.5.40") set(LIBKLEO_LIB_VERSION_LIB "5.5.40")
set(PIMCOMMON_LIB_VERSION_LIB "5.5.41") set(PIMCOMMON_LIB_VERSION_LIB "5.5.41")
set(LIBKDEPIM_LIB_VERSION_LIB "5.5.42") set(LIBKDEPIM_LIB_VERSION_LIB "5.5.42")
......
...@@ -46,7 +46,7 @@ void KMComposerCreateNewComposerJob::start() ...@@ -46,7 +46,7 @@ void KMComposerCreateNewComposerJob::start()
TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage); TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage);
connect(parser, &TemplateParser::TemplateParserJob::parsingDone, this, &KMComposerCreateNewComposerJob::slotCreateNewComposer); connect(parser, &TemplateParser::TemplateParserJob::parsingDone, this, &KMComposerCreateNewComposerJob::slotCreateNewComposer);
parser->setIdentityManager(KMKernel::self()->identityManager()); parser->setIdentityManager(KMKernel::self()->identityManager());
parser->process(mMsg, mCollectionForNewMessage); parser->process(mMsg, mCollectionForNewMessage.id());
} }
void KMComposerCreateNewComposerJob::slotCreateNewComposer(bool forceCursorPosition) void KMComposerCreateNewComposerJob::slotCreateNewComposer(bool forceCursorPosition)
......
...@@ -47,9 +47,9 @@ void KMComposerUpdateTemplateJob::start() ...@@ -47,9 +47,9 @@ void KMComposerUpdateTemplateJob::start()
parser->setAllowDecryption(true); parser->setAllowDecryption(true);
parser->setIdentityManager(KMKernel::self()->identityManager()); parser->setIdentityManager(KMKernel::self()->identityManager());
if (!mCustomTemplate.isEmpty()) { if (!mCustomTemplate.isEmpty()) {
parser->process(mCustomTemplate, mMsg, mCollectionForNewMessage); parser->process(mCustomTemplate, mMsg, mCollectionForNewMessage.id());
} else { } else {
parser->processWithIdentity(mUoid, mMsg, mCollectionForNewMessage); parser->processWithIdentity(mUoid, mMsg, mCollectionForNewMessage.id());
} }
} }
......
...@@ -52,9 +52,9 @@ void ComposeNewMessageJob::start() ...@@ -52,9 +52,9 @@ void ComposeNewMessageJob::start()
connect(parser, &TemplateParser::TemplateParserJob::parsingDone, this, &ComposeNewMessageJob::slotOpenComposer); connect(parser, &TemplateParser::TemplateParserJob::parsingDone, this, &ComposeNewMessageJob::slotOpenComposer);
parser->setIdentityManager(KMKernel::self()->identityManager()); parser->setIdentityManager(KMKernel::self()->identityManager());
if (mFolder) { if (mFolder) {
parser->process(mMsg, mCurrentCollection); parser->process(mMsg, mCurrentCollection.id());
} else { } else {
parser->process(KMime::Message::Ptr(), Akonadi::Collection()); parser->process(KMime::Message::Ptr());
} }
} }
......
...@@ -73,7 +73,7 @@ void HandleClickedUrlJob::start() ...@@ -73,7 +73,7 @@ void HandleClickedUrlJob::start()
TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage); TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage);
connect(parser, &TemplateParser::TemplateParserJob::parsingDone, this, &HandleClickedUrlJob::slotOpenComposer); connect(parser, &TemplateParser::TemplateParserJob::parsingDone, this, &HandleClickedUrlJob::slotOpenComposer);
parser->setIdentityManager(KMKernel::self()->identityManager()); parser->setIdentityManager(KMKernel::self()->identityManager());
parser->process(mMsg, mCurrentCollection); parser->process(mMsg, mCurrentCollection.id());
} }
void HandleClickedUrlJob::slotOpenComposer() void HandleClickedUrlJob::slotOpenComposer()
......
...@@ -59,7 +59,7 @@ void NewMessageJob::start() ...@@ -59,7 +59,7 @@ void NewMessageJob::start()
TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage); TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage);
connect(parser, &TemplateParser::TemplateParserJob::parsingDone, this, &NewMessageJob::slotOpenComposer); connect(parser, &TemplateParser::TemplateParserJob::parsingDone, this, &NewMessageJob::slotOpenComposer);
parser->setIdentityManager(KMKernel::self()->identityManager()); parser->setIdentityManager(KMKernel::self()->identityManager());
parser->process(mMsg, mCollection); parser->process(mMsg, mCollection.id());
} }
void NewMessageJob::slotOpenComposer() void NewMessageJob::slotOpenComposer()
......
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