summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Beltrame <lbeltrame@kde.org>2016-09-16 05:11:08 (GMT)
committerLuca Beltrame <lbeltrame@kde.org>2016-09-16 05:11:08 (GMT)
commit101ae0188a9386f7b5b7c142054eaef4329f8cc9 (patch)
tree992cc56d1be42446cf931cbfb914bc4d44b94fe7
parente8a29bbdb4eb1191c05121326416b4d389811383 (diff)
Try (again!) to fix build
If this doesn't work, I'm disabling the examples directory entirely.
-rw-r--r--examples/apps/etm_usage/entitytreemodelfactory.cpp16
-rw-r--r--examples/apps/etm_usage/entitytreemodelfactory.h4
2 files changed, 10 insertions, 10 deletions
diff --git a/examples/apps/etm_usage/entitytreemodelfactory.cpp b/examples/apps/etm_usage/entitytreemodelfactory.cpp
index 8b19ba8..44de683 100644
--- a/examples/apps/etm_usage/entitytreemodelfactory.cpp
+++ b/examples/apps/etm_usage/entitytreemodelfactory.cpp
@@ -57,13 +57,13 @@ void EntityTreeModelFactory::collectionsFetched(const Akonadi::Collection::List
if (!wantedRemoteId.isEmpty()) {
foreach (const Collection &col, list) {
if (col.remoteId() == wantedRemoteId) {
- Monitor *changeRecorder = new Monitor(this);
- changeRecorder->setCollectionMonitored(col, true);
- changeRecorder->fetchCollection(true);
- changeRecorder->setAllMonitored(true);
- changeRecorder->itemFetchScope().fetchFullPayload();
+ Monitor *monitor = new Monitor(this);
+ monitor->setCollectionMonitored(col, true);
+ monitor->fetchCollection(true);
+ monitor->setAllMonitored(true);
+ monitor->itemFetchScope().fetchFullPayload();
- EntityTreeModel *etm = getModel(changeRecorder, parent());
+ EntityTreeModel *etm = getModel(monitor, parent());
Q_EMIT modelCreated(etm);
return;
@@ -73,8 +73,8 @@ void EntityTreeModelFactory::collectionsFetched(const Akonadi::Collection::List
}
}
-EntityTreeModel *EntityTreeModelFactory::getModel(Monitor *changeRecorder, QObject *parent)
+EntityTreeModel *EntityTreeModelFactory::getModel(Monitor *monitor, QObject *parent)
{
- return new EntityTreeModel(changeRecorder, parent);
+ return new EntityTreeModel(monitor, parent);
}
diff --git a/examples/apps/etm_usage/entitytreemodelfactory.h b/examples/apps/etm_usage/entitytreemodelfactory.h
index 8e83f7c..731d592 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:
- Akonadi::EntityTreeModel* getModel(Akonadi::Monitor* changeRecorder, QObject* parent);
+ Akonadi::EntityTreeModel* getModel(Akonadi::Monitor* monitor, QObject* parent);
private Q_SLOTS:
void collectionsFetched(const Akonadi::Collection::List &list);
private:
- Akonadi::Monitor *m_changeRecorder;
+ Akonadi::Monitor *m_monitor;
};