diff --git a/src/contentmanagermodel.cpp b/src/contentmanagermodel.cpp index dca844a..559c9fb 100644 --- a/src/contentmanagermodel.cpp +++ b/src/contentmanagermodel.cpp @@ -7,8 +7,9 @@ #include "kiwixapp.h" #include -ContentManagerModel::ContentManagerModel(QObject *parent) - : QAbstractItemModel(parent) +ContentManagerModel::ContentManagerModel(ContentManager *contentMgr) + : QAbstractItemModel(contentMgr) + , m_contentMgr(*contentMgr) { connect(&td, &ThumbnailDownloader::oneThumbnailDownloaded, this, &ContentManagerModel::updateImage); } @@ -225,7 +226,7 @@ void ContentManagerModel::sort(int column, Qt::SortOrder order) default: sortBy = "unsorted"; } - KiwixApp::instance()->getContentManager()->setSortBy(sortBy, order == Qt::AscendingOrder); + m_contentMgr.setSortBy(sortBy, order == Qt::AscendingOrder); } RowNode* ContentManagerModel::getRowNode(size_t row) diff --git a/src/contentmanagermodel.h b/src/contentmanagermodel.h index a992969..fb09bed 100644 --- a/src/contentmanagermodel.h +++ b/src/contentmanagermodel.h @@ -11,6 +11,7 @@ #include "rownode.h" #include +class ContentManager; class RowNode; class Node; class DescriptionNode; @@ -58,7 +59,7 @@ public: // types public: // functions - explicit ContentManagerModel(QObject *parent = nullptr); + explicit ContentManagerModel(ContentManager* contentMgr); ~ContentManagerModel(); QVariant data(const QModelIndex &index, int role) const override; @@ -89,6 +90,7 @@ private: // functions RowNode* getRowNode(size_t row); private: // data + ContentManager& m_contentMgr; std::shared_ptr rootNode; mutable ThumbnailDownloader td; QMap bookIdToRowMap;