jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-19 00:42:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Address comments.

Browse source
This commit is contained in:
Lukas Brübach 2025-01-18 22:57:42 +01:00
parent 17d651de62
commit 40d34e0f21
11 changed files with 19 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cockatrice/resources/config/qtlogging.ini
View file

@ -42,7 +42,6 @@
# cockatrice_xml.* = false # cockatrice_xml.* = false
# cockatrice_xml.xml_3_parser = false # cockatrice_xml.xml_3_parser = false
# cockatrice_xml.xml_4_parser = false # cockatrice_xml.xml_4_parser = false
# set_list = false
# card_list = false # card_list = false
# filter_string = false # filter_string = false

4
cockatrice/src/client/network/release_channel.h
View file

@ -8,9 +8,9 @@
#include <QVariantMap> #include <QVariantMap>
#include <utility> #include <utility>
inline Q_LOGGING_CATEGORY(ReleaseChannelLog, "release_channel") inline Q_LOGGING_CATEGORY(ReleaseChannelLog, "release_channel");
class QNetworkReply; class QNetworkReply;
class QNetworkAccessManager; class QNetworkAccessManager;
class Release class Release

4
cockatrice/src/client/tapped_out_interface.h
View file

@ -7,9 +7,9 @@
#include <QLoggingCategory> #include <QLoggingCategory>
#include <QObject> #include <QObject>
inline Q_LOGGING_CATEGORY(TappedOutInterfaceLog, "tapped_out_interface") inline Q_LOGGING_CATEGORY(TappedOutInterfaceLog, "tapped_out_interface");
class QByteArray; class QByteArray;
class QNetworkAccessManager; class QNetworkAccessManager;
class QNetworkReply; class QNetworkReply;
class DeckList; class DeckList;

5
cockatrice/src/client/ui/picture_loader/picture_loader.h
View file

