[Cleanup] Unused #includes (#6367)

* [Cleanup] Unused #includes Took 44 minutes * [Cleanup] More unused #includes Took 55 minutes * [Cleanup] Include QSet Took 4 minutes * [Cleanup] Include QDebug in deck_list.cpp Took 3 minutes * [Cleanup] Include protocol stuff in servatrice_database_interface.h Took 3 minutes * [Cleanup] Include QDialogButtonBox Took 8 minutes * [Cleanup] Include QUrl Took 8 minutes * [Cleanup] Include QTextOption in header. Took 3 minutes * [Cleanup] Include QMap in user_list_manager.h Took 8 minutes * [Cleanup] Adjust qjson Took 8 minutes * [Cleanup] include button box. Took 3 minutes * [Cleanup] Redo fwd declarations. * [Cleanup] Redo last removed fwd declarations. --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
2025-12-12 15:49:28 -08:00 · 2025-11-29 18:53:11 +01:00
parent 8abd04dab1
commit c5fde071e7
227 changed files with 58 additions and 446 deletions
--- a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h
+++ b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h
@@ -8,7 +8,6 @@
 #define ABSTRACTCLIENT_H

 #include <QMutex>
-#include <QObject>
 #include <QVariant>
 #include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
--- a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h
+++ b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h
@@ -10,7 +10,6 @@
 #include "../abstract/abstract_client.h"

 #include <QLoggingCategory>
-#include <QTcpSocket>
 #include <QWebSocket>
 #include <libcockatrice/interfaces/interface_network_settings_provider.h>
 #include <libcockatrice/protocol/pb/commands.pb.h>
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.cpp
@@ -4,18 +4,10 @@
 #include "../server_abstractuserinterface.h"
 #include "../server_database_interface.h"
 #include "../server_room.h"
-#include "server_arrow.h"
 #include "server_card.h"
-#include "server_cardzone.h"
-#include "server_counter.h"
 #include "server_game.h"
 #include "server_player.h"

-#include <QDebug>
-#include <QRegularExpression>
-#include <algorithm>
-#include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/deck_list_card_node.h>
 #include <libcockatrice/protocol/get_pb_extension.h>
 #include <libcockatrice/protocol/pb/command_attach_card.pb.h>
 #include <libcockatrice/protocol/pb/command_change_zone_properties.pb.h>
@@ -49,42 +41,13 @@
 #include <libcockatrice/protocol/pb/command_set_sideboard_plan.pb.h>
 #include <libcockatrice/protocol/pb/command_shuffle.pb.h>
 #include <libcockatrice/protocol/pb/command_undo_draw.pb.h>
-#include <libcockatrice/protocol/pb/context_concede.pb.h>
 #include <libcockatrice/protocol/pb/context_connection_state_changed.pb.h>
-#include <libcockatrice/protocol/pb/context_deck_select.pb.h>
-#include <libcockatrice/protocol/pb/context_move_card.pb.h>
-#include <libcockatrice/protocol/pb/context_mulligan.pb.h>
-#include <libcockatrice/protocol/pb/context_ready_start.pb.h>
-#include <libcockatrice/protocol/pb/context_set_sideboard_lock.pb.h>
-#include <libcockatrice/protocol/pb/context_undo_draw.pb.h>
-#include <libcockatrice/protocol/pb/event_attach_card.pb.h>
-#include <libcockatrice/protocol/pb/event_change_zone_properties.pb.h>
-#include <libcockatrice/protocol/pb/event_create_arrow.pb.h>
-#include <libcockatrice/protocol/pb/event_create_counter.pb.h>
-#include <libcockatrice/protocol/pb/event_create_token.pb.h>
-#include <libcockatrice/protocol/pb/event_del_counter.pb.h>
-#include <libcockatrice/protocol/pb/event_delete_arrow.pb.h>
-#include <libcockatrice/protocol/pb/event_destroy_card.pb.h>
-#include <libcockatrice/protocol/pb/event_draw_cards.pb.h>
-#include <libcockatrice/protocol/pb/event_dump_zone.pb.h>
-#include <libcockatrice/protocol/pb/event_flip_card.pb.h>
 #include <libcockatrice/protocol/pb/event_game_say.pb.h>
-#include <libcockatrice/protocol/pb/event_move_card.pb.h>
 #include <libcockatrice/protocol/pb/event_player_properties_changed.pb.h>
-#include <libcockatrice/protocol/pb/event_reveal_cards.pb.h>
 #include <libcockatrice/protocol/pb/event_reverse_turn.pb.h>
