From 7a92a766dd8b57fe1e04860d595215952ddacb53 Mon Sep 17 00:00:00 2001 From: RickyRister Date: Wed, 25 Jun 2025 02:41:20 -0700 Subject: [PATCH] Make imageIsBlackListed static --- .../picture_loader/picture_loader_worker_work.cpp | 14 +++++++------- .../ui/picture_loader/picture_loader_worker_work.h | 2 -- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.cpp b/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.cpp index 60f63f39c..a92116721 100644 --- a/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.cpp +++ b/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.cpp @@ -13,7 +13,7 @@ #include // Card back returned by gatherer when card is not found -QStringList PictureLoaderWorkerWork::md5Blacklist = QStringList() << "db0c48db407a907c16ade38de048a441"; +static const QStringList MD5_BLACKLIST = {"db0c48db407a907c16ade38de048a441"}; PictureLoaderWorkerWork::PictureLoaderWorkerWork(const PictureLoaderWorker *worker, const CardInfoPtr &toLoad) : QObject(nullptr), cardToDownload(toLoad), picDownload(SettingsCache::instance().getPicDownload()) @@ -78,6 +78,12 @@ void PictureLoaderWorkerWork::picDownloadFailed() } } +static bool imageIsBlackListed(const QByteArray &picData) +{ + QString md5sum = QCryptographicHash::hash(picData, QCryptographicHash::Md5).toHex(); + return MD5_BLACKLIST.contains(md5sum); +} + void PictureLoaderWorkerWork::picDownloadFinished(QNetworkReply *reply) { bool isFromCache = reply->attribute(QNetworkRequest::SourceIsFromCacheAttribute).toBool(); @@ -195,9 +201,3 @@ void PictureLoaderWorkerWork::picDownloadChanged() { picDownload = SettingsCache::instance().getPicDownload(); } - -bool PictureLoaderWorkerWork::imageIsBlackListed(const QByteArray &picData) -{ - QString md5sum = QCryptographicHash::hash(picData, QCryptographicHash::Md5).toHex(); - return md5Blacklist.contains(md5sum); -} \ No newline at end of file diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.h b/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.h index 6b8104e11..87a8fc813 100644 --- a/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.h +++ b/cockatrice/src/client/ui/picture_loader/picture_loader_worker_work.h @@ -34,7 +34,6 @@ public slots: void picDownloadFailed(); private: - static QStringList md5Blacklist; QThread *pictureLoaderThread; QNetworkAccessManager *networkManager; bool picDownload, downloadRunning, loadQueueRunning; @@ -42,7 +41,6 @@ private: void startNextPicDownload(); QImage tryLoadImageFromReply(QNetworkReply *reply); void concludeImageLoad(const QImage &image); - bool imageIsBlackListed(const QByteArray &); private slots: void picDownloadChanged();