aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Vrátil <[email protected]>2015-09-22 19:07:23 +0200
committerDan Vrátil <[email protected]>2015-09-22 19:07:23 +0200
commit5f9a4b584b9c91e7bb013969f3197fc475483697 (patch)
tree5d6156f843588d5839423eaf5ec05b2f29e95d61
parent95e478627442f450d3832e74641bb3246edf651f (diff)
Prepare for removal of Akonadi::Entity
-rw-r--r--src/etmcalendar_p.h2
-rw-r--r--src/todopurger.cpp2
-rw-r--r--src/todopurger_p.h4
3 files changed, 5 insertions, 3 deletions
diff --git a/src/etmcalendar_p.h b/src/etmcalendar_p.h
index 7d7d199..6ae5679 100644
--- a/src/etmcalendar_p.h
+++ b/src/etmcalendar_p.h
@@ -135,7 +135,7 @@ public:
Akonadi::EntityMimeTypeFilterModel *mFilteredETM;
// akonadi id to collections
- QHash<Akonadi::Entity::Id, Akonadi::Collection> mCollectionMap;
+ QHash<Akonadi::Collection::Id, Akonadi::Collection> mCollectionMap;
CheckableProxyModel *mCheckableProxyModel;
Akonadi::CollectionFilterProxyModel *mCollectionProxyModel;
Akonadi::CalFilterProxyModel *mCalFilterProxyModel; //KCalCore::CalFilter stuff
diff --git a/src/todopurger.cpp b/src/todopurger.cpp
index cff04fb..de0cb6d 100644
--- a/src/todopurger.cpp
+++ b/src/todopurger.cpp
@@ -49,7 +49,7 @@ void TodoPurger::Private::onCalendarLoaded(bool success, const QString &message)
}
}
-void TodoPurger::Private::onItemsDeleted(int changeId, const QVector<Entity::Id> &deletedItems,
+void TodoPurger::Private::onItemsDeleted(int changeId, const QVector<Item::Id> &deletedItems,
IncidenceChanger::ResultCode result, const QString &message)
{
if (changeId != m_currentChangeId) {
diff --git a/src/todopurger_p.h b/src/todopurger_p.h
index a55a230..5845c56 100644
--- a/src/todopurger_p.h
+++ b/src/todopurger_p.h
@@ -48,7 +48,9 @@ public:
public Q_SLOTS:
void onCalendarLoaded(bool success, const QString &message);
- void onItemsDeleted(int changeId, const QVector<Akonadi::Item::Id> &deletedItems, Akonadi::IncidenceChanger::ResultCode, const QString &message);
+ void onItemsDeleted(int changeId, const QVector<Akonadi::Item::Id> &deletedItems,
+ Akonadi::IncidenceChanger::ResultCode,
+ const QString &message);
private:
TodoPurger *const q;
};