-#include <libcockatrice/protocol/pb/event_roll_die.pb.h>
-#include <libcockatrice/protocol/pb/event_set_card_attr.pb.h>
-#include <libcockatrice/protocol/pb/event_set_card_counter.pb.h>
-#include <libcockatrice/protocol/pb/event_set_counter.pb.h>
-#include <libcockatrice/protocol/pb/event_shuffle.pb.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
-#include <libcockatrice/protocol/pb/response_deck_download.pb.h>
-#include <libcockatrice/protocol/pb/response_dump_zone.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_player.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <libcockatrice/rng/rng_abstract.h>
-#include <libcockatrice/utility/color.h>
 #include <libcockatrice/utility/trice_limits.h>

 Server_AbstractParticipant::Server_AbstractParticipant(Server_Game *_game,
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.h
@@ -4,7 +4,6 @@
 #include "../serverinfo_user_container.h"
 #include "server_abstract_participant.h"

-#include <QList>
 #include <QMap>
 #include <QString>

--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.h
@@ -20,7 +20,6 @@
 #ifndef SERVER_CARDZONE_H
 #define SERVER_CARDZONE_H

-#include <QList>
 #include <QMap>
 #include <QSet>
 #include <QString>
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp
@@ -35,7 +35,6 @@
 #include <google/protobuf/descriptor.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/protocol/pb/context_connection_state_changed.pb.h>
-#include <libcockatrice/protocol/pb/context_deck_select.pb.h>
 #include <libcockatrice/protocol/pb/context_ping_changed.pb.h>
 #include <libcockatrice/protocol/pb/event_delete_arrow.pb.h>
 #include <libcockatrice/protocol/pb/event_game_closed.pb.h>
@@ -50,7 +49,6 @@
 #include <libcockatrice/protocol/pb/event_set_active_phase.pb.h>
 #include <libcockatrice/protocol/pb/event_set_active_player.pb.h>
 #include <libcockatrice/protocol/pb/game_replay.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_playerping.pb.h>

 Server_Game::Server_Game(const ServerInfo_User &_creatorInfo,
                         int _gameId,
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp
@@ -4,7 +4,6 @@
 #include "../server_abstractuserinterface.h"
 #include "../server_database_interface.h"
 #include "../server_room.h"
-#include "server_arrow.h"
 #include "server_card.h"
 #include "server_cardzone.h"
 #include "server_counter.h"
@@ -16,66 +15,28 @@
 #include <algorithm>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/deck_list/deck_list_card_node.h>
-#include <libcockatrice/protocol/get_pb_extension.h>
 #include <libcockatrice/protocol/pb/command_attach_card.pb.h>
 #include <libcockatrice/protocol/pb/command_change_zone_properties.pb.h>
 #include <libcockatrice/protocol/pb/command_concede.pb.h>
-#include <libcockatrice/protocol/pb/command_create_arrow.pb.h>
 #include <libcockatrice/protocol/pb/command_create_counter.pb.h>
-#include <libcockatrice/protocol/pb/command_create_token.pb.h>
 #include <libcockatrice/protocol/pb/command_deck_select.pb.h>
 #include <libcockatrice/protocol/pb/command_del_counter.pb.h>
-#include <libcockatrice/protocol/pb/command_delete_arrow.pb.h>
 #include <libcockatrice/protocol/pb/command_draw_cards.pb.h>
-#include <libcockatrice/protocol/pb/command_dump_zone.pb.h>
-#include <libcockatrice/protocol/pb/command_flip_card.pb.h>
-#include <libcockatrice/protocol/pb/command_game_say.pb.h>
-#include <libcockatrice/protocol/pb/command_inc_card_counter.pb.h>
 #include <libcockatrice/protocol/pb/command_inc_counter.pb.h>
-#include <libcockatrice/protocol/pb/command_kick_from_game.pb.h>
-#include <libcockatrice/protocol/pb/command_leave_game.pb.h>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>
 #include <libcockatrice/protocol/pb/command_mulligan.pb.h>
-#include <libcockatrice/protocol/pb/command_next_turn.pb.h>
-#include <libcockatrice/protocol/pb/command_ready_start.pb.h>
-#include <libcockatrice/protocol/pb/command_reveal_cards.pb.h>
-#include <libcockatrice/protocol/pb/command_reverse_turn.pb.h>
-#include <libcockatrice/protocol/pb/command_roll_die.pb.h>
 #include <libcockatrice/protocol/pb/command_set_active_phase.pb.h>
-#include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
-#include <libcockatrice/protocol/pb/command_set_card_counter.pb.h>
 #include <libcockatrice/protocol/pb/command_set_counter.pb.h>
 #include <libcockatrice/protocol/pb/command_set_sideboard_lock.pb.h>
 #include <libcockatrice/protocol/pb/command_set_sideboard_plan.pb.h>
 #include <libcockatrice/protocol/pb/command_shuffle.pb.h>
-#include <libcockatrice/protocol/pb/command_undo_draw.pb.h>
-#include <libcockatrice/protocol/pb/context_concede.pb.h>
-#include <libcockatrice/protocol/pb/context_connection_state_changed.pb.h>
 #include <libcockatrice/protocol/pb/context_deck_select.pb.h>
-#include <libcockatrice/protocol/pb/context_move_card.pb.h>
 #include <libcockatrice/protocol/pb/context_mulligan.pb.h>
-#include <libcockatrice/protocol/pb/context_ready_start.pb.h>
 #include <libcockatrice/protocol/pb/context_set_sideboard_lock.pb.h>
-#include <libcockatrice/protocol/pb/context_undo_draw.pb.h>
-#include <libcockatrice/protocol/pb/event_attach_card.pb.h>
-#include <libcockatrice/protocol/pb/event_change_zone_properties.pb.h>
-#include <libcockatrice/protocol/pb/event_create_arrow.pb.h>
 #include <libcockatrice/protocol/pb/event_create_counter.pb.h>
-#include <libcockatrice/protocol/pb/event_create_token.pb.h>
 #include <libcockatrice/protocol/pb/event_del_counter.pb.h>
-#include <libcockatrice/protocol/pb/event_delete_arrow.pb.h>
-#include <libcockatrice/protocol/pb/event_destroy_card.pb.h>
 #include <libcockatrice/protocol/pb/event_draw_cards.pb.h>
-#include <libcockatrice/protocol/pb/event_dump_zone.pb.h>
-#include <libcockatrice/protocol/pb/event_flip_card.pb.h>
-#include <libcockatrice/protocol/pb/event_game_say.pb.h>
-#include <libcockatrice/protocol/pb/event_move_card.pb.h>
 #include <libcockatrice/protocol/pb/event_player_properties_changed.pb.h>
-#include <libcockatrice/protocol/pb/event_reveal_cards.pb.h>
-#include <libcockatrice/protocol/pb/event_reverse_turn.pb.h>
-#include <libcockatrice/protocol/pb/event_roll_die.pb.h>
-#include <libcockatrice/protocol/pb/event_set_card_attr.pb.h>
-#include <libcockatrice/protocol/pb/event_set_card_counter.pb.h>
 #include <libcockatrice/protocol/pb/event_set_counter.pb.h>
 #include <libcockatrice/protocol/pb/event_shuffle.pb.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
--- a/libcockatrice_network/libcockatrice/network/server/remote/server.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server.cpp
@@ -30,7 +30,6 @@
 #include <QDebug>
 #include <QThread>
 #include <libcockatrice/protocol/debug_pb_message.h>
-#include <libcockatrice/protocol/featureset.h>
 #include <libcockatrice/protocol/pb/event_connection_closed.pb.h>
 #include <libcockatrice/protocol/pb/event_list_rooms.pb.h>
 #include <libcockatrice/protocol/pb/event_user_joined.pb.h>
--- a/libcockatrice_network/libcockatrice/network/server/remote/server.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server.h
@@ -3,17 +3,13 @@

 #include "server_player_reference.h"

-#include <QMap>
 #include <QMultiMap>
 #include <QMutex>
 #include <QObject>
 #include <QReadWriteLock>
-#include <QStringList>
 #include <libcockatrice/protocol/pb/commands.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_ban.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_chat_message.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_warning.pb.h>

 class Server_DatabaseInterface;
 class Server_Game;
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp
@@ -9,10 +9,8 @@

 #include <QDebug>
 #include <QList>
-#include <QPair>
 #include <google/protobuf/descriptor.h>
 #include <libcockatrice/protocol/pb/event_game_joined.pb.h>
-#include <libcockatrice/protocol/pb/event_game_state_changed.pb.h>

 void Server_AbstractUserInterface::sendProtocolItemByType(ServerMessage::MessageType type,
                                                          const ::google::protobuf::Message &item)
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.h
@@ -5,7 +5,6 @@

 #include <QMap>
 #include <QMutex>
-#include <QPair>
 #include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/protocol/pb/server_message.pb.h>

--- a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h
@@ -5,7 +5,6 @@
 #include "server_abstractuserinterface.h"

 #include <QObject>
-#include <QPair>
 #include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/protocol/pb/server_message.pb.h>

--- a/libcockatrice_network/libcockatrice/network/server/remote/server_room.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_room.h
@@ -3,12 +3,10 @@

 #include "serverinfo_user_container.h"

-#include <QList>
 #include <QMap>
 #include <QMutex>
 #include <QObject>
 #include <QReadWriteLock>
-#include <QStringList>
 #include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_chat_message.pb.h>