1 files changed, 10 insertions, 45 deletions

diff --git a/framework/mail/maillistmodel.cpp b/framework/mail/maillistmodel.cpp
index 14219ee2..f18861c4 100644
--- a/framework/mail/maillistmodel.cpp
+++ b/framework/mail/maillistmodel.cpp
@@ -1,10 +1,12 @@
 #include "maillistmodel.h"
 
-#include <QDateTime>
-
-MailListModel::MailListModel(QObject *parent) : QAbstractListModel(parent), m_msgs()
+MailListModel::MailListModel(QObject *parent) : ListModelResult<Akonadi2::ApplicationDomain::Mail::Ptr>(QList<QByteArray>() << "subject" << "uid")
 {
-
+    Akonadi2::Query query;
+    query.syncOnDemand = false;
+    query.processAll = false;
+    query.liveQuery = true;
+    setEmitter(Akonadi2::Store::load<Akonadi2::ApplicationDomain::Mail>(query));
 }
 
 MailListModel::~MailListModel()
@@ -21,53 +23,16 @@ QHash< int, QByteArray > MailListModel::roleNames() const
     return roles;
 }
 
-
-QVariant MailListModel::data(const QModelIndex &index, int role) const
+QVariant MailListModel::data(const QModelIndex &idx, int role) const
 {
-    if (!index.isValid()) {
-        return QVariant();
-    }
-
-    if (index.row() >= m_msgs.count() || index.row() < 0) {
-        return QVariant();
-    }
-        switch (role) {
+    switch (role) {
         case Subject:
-            return m_msgs.at(index.row());
-        }
-    return QVariant();
-}
-
-int MailListModel::rowCount(const QModelIndex &parent) const
-{
-    return m_msgs.size();
-}
-
-bool MailListModel::addMails(const QStringList &items)
-{
-    beginInsertRows(QModelIndex(), rowCount(), rowCount() + items.size() - 1);
-
-    m_msgs += items;
-
-    endInsertRows();
-
-    return true;
-}
-
-void MailListModel::clearMails()
-{
-    if (!m_msgs.isEmpty()) {
-        beginResetModel();
-        m_msgs.clear();
-        endResetModel();
+            return ListModelResult<Akonadi2::ApplicationDomain::Mail::Ptr>::data(index(idx.row(), 0, idx.parent()), Qt::DisplayRole);
     }
+    return QVariant();
 }
 
 void MailListModel::runQuery(const QString& query)
 {
-    clearMails();
-    QStringList itemlist;
-    itemlist << "I feel tiny" << "Big News!" <<  "[FUN] lets do things";
-    addMails(itemlist);
 }