From 67b2944078f3a9d591dc31a40717c927c194247f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Fri, 17 Jan 2025 12:11:44 +0100 Subject: [PATCH] Remove .debug category since this is autofilled by Qt and used to differentiate between QCDebug and QCWarning and QCError. --- cockatrice/resources/config/qtlogging.ini | 72 +++++++++---------- .../src/client/network/release_channel.h | 2 +- .../network/spoiler_background_updater.h | 2 +- cockatrice/src/client/sound_engine.h | 2 +- cockatrice/src/client/tabs/tab_game.h | 2 +- cockatrice/src/client/tabs/tab_message.h | 2 +- cockatrice/src/client/tabs/tab_supervisor.h | 2 +- cockatrice/src/client/tapped_out_interface.h | 2 +- cockatrice/src/client/ui/theme_manager.h | 2 +- cockatrice/src/client/ui/window_main.h | 10 +-- cockatrice/src/dialogs/dlg_edit_avatar.h | 2 +- cockatrice/src/dialogs/dlg_settings.h | 2 +- cockatrice/src/dialogs/dlg_tip_of_the_day.h | 2 +- cockatrice/src/dialogs/dlg_update.h | 2 +- cockatrice/src/game/cards/card_database.h | 8 +-- .../card_database_parser/cockatrice_xml_3.h | 2 +- .../card_database_parser/cockatrice_xml_4.h | 2 +- cockatrice/src/game/cards/card_list.h | 2 +- cockatrice/src/game/filters/filter_string.h | 2 +- cockatrice/src/game/game_scene.h | 4 +- cockatrice/src/game/player/player.h | 2 +- cockatrice/src/game/zones/card_zone.h | 2 +- cockatrice/src/game/zones/view_zone.h | 2 +- cockatrice/src/main.h | 2 +- .../src/server/user/user_info_connection.h | 2 +- cockatrice/src/settings/cache_settings.h | 2 +- cockatrice/src/settings/servers_settings.h | 2 +- cockatrice/src/settings/shortcuts_settings.h | 2 +- 28 files changed, 71 insertions(+), 71 deletions(-) diff --git a/cockatrice/resources/config/qtlogging.ini b/cockatrice/resources/config/qtlogging.ini index 102740925..5e76390e9 100644 --- a/cockatrice/resources/config/qtlogging.ini +++ b/cockatrice/resources/config/qtlogging.ini @@ -1,47 +1,47 @@ [Rules] # Uncomment a rule to disable logging for that category -# qt_translator.debug = false // Doesn't work because logging isn't initialized yet in main.cpp +# qt_translator = false -# window_main.debug = false -# release_channel.debug = false -# spoiler_background_updater.debug = false -# theme_manager.debug = false -# sound_engine.debug = false -# tapped_out_interface.debug = false +window_main.* = false +release_channel = false +spoiler_background_updater = false +theme_manager = false +sound_engine = false +# tapped_out_interface = false -# tab_game.debug = false -# tab_message.debug = false -# tab_supervisor.debug = false +# tab_game = false +# tab_message = false +# tab_supervisor = false -# dlg_edit_avatar.debug = false -# dlg_settings.debug = false -# dlg_tip_of_the_day.debug = false -# dlg_update.debug = false +# dlg_edit_avatar = false +# dlg_settings = false +# dlg_tip_of_the_day = false +# dlg_update = false -# settings_cache.debug = false -# servers_settings.debug = false -# shortcuts_settings.debug = false +# settings_cache = false +# servers_settings = false +# shortcuts_settings = false -# player.debug = false -# game_scene.debug = false -# game_scene.debug.player_addition_removal = false -# card_zone.debug = false -# view_zone.debug = false +# player = false +# game_scene = false +# game_scene.player_addition_removal = false +# card_zone = false +# view_zone = false -# user_info_connection.debug = false +# user_info_connection = false -# picture_loader.* = false -# picture_loader.debug = false -# picture_loader.worker.debug = false -# deck_loader.debug = false -# card_database.debug = false -# card_database.debug.loading = false -# card_database.debug.loading.success_or_failure = false -# cockatrice_xml.debug.* = false -# cockatrice_xml.debug.xml_3_parser = false -# cockatrice_xml.debug.xml_4_parser = false -# set_list.debug = false -# card_list.debug = false +picture_loader.* = false +# picture_loader = false +# picture_loader.worker = false +# deck_loader = false +# card_database = false +card_database.loading = false +# card_database.loading.success_or_failure = false +cockatrice_xml.* = false +# cockatrice_xml.xml_3_parser = false +# cockatrice_xml.xml_4_parser = false +# set_list = false +# card_list = false -# filter_string.debug = false \ No newline at end of file +# 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 2ec44383a..8568d2250 100644 --- a/cockatrice/src/client/network/release_channel.h +++ b/cockatrice/src/client/network/release_channel.h @@ -8,7 +8,7 @@ #include #include -inline Q_LOGGING_CATEGORY(ReleaseChannelLog, "release_channel.debug") +inline Q_LOGGING_CATEGORY(ReleaseChannelLog, "release_channel") class QNetworkReply; class QNetworkAccessManager; diff --git a/cockatrice/src/client/network/spoiler_background_updater.h b/cockatrice/src/client/network/spoiler_background_updater.h index a102447c1..a29488bf2 100644 --- a/cockatrice/src/client/network/spoiler_background_updater.h +++ b/cockatrice/src/client/network/spoiler_background_updater.h @@ -6,7 +6,7 @@ #include #include -inline Q_LOGGING_CATEGORY(SpoilerBackgroundUpdaterLog, "spoiler_background_updater.debug"); +inline Q_LOGGING_CATEGORY(SpoilerBackgroundUpdaterLog, "spoiler_background_updater"); class SpoilerBackgroundUpdater : public QObject { diff --git a/cockatrice/src/client/sound_engine.h b/cockatrice/src/client/sound_engine.h index 86412ca60..851ca3928 100644 --- a/cockatrice/src/client/sound_engine.h +++ b/cockatrice/src/client/sound_engine.h @@ -8,7 +8,7 @@ #include #include -inline Q_LOGGING_CATEGORY(SoundEngineLog, "sound_engine.debug"); +inline Q_LOGGING_CATEGORY(SoundEngineLog, "sound_engine"); class QBuffer; diff --git a/cockatrice/src/client/tabs/tab_game.h b/cockatrice/src/client/tabs/tab_game.h index 8304d3f93..55a371496 100644 --- a/cockatrice/src/client/tabs/tab_game.h +++ b/cockatrice/src/client/tabs/tab_game.h @@ -12,7 +12,7 @@ #include #include -inline Q_LOGGING_CATEGORY(TabGameLog, "tab_game.debug"); +inline Q_LOGGING_CATEGORY(TabGameLog, "tab_game"); class UserListProxy; class DeckViewContainer; diff --git a/cockatrice/src/client/tabs/tab_message.h b/cockatrice/src/client/tabs/tab_message.h index 4d2c92d5c..dd7424e5d 100644 --- a/cockatrice/src/client/tabs/tab_message.h +++ b/cockatrice/src/client/tabs/tab_message.h @@ -5,7 +5,7 @@ #include -inline Q_LOGGING_CATEGORY(TabMessageLog, "tab_message.debug"); +inline Q_LOGGING_CATEGORY(TabMessageLog, "tab_message"); class AbstractClient; class ChatView; diff --git a/cockatrice/src/client/tabs/tab_supervisor.h b/cockatrice/src/client/tabs/tab_supervisor.h index ce23ef73e..3925807fb 100644 --- a/cockatrice/src/client/tabs/tab_supervisor.h +++ b/cockatrice/src/client/tabs/tab_supervisor.h @@ -12,7 +12,7 @@ #include #include -inline Q_LOGGING_CATEGORY(TabSupervisorLog, "tab_supervisor.debug"); +inline Q_LOGGING_CATEGORY(TabSupervisorLog, "tab_supervisor"); class UserListManager; class QMenu; diff --git a/cockatrice/src/client/tapped_out_interface.h b/cockatrice/src/client/tapped_out_interface.h index f76d634d4..0464cf2e6 100644 --- a/cockatrice/src/client/tapped_out_interface.h +++ b/cockatrice/src/client/tapped_out_interface.h @@ -7,7 +7,7 @@ #include #include -inline Q_LOGGING_CATEGORY(TappedOutInterfaceLog, "tapped_out_interface.debug") +inline Q_LOGGING_CATEGORY(TappedOutInterfaceLog, "tapped_out_interface") class QByteArray; class QNetworkAccessManager; diff --git a/cockatrice/src/client/ui/theme_manager.h b/cockatrice/src/client/ui/theme_manager.h index 8785af3c9..2385f5c23 100644 --- a/cockatrice/src/client/ui/theme_manager.h +++ b/cockatrice/src/client/ui/theme_manager.h @@ -9,7 +9,7 @@ #include #include -inline Q_LOGGING_CATEGORY(ThemeManagerLog, "theme_manager.debug"); +inline Q_LOGGING_CATEGORY(ThemeManagerLog, "theme_manager"); typedef QMap QStringMap; typedef QMap QBrushMap; diff --git a/cockatrice/src/client/ui/window_main.h b/cockatrice/src/client/ui/window_main.h index 0612949bb..8ba3ea440 100644 --- a/cockatrice/src/client/ui/window_main.h +++ b/cockatrice/src/client/ui/window_main.h @@ -31,11 +31,11 @@ #include #include -inline Q_LOGGING_CATEGORY(WindowMainLog, "window_main.debug"); -inline Q_LOGGING_CATEGORY(WindowMainStartupLog, "window_main.debug.startup"); -inline Q_LOGGING_CATEGORY(WindowMainStartupVersionLog, "window_main.debug.startup.version"); -inline Q_LOGGING_CATEGORY(WindowMainStartupShortcutsLog, "window_main.debug.startup.shortcuts"); -inline Q_LOGGING_CATEGORY(WindowMainStartupAutoconnectLog, "window_main.debug.startup.autoconnect"); +inline Q_LOGGING_CATEGORY(WindowMainLog, "window_main"); +inline Q_LOGGING_CATEGORY(WindowMainStartupLog, "window_main.startup"); +inline Q_LOGGING_CATEGORY(WindowMainStartupVersionLog, "window_main.startup.version"); +inline Q_LOGGING_CATEGORY(WindowMainStartupShortcutsLog, "window_main.startup.shortcuts"); +inline Q_LOGGING_CATEGORY(WindowMainStartupAutoconnectLog, "window_main.startup.autoconnect"); class Release; class DlgConnect; diff --git a/cockatrice/src/dialogs/dlg_edit_avatar.h b/cockatrice/src/dialogs/dlg_edit_avatar.h index f8f020c58..33f61a714 100644 --- a/cockatrice/src/dialogs/dlg_edit_avatar.h +++ b/cockatrice/src/dialogs/dlg_edit_avatar.h @@ -6,7 +6,7 @@ #include #include -inline Q_LOGGING_CATEGORY(DlgEditAvatarLog, "dlg_edit_avatar.debug") +inline Q_LOGGING_CATEGORY(DlgEditAvatarLog, "dlg_edit_avatar") class QLabel; class QPushButton; diff --git a/cockatrice/src/dialogs/dlg_settings.h b/cockatrice/src/dialogs/dlg_settings.h index 7a5d334e6..cc6120ffc 100644 --- a/cockatrice/src/dialogs/dlg_settings.h +++ b/cockatrice/src/dialogs/dlg_settings.h @@ -12,7 +12,7 @@ #include #include -inline Q_LOGGING_CATEGORY(DlgSettingsLog, "dlg_settings.debug"); +inline Q_LOGGING_CATEGORY(DlgSettingsLog, "dlg_settings"); class ShortcutTreeView; class SearchLineEdit; diff --git a/cockatrice/src/dialogs/dlg_tip_of_the_day.h b/cockatrice/src/dialogs/dlg_tip_of_the_day.h index e8ed152c7..4a7d86354 100644 --- a/cockatrice/src/dialogs/dlg_tip_of_the_day.h +++ b/cockatrice/src/dialogs/dlg_tip_of_the_day.h @@ -10,7 +10,7 @@ #include #include -inline Q_LOGGING_CATEGORY(DlgTipOfTheDayLog, "dlg_tip_of_the_day.debug"); +inline Q_LOGGING_CATEGORY(DlgTipOfTheDayLog, "dlg_tip_of_the_day"); class QLabel; class QPushButton; diff --git a/cockatrice/src/dialogs/dlg_update.h b/cockatrice/src/dialogs/dlg_update.h index 798d4658a..e4415283e 100644 --- a/cockatrice/src/dialogs/dlg_update.h +++ b/cockatrice/src/dialogs/dlg_update.h @@ -8,7 +8,7 @@ #include #include -inline Q_LOGGING_CATEGORY(DlgUpdateLog, "dlg_update.debug"); +inline Q_LOGGING_CATEGORY(DlgUpdateLog, "dlg_update"); class Release; diff --git a/cockatrice/src/game/cards/card_database.h b/cockatrice/src/game/cards/card_database.h index 2b448ec2d..32a791009 100644 --- a/cockatrice/src/game/cards/card_database.h +++ b/cockatrice/src/game/cards/card_database.h @@ -14,10 +14,10 @@ #include #include -inline Q_LOGGING_CATEGORY(SetListLog, "set_list.debug"); -inline Q_LOGGING_CATEGORY(CardDatabaseLog, "card_database.debug"); -inline Q_LOGGING_CATEGORY(CardDatabaseLoadingLog, "card_database.debug.loading"); -inline Q_LOGGING_CATEGORY(CardDatabaseLoadingSuccessOrFailureLog, "card_database.debug.loading.success_or_failure"); +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"); class CardDatabase; class CardInfo; 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 998a3d9a4..ca18e0bb0 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,7 +6,7 @@ #include #include -inline Q_LOGGING_CATEGORY(CockatriceXml3Log, "cockatrice_xml.debug.xml_3_parser") +inline Q_LOGGING_CATEGORY(CockatriceXml3Log, "cockatrice_xml.xml_3_parser") class CockatriceXml3Parser : public 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 d1104f51d..9f047e231 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,7 +6,7 @@ #include #include -inline Q_LOGGING_CATEGORY(CockatriceXml4Log, "cockatrice_xml.debug.xml_4_parser") +inline Q_LOGGING_CATEGORY(CockatriceXml4Log, "cockatrice_xml.xml_4_parser") class CockatriceXml4Parser : public ICardDatabaseParser { diff --git a/cockatrice/src/game/cards/card_list.h b/cockatrice/src/game/cards/card_list.h index df5397a0a..1bbf08639 100644 --- a/cockatrice/src/game/cards/card_list.h +++ b/cockatrice/src/game/cards/card_list.h @@ -4,7 +4,7 @@ #include #include -inline Q_LOGGING_CATEGORY(CardListLog, "card_list.debug"); +inline Q_LOGGING_CATEGORY(CardListLog, "card_list"); class CardItem; diff --git a/cockatrice/src/game/filters/filter_string.h b/cockatrice/src/game/filters/filter_string.h index 690c20e7e..a633a235b 100644 --- a/cockatrice/src/game/filters/filter_string.h +++ b/cockatrice/src/game/filters/filter_string.h @@ -10,7 +10,7 @@ #include #include -inline Q_LOGGING_CATEGORY(FilterStringLog, "filter_string.debug"); +inline Q_LOGGING_CATEGORY(FilterStringLog, "filter_string"); typedef CardInfoPtr CardData; typedef std::function Filter; diff --git a/cockatrice/src/game/game_scene.h b/cockatrice/src/game/game_scene.h index 73428f81d..7654f0b6e 100644 --- a/cockatrice/src/game/game_scene.h +++ b/cockatrice/src/game/game_scene.h @@ -7,8 +7,8 @@ #include #include -inline Q_LOGGING_CATEGORY(GameSceneLog, "game_scene.debug"); -inline Q_LOGGING_CATEGORY(GameScenePlayerAdditionRemovalLog, "game_scene.debug.player_addition_removal"); +inline Q_LOGGING_CATEGORY(GameSceneLog, "game_scene"); +inline Q_LOGGING_CATEGORY(GameScenePlayerAdditionRemovalLog, "game_scene.player_addition_removal"); class Player; class ZoneViewWidget; diff --git a/cockatrice/src/game/player/player.h b/cockatrice/src/game/player/player.h index 2dcb41f93..b5596928d 100644 --- a/cockatrice/src/game/player/player.h +++ b/cockatrice/src/game/player/player.h @@ -14,7 +14,7 @@ #include #include -inline Q_LOGGING_CATEGORY(PlayerLog, "player.debug"); +inline Q_LOGGING_CATEGORY(PlayerLog, "player"); namespace google { diff --git a/cockatrice/src/game/zones/card_zone.h b/cockatrice/src/game/zones/card_zone.h index 9b9c99f81..20f58d4ba 100644 --- a/cockatrice/src/game/zones/card_zone.h +++ b/cockatrice/src/game/zones/card_zone.h @@ -8,7 +8,7 @@ #include #include -inline Q_LOGGING_CATEGORY(CardZoneLog, "card_zone.debug"); +inline Q_LOGGING_CATEGORY(CardZoneLog, "card_zone"); class Player; class ZoneViewZone; diff --git a/cockatrice/src/game/zones/view_zone.h b/cockatrice/src/game/zones/view_zone.h index daae4d94f..06abf91f8 100644 --- a/cockatrice/src/game/zones/view_zone.h +++ b/cockatrice/src/game/zones/view_zone.h @@ -7,7 +7,7 @@ #include #include -inline Q_LOGGING_CATEGORY(ViewZoneLog, "view_zone.debug") +inline Q_LOGGING_CATEGORY(ViewZoneLog, "view_zone") class ZoneViewWidget; class Response; diff --git a/cockatrice/src/main.h b/cockatrice/src/main.h index 542fae866..49ef61bf4 100644 --- a/cockatrice/src/main.h +++ b/cockatrice/src/main.h @@ -5,7 +5,7 @@ #include -inline Q_LOGGING_CATEGORY(QtTranslatorDebug, "qt_translator.debug"); +inline Q_LOGGING_CATEGORY(QtTranslatorDebug, "qt_translator"); class CardDatabase; class QString; diff --git a/cockatrice/src/server/user/user_info_connection.h b/cockatrice/src/server/user/user_info_connection.h index 550c202f9..b2abf65ac 100644 --- a/cockatrice/src/server/user/user_info_connection.h +++ b/cockatrice/src/server/user/user_info_connection.h @@ -8,7 +8,7 @@ #include #include -inline Q_LOGGING_CATEGORY(UserInfoConnectionLog, "user_info_connection.debug"); +inline Q_LOGGING_CATEGORY(UserInfoConnectionLog, "user_info_connection"); class UserConnection_Information { diff --git a/cockatrice/src/settings/cache_settings.h b/cockatrice/src/settings/cache_settings.h index 118e90f9e..77833bfbe 100644 --- a/cockatrice/src/settings/cache_settings.h +++ b/cockatrice/src/settings/cache_settings.h @@ -18,7 +18,7 @@ #include #include -inline Q_LOGGING_CATEGORY(SettingsCacheLog, "settings_cache.debug"); +inline Q_LOGGING_CATEGORY(SettingsCacheLog, "settings_cache"); class ReleaseChannel; diff --git a/cockatrice/src/settings/servers_settings.h b/cockatrice/src/settings/servers_settings.h index 254d81521..9bf5c47d7 100644 --- a/cockatrice/src/settings/servers_settings.h +++ b/cockatrice/src/settings/servers_settings.h @@ -8,7 +8,7 @@ #define SERVERSETTINGS_DEFAULT_HOST "server.cockatrice.us" #define SERVERSETTINGS_DEFAULT_PORT "4748" -inline Q_LOGGING_CATEGORY(ServersSettingsLog, "servers_settings.debug"); +inline Q_LOGGING_CATEGORY(ServersSettingsLog, "servers_settings"); class ServersSettings : public SettingsManager { diff --git a/cockatrice/src/settings/shortcuts_settings.h b/cockatrice/src/settings/shortcuts_settings.h index 3a92e5e08..ce51b5126 100644 --- a/cockatrice/src/settings/shortcuts_settings.h +++ b/cockatrice/src/settings/shortcuts_settings.h @@ -6,7 +6,7 @@ #include #include -inline Q_LOGGING_CATEGORY(ShortcutsSettingsLog, "shortcuts_settings.debug"); +inline Q_LOGGING_CATEGORY(ShortcutsSettingsLog, "shortcuts_settings"); class ShortcutGroup {