Refactor models

src/CMakeLists.txt

@@ -1,7 +1,7 @@
 set(alligator_SRCS
     main.cpp
-    feedListModel.cpp
+    feedsmodel.cpp
-    entryListModel.cpp
+    entriesmodel.cpp
     fetcher.cpp
     database.cpp
     entry.cpp

src/entriesmodel.cpp

@@ -9,11 +9,12 @@
 #include <QVector>
 
 #include "database.h"
-#include "entryListModel.h"
+#include "entriesmodel.h"
 #include "fetcher.h"
 
-EntryListModel::EntryListModel(QObject *parent)
+EntriesModel::EntriesModel(Feed *feed)
-    : QAbstractListModel(parent)
+    : QAbstractListModel(feed)
+    , m_feed(feed)
 {
     connect(&Fetcher::instance(), &Fetcher::feedUpdated, this, [this](QString url) {
         if (m_feed->url() == url) {
@@ -27,7 +28,7 @@ EntryListModel::EntryListModel(QObject *parent)
     });
 }
 
-QVariant EntryListModel::data(const QModelIndex &index, int role) const
+QVariant EntriesModel::data(const QModelIndex &index, int role) const
 {
     if (role != 0)
         return QVariant();
@@ -36,14 +37,14 @@ QVariant EntryListModel::data(const QModelIndex &index, int role) const
     return QVariant::fromValue(m_entries[index.row()]);
 }
 
-QHash<int, QByteArray> EntryListModel::roleNames() const
+QHash<int, QByteArray> EntriesModel::roleNames() const
 {
     QHash<int, QByteArray> roleNames;
     roleNames[0] = "entry";
     return roleNames;
 }
 
-int EntryListModel::rowCount(const QModelIndex &parent) const
+int EntriesModel::rowCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent)
     QSqlQuery query;
@@ -55,18 +56,12 @@ int EntryListModel::rowCount(const QModelIndex &parent) const
     return query.value(0).toInt();
 }
 
-void EntryListModel::loadEntry(int index) const
+void EntriesModel::loadEntry(int index) const
 {
     m_entries[index] = new Entry(m_feed, index);
 }
 
-Feed *EntryListModel::feed() const
+Feed *EntriesModel::feed() const
 {
     return m_feed;
 }
-
-void EntryListModel::setFeed(Feed *feed)
-{
-    m_feed = feed;
-    Q_EMIT feedChanged(feed);
-}

src/entriesmodel.h

@@ -12,26 +12,22 @@
 #include <QString>
 
 #include "entry.h"
+#include "feed.h"
 
-class EntryListModel : public QAbstractListModel
+class EntriesModel : public QAbstractListModel
 {
     Q_OBJECT
 
-    Q_PROPERTY(Feed *feed READ feed WRITE setFeed NOTIFY feedChanged)
+    Q_PROPERTY(Feed *feed READ feed CONSTANT)
 
 public:
-    explicit EntryListModel(QObject *parent = nullptr);
+    explicit EntriesModel(Feed *feed);
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
     QHash<int, QByteArray> roleNames() const override;
     int rowCount(const QModelIndex &parent) const override;
 
     Feed *feed() const;
 
-    void setFeed(Feed *feed);
-
-Q_SIGNALS:
-    void feedChanged(Feed *feed);
-
 private:
     void loadEntry(int index) const;
 

src/feed.cpp

@@ -7,6 +7,7 @@
 #include <QVariant>
 
 #include "database.h"
+#include "entriesmodel.h"
 #include "feed.h"
 #include "fetcher.h"
 
@@ -70,6 +71,8 @@ Feed::Feed(int index)
         if(url == m_image)
             Q_EMIT imageChanged(url);
     });
+
+    m_entries = new EntriesModel(this);
 }
 
 Feed::~Feed()

src/feed.h

@@ -12,6 +12,8 @@
 
 #include "author.h"
 
+class EntriesModel;
+
 class Feed : public QObject
 {
     Q_OBJECT
@@ -32,6 +34,7 @@ class Feed : public QObject
     Q_PROPERTY(int unreadEntryCount READ unreadEntryCount NOTIFY unreadEntryCountChanged)
     Q_PROPERTY(int errorId READ errorId WRITE setErrorId NOTIFY errorIdChanged)
     Q_PROPERTY(QString errorString READ errorString WRITE setErrorString NOTIFY errorStringChanged)
+    Q_PROPERTY(EntriesModel *entries MEMBER m_entries CONSTANT)
 
 public:
     Feed(int index);
@@ -104,6 +107,7 @@ private:
     bool m_notify;
     int m_errorId;
     QString m_errorString;
+    EntriesModel *m_entries;
 
     bool m_refreshing = false;
 };

src/feedsmodel.cpp

@@ -11,10 +11,10 @@
 #include <QVariant>
 
 #include "database.h"
-#include "feedListModel.h"
+#include "feedsmodel.h"
 #include "fetcher.h"
 
-FeedListModel::FeedListModel(QObject *parent)
+FeedsModel::FeedsModel(QObject *parent)
     : QAbstractListModel(parent)
 {
     connect(&Database::instance(), &Database::feedAdded, this, [this]() {
@@ -36,14 +36,14 @@ FeedListModel::FeedListModel(QObject *parent)
     });
 }
 
-QHash<int, QByteArray> FeedListModel::roleNames() const
+QHash<int, QByteArray> FeedsModel::roleNames() const
 {
     QHash<int, QByteArray> roleNames;
     roleNames[0] = "feed";
     return roleNames;
 }
 
-int FeedListModel::rowCount(const QModelIndex &parent) const
+int FeedsModel::rowCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent)
     QSqlQuery query;
@@ -54,7 +54,7 @@ int FeedListModel::rowCount(const QModelIndex &parent) const
     return query.value(0).toInt();
 }
 
-QVariant FeedListModel::data(const QModelIndex &index, int role) const
+QVariant FeedsModel::data(const QModelIndex &index, int role) const
 {
     if (role != 0)
         return QVariant();
@@ -63,12 +63,12 @@ QVariant FeedListModel::data(const QModelIndex &index, int role) const
     return QVariant::fromValue(m_feeds[index.row()]);
 }
 
-void FeedListModel::loadFeed(int index) const
+void FeedsModel::loadFeed(int index) const
 {
     m_feeds += new Feed(index);
 }
 
-void FeedListModel::removeFeed(int index)
+void FeedsModel::removeFeed(int index)
 {
     m_feeds[index]->remove();
     delete m_feeds[index];
@@ -77,7 +77,7 @@ void FeedListModel::removeFeed(int index)
     endRemoveRows();
 }
 
-void FeedListModel::refreshAll()
+void FeedsModel::refreshAll()
 {
     for (auto &feed : m_feeds) {
         feed->refresh();

src/feedsmodel.h

@@ -13,12 +13,12 @@
 
 #include "feed.h"
 
-class FeedListModel : public QAbstractListModel
+class FeedsModel : public QAbstractListModel
 {
     Q_OBJECT
 
 public:
-    explicit FeedListModel(QObject *parent = nullptr);
+    explicit FeedsModel(QObject *parent = nullptr);
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
     QHash<int, QByteArray> roleNames() const override;
     int rowCount(const QModelIndex &parent) const override;

src/main.cpp

@@ -23,8 +23,8 @@
 
 #include "alligatorsettings.h"
 #include "database.h"
-#include "entryListModel.h"
+#include "entriesmodel.h"
-#include "feedListModel.h"
+#include "feedsmodel.h"
 #include "fetcher.h"
 
 #ifdef Q_OS_ANDROID
@@ -44,8 +44,8 @@ int main(int argc, char *argv[])
     QCoreApplication::setApplicationName(QStringLiteral("Alligator"));
     QCoreApplication::setApplicationVersion(QStringLiteral("0.1"));
 
-    qmlRegisterType<FeedListModel>("org.kde.alligator", 1, 0, "FeedListModel");
+    qmlRegisterType<FeedsModel>("org.kde.alligator", 1, 0, "FeedsModel");
-    qmlRegisterType<EntryListModel>("org.kde.alligator", 1, 0, "EntryListModel");
+    qmlRegisterUncreatableType<EntriesModel>("org.kde.alligator", 1, 0, "EntriesModel", QStringLiteral("Get from Feed"));
     qmlRegisterSingletonType<Fetcher>("org.kde.alligator", 1, 0, "Fetcher", [](QQmlEngine *engine, QJSEngine *) -> QObject * {
         engine->setObjectOwnership(&Fetcher::instance(), QQmlEngine::CppOwnership);
         return &Fetcher::instance();

src/qml/EntryListPage.qml

@@ -61,10 +61,7 @@ Kirigami.ScrollablePage {
     ListView {
         id: entryList
         visible: count !== 0
-        model: EntryListModel {
+        model: page.feed.entries
-            id: entryListModel
-            feed: page.feed
-        }
 
         header: EntryListHeader { }
 

src/qml/FeedListDelegate.qml

@@ -36,7 +36,7 @@ Kirigami.SwipeListItem {
             onTriggered: {
                 if(pageStack.depth > 1 && model.feed.url === lastFeed)
                     pageStack.pop()
-                feedListModel.removeFeed(index)
+                feedsModel.removeFeed(index)
             }
         }
 

src/qml/FeedListPage.qml

@@ -69,8 +69,8 @@ Kirigami.ScrollablePage {
         id: feedList
         visible: count !== 0
         anchors.fill: parent
-        model: FeedListModel {
+        model: FeedsModel {
-            id: feedListModel
+            id: feedsModel
         }
 
         delegate: FeedListDelegate { }