Commit 961d0715 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Port to new pimcommon api

parent cb19672c
Pipeline #23645 canceled with stage
...@@ -68,7 +68,7 @@ set(LIBGRAVATAR_VERSION_LIB "5.14.40") ...@@ -68,7 +68,7 @@ set(LIBGRAVATAR_VERSION_LIB "5.14.40")
set(MAILCOMMON_LIB_VERSION_LIB "5.14.43") set(MAILCOMMON_LIB_VERSION_LIB "5.14.43")
set(MESSAGELIB_LIB_VERSION_LIB "5.14.45") set(MESSAGELIB_LIB_VERSION_LIB "5.14.45")
set(LIBKLEO_LIB_VERSION_LIB "5.14.40") set(LIBKLEO_LIB_VERSION_LIB "5.14.40")
set(PIMCOMMON_LIB_VERSION_LIB "5.14.43") set(PIMCOMMON_LIB_VERSION_LIB "5.14.45")
set(LIBKDEPIM_LIB_VERSION_LIB "5.14.46") set(LIBKDEPIM_LIB_VERSION_LIB "5.14.46")
set(LIBKSIEVE_LIB_VERSION_LIB "5.14.40") set(LIBKSIEVE_LIB_VERSION_LIB "5.14.40")
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include "job/opencomposerhiddenjob.h" #include "job/opencomposerhiddenjob.h"
#include "job/fillcomposerjob.h" #include "job/fillcomposerjob.h"
#include <AkonadiSearch/PIM/indexeditems.h> #include <AkonadiSearch/PIM/indexeditems.h>
#include <LibkdepimAkonadi/ProgressManagerAkonadi> #include <PimCommonAkonadi/ProgressManagerAkonadi>
using PimCommon::BroadcastStatus; using PimCommon::BroadcastStatus;
#include "kmmainwin.h" #include "kmmainwin.h"
#include "editor/composer.h" #include "editor/composer.h"
...@@ -1562,7 +1562,7 @@ void KMKernel::transportRenamed(int id, const QString &oldName, const QString &n ...@@ -1562,7 +1562,7 @@ void KMKernel::transportRenamed(int id, const QString &oldName, const QString &n
void KMKernel::itemDispatchStarted() void KMKernel::itemDispatchStarted()
{ {
// Watch progress of the MDA. // Watch progress of the MDA.
KPIM::ProgressManagerAkonadi::createProgressItem(nullptr, PimCommon::ProgressManagerAkonadi::createProgressItem(nullptr,
MailTransport::DispatcherInterface().dispatcherInstance(), MailTransport::DispatcherInterface().dispatcherInstance(),
QStringLiteral("Sender"), QStringLiteral("Sender"),
i18n("Sending messages"), i18n("Sending messages"),
...@@ -1575,7 +1575,7 @@ void KMKernel::instanceStatusChanged(const Akonadi::AgentInstance &instance) ...@@ -1575,7 +1575,7 @@ void KMKernel::instanceStatusChanged(const Akonadi::AgentInstance &instance)
if (instance.identifier() == QLatin1String("akonadi_mailfilter_agent")) { if (instance.identifier() == QLatin1String("akonadi_mailfilter_agent")) {
// Creating a progress item twice is ok, it will simply return the already existing // Creating a progress item twice is ok, it will simply return the already existing
// item // item
KPIM::ProgressItem *progress = KPIM::ProgressManagerAkonadi::createProgressItem(nullptr, instance, KPIM::ProgressItem *progress = PimCommon::ProgressManagerAkonadi::createProgressItem(nullptr, instance,
instance.identifier(), instance.name(), instance.statusMessage(), instance.identifier(), instance.name(), instance.statusMessage(),
false, KPIM::ProgressItem::Encrypted); false, KPIM::ProgressItem::Encrypted);
progress->setProperty("AgentIdentifier", instance.identifier()); progress->setProperty("AgentIdentifier", instance.identifier());
...@@ -1624,7 +1624,7 @@ void KMKernel::instanceStatusChanged(const Akonadi::AgentInstance &instance) ...@@ -1624,7 +1624,7 @@ void KMKernel::instanceStatusChanged(const Akonadi::AgentInstance &instance)
// Creating a progress item twice is ok, it will simply return the already existing // Creating a progress item twice is ok, it will simply return the already existing
// item // item
KPIM::ProgressItem *progress = KPIM::ProgressManagerAkonadi::createProgressItem(nullptr, instance, KPIM::ProgressItem *progress = PimCommon::ProgressManagerAkonadi::createProgressItem(nullptr, instance,
instance.identifier(), instance.name(), instance.statusMessage(), instance.identifier(), instance.name(), instance.statusMessage(),
true, cryptoStatus); true, cryptoStatus);
progress->setProperty("AgentIdentifier", instance.identifier()); progress->setProperty("AgentIdentifier", instance.identifier());
......
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