summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Beltrame <lbeltrame@kde.org>2016-09-15 22:35:47 (GMT)
committerLuca Beltrame <lbeltrame@kde.org>2016-09-15 22:35:47 (GMT)
commite8a29bbdb4eb1191c05121326416b4d389811383 (patch)
tree80931f1efb2ff8b7e84602430ce478003934a98f
parent4e4263d1a92601018e46d7577903bc67e4224442 (diff)
Last (hopefully) batch of changes due to SIC change in Akonadi
-rw-r--r--examples/apps/etm_usage/checkable2.cpp4
-rw-r--r--examples/apps/etm_usage/entitytreemodelfactory.cpp6
-rw-r--r--examples/apps/etm_usage/entitytreemodelfactory.h4
-rw-r--r--examples/apps/etm_usage/entitytreewidget.cpp12
-rw-r--r--examples/apps/etm_usage/recursiveitemlistwidget.cpp12
5 files changed, 19 insertions, 19 deletions
diff --git a/examples/apps/etm_usage/checkable2.cpp b/examples/apps/etm_usage/checkable2.cpp
index f1b1c80..5a15ff6 100644
--- a/examples/apps/etm_usage/checkable2.cpp
+++ b/examples/apps/etm_usage/checkable2.cpp
@@ -33,7 +33,7 @@
#include <kcheckableproxymodel.h>
#include <AkonadiCore/entitytreemodel.h>
-#include <AkonadiCore/changerecorder.h>
+#include <AkonadiCore/monitor.h>
#include <AkonadiCore/itemfetchscope.h>
#include <AkonadiCore/entitymimetypefiltermodel.h>
@@ -46,7 +46,7 @@ Checkable2::Checkable2(QWidget *parent, Qt::WindowFlags f)
QSplitter *splitter = new QSplitter(this);
layout->addWidget(splitter);
- ChangeRecorder *changeRecorder = new ChangeRecorder(this);
+ Monitor *changeRecorder = new Monitor(this);
changeRecorder->setCollectionMonitored(Collection::root());
changeRecorder->fetchCollection(true);
diff --git a/examples/apps/etm_usage/entitytreemodelfactory.cpp b/examples/apps/etm_usage/entitytreemodelfactory.cpp
index 9d4ef14..8b19ba8 100644
--- a/examples/apps/etm_usage/entitytreemodelfactory.cpp
+++ b/examples/apps/etm_usage/entitytreemodelfactory.cpp
@@ -25,7 +25,7 @@
#include <AkonadiCore/collectionfetchjob.h>
#include <AkonadiCore/entitytreemodel.h>
-#include <AkonadiCore/changerecorder.h>
+#include <AkonadiCore/monitor.h>
#include <AkonadiCore/session.h>
#define WANTED_REMOTE_ID "WANTED_REMOTE_ID"
@@ -57,7 +57,7 @@ void EntityTreeModelFactory::collectionsFetched(const Akonadi::Collection::List
if (!wantedRemoteId.isEmpty()) {
foreach (const Collection &col, list) {
if (col.remoteId() == wantedRemoteId) {
- ChangeRecorder *changeRecorder = new ChangeRecorder(this);
+ Monitor *changeRecorder = new Monitor(this);
changeRecorder->setCollectionMonitored(col, true);
changeRecorder->fetchCollection(true);
changeRecorder->setAllMonitored(true);
@@ -73,7 +73,7 @@ void EntityTreeModelFactory::collectionsFetched(const Akonadi::Collection::List
}
}
-EntityTreeModel *EntityTreeModelFactory::getModel(ChangeRecorder *changeRecorder, QObject *parent)
+EntityTreeModel *EntityTreeModelFactory::getModel(Monitor *changeRecorder, QObject *parent)
{
return new EntityTreeModel(changeRecorder, parent);
}
diff --git a/examples/apps/etm_usage/entitytreemodelfactory.h b/examples/apps/etm_usage/entitytreemodelfactory.h
index e890d32..8e83f7c 100644
--- a/examples/apps/etm_usage/entitytreemodelfactory.h
+++ b/examples/apps/etm_usage/entitytreemodelfactory.h
@@ -38,13 +38,13 @@ Q_SIGNALS:
void modelCreated(Akonadi::EntityTreeModel *model);
protected:
- virtual Akonadi::EntityTreeModel *getModel(Akonadi::ChangeRecorder *changeRecorder, QObject *parent);
+ Akonadi::EntityTreeModel* getModel(Akonadi::Monitor* changeRecorder, QObject* parent);
private Q_SLOTS:
void collectionsFetched(const Akonadi::Collection::List &list);
private:
- Akonadi::ChangeRecorder *m_changeRecorder;
+ Akonadi::Monitor *m_changeRecorder;
};
diff --git a/examples/apps/etm_usage/entitytreewidget.cpp b/examples/apps/etm_usage/entitytreewidget.cpp
index e929f69..aebf891 100644
--- a/examples/apps/etm_usage/entitytreewidget.cpp
+++ b/examples/apps/etm_usage/entitytreewidget.cpp
@@ -65,11 +65,11 @@ EntityTreeWidget::EntityTreeWidget(QWidget *parent)
layout->addWidget(m_typeLineEdit);
layout->addWidget(m_treeView);
- m_changeRecorder->setCollectionMonitored(Collection::root());
- m_changeRecorder->fetchCollection(true);
- m_changeRecorder->setAllMonitored(true);
- m_changeRecorder->itemFetchScope().fetchFullPayload(true);
- m_changeRecorder->itemFetchScope().fetchAllAttributes(true);
+ m_monitor->setCollectionMonitored(Collection::root());
+ m_monitor->fetchCollection(true);
+ m_monitor->setAllMonitored(true);
+ m_monitor->itemFetchScope().fetchFullPayload(true);
+ m_monitor->itemFetchScope().fetchAllAttributes(true);
m_treeView->setSelectionMode(QAbstractItemView::ExtendedSelection);
}
@@ -124,7 +124,7 @@ void EntityTreeWidget::init()
connect(m_typeLineEdit, SIGNAL(textChanged(QString)), SLOT(mimeTypesChanged(QString)));
}
-Akonadi::ChangeRecorder *EntityTreeWidget::monitor() const
+Akonadi::Monitor *EntityTreeWidget::monitor() const
{
return m_monitor;
}
diff --git a/examples/apps/etm_usage/recursiveitemlistwidget.cpp b/examples/apps/etm_usage/recursiveitemlistwidget.cpp
index 2fc9678..caca35b 100644
--- a/examples/apps/etm_usage/recursiveitemlistwidget.cpp
+++ b/examples/apps/etm_usage/recursiveitemlistwidget.cpp
@@ -28,7 +28,7 @@
#include <AkonadiCore/entitytreemodel.h>
#include <AkonadiCore/entitymimetypefiltermodel.h>
-#include <AkonadiCore/changerecorder.h>
+#include <AkonadiCore/monitor.h>
#include <Akonadi/Contact/ContactsTreeModel>
#include <AkonadiWidgets/entitylistview.h>
@@ -40,11 +40,11 @@ RecursiveItemListWidget::RecursiveItemListWidget(QWidget *parent, Qt::WindowFlag
: QWidget(parent, f)
{
- Akonadi::ChangeRecorder *changeRecorder = new Akonadi::ChangeRecorder(this);
- changeRecorder->setAllMonitored(true);
- changeRecorder->setMimeTypeMonitored(KContacts::Addressee::mimeType());
- changeRecorder->itemFetchScope().fetchFullPayload(true);
- m_etm = new Akonadi::ContactsTreeModel(changeRecorder, this);
+ Akonadi::Monitor *monitor = new Akonadi::Monitor(this);
+ monitor->setAllMonitored(true);
+ monitor->setMimeTypeMonitored(KContacts::Addressee::mimeType());
+ monitor->itemFetchScope().fetchFullPayload(true);
+ m_etm = new Akonadi::ContactsTreeModel(monitor, this);
m_etm->setCollectionFetchStrategy(Akonadi::EntityTreeModel::InvisibleCollectionFetch);