summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Beltrame <lbeltrame@kde.org>2016-09-15 22:26:10 (GMT)
committerLuca Beltrame <lbeltrame@kde.org>2016-09-15 22:26:10 (GMT)
commitee6e0ae7f47cb1ce1e0bba4ea6bd1aa90f36120c (patch)
tree478a58d53c180dee36ebb1e6d94868cb737eab01
parentab9ea188edd9aeb531984d33d859d599dbd372d0 (diff)
More fixes due to BIC change
Please review, and ensure to check *all* users next time. CCMAIL:dvratil@kde.org
-rw-r--r--examples/apps/etm_usage/categorizedentitymodel.h2
-rw-r--r--examples/apps/etm_usage/entitytreewidget.cpp16
-rw-r--r--examples/apps/etm_usage/entitytreewidget.h6
-rw-r--r--examples/apps/etm_usage/mailmodel.cpp2
-rw-r--r--examples/apps/etm_usage/mailmodel.h4
-rw-r--r--examples/apps/etm_usage/mixedtreemodel.h2
-rw-r--r--examples/apps/etm_usage/tab2_5widget.cpp2
-rw-r--r--examples/apps/etm_usage/tab3widget.cpp2
-rw-r--r--examples/apps/etm_usage/tab4widget.cpp2
-rw-r--r--examples/apps/etm_usage/tab5widget.cpp2
-rw-r--r--examples/apps/etm_usage/tab6widget.cpp2
-rw-r--r--examples/apps/etm_usage/tab7widget.cpp4
-rw-r--r--examples/apps/etm_usage/unreadmailsincollectionswidget.cpp3
-rw-r--r--examples/apps/etm_usage/unreadmailsincollectionswidget.h3
14 files changed, 27 insertions, 25 deletions
diff --git a/examples/apps/etm_usage/categorizedentitymodel.h b/examples/apps/etm_usage/categorizedentitymodel.h
index ea8d683..c0b880f 100644
--- a/examples/apps/etm_usage/categorizedentitymodel.h
+++ b/examples/apps/etm_usage/categorizedentitymodel.h
@@ -28,7 +28,7 @@
class CategorisedEntityModel : public MixedTreeModel
{
public:
- CategorisedEntityModel(Akonadi::ChangeRecorder *monitor, QObject *parent = Q_NULLPTR)
+ CategorisedEntityModel(Akonadi::Monitor *monitor, QObject *parent = Q_NULLPTR)
: MixedTreeModel(monitor, parent)
{
diff --git a/examples/apps/etm_usage/entitytreewidget.cpp b/examples/apps/etm_usage/entitytreewidget.cpp
index d96c3e8..e929f69 100644
--- a/examples/apps/etm_usage/entitytreewidget.cpp
+++ b/examples/apps/etm_usage/entitytreewidget.cpp
@@ -27,7 +27,7 @@
#include <QVBoxLayout>
#include <QTimer>
-#include <AkonadiCore/changerecorder.h>
+#include <AkonadiCore/monitor.h>
#include <AkonadiCore/entitytreemodel.h>
#include <AkonadiCore/itemfetchscope.h>
@@ -54,7 +54,7 @@ EntityTreeWidget::EntityTreeWidget(QWidget *parent)
m_treeView(new QTreeView),
m_typeComboBox(new QComboBox),
m_typeLineEdit(new QLineEdit),
- m_changeRecorder(new ChangeRecorder(this))
+ m_monitor(new Monitor(this))
{
for (uint i = 0; i < sizeof predefinedMimeTypes / sizeof * predefinedMimeTypes; ++i) {
m_typeComboBox->addItem(predefinedUserVisibleMimeTypes[i], predefinedMimeTypes[i]);
@@ -92,13 +92,13 @@ void EntityTreeWidget::mimeTypesChanged(const QString &mimetypeList)
{
QStringList list = mimetypeList.isEmpty() ? QStringList() : mimetypeList.split(QLatin1String(","));
- foreach (const QString mimetype, m_changeRecorder->mimeTypesMonitored())
+ foreach (const QString mimetype, m_monitor->mimeTypesMonitored())
if (!list.contains(mimetype)) {
- m_changeRecorder->setMimeTypeMonitored(mimetype, false);
+ m_monitor->setMimeTypeMonitored(mimetype, false);
}
foreach (const QString mimetype, list) {
- m_changeRecorder->setMimeTypeMonitored(mimetype, true);
+ m_monitor->setMimeTypeMonitored(mimetype, true);
}
}
@@ -124,14 +124,14 @@ void EntityTreeWidget::init()
connect(m_typeLineEdit, SIGNAL(textChanged(QString)), SLOT(mimeTypesChanged(QString)));
}
-Akonadi::ChangeRecorder *EntityTreeWidget::changeRecorder() const
+Akonadi::ChangeRecorder *EntityTreeWidget::monitor() const
{
- return m_changeRecorder;
+ return m_monitor;
}
EntityTreeModel *EntityTreeWidget::getETM()
{
- return new EntityTreeModel(m_changeRecorder, this);
+ return new EntityTreeModel(m_monitor, this);
}
static int num;
diff --git a/examples/apps/etm_usage/entitytreewidget.h b/examples/apps/etm_usage/entitytreewidget.h
index 2deea5d..c389e2c 100644
--- a/examples/apps/etm_usage/entitytreewidget.h
+++ b/examples/apps/etm_usage/entitytreewidget.h
@@ -32,7 +32,7 @@ class QComboBox;
namespace Akonadi
{
class EntityTreeModel;
-class ChangeRecorder;
+class Monitor;
}
class EntityTreeWidget : public QWidget
@@ -45,7 +45,7 @@ public:
QTreeView *view() const;
Akonadi::EntityTreeModel *model() const;
- Akonadi::ChangeRecorder *changeRecorder() const;
+ Akonadi::Monitor *monitor() const;
virtual void connectTreeToModel(QTreeView *tree, Akonadi::EntityTreeModel *model);
virtual QModelIndex mapToSource(const QModelIndex &index)
@@ -69,7 +69,7 @@ private:
QLineEdit *m_typeLineEdit;
Akonadi::EntityTreeModel *m_etm;
- Akonadi::ChangeRecorder *m_changeRecorder;
+ Akonadi::Monitor *m_monitor;
};
#endif
diff --git a/examples/apps/etm_usage/mailmodel.cpp b/examples/apps/etm_usage/mailmodel.cpp
index 74f85bf..cfe75e7 100644
--- a/examples/apps/etm_usage/mailmodel.cpp
+++ b/examples/apps/etm_usage/mailmodel.cpp
@@ -46,7 +46,7 @@ public:
};
-MailModel::MailModel(ChangeRecorder *monitor, QObject *parent)
+MailModel::MailModel(Monitor *monitor, QObject *parent)
: EntityTreeModel(monitor, parent), d_ptr(new MailModelPrivate(this))
{
diff --git a/examples/apps/etm_usage/mailmodel.h b/examples/apps/etm_usage/mailmodel.h
index ae45f1f..4249c3c 100644
--- a/examples/apps/etm_usage/mailmodel.h
+++ b/examples/apps/etm_usage/mailmodel.h
@@ -23,7 +23,7 @@
#define MAILMODEL_H
#include <AkonadiCore/entitytreemodel.h>
-#include <AkonadiCore/changerecorder.h>
+#include <AkonadiCore/monitor.h>
using namespace Akonadi;
@@ -34,7 +34,7 @@ class MailModel : public EntityTreeModel
Q_OBJECT
public:
- explicit MailModel(ChangeRecorder *monitor, QObject *parent = Q_NULLPTR);
+ explicit MailModel(Monitor *monitor, QObject *parent = Q_NULLPTR);
virtual ~MailModel();
QVariant entityData(const Item &item, int column, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
diff --git a/examples/apps/etm_usage/mixedtreemodel.h b/examples/apps/etm_usage/mixedtreemodel.h
index 063aea2..a14cecc 100644
--- a/examples/apps/etm_usage/mixedtreemodel.h
+++ b/examples/apps/etm_usage/mixedtreemodel.h
@@ -28,7 +28,7 @@
namespace Akonadi
{
-class ChangeRecorder;
+class Monitor;
}
class MixedTreeModel : public Akonadi::EntityTreeModel
diff --git a/examples/apps/etm_usage/tab2_5widget.cpp b/examples/apps/etm_usage/tab2_5widget.cpp
index 457d436..436bd01 100644
--- a/examples/apps/etm_usage/tab2_5widget.cpp
+++ b/examples/apps/etm_usage/tab2_5widget.cpp
@@ -55,7 +55,7 @@ public:
}
/* reimp */ Akonadi::EntityTreeModel *getETM() Q_DECL_OVERRIDE {
- return new MixedTreeModel(changeRecorder(), this);
+ return new MixedTreeModel(monitor(), this);
}
private:
diff --git a/examples/apps/etm_usage/tab3widget.cpp b/examples/apps/etm_usage/tab3widget.cpp
index a4a5d2f..04689f3 100644
--- a/examples/apps/etm_usage/tab3widget.cpp
+++ b/examples/apps/etm_usage/tab3widget.cpp
@@ -57,7 +57,7 @@ public:
}
/* reimp */ Akonadi::EntityTreeModel *getETM() Q_DECL_OVERRIDE {
- return new MixedTreeModel(changeRecorder(), this);
+ return new MixedTreeModel(monitor(), this);
}
private:
diff --git a/examples/apps/etm_usage/tab4widget.cpp b/examples/apps/etm_usage/tab4widget.cpp
index 45e373d..584287a 100644
--- a/examples/apps/etm_usage/tab4widget.cpp
+++ b/examples/apps/etm_usage/tab4widget.cpp
@@ -57,7 +57,7 @@ public:
}
/* reimp */ Akonadi::EntityTreeModel *getETM() Q_DECL_OVERRIDE {
- return new MixedTreeModel(changeRecorder(), this);
+ return new MixedTreeModel(monitor(), this);
}
private:
diff --git a/examples/apps/etm_usage/tab5widget.cpp b/examples/apps/etm_usage/tab5widget.cpp
index fa47473..50560a5 100644
--- a/examples/apps/etm_usage/tab5widget.cpp
+++ b/examples/apps/etm_usage/tab5widget.cpp
@@ -61,7 +61,7 @@ public:
}
Akonadi::EntityTreeModel *getETM() Q_DECL_OVERRIDE {
- return new CategorisedEntityModel(changeRecorder(), this);
+ return new CategorisedEntityModel(monitor(), this);
}
private:
diff --git a/examples/apps/etm_usage/tab6widget.cpp b/examples/apps/etm_usage/tab6widget.cpp
index a74b085..21703f4 100644
--- a/examples/apps/etm_usage/tab6widget.cpp
+++ b/examples/apps/etm_usage/tab6widget.cpp
@@ -68,7 +68,7 @@ public:
}
Akonadi::EntityTreeModel *getETM() Q_DECL_OVERRIDE {
- MixedTreeModel *model = new MixedTreeModel(changeRecorder(), this);
+ MixedTreeModel *model = new MixedTreeModel(monitor(), this);
return model;
}
diff --git a/examples/apps/etm_usage/tab7widget.cpp b/examples/apps/etm_usage/tab7widget.cpp
index 5c8238f..22acc9a 100644
--- a/examples/apps/etm_usage/tab7widget.cpp
+++ b/examples/apps/etm_usage/tab7widget.cpp
@@ -50,8 +50,8 @@ public:
}
- Akonadi::EntityTreeModel *getModel(Akonadi::ChangeRecorder *changeRecorder, QObject *parent) Q_DECL_OVERRIDE {
- return new CategorisedEntityModel(changeRecorder, parent);
+ Akonadi::EntityTreeModel *getModel(Akonadi::Monitor *monitor, QObject *parent) Q_DECL_OVERRIDE {
+ return new CategorisedEntityModel(monitor, parent);
}
};
diff --git a/examples/apps/etm_usage/unreadmailsincollectionswidget.cpp b/examples/apps/etm_usage/unreadmailsincollectionswidget.cpp
index f00b122..267183e 100644
--- a/examples/apps/etm_usage/unreadmailsincollectionswidget.cpp
+++ b/examples/apps/etm_usage/unreadmailsincollectionswidget.cpp
@@ -40,6 +40,7 @@
#include "mailmodel.h"
#include <AkonadiCore/ChangeRecorder>
+#include <AkonadiCore/Monitor>
#include <AkonadiCore/ItemFetchScope>
#include <AkonadiCore/entitymimetypefiltermodel.h>
#include <AkonadiCore/selectionproxymodel.h>
@@ -89,7 +90,7 @@ UnreadMailsInCollectionsWidget::UnreadMailsInCollectionsWidget(QWidget *parent,
QSplitter *splitter = new QSplitter;
layout->addWidget(splitter);
- m_changeRecorder = new Akonadi::ChangeRecorder(this);
+ m_changeRecorder = new Akonadi::Monitor(this);
m_changeRecorder->itemFetchScope().fetchFullPayload(true);
m_changeRecorder->setCollectionMonitored(Akonadi::Collection::root());
m_changeRecorder->setMimeTypeMonitored(KMime::Message::mimeType());
diff --git a/examples/apps/etm_usage/unreadmailsincollectionswidget.h b/examples/apps/etm_usage/unreadmailsincollectionswidget.h
index 33b5743..56872f4 100644
--- a/examples/apps/etm_usage/unreadmailsincollectionswidget.h
+++ b/examples/apps/etm_usage/unreadmailsincollectionswidget.h
@@ -35,6 +35,7 @@ namespace Akonadi
{
class ChangeRecorder;
class EntityTreeModel;
+class Monitor;
}
class UnreadMailsInCollectionsProxy : public QSortFilterProxyModel
@@ -59,7 +60,7 @@ private Q_SLOTS:
void restoreCheckState();
private:
- Akonadi::ChangeRecorder *m_changeRecorder;
+ Akonadi::Monitor *m_changeRecorder;
Akonadi::EntityTreeModel *m_etm;
QItemSelectionModel *m_checkedItemModel;
KCheckableProxyModel *m_checkableProxy;