From 76f2c3d08b801ce5126f7f18f28eb54a64e85e1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= <Bruebach.Lukas@bdosecurity.de>
Date: Fri, 17 Jan 2025 09:52:31 +0100
Subject: [PATCH] Lint and move logging categories to headers to silence build
 warnings about no previous definition.

---
 .../src/client/ui/picture_loader/picture_loader_worker.cpp     | 3 +--
 .../src/client/ui/picture_loader/picture_loader_worker.h       | 2 ++
 .../client/ui/picture_loader/picture_loader_worker_work.cpp    | 2 --
 .../src/client/ui/picture_loader/picture_loader_worker_work.h  | 3 +++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader_worker.cpp b/cockatrice/src/client/ui/picture_loader/picture_loader_worker.cpp
index 51e63dfab..5ef2fada6 100644
--- a/cockatrice/src/client/ui/picture_loader/picture_loader_worker.cpp
+++ b/cockatrice/src/client/ui/picture_loader/picture_loader_worker.cpp
@@ -4,7 +4,6 @@
 #include "../../../settings/cache_settings.h"
 #include "picture_loader_worker_work.h"
 
-#include <QBuffer>
 #include <QDirIterator>
 #include <QMovie>
 #include <QNetworkDiskCache>
@@ -126,7 +125,7 @@ void PictureLoaderWorker::imageLoadedSuccessfully(CardInfoPtr card, const QImage
 void PictureLoaderWorker::cacheRedirect(const QUrl &originalUrl, const QUrl &redirectUrl)
 {
     redirectCache[originalUrl] = qMakePair(redirectUrl, QDateTime::currentDateTimeUtc());
-    //saveRedirectCache();
+    // saveRedirectCache();
 }
 
 QUrl PictureLoaderWorker::getCachedRedirect(const QUrl &originalUrl) const
diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader_worker.h b/cockatrice/src/client/ui/picture_loader/picture_loader_worker.h
index 9d4bc5bd8..b5b624944 100644
--- a/cockatrice/src/client/ui/picture_loader/picture_loader_worker.h
+++ b/cockatrice/src/client/ui/picture_loader/picture_loader_worker.h
@@ -16,6 +16,8 @@
 #define REDIRECT_TIMESTAMP "timestamp"
 #define REDIRECT_CACHE_FILENAME "cache.ini"
 
+inline Q_LOGGING_CATEGORY(PictureLoaderWorkerLog, "picture_loader.worker");
+
 class PictureLoaderWorkerWork;
 inline Q_LOGGING_CATEGORY(PictureLoaderWorkerLog, "picture_loader.worker");
 
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 f0a9193a2..b3e4089d3 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
@@ -12,8 +12,6 @@
 #include <QNetworkReply>
 #include <QThread>
 
-Q_LOGGING_CATEGORY(PictureLoaderWorkerWorkLog, "picture_loader.worker");
-
 // Card back returned by gatherer when card is not found
 QStringList PictureLoaderWorkerWork::md5Blacklist = QStringList() << "db0c48db407a907c16ade38de048a441";
 
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 ce65497f8..bbc1564ec 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
@@ -5,6 +5,7 @@
 #include "picture_loader_worker.h"
 #include "picture_to_load.h"
 
+#include <QLoggingCategory>
 #include <QMutex>
 #include <QNetworkAccessManager>
 #include <QObject>
@@ -16,6 +17,8 @@
 #define REDIRECT_TIMESTAMP "timestamp"
 #define REDIRECT_CACHE_FILENAME "cache.ini"
 
+inline Q_LOGGING_CATEGORY(PictureLoaderWorkerWorkLog, "picture_loader.worker");
+
 class PictureLoaderWorker;
 class PictureLoaderWorkerWork : public QThread
 {