summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-06-12 23:16:36 +0200
committerMontel Laurent <[email protected]>2017-06-12 23:16:36 +0200
commitc5d6aac5a4e44d687daeafb4f79b217892a6d535 (patch)
treefa97af8c28f11f100b632175cddf2abe8fcf65e0
parentd1bf69d720073fe700ff81f2dec77a331416f392 (diff)
Adapt to new api
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/editor/kmcomposercreatenewcomposerjob.cpp2
-rw-r--r--src/editor/kmcomposerupdatetemplatejob.cpp4
-rw-r--r--src/job/composenewmessagejob.cpp4
-rw-r--r--src/job/handleclickedurljob.cpp2
-rw-r--r--src/job/newmessagejob.cpp2
6 files changed, 8 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc8e334..911e65d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,7 +65,7 @@ find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widget
set(LIBGRAVATAR_VERSION_LIB "5.5.40")
set(MAILCOMMON_LIB_VERSION_LIB "5.5.43")
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(PIMCOMMON_LIB_VERSION_LIB "5.5.41")
set(LIBKDEPIM_LIB_VERSION_LIB "5.5.42")
diff --git a/src/editor/kmcomposercreatenewcomposerjob.cpp b/src/editor/kmcomposercreatenewcomposerjob.cpp
index 3d71ba6..828a4e0 100644
--- a/src/editor/kmcomposercreatenewcomposerjob.cpp
+++ b/src/editor/kmcomposercreatenewcomposerjob.cpp
@@ -46,7 +46,7 @@ void KMComposerCreateNewComposerJob::start()
TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage);
connect(parser, &TemplateParser::TemplateParserJob::parsingDone, this, &KMComposerCreateNewComposerJob::slotCreateNewComposer);
parser->setIdentityManager(KMKernel::self()->identityManager());
- parser->process(mMsg, mCollectionForNewMessage);
+ parser->process(mMsg, mCollectionForNewMessage.id());
}
void KMComposerCreateNewComposerJob::slotCreateNewComposer(bool forceCursorPosition)
diff --git a/src/editor/kmcomposerupdatetemplatejob.cpp b/src/editor/kmcomposerupdatetemplatejob.cpp
index 0369602..2c14b69 100644
--- a/src/editor/kmcomposerupdatetemplatejob.cpp
+++ b/src/editor/kmcomposerupdatetemplatejob.cpp
@@ -47,9 +47,9 @@ void KMComposerUpdateTemplateJob::start()
parser->setAllowDecryption(true);
parser->setIdentityManager(KMKernel::self()->identityManager());
if (!mCustomTemplate.isEmpty()) {
- parser->process(mCustomTemplate, mMsg, mCollectionForNewMessage);
+ parser->process(mCustomTemplate, mMsg, mCollectionForNewMessage.id());
} else {
- parser->processWithIdentity(mUoid, mMsg, mCollectionForNewMessage);
+ parser->processWithIdentity(mUoid, mMsg, mCollectionForNewMessage.id());
}
}
diff --git a/src/job/composenewmessagejob.cpp b/src/job/composenewmessagejob.cpp
index 0a41960..51a17bd 100644
--- a/src/job/composenewmessagejob.cpp
+++ b/src/job/composenewmessagejob.cpp
@@ -52,9 +52,9 @@ void ComposeNewMessageJob::start()
connect(parser, &TemplateParser::TemplateParserJob::parsingDone, this, &ComposeNewMessageJob::slotOpenComposer);
parser->setIdentityManager(KMKernel::self()->identityManager());
if (mFolder) {
- parser->process(mMsg, mCurrentCollection);
+ parser->process(mMsg, mCurrentCollection.id());
} else {
- parser->process(KMime::Message::Ptr(), Akonadi::Collection());
+ parser->process(KMime::Message::Ptr());
}
}
diff --git a/src/job/handleclickedurljob.cpp b/src/job/handleclickedurljob.cpp
index fb0d6d7..4ede9f8 100644
--- a/src/job/handleclickedurljob.cpp
+++ b/src/job/handleclickedurljob.cpp
@@ -73,7 +73,7 @@ void HandleClickedUrlJob::start()
TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage);
connect(parser, &TemplateParser::TemplateParserJob::parsingDone, this, &HandleClickedUrlJob::slotOpenComposer);
parser->setIdentityManager(KMKernel::self()->identityManager());
- parser->process(mMsg, mCurrentCollection);
+ parser->process(mMsg, mCurrentCollection.id());
}
void HandleClickedUrlJob::slotOpenComposer()
diff --git a/src/job/newmessagejob.cpp b/src/job/newmessagejob.cpp
index 6973186..eb692ea 100644
--- a/src/job/newmessagejob.cpp
+++ b/src/job/newmessagejob.cpp
@@ -59,7 +59,7 @@ void NewMessageJob::start()
TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage);
connect(parser, &TemplateParser::TemplateParserJob::parsingDone, this, &NewMessageJob::slotOpenComposer);
parser->setIdentityManager(KMKernel::self()->identityManager());
- parser->process(mMsg, mCollection);
+ parser->process(mMsg, mCollection.id());
}
void NewMessageJob::slotOpenComposer()