aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vrátil <dvratil@kde.org>2016-09-15 12:52:14 (GMT)
committerDaniel Vrátil <dvratil@kde.org>2016-09-15 12:52:14 (GMT)
commit8826846e2e5c46b39f398831ca362fdad71284c1 (patch)
tree7ff438e8b06bf5167b089ab9327e72b72fbb8b0b
parentd47c178752902654928550f51e433ada3b4b56e8 (diff)
[BIC] Adapt to ETM ctor change
-rw-r--r--CMakeLists.txt4
-rw-r--r--src/etmcalendar.cpp6
-rw-r--r--src/etmcalendar.h4
3 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 82e851d..8fdd26b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,12 +17,12 @@ include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(ECMQtDeclareLoggingCategory)
-set(PIM_VERSION "5.3.40")
+set(PIM_VERSION "5.3.41")
set(AKONADICALENDAR_LIB_VERSION ${PIM_VERSION})
set(CALENDARCORE_LIB_VERSION "5.3.40")
set(AKONADICONTACT_LIB_VERSION "5.3.40")
-set(AKONADI_LIB_VERSION "5.3.40")
+set(AKONADI_LIB_VERSION "5.3.45")
set(MAILTRANSPORT_LIB_VERSION "5.3.40")
set(KCONTACTS_LIB_VERSION "5.3.40")
set(CALENDARUTILS_LIB_VERSION "5.3.40")
diff --git a/src/etmcalendar.cpp b/src/etmcalendar.cpp
index 588a6c5..18114f5 100644
--- a/src/etmcalendar.cpp
+++ b/src/etmcalendar.cpp
@@ -29,7 +29,7 @@
#include <item.h>
#include <session.h>
#include <collection.h>
-#include <changerecorder.h>
+#include <monitor.h>
#include <itemfetchscope.h>
#include <entitydisplayattribute.h>
#include <entitymimetypefiltermodel.h>
@@ -64,7 +64,7 @@ void ETMCalendarPrivate::init()
{
if (!mETM) {
Akonadi::Session *session = new Akonadi::Session("ETMCalendar", q);
- Akonadi::ChangeRecorder *monitor = new Akonadi::ChangeRecorder(q);
+ Akonadi::Monitor *monitor = new Akonadi::Monitor(q);
connect(monitor, SIGNAL(collectionChanged(Akonadi::Collection,QSet<QByteArray>)),
SLOT(onCollectionChanged(Akonadi::Collection,QSet<QByteArray>)));
@@ -489,7 +489,7 @@ ETMCalendar::ETMCalendar(ETMCalendar *other, QObject *parent)
d->init();
}
-ETMCalendar::ETMCalendar(ChangeRecorder *monitor, QObject *parent)
+ETMCalendar::ETMCalendar(Monitor *monitor, QObject *parent)
: CalendarBase(new ETMCalendarPrivate(this), parent)
{
Q_D(ETMCalendar);
diff --git a/src/etmcalendar.h b/src/etmcalendar.h
index 4ec0479..c4ee454 100644
--- a/src/etmcalendar.h
+++ b/src/etmcalendar.h
@@ -31,7 +31,7 @@ class KCheckableProxyModel;
namespace Akonadi
{
-class ChangeRecorder;
+class Monitor;
class ETMCalendarPrivate;
class EntityTreeModel;
@@ -90,7 +90,7 @@ public:
*/
explicit ETMCalendar(ETMCalendar *calendar, QObject *parent = Q_NULLPTR);
- explicit ETMCalendar(ChangeRecorder *monitor, QObject *parent = Q_NULLPTR);
+ explicit ETMCalendar(Monitor *monitor, QObject *parent = Q_NULLPTR);
/**
* Destroys this ETMCalendar.
*/