mirror of
https://github.com/PrismLauncher/PrismLauncher.git
synced 2026-06-29 01:54:20 +03:00
refactor!!!: migrate from shared pointers
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
This commit is contained in:
parent
c64d871a28
commit
549405ab2f
199 changed files with 742 additions and 709 deletions
|
|
@ -40,7 +40,7 @@
|
|||
|
||||
#include <QDebug>
|
||||
|
||||
NewsChecker::NewsChecker(shared_qobject_ptr<QNetworkAccessManager> network, const QString& feedUrl)
|
||||
NewsChecker::NewsChecker(QNetworkAccessManager* network, const QString& feedUrl)
|
||||
{
|
||||
m_network = network;
|
||||
m_feedUrl = feedUrl;
|
||||
|
|
@ -57,7 +57,7 @@ void NewsChecker::reloadNews()
|
|||
qDebug() << "Reloading news.";
|
||||
|
||||
NetJob::Ptr job{ new NetJob("News RSS Feed", m_network) };
|
||||
job->addNetAction(Net::Download::makeByteArray(m_feedUrl, newsData));
|
||||
job->addNetAction(Net::Download::makeByteArray(m_feedUrl, newsData.get()));
|
||||
job->setAskRetry(false);
|
||||
connect(job.get(), &NetJob::succeeded, this, &NewsChecker::rssDownloadFinished);
|
||||
connect(job.get(), &NetJob::failed, this, &NewsChecker::rssDownloadFailed);
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ class NewsChecker : public QObject {
|
|||
/*!
|
||||
* Constructs a news reader to read from the given RSS feed URL.
|
||||
*/
|
||||
NewsChecker(shared_qobject_ptr<QNetworkAccessManager> network, const QString& feedUrl);
|
||||
NewsChecker(QNetworkAccessManager* network, const QString& feedUrl);
|
||||
|
||||
/*!
|
||||
* Returns the error message for the last time the news was loaded.
|
||||
|
|
@ -84,7 +84,7 @@ class NewsChecker : public QObject {
|
|||
//! True if news has been loaded.
|
||||
bool m_loadedNews;
|
||||
|
||||
std::shared_ptr<QByteArray> newsData = std::make_shared<QByteArray>();
|
||||
std::unique_ptr<QByteArray> newsData = std::make_unique<QByteArray>();
|
||||
|
||||
/*!
|
||||
* Gets the error message that was given last time the news was loaded.
|
||||
|
|
@ -92,7 +92,7 @@ class NewsChecker : public QObject {
|
|||
*/
|
||||
QString m_lastLoadError;
|
||||
|
||||
shared_qobject_ptr<QNetworkAccessManager> m_network;
|
||||
QNetworkAccessManager* m_network;
|
||||
|
||||
protected slots:
|
||||
/// Emits newsLoaded() and sets m_lastLoadError to empty string.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue