summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-06-12 23:16:17 +0200
committerMontel Laurent <[email protected]>2017-06-12 23:16:17 +0200
commit2173b7e56176f829d46d42db53c1d3fdc9ca8d19 (patch)
tree34783493f0c2e17785a8527cff0f9cd32a930ef0
parent433e1807704d86d5d763de84eae98a572d14e080 (diff)
Remove akonadi support
-rw-r--r--CMakeLists.txt2
-rw-r--r--messagecomposer/src/helper/messagefactoryforwardjob.cpp2
-rw-r--r--messagecomposer/src/helper/messagefactoryreplyjob.cpp2
-rw-r--r--templateparser/autotests/CMakeLists.txt1
-rw-r--r--templateparser/src/CMakeLists.txt2
-rw-r--r--templateparser/src/templateparserjob.cpp12
-rw-r--r--templateparser/src/templateparserjob.h7
7 files changed, 14 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f51c83a..e9619d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.0)
-set(PIM_VERSION "5.5.48")
+set(PIM_VERSION "5.5.49")
if (POLICY CMP0053)
cmake_policy(SET CMP0053 NEW)
diff --git a/messagecomposer/src/helper/messagefactoryforwardjob.cpp b/messagecomposer/src/helper/messagefactoryforwardjob.cpp
index 6ad429d..886e1c5 100644
--- a/messagecomposer/src/helper/messagefactoryforwardjob.cpp
+++ b/messagecomposer/src/helper/messagefactoryforwardjob.cpp
@@ -48,7 +48,7 @@ void MessageFactoryForwardJob::start()
if (!mTemplate.isEmpty()) {
parser->process(mTemplate, mOrigMsg);
} else {
- parser->process(mOrigMsg, mCollection);
+ parser->process(mOrigMsg, mCollection.id());
}
}
diff --git a/messagecomposer/src/helper/messagefactoryreplyjob.cpp b/messagecomposer/src/helper/messagefactoryreplyjob.cpp
index c80d7f2..56d7df2 100644
--- a/messagecomposer/src/helper/messagefactoryreplyjob.cpp
+++ b/messagecomposer/src/helper/messagefactoryreplyjob.cpp
@@ -53,7 +53,7 @@ void MessageFactoryReplyJob::start()
if (!mTemplate.isEmpty()) {
parser->process(mTemplate, mOrigMsg);
} else {
- parser->process(mOrigMsg, mCollection);
+ parser->process(mOrigMsg, mCollection.id());
}
}
diff --git a/templateparser/autotests/CMakeLists.txt b/templateparser/autotests/CMakeLists.txt
index ccbbb10..58bf7e2 100644
--- a/templateparser/autotests/CMakeLists.txt
+++ b/templateparser/autotests/CMakeLists.txt
@@ -19,7 +19,6 @@ macro(add_templateparser_unittest _source)
Qt5::Test
KF5::KIOCore
KF5::Mime
- KF5::AkonadiCore
KF5::IdentityManagement
KF5::XmlGui
KF5::Completion
diff --git a/templateparser/src/CMakeLists.txt b/templateparser/src/CMakeLists.txt
index 53ee2c4..1dc30ab 100644
--- a/templateparser/src/CMakeLists.txt
+++ b/templateparser/src/CMakeLists.txt
@@ -21,6 +21,7 @@ set(templateparser_LIB_SRCS
templateextracthtmlelementwebengineview.cpp
templateparserextracthtmlinfo.cpp
templateparserextracthtmlinforesult.cpp
+ templateparseremailaddressrequesterbase.cpp
)
@@ -84,6 +85,7 @@ ecm_generate_headers(TemplateParser_CamelCase_HEADERS
TemplatesInsertCommand
TemplateParserJob
TemplateParserExtractHtmlInfoResult
+ TemplateParserEmailAddressRequesterBase
REQUIRED_HEADERS TemplateParser_HEADERS
PREFIX TemplateParser
)
diff --git a/templateparser/src/templateparserjob.cpp b/templateparser/src/templateparserjob.cpp
index 6cfcae2..76bf593 100644
--- a/templateparser/src/templateparserjob.cpp
+++ b/templateparser/src/templateparserjob.cpp
@@ -255,7 +255,7 @@ QString TemplateParserJob::getLastName(const QString &str)
}
void TemplateParserJob::process(const KMime::Message::Ptr &aorig_msg,
- const Akonadi::Collection &afolder)
+ qint64 afolder)
{
if (aorig_msg == nullptr) {
qCDebug(TEMPLATEPARSER_LOG) << "aorig_msg == 0!";
@@ -264,7 +264,7 @@ void TemplateParserJob::process(const KMime::Message::Ptr &aorig_msg,
}
mOrigMsg = aorig_msg;
- mFolder = afolder.isValid() ? afolder.id() : -1;
+ mFolder = afolder;
const QString tmpl = findTemplate();
if (tmpl.isEmpty()) {
Q_EMIT parsingDone(mForceCursorPosition);
@@ -274,17 +274,17 @@ void TemplateParserJob::process(const KMime::Message::Ptr &aorig_msg,
}
void TemplateParserJob::process(const QString &tmplName, const KMime::Message::Ptr &aorig_msg,
- const Akonadi::Collection &afolder)
+ qint64 afolder)
{
mForceCursorPosition = false;
mOrigMsg = aorig_msg;
- mFolder = afolder.isValid() ? afolder.id() : -1;
+ mFolder = afolder;
const QString tmpl = findCustomTemplate(tmplName);
processWithTemplate(tmpl);
}
void TemplateParserJob::processWithIdentity(uint uoid, const KMime::Message::Ptr &aorig_msg,
- const Akonadi::Collection &afolder)
+ qint64 afolder)
{
mIdentity = uoid;
process(aorig_msg, afolder);
@@ -1379,7 +1379,7 @@ QString TemplateParserJob::findTemplate()
QString tmpl;
- qCDebug(TEMPLATEPARSER_LOG) << "Folder found:" << mFolder;
+ qCDebug(TEMPLATEPARSER_LOG) << "Folder identify found:" << mFolder;
if (mFolder >= 0) { // only if a folder was found
QString fid = QString::number(mFolder);
Templates fconf(fid);
diff --git a/templateparser/src/templateparserjob.h b/templateparser/src/templateparserjob.h
index 1b164a8..31cc82b 100644
--- a/templateparser/src/templateparserjob.h
+++ b/templateparser/src/templateparserjob.h
@@ -24,7 +24,6 @@
#include "templateparserextracthtmlinforesult.h"
#include <MessageViewer/ObjectTreeEmptySource>
-#include <AkonadiCore/Collection>
#include <KMime/KMimeMessage>
#include <QObject>
@@ -213,11 +212,11 @@ public:
void setCharsets(const QStringList &charsets);
void process(const KMime::Message::Ptr &aorig_msg,
- const Akonadi::Collection &afolder = Akonadi::Collection());
+ qint64 afolder = -1);
void process(const QString &tmplName, const KMime::Message::Ptr &aorig_msg,
- const Akonadi::Collection &afolder = Akonadi::Collection());
+ qint64 afolder = -1);
void processWithIdentity(uint uoid, const KMime::Message::Ptr &aorig_msg,
- const Akonadi::Collection &afolder = Akonadi::Collection());
+ qint64 afolder = -1);
void processWithTemplate(const QString &tmpl);