From 4240f10260cbffbff52bf2d549100f4690a642b5 Mon Sep 17 00:00:00 2001 From: Mikaël Capelle Date: Wed, 2 Dec 2020 21:09:42 +0100 Subject: Fix callbacks for pluginlist, modlist and download manager. --- src/downloadmanager.h | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'src/downloadmanager.h') diff --git a/src/downloadmanager.h b/src/downloadmanager.h index bd8e9799..953ab88b 100644 --- a/src/downloadmanager.h +++ b/src/downloadmanager.h @@ -48,7 +48,7 @@ class OrganizerCore; /*! * \brief manages downloading of files and provides progress information for gui elements **/ -class DownloadManager : public MOBase::IDownloadManager +class DownloadManager : public QObject { Q_OBJECT @@ -127,6 +127,8 @@ private: DownloadInfo() : m_TotalSize(0), m_ReQueried(false), m_Hidden(false), m_SpeedDiff(std::tuple(0,0,0,0,0)), m_HasData(false) {} }; + friend class DownloadManagerProxy; + using SignalDownloadCallback = boost::signals2::signal; public: @@ -366,14 +368,14 @@ public: public: // IDownloadManager interface: - int startDownloadURLs(const QStringList &urls) override; - int startDownloadNexusFile(int modID, int fileID) override; - QString downloadPath(int id) override; + int startDownloadURLs(const QStringList &urls); + int startDownloadNexusFile(int modID, int fileID); + QString downloadPath(int id); - bool onDownloadComplete(const std::function& callback) override; - bool onDownloadPaused(const std::function& callback) override; - bool onDownloadFailed(const std::function& callback) override; - bool onDownloadRemoved(const std::function& callback) override; + boost::signals2::connection onDownloadComplete(const std::function& callback); + boost::signals2::connection onDownloadPaused(const std::function& callback); + boost::signals2::connection onDownloadFailed(const std::function& callback); + boost::signals2::connection onDownloadRemoved(const std::function& callback); /** * @brief retrieve a download index from the filename -- cgit v1.3.1