diff --git a/cockatrice/resources/config/qtlogging.ini b/cockatrice/resources/config/qtlogging.ini index d30236c4b..ddfbec51b 100644 --- a/cockatrice/resources/config/qtlogging.ini +++ b/cockatrice/resources/config/qtlogging.ini @@ -42,7 +42,6 @@ # cockatrice_xml.* = false # cockatrice_xml.xml_3_parser = false # cockatrice_xml.xml_4_parser = false -# set_list = false # card_list = false # filter_string = false \ No newline at end of file diff --git a/cockatrice/src/client/network/release_channel.h b/cockatrice/src/client/network/release_channel.h index 8568d2250..0fb459969 100644 --- a/cockatrice/src/client/network/release_channel.h +++ b/cockatrice/src/client/network/release_channel.h @@ -8,9 +8,9 @@ #include #include -inline Q_LOGGING_CATEGORY(ReleaseChannelLog, "release_channel") +inline Q_LOGGING_CATEGORY(ReleaseChannelLog, "release_channel"); - class QNetworkReply; +class QNetworkReply; class QNetworkAccessManager; class Release diff --git a/cockatrice/src/client/tapped_out_interface.h b/cockatrice/src/client/tapped_out_interface.h index 0464cf2e6..2135ff7d9 100644 --- a/cockatrice/src/client/tapped_out_interface.h +++ b/cockatrice/src/client/tapped_out_interface.h @@ -7,9 +7,9 @@ #include #include -inline Q_LOGGING_CATEGORY(TappedOutInterfaceLog, "tapped_out_interface") +inline Q_LOGGING_CATEGORY(TappedOutInterfaceLog, "tapped_out_interface"); - class QByteArray; +class QByteArray; class QNetworkAccessManager; class QNetworkReply; class DeckList; diff --git a/cockatrice/src/client/ui/picture_loader/picture_loader.h b/cockatrice/src/client/ui/picture_loader/picture_loader.h index eb674bb73..8819bddac 100644 --- a/cockatrice/src/client/ui/picture_loader/picture_loader.h +++ b/cockatrice/src/client/ui/picture_loader/picture_loader.h @@ -6,9 +6,8 @@ #include -inline Q_LOGGING_CATEGORY(PictureLoaderLog, - "picture_loader") inline Q_LOGGING_CATEGORY(PictureLoaderCardBackCacheFailLog, - "picture_loader.card_back_cache_fail"); +inline Q_LOGGING_CATEGORY(PictureLoaderLog, "picture_loader"); +inline Q_LOGGING_CATEGORY(PictureLoaderCardBackCacheFailLog, "picture_loader.card_back_cache_fail"); class PictureLoader : public QObject { diff --git a/cockatrice/src/client/ui/picture_loader/picture_to_load.h b/cockatrice/src/client/ui/picture_loader/picture_to_load.h index 594715163..96a114cd4 100644 --- a/cockatrice/src/client/ui/picture_loader/picture_to_load.h +++ b/cockatrice/src/client/ui/picture_loader/picture_to_load.h @@ -5,9 +5,9 @@ #include -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: class SetDownloadPriorityComparator diff --git a/cockatrice/src/dialogs/dlg_edit_avatar.h b/cockatrice/src/dialogs/dlg_edit_avatar.h index 33f61a714..604650fa2 100644 --- a/cockatrice/src/dialogs/dlg_edit_avatar.h +++ b/cockatrice/src/dialogs/dlg_edit_avatar.h @@ -6,9 +6,9 @@ #include #include -inline Q_LOGGING_CATEGORY(DlgEditAvatarLog, "dlg_edit_avatar") +inline Q_LOGGING_CATEGORY(DlgEditAvatarLog, "dlg_edit_avatar"); - class QLabel; +class QLabel; class QPushButton; class QCheckBox; diff --git a/cockatrice/src/game/cards/card_database.cpp b/cockatrice/src/game/cards/card_database.cpp index cc0a0f15e..6da0ba825 100644 --- a/cockatrice/src/game/cards/card_database.cpp +++ b/cockatrice/src/game/cards/card_database.cpp @@ -102,7 +102,7 @@ public: inline bool operator()(const CardSetPtr &a, const CardSetPtr &b) const { 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; } @@ -170,7 +170,7 @@ void SetList::enableAll() CardSetPtr set = at(i); if (set == nullptr) { - qCDebug(SetListLog) << "enabledAll has null"; + qCDebug(CardDatabaseLog) << "enabledAll has null"; continue; } @@ -201,7 +201,7 @@ void SetList::guessSortKeys() for (int i = 0; i < size(); ++i) { CardSetPtr set = at(i); if (set.isNull()) { - qCDebug(SetListLog) << "guessSortKeys set is null"; + qCDebug(CardDatabaseLog) << "guessSortKeys set is null"; continue; } set->setSortKey(i); diff --git a/cockatrice/src/game/cards/card_database.h b/cockatrice/src/game/cards/card_database.h index 32a791009..74918939a 100644 --- a/cockatrice/src/game/cards/card_database.h +++ b/cockatrice/src/game/cards/card_database.h @@ -14,7 +14,6 @@ #include #include -inline Q_LOGGING_CATEGORY(SetListLog, "set_list"); inline Q_LOGGING_CATEGORY(CardDatabaseLog, "card_database"); inline Q_LOGGING_CATEGORY(CardDatabaseLoadingLog, "card_database.loading"); inline Q_LOGGING_CATEGORY(CardDatabaseLoadingSuccessOrFailureLog, "card_database.loading.success_or_failure"); diff --git a/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.h b/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.h index ca18e0bb0..f8c060774 100644 --- a/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.h +++ b/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.h @@ -6,9 +6,9 @@ #include #include -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_INTERFACES(ICardDatabaseParser) diff --git a/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.h b/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.h index 9f047e231..9cd200441 100644 --- a/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.h +++ b/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.h @@ -6,9 +6,9 @@ #include #include -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_INTERFACES(ICardDatabaseParser) diff --git a/cockatrice/src/game/zones/view_zone.h b/cockatrice/src/game/zones/view_zone.h index 06abf91f8..6eda0fd23 100644 --- a/cockatrice/src/game/zones/view_zone.h +++ b/cockatrice/src/game/zones/view_zone.h @@ -7,9 +7,9 @@ #include #include -inline Q_LOGGING_CATEGORY(ViewZoneLog, "view_zone") +inline Q_LOGGING_CATEGORY(ViewZoneLog, "view_zone"); - class ZoneViewWidget; +class ZoneViewWidget; class Response; class ServerInfo_Card; class QGraphicsSceneWheelEvent;