jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-12 00:54:53 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[PictureLoader] Remove manual multithreading (#6078)

Browse source
This commit is contained in:
RickyRister 2025-08-16 17:38:49 -07:00 • committed by GitHub
parent 03b216a6b4
commit f31d30bf84
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/client/ui/picture_loader/picture_loader_worker.cpp
View file

@ -94,7 +94,7 @@ QNetworkReply *PictureLoaderWorker::makeRequest(const QUrl &url, PictureLoaderWo
QNetworkReply *reply = networkManager->get(req); QNetworkReply *reply = networkManager->get(req);
// Connect reply handling // Connect reply handling
connect(reply, &QNetworkReply::finished, worker, [reply, worker] { worker->acceptNetworkReply(reply); }); connect(reply, &QNetworkReply::finished, worker, [reply, worker] { worker->handleNetworkReply(reply); });
return reply; return reply;
} }

9
cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.cpp
View file

@ -70,15 +70,6 @@ void PictureLoaderWorkerWork::picDownloadFailed()
} }
} }
/**
* Processes the reply in another thread.
* @param reply The finished reply. Takes ownership of the object
*/
void PictureLoaderWorkerWork::acceptNetworkReply(QNetworkReply *reply)
{
QThreadPool::globalInstance()->start([this, reply] { handleNetworkReply(reply); });
}
/** /**
* *
* @param reply The reply. Takes ownership of the object * @param reply The reply. Takes ownership of the object

3
cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.h
View file

@ -30,14 +30,13 @@ public:
PictureToLoad cardToDownload; PictureToLoad cardToDownload;
public slots: public slots:
void acceptNetworkReply(QNetworkReply *reply); void handleNetworkReply(QNetworkReply *reply);
private: private:
bool picDownload; bool picDownload;
void startNextPicDownload(); void startNextPicDownload();
void picDownloadFailed(); void picDownloadFailed();
void handleNetworkReply(QNetworkReply *reply);
void handleFailedReply(const QNetworkReply *reply); void handleFailedReply(const QNetworkReply *reply);
void handleSuccessfulReply(QNetworkReply *reply); void handleSuccessfulReply(QNetworkReply *reply);
QImage tryLoadImageFromReply(QNetworkReply *reply); QImage tryLoadImageFromReply(QNetworkReply *reply);