Add invariant checking in ArticleListWidget

This commit is contained in:
Vladimir Golovnev (Glassez) 2017-04-26 08:09:09 +03:00
parent 6764de8ef0
commit a78a1a9c64
2 changed files with 33 additions and 14 deletions

View file

@ -38,6 +38,8 @@ ArticleListWidget::ArticleListWidget(QWidget *parent)
{ {
setContextMenuPolicy(Qt::CustomContextMenu); setContextMenuPolicy(Qt::CustomContextMenu);
setSelectionMode(QAbstractItemView::ExtendedSelection); setSelectionMode(QAbstractItemView::ExtendedSelection);
checkInvariant();
} }
RSS::Article *ArticleListWidget::getRSSArticle(QListWidgetItem *item) const RSS::Article *ArticleListWidget::getRSSArticle(QListWidgetItem *item) const
@ -61,23 +63,32 @@ void ArticleListWidget::setRSSItem(RSS::Item *rssItem, bool unreadOnly)
m_unreadOnly = unreadOnly; m_unreadOnly = unreadOnly;
m_rssItem = rssItem; m_rssItem = rssItem;
if (!m_rssItem) return; if (m_rssItem) {
connect(m_rssItem, &RSS::Item::newArticle, this, &ArticleListWidget::handleArticleAdded);
connect(m_rssItem, &RSS::Item::articleRead, this, &ArticleListWidget::handleArticleRead);
connect(m_rssItem, &RSS::Item::articleAboutToBeRemoved, this, &ArticleListWidget::handleArticleAboutToBeRemoved);
m_rssItem = rssItem; foreach (auto article, rssItem->articles()) {
connect(m_rssItem, &RSS::Item::newArticle, this, &ArticleListWidget::handleArticleAdded); if (!(m_unreadOnly && article->isRead())) {
connect(m_rssItem, &RSS::Item::articleRead, this, &ArticleListWidget::handleArticleRead); auto item = createItem(article);
connect(m_rssItem, &RSS::Item::articleAboutToBeRemoved, this, &ArticleListWidget::handleArticleAboutToBeRemoved); addItem(item);
m_rssArticleToListItemMapping.insert(article, item);
foreach (auto article, rssItem->articles()) { }
if (!(m_unreadOnly && article->isRead())) }
addItem(createItem(article));
} }
checkInvariant();
} }
void ArticleListWidget::handleArticleAdded(RSS::Article *rssArticle) void ArticleListWidget::handleArticleAdded(RSS::Article *rssArticle)
{ {
if (!(m_unreadOnly && rssArticle->isRead())) if (!(m_unreadOnly && rssArticle->isRead())) {
insertItem(0, createItem(rssArticle)); auto item = createItem(rssArticle);
insertItem(0, item);
m_rssArticleToListItemMapping.insert(rssArticle, item);
}
checkInvariant();
} }
void ArticleListWidget::handleArticleRead(RSS::Article *rssArticle) void ArticleListWidget::handleArticleRead(RSS::Article *rssArticle)
@ -90,14 +101,22 @@ void ArticleListWidget::handleArticleRead(RSS::Article *rssArticle)
item->setData(Qt::ForegroundRole, QColor("grey")); item->setData(Qt::ForegroundRole, QColor("grey"));
item->setData(Qt::DecorationRole, QIcon(":/icons/sphere.png")); item->setData(Qt::DecorationRole, QIcon(":/icons/sphere.png"));
} }
checkInvariant();
} }
void ArticleListWidget::handleArticleAboutToBeRemoved(RSS::Article *rssArticle) void ArticleListWidget::handleArticleAboutToBeRemoved(RSS::Article *rssArticle)
{ {
delete m_rssArticleToListItemMapping.take(rssArticle); delete m_rssArticleToListItemMapping.take(rssArticle);
checkInvariant();
} }
QListWidgetItem *ArticleListWidget::createItem(RSS::Article *article) void ArticleListWidget::checkInvariant() const
{
Q_ASSERT(count() == m_rssArticleToListItemMapping.count());
}
QListWidgetItem *ArticleListWidget::createItem(RSS::Article *article) const
{ {
Q_ASSERT(article); Q_ASSERT(article);
QListWidgetItem *item = new QListWidgetItem; QListWidgetItem *item = new QListWidgetItem;
@ -113,6 +132,5 @@ QListWidgetItem *ArticleListWidget::createItem(RSS::Article *article)
item->setData(Qt::DecorationRole, QIcon(":/icons/sphere2.png")); item->setData(Qt::DecorationRole, QIcon(":/icons/sphere2.png"));
} }
m_rssArticleToListItemMapping.insert(article, item);
return item; return item;
} }

View file

@ -56,7 +56,8 @@ private slots:
void handleArticleAboutToBeRemoved(RSS::Article *rssArticle); void handleArticleAboutToBeRemoved(RSS::Article *rssArticle);
private: private:
QListWidgetItem *createItem(RSS::Article *article); void checkInvariant() const;
QListWidgetItem *createItem(RSS::Article *article) const;
RSS::Item *m_rssItem = nullptr; RSS::Item *m_rssItem = nullptr;
bool m_unreadOnly = false; bool m_unreadOnly = false;