diff options
Diffstat (limited to 'launcher/news')
| -rw-r--r-- | launcher/news/NewsChecker.cpp | 5 | ||||
| -rw-r--r-- | launcher/news/NewsChecker.h | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/launcher/news/NewsChecker.cpp b/launcher/news/NewsChecker.cpp index c66f49e1..77d428a5 100644 --- a/launcher/news/NewsChecker.cpp +++ b/launcher/news/NewsChecker.cpp @@ -20,8 +20,9 @@ #include <QDebug> -NewsChecker::NewsChecker(const QString& feedUrl) +NewsChecker::NewsChecker(shared_qobject_ptr<QNetworkAccessManager> network, const QString& feedUrl) { + m_network = network; m_feedUrl = feedUrl; } @@ -41,7 +42,7 @@ void NewsChecker::reloadNews() QObject::connect(job, &NetJob::succeeded, this, &NewsChecker::rssDownloadFinished); QObject::connect(job, &NetJob::failed, this, &NewsChecker::rssDownloadFailed); m_newsNetJob.reset(job); - job->start(); + job->start(m_network); } void NewsChecker::rssDownloadFinished() diff --git a/launcher/news/NewsChecker.h b/launcher/news/NewsChecker.h index 84b1f552..8467a541 100644 --- a/launcher/news/NewsChecker.h +++ b/launcher/news/NewsChecker.h @@ -30,7 +30,7 @@ public: /*! * Constructs a news reader to read from the given RSS feed URL. */ - NewsChecker(const QString& feedUrl); + NewsChecker(shared_qobject_ptr<QNetworkAccessManager> network, const QString& feedUrl); /*! * Returns the error message for the last time the news was loaded. @@ -80,7 +80,7 @@ protected: /* data */ QList<NewsEntryPtr> m_newsEntries; //! The network job to use to load the news. - NetJobPtr m_newsNetJob; + NetJob::Ptr m_newsNetJob; //! True if news has been loaded. bool m_loadedNews; @@ -93,6 +93,8 @@ protected: /* data */ */ QString m_lastLoadError; + shared_qobject_ptr<QNetworkAccessManager> m_network; + protected slots: /// Emits newsLoaded() and sets m_lastLoadError to empty string. void succeed(); |