diff --git a/src/contentmanager.cpp b/src/contentmanager.cpp index b6fe499..b9cd56a 100644 --- a/src/contentmanager.cpp +++ b/src/contentmanager.cpp @@ -154,7 +154,7 @@ ContentManager::ContentManager(Library* library, kiwix::Downloader* downloader) } } -void ContentManager::startDownloadUpdaterThread() +void DownloadManager::startDownloadUpdaterThread() { // so that DownloadInfo can be copied across threads qRegisterMetaType("DownloadInfo"); @@ -168,7 +168,7 @@ void ContentManager::startDownloadUpdaterThread() mp_downloadUpdaterThread->start(); } -ContentManager::~ContentManager() +DownloadManager::~DownloadManager() { if ( mp_downloadUpdaterThread ) { diff --git a/src/contentmanager.h b/src/contentmanager.h index 18f8fad..c51b319 100644 --- a/src/contentmanager.h +++ b/src/contentmanager.h @@ -59,7 +59,6 @@ public: // types public: // functions ContentManager(Library* library, kiwix::Downloader *downloader); - virtual ~ContentManager(); ContentManagerView* getView() { return mp_view; } void setLocal(bool local); @@ -122,7 +121,6 @@ private: // functions const kiwix::Book& getRemoteOrLocalBook(const QString &id); QString getRemoteLibraryUrl() const; - void startDownloadUpdaterThread(); std::string startDownload(const kiwix::Book& book); void removeDownload(QString bookId); void downloadStarted(const kiwix::Book& book, const std::string& downloadId); @@ -132,7 +130,6 @@ private: // functions private: // data Library* mp_library; kiwix::LibraryPtr mp_remoteLibrary; - QThread* mp_downloadUpdaterThread = nullptr; OpdsRequestManager m_remoteLibraryManager; ContentManagerView* mp_view; bool m_local = true; diff --git a/src/downloadmanagement.h b/src/downloadmanagement.h index fc9d50e..5ff95d7 100644 --- a/src/downloadmanagement.h +++ b/src/downloadmanagement.h @@ -70,6 +70,9 @@ private: public: // functions DownloadManager(const Library* lib, kiwix::Downloader *downloader); + virtual ~DownloadManager(); + + void startDownloadUpdaterThread(); DownloadInfo getDownloadInfo(QString bookId) const; void restoreDownloads(); @@ -97,6 +100,7 @@ protected: // data private: Downloads m_downloads; + QThread* mp_downloadUpdaterThread = nullptr; }; #endif // DOWNLOADMANAGEMENT_H