@ -6,9 +6,8 @@
#include <QLoggingCategory> #include <QLoggingCategory>
inline Q_LOGGING_CATEGORY(PictureLoaderLog, inline Q_LOGGING_CATEGORY(PictureLoaderLog, "picture_loader");
"picture_loader") inline Q_LOGGING_CATEGORY(PictureLoaderCardBackCacheFailLog, inline Q_LOGGING_CATEGORY(PictureLoaderCardBackCacheFailLog, "picture_loader.card_back_cache_fail");
"picture_loader.card_back_cache_fail");
class PictureLoader : public QObject class PictureLoader : public QObject
{ {

4
cockatrice/src/client/ui/picture_loader/picture_to_load.h
View file

@ -5,9 +5,9 @@
#include <QLoggingCategory> #include <QLoggingCategory>
inline Q_LOGGING_CATEGORY(PictureToLoadLog, "picture_loader.picture_to_load") inline Q_LOGGING_CATEGORY(PictureToLoadLog, "picture_loader.picture_to_load");
class PictureToLoad class PictureToLoad
{ {
private: private:
class SetDownloadPriorityComparator class SetDownloadPriorityComparator

4
cockatrice/src/dialogs/dlg_edit_avatar.h
View file

@ -6,9 +6,9 @@
#include <QLineEdit> #include <QLineEdit>
#include <QLoggingCategory> #include <QLoggingCategory>
inline Q_LOGGING_CATEGORY(DlgEditAvatarLog, "dlg_edit_avatar") inline Q_LOGGING_CATEGORY(DlgEditAvatarLog, "dlg_edit_avatar");
class QLabel; class QLabel;
class QPushButton; class QPushButton;
class QCheckBox; class QCheckBox;

6
cockatrice/src/game/cards/card_database.cpp
View file

@ -102,7 +102,7 @@ public:
inline bool operator()(const CardSetPtr &a, const CardSetPtr &b) const inline bool operator()(const CardSetPtr &a, const CardSetPtr &b) const
{ {
if (a.isNull() || b.isNull()) { if (a.isNull() || b.isNull()) {
qCDebug(SetListLog) << "SetList::KeyCompareFunctor a or b is null"; qCDebug(CardDatabaseLog) << "SetList::KeyCompareFunctor a or b is null";
return false; return false;
} }
@ -170,7 +170,7 @@ void SetList::enableAll()
CardSetPtr set = at(i); CardSetPtr set = at(i);
if (set == nullptr) { if (set == nullptr) {
qCDebug(SetListLog) << "enabledAll has null"; qCDebug(CardDatabaseLog) << "enabledAll has null";
continue; continue;
} }
@ -201,7 +201,7 @@ void SetList::guessSortKeys()
for (int i = 0; i < size(); ++i) { for (int i = 0; i < size(); ++i) {
CardSetPtr set = at(i); CardSetPtr set = at(i);
if (set.isNull()) { if (set.isNull()) {
qCDebug(SetListLog) << "guessSortKeys set is null"; qCDebug(CardDatabaseLog) << "guessSortKeys set is null";
continue; continue;
} }
set->setSortKey(i); set->setSortKey(i);

1
cockatrice/src/game/cards/card_database.h
View file

@ -14,7 +14,6 @@
#include <QVector> #include <QVector>
#include <utility> #include <utility>
inline Q_LOGGING_CATEGORY(SetListLog, "set_list");
inline Q_LOGGING_CATEGORY(CardDatabaseLog, "card_database"); inline Q_LOGGING_CATEGORY(CardDatabaseLog, "card_database");
inline Q_LOGGING_CATEGORY(CardDatabaseLoadingLog, "card_database.loading"); inline Q_LOGGING_CATEGORY(CardDatabaseLoadingLog, "card_database.loading");
inline Q_LOGGING_CATEGORY(CardDatabaseLoadingSuccessOrFailureLog, "card_database.loading.success_or_failure"); inline Q_LOGGING_CATEGORY(CardDatabaseLoadingSuccessOrFailureLog, "card_database.loading.success_or_failure");

4
cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.h
View file

@ -6,9 +6,9 @@
#include <QLoggingCategory> #include <QLoggingCategory>
#include <QXmlStreamReader> #include <QXmlStreamReader>
inline Q_LOGGING_CATEGORY(CockatriceXml3Log, "cockatrice_xml.xml_3_parser") inline Q_LOGGING_CATEGORY(CockatriceXml3Log, "cockatrice_xml.xml_3_parser");
class CockatriceXml3Parser : public ICardDatabaseParser class CockatriceXml3Parser : public ICardDatabaseParser
{ {
Q_OBJECT Q_OBJECT
Q_INTERFACES(ICardDatabaseParser) Q_INTERFACES(ICardDatabaseParser)

4
cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.h
View file

@ -6,9 +6,9 @@
#include <QLoggingCategory> #include <QLoggingCategory>
#include <QXmlStreamReader> #include <QXmlStreamReader>
inline Q_LOGGING_CATEGORY(CockatriceXml4Log, "cockatrice_xml.xml_4_parser") inline Q_LOGGING_CATEGORY(CockatriceXml4Log, "cockatrice_xml.xml_4_parser");
class CockatriceXml4Parser : public ICardDatabaseParser class CockatriceXml4Parser : public ICardDatabaseParser
{ {
Q_OBJECT Q_OBJECT
Q_INTERFACES(ICardDatabaseParser) Q_INTERFACES(ICardDatabaseParser)

4
cockatrice/src/game/zones/view_zone.h
View file

@ -7,9 +7,9 @@
#include <QLoggingCategory> #include <QLoggingCategory>
#include <pb/commands.pb.h> #include <pb/commands.pb.h>
inline Q_LOGGING_CATEGORY(ViewZoneLog, "view_zone") inline Q_LOGGING_CATEGORY(ViewZoneLog, "view_zone");
class ZoneViewWidget; class ZoneViewWidget;
class Response; class Response;
class ServerInfo_Card; class ServerInfo_Card;
class QGraphicsSceneWheelEvent; class QGraphicsSceneWheelEvent;