Major Directory Refactoring (#5118)

* refactored cardzone.cpp, added doc and changed if to switch case

* started moving every files into different folders

* remove undercase to match with other files naming convention

* refactored dialog files

* ran format.sh

* refactored client/tabs folder

* refactored client/tabs folder

* refactored client/tabs folder

* refactored client folder

* refactored carddbparser

* refactored dialogs

* Create sonar-project.properties

temporary file for lint

* Create build.yml

temporary file for lint

* removed all files from root directory

* removed all files from root directory

* added current branch to workflow

* fixed most broken import

* fixed issues while renaming files

* fixed oracle importer

* fixed dbconverter

* updated translations

* made sub-folders for client

* removed linter

* removed linter folder

* fixed oracle import

* revert card_zone documentation

* renamed db parser files name and deck_view imports

* fixed dlg file issue

* ran format file and fixed test file

* fixed carddb test files

* moved player folder in game

* updated translations and format files

* fixed peglib import

* format cmake files

* removing vcpkg to try to add it back later

* tried fixing vcpkg file

* renamed filter to filters and moved database parser to cards folder

* reverted translation files

* reverted oracle translated

* Update cockatrice/src/dialogs/dlg_register.cpp

Co-authored-by: tooomm <tooomm@users.noreply.github.com>

* Update cockatrice/src/client/ui/window_main.cpp

Co-authored-by: tooomm <tooomm@users.noreply.github.com>

* removed empty line at file start

* removed useless include from tab_supervisor.cpp

* refactored cardzone.cpp, added doc and changed if to switch case

* started moving every files into different folders

* remove undercase to match with other files naming convention

* refactored dialog files

* ran format.sh

* refactored client/tabs folder

* refactored client folder

* refactored carddbparser

* refactored dialogs

* removed all files from root directory

* Create sonar-project.properties

temporary file for lint

* Create build.yml

temporary file for lint

* added current branch to workflow

* fixed most broken import

* fixed issues while renaming files

* fixed oracle importer

* fixed dbconverter

* updated translations

* made sub-folders for client

* removed linter

* removed linter folder

* fixed oracle import

* revert card_zone documentation

* renamed db parser files name and deck_view imports

* fixed dlg file issue

* ran format file and fixed test file

* fixed carddb test files

* moved player folder in game

* updated translations and format files

* fixed peglib import

* reverted translation files

* format cmake files

* removing vcpkg to try to add it back later

* tried fixing vcpkg file

* pre-updating of cockatrice changes

* removed empty line at file start

* reverted oracle translated

* Update cockatrice/src/dialogs/dlg_register.cpp

Co-authored-by: tooomm <tooomm@users.noreply.github.com>

* Update cockatrice/src/client/ui/window_main.cpp

Co-authored-by: tooomm <tooomm@users.noreply.github.com>

* removed useless include from tab_supervisor.cpp

---------

Co-authored-by: tooomm <tooomm@users.noreply.github.com>

cockatrice/CMakeLists.txt

@@ -5,128 +5,128 @@
 project(Cockatrice VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 
 set(cockatrice_SOURCES
-    src/abstractcarddragitem.cpp
-    src/abstractcarditem.cpp
-    src/abstractclient.cpp
-    src/abstractcounter.cpp
-    src/abstractgraphicsitem.cpp
-    src/arrowitem.cpp
-    src/arrowtarget.cpp
-    src/carddatabase.cpp
-    src/carddatabasemodel.cpp
-    src/carddbparser/carddatabaseparser.cpp
-    src/carddbparser/cockatricexml3.cpp
-    src/carddbparser/cockatricexml4.cpp
-    src/carddragitem.cpp
-    src/cardfilter.cpp
-    src/cardframe.cpp
-    src/cardinfopicture.cpp
-    src/cardinfotext.cpp
-    src/cardinfowidget.cpp
-    src/carditem.cpp
-    src/cardlist.cpp
-    src/cardzone.cpp
-    src/chatview/chatview.cpp
-    src/counter_general.cpp
-    src/customlineedit.cpp
-    src/deck_loader.cpp
-    src/decklistmodel.cpp
-    src/deckstats_interface.cpp
-    src/deckview.cpp
-    src/dlg_connect.cpp
-    src/dlg_create_token.cpp
-    src/dlg_creategame.cpp
-    src/dlg_edit_avatar.cpp
-    src/dlg_edit_password.cpp
-    src/dlg_edit_tokens.cpp
-    src/dlg_edit_user.cpp
-    src/dlg_filter_games.cpp
-    src/dlg_forgotpasswordchallenge.cpp
-    src/dlg_forgotpasswordrequest.cpp
-    src/dlg_forgotpasswordreset.cpp
-    src/dlg_load_deck_from_clipboard.cpp
-    src/dlg_load_remote_deck.cpp
-    src/dlg_manage_sets.cpp
-    src/dlg_register.cpp
-    src/dlg_roll_dice.cpp
-    src/dlg_settings.cpp
-    src/dlg_tip_of_the_day.cpp
-    src/dlg_update.cpp
-    src/dlg_viewlog.cpp
-    src/filter_string.cpp
-    src/filterbuilder.cpp
-    src/filtertree.cpp
-    src/filtertreemodel.cpp
-    src/gamescene.cpp
-    src/gameselector.cpp
-    src/gamesmodel.cpp
-    src/gameview.cpp
-    src/gettextwithmax.cpp
-    src/handcounter.cpp
-    src/handle_public_servers.cpp
-    src/handzone.cpp
-    src/keysignals.cpp
-    src/lineeditcompleter.cpp
-    src/localclient.cpp
-    src/localserver.cpp
-    src/localserverinterface.cpp
-    src/logger.cpp
+    src/game/cards/abstract_card_drag_item.cpp
+    src/game/cards/abstract_card_item.cpp
+    src/client/game_logic/abstract_client.cpp
+    src/game/board/abstract_counter.cpp
+    src/game/board/abstract_graphics_item.cpp
+    src/game/board/arrow_item.cpp
+    src/game/board/arrow_target.cpp
+    src/game/cards/card_database.cpp
+    src/game/cards/card_database_model.cpp
+    src/game/cards/card_database_parser/card_database_parser.cpp
+    src/game/cards/card_database_parser/cockatrice_xml_3.cpp
+    src/game/cards/card_database_parser/cockatrice_xml_4.cpp
+    src/game/cards/card_drag_item.cpp
+    src/game/filters/filter_card.cpp
+    src/game/cards/card_frame.cpp
+    src/game/cards/card_info_picture.cpp
+    src/game/cards/card_info_text.cpp
+    src/game/cards/card_info_widget.cpp
+    src/game/cards/card_item.cpp
+    src/game/cards/card_list.cpp
+    src/game/zones/card_zone.cpp
+    src/server/chat_view/chat_view.cpp
+    src/game/board/counter_general.cpp
+    src/deck/custom_line_edit.cpp
+    src/deck/deck_loader.cpp
+    src/deck/deck_list_model.cpp
+    src/deck/deck_stats_interface.cpp
+    src/deck/deck_view.cpp
+    src/dialogs/dlg_connect.cpp
+    src/dialogs/dlg_create_token.cpp
+    src/dialogs/dlg_create_game.cpp
+    src/dialogs/dlg_edit_avatar.cpp
+    src/dialogs/dlg_edit_password.cpp
+    src/dialogs/dlg_edit_tokens.cpp
+    src/dialogs/dlg_edit_user.cpp
+    src/dialogs/dlg_filter_games.cpp
+    src/dialogs/dlg_forgot_password_challenge.cpp
+    src/dialogs/dlg_forgot_password_request.cpp
+    src/dialogs/dlg_forgot_password_reset.cpp
+    src/dialogs/dlg_load_deck_from_clipboard.cpp
+    src/dialogs/dlg_load_remote_deck.cpp
+    src/dialogs/dlg_manage_sets.cpp
+    src/dialogs/dlg_register.cpp
+    src/dialogs/dlg_roll_dice.cpp
+    src/dialogs/dlg_settings.cpp
+    src/dialogs/dlg_tip_of_the_day.cpp
+    src/dialogs/dlg_update.cpp
+    src/dialogs/dlg_view_log.cpp
+    src/game/filters/filter_string.cpp
+    src/game/filters/filter_builder.cpp
+    src/game/filters/filter_tree.cpp
+    src/game/filters/filter_tree_model.cpp
+    src/game/game_scene.cpp
+    src/game/game_selector.cpp
+    src/game/games_model.cpp
+    src/game/game_view.cpp
+    src/client/get_text_with_max.cpp
+    src/game/hand_counter.cpp
+    src/server/handle_public_servers.cpp
+    src/game/zones/hand_zone.cpp
+    src/client/game_logic/key_signals.cpp
+    src/client/ui/line_edit_completer.cpp
+    src/server/local_client.cpp
+    src/server/local_server.cpp
+    src/server/local_server_interface.cpp
+    src/utility/logger.cpp
     src/main.cpp
-    src/messagelogwidget.cpp
-    src/pending_command.cpp
-    src/phase.cpp
-    src/phasestoolbar.cpp
-    src/pictureloader.cpp
-    src/pilezone.cpp
-    src/pixmapgenerator.cpp
-    src/player.cpp
-    src/playerlistwidget.cpp
-    src/playertarget.cpp
-    src/releasechannel.cpp
-    src/remoteclient.cpp
-    src/remotedecklist_treewidget.cpp
-    src/remotereplaylist_treewidget.cpp
-    src/replay_timeline_widget.cpp
-    src/selectzone.cpp
-    src/sequenceEdit/sequenceedit.cpp
-    src/setsmodel.cpp
-    src/settings/carddatabasesettings.cpp
-    src/settings/downloadsettings.cpp
-    src/settings/gamefilterssettings.cpp
-    src/settings/layoutssettings.cpp
-    src/settings/messagesettings.cpp
-    src/settings/serverssettings.cpp
-    src/settings/settingsmanager.cpp
-    src/settingscache.cpp
-    src/shortcutssettings.cpp
-    src/soundengine.cpp
-    src/spoilerbackgroundupdater.cpp
-    src/stackzone.cpp
-    src/tab.cpp
-    src/tab_account.cpp
-    src/tab_admin.cpp
-    src/tab_deck_editor.cpp
-    src/tab_deck_storage.cpp
-    src/tab_game.cpp
-    src/tab_logs.cpp
-    src/tab_message.cpp
-    src/tab_replays.cpp
-    src/tab_room.cpp
-    src/tab_server.cpp
-    src/tab_supervisor.cpp
-    src/tablezone.cpp
-    src/tappedout_interface.cpp
-    src/thememanager.cpp
-    src/tip_of_the_day.cpp
-    src/translatecountername.cpp
-    src/update_downloader.cpp
-    src/user_context_menu.cpp
-    src/userconnection_information.cpp
-    src/userinfobox.cpp
-    src/userlist.cpp
-    src/window_main.cpp
-    src/zoneviewwidget.cpp
-    src/zoneviewzone.cpp
+    src/server/message_log_widget.cpp
+    src/server/pending_command.cpp
+    src/game/phase.cpp
+    src/client/ui/phases_toolbar.cpp
+    src/client/ui/picture_loader.cpp
+    src/game/zones/pile_zone.cpp
+    src/client/ui/pixel_map_generator.cpp
+    src/game/player/player.cpp
+    src/game/player/player_list_widget.cpp
+    src/game/player/player_target.cpp
+    src/client/network/release_channel.cpp
+    src/server/remote/remote_client.cpp
+    src/server/remote/remote_decklist_tree_widget.cpp
+    src/server/remote/remote_replay_list_tree_widget.cpp
+    src/client/network/replay_timeline_widget.cpp
+    src/game/zones/select_zone.cpp
+    src/utility/sequence_edit.cpp
+    src/client/network/sets_model.cpp
+    src/settings/card_database_settings.cpp
+    src/settings/download_settings.cpp
+    src/settings/game_filters_settings.cpp
+    src/settings/layouts_settings.cpp
+    src/settings/message_settings.cpp
+    src/settings/servers_settings.cpp
+    src/settings/settings_manager.cpp
+    src/settings/cache_settings.cpp
+    src/settings/shortcuts_settings.cpp
+    src/client/sound_engine.cpp
+    src/client/network/spoiler_background_updater.cpp
+    src/game/zones/stack_zone.cpp
+    src/client/tabs/tab.cpp
+    src/client/tabs/tab_account.cpp
+    src/client/tabs/tab_admin.cpp
+    src/client/tabs/tab_deck_editor.cpp
+    src/client/tabs/tab_deck_storage.cpp
+    src/client/tabs/tab_game.cpp
+    src/client/tabs/tab_logs.cpp
+    src/client/tabs/tab_message.cpp
+    src/client/tabs/tab_replays.cpp
+    src/client/tabs/tab_room.cpp
+    src/client/tabs/tab_server.cpp
+    src/client/tabs/tab_supervisor.cpp
+    src/game/zones/table_zone.cpp
+    src/client/tapped_out_interface.cpp
+    src/client/ui/theme_manager.cpp
+    src/client/ui/tip_of_the_day.cpp
+    src/client/translate_counter_name.cpp
+    src/client/update_downloader.cpp
+    src/server/user/user_context_menu.cpp
+    src/server/user/user_info_connection.cpp
+    src/server/user/user_info_box.cpp
+    src/server/user/user_list.cpp
+    src/client/ui/window_main.cpp
+    src/game/zones/view_zone_widget.cpp
+    src/game/zones/view_zone.cpp
     ${VERSION_STRING_CPP}
 )
 

cockatrice/src/client/game_logic/abstract_client.cpp

@@ -1,5 +1,6 @@
-#include "abstractclient.h"
+#include "abstract_client.h"
 
+#include "../../server/pending_command.h"
 #include "featureset.h"
 #include "get_pb_extension.h"
 #include "pb/commands.pb.h"
@@ -17,7 +18,6 @@
 #include "pb/event_user_left.pb.h"
 #include "pb/event_user_message.pb.h"
 #include "pb/server_message.pb.h"
-#include "pending_command.h"
 
 #include <google/protobuf/descriptor.h>
 

cockatrice/src/client/game_logic/key_signals.cpp

@@ -1,4 +1,4 @@
-#include "keysignals.h"
+#include "key_signals.h"
 
 #include <QKeyEvent>
 

cockatrice/src/client/get_text_with_max.cpp

@@ -1,4 +1,4 @@
-#include "gettextwithmax.h"
+#include "get_text_with_max.h"
 
 QString getTextWithMax(QWidget *parent,
                        const QString &title,

cockatrice/src/client/network/release_channel.cpp

@@ -1,4 +1,4 @@
-#include "releasechannel.h"
+#include "release_channel.h"
 
 #include "version_string.h"
 

cockatrice/src/client/network/sets_model.cpp

@@ -1,4 +1,4 @@
-#include "setsmodel.h"
+#include "sets_model.h"
 
 #include <QSortFilterProxyModel>
 

cockatrice/src/client/network/sets_model.h

@@ -1,7 +1,7 @@
 #ifndef SETSMODEL_H
 #define SETSMODEL_H
 
-#include "carddatabase.h"
+#include "../../game/cards/card_database.h"
 
 #include <QAbstractTableModel>
 #include <QMimeData>

cockatrice/src/client/network/spoiler_background_updater.cpp

@@ -1,9 +1,9 @@
-#include "spoilerbackgroundupdater.h"
+#include "spoiler_background_updater.h"
 
-#include "carddatabase.h"
-#include "main.h"
-#include "settingscache.h"
-#include "window_main.h"
+#include "../../game/cards/card_database.h"
+#include "../../main.h"
+#include "../../settings/cache_settings.h"
+#include "../ui/window_main.h"
 
 #include <QApplication>
 #include <QCryptographicHash>

cockatrice/src/client/sound_engine.cpp

@@ -1,6 +1,6 @@
-#include "soundengine.h"
+#include "sound_engine.h"
 
-#include "settingscache.h"
+#include "../settings/cache_settings.h"
 
 #include <QDir>
 #include <QMediaPlayer>

cockatrice/src/client/tabs/tab.cpp

@@ -1,6 +1,6 @@
 #include "tab.h"
 
-#include "cardinfowidget.h"
+#include "../../game/cards/card_info_widget.h"
 
 #include <QApplication>
 #include <QDebug>

cockatrice/src/client/tabs/tab_account.cpp

@@ -1,18 +1,18 @@
 #include "tab_account.h"
 
-#include "abstractclient.h"
-#include "customlineedit.h"
+#include "../../deck/custom_line_edit.h"
+#include "../../server/pending_command.h"
+#include "../../server/user/user_info_box.h"
+#include "../../server/user/user_list.h"
+#include "../game_logic/abstract_client.h"
+#include "../sound_engine.h"
 #include "pb/event_add_to_list.pb.h"
 #include "pb/event_remove_from_list.pb.h"
 #include "pb/event_user_joined.pb.h"
 #include "pb/event_user_left.pb.h"
 #include "pb/response_list_users.pb.h"
 #include "pb/session_commands.pb.h"
-#include "pending_command.h"
-#include "soundengine.h"
 #include "trice_limits.h"
-#include "userinfobox.h"
-#include "userlist.h"
 
 #include <QHBoxLayout>
 #include <QPushButton>

cockatrice/src/client/tabs/tab_admin.cpp

@@ -1,6 +1,6 @@
 #include "tab_admin.h"
 
-#include "abstractclient.h"
+#include "../game_logic/abstract_client.h"
 #include "pb/admin_commands.pb.h"
 #include "trice_limits.h"
 

cockatrice/src/client/tabs/tab_deck_editor.cpp

@@ -1,22 +1,22 @@
 #include "tab_deck_editor.h"
 
-#include "abstractclient.h"
-#include "carddatabasemodel.h"
-#include "cardframe.h"
-#include "decklistmodel.h"
-#include "deckstats_interface.h"
-#include "dlg_load_deck_from_clipboard.h"
-#include "filterbuilder.h"
-#include "filtertreemodel.h"
-#include "main.h"
+#include "../../client/game_logic/abstract_client.h"
+#include "../../client/tapped_out_interface.h"
+#include "../../deck/deck_list_model.h"
+#include "../../deck/deck_stats_interface.h"
+#include "../../dialogs/dlg_load_deck_from_clipboard.h"
+#include "../../game/cards/card_database_model.h"
+#include "../../game/cards/card_frame.h"
+#include "../../game/filters/filter_builder.h"
+#include "../../game/filters/filter_tree_model.h"
+#include "../../main.h"
+#include "../../server/pending_command.h"
+#include "../../settings/cache_settings.h"
+#include "../ui/picture_loader.h"
+#include "../ui/pixel_map_generator.h"
 #include "pb/command_deck_upload.pb.h"
 #include "pb/response.pb.h"
-#include "pending_command.h"
-#include "pictureloader.h"
-#include "pixmapgenerator.h"
-#include "settingscache.h"
 #include "tab_supervisor.h"
-#include "tappedout_interface.h"
 #include "trice_limits.h"
 
 #include <QAction>

cockatrice/src/client/tabs/tab_deck_editor.h

@@ -1,9 +1,9 @@
 #ifndef WINDOW_DECKEDITOR_H
 #define WINDOW_DECKEDITOR_H
 
-#include "carddatabase.h"
-#include "customlineedit.h"
-#include "keysignals.h"
+#include "../../deck/custom_line_edit.h"
+#include "../../game/cards/card_database.h"
+#include "../game_logic/key_signals.h"
 #include "tab.h"
 
 #include <QAbstractItemModel>

cockatrice/src/client/tabs/tab_deck_storage.cpp

@@ -1,9 +1,12 @@
 #include "tab_deck_storage.h"
 
-#include "abstractclient.h"
-#include "deck_loader.h"
+#include "../../deck/deck_loader.h"
+#include "../../server/pending_command.h"
+#include "../../server/remote/remote_decklist_tree_widget.h"
+#include "../../settings/cache_settings.h"
+#include "../game_logic/abstract_client.h"
+#include "../get_text_with_max.h"
 #include "decklist.h"
-#include "gettextwithmax.h"
 #include "pb/command_deck_del.pb.h"
 #include "pb/command_deck_del_dir.pb.h"
 #include "pb/command_deck_download.pb.h"
@@ -12,9 +15,6 @@
 #include "pb/response.pb.h"
 #include "pb/response_deck_download.pb.h"
 #include "pb/response_deck_upload.pb.h"
-#include "pending_command.h"
-#include "remotedecklist_treewidget.h"
-#include "settingscache.h"
 
 #include <QAction>
 #include <QApplication>

cockatrice/src/client/tabs/tab_game.cpp

@@ -1,21 +1,31 @@
 #include "tab_game.h"
 
-#include "abstractclient.h"
-#include "arrowitem.h"
-#include "carddatabase.h"
-#include "cardframe.h"
-#include "carditem.h"
-#include "deck_loader.h"
-#include "deckview.h"
-#include "dlg_creategame.h"
-#include "dlg_load_remote_deck.h"
-#include "dlg_manage_sets.h"
-#include "gamescene.h"
-#include "gameview.h"
+#include "../../deck/deck_loader.h"
+#include "../../deck/deck_view.h"
+#include "../../dialogs/dlg_create_game.h"
+#include "../../dialogs/dlg_load_remote_deck.h"
+#include "../../dialogs/dlg_manage_sets.h"
+#include "../../game/board/arrow_item.h"
+#include "../../game/cards/card_database.h"
+#include "../../game/cards/card_frame.h"
+#include "../../game/cards/card_item.h"
+#include "../../game/game_scene.h"
+#include "../../game/game_view.h"
+#include "../../game/player/player.h"
+#include "../../game/player/player_list_widget.h"
+#include "../../game/zones/view_zone.h"
+#include "../../game/zones/view_zone_widget.h"
+#include "../../main.h"
+#include "../../server/message_log_widget.h"
+#include "../../server/pending_command.h"
+#include "../../settings/cache_settings.h"
+#include "../game_logic/abstract_client.h"
+#include "../network/replay_timeline_widget.h"
+#include "../ui/line_edit_completer.h"
+#include "../ui/phases_toolbar.h"
+#include "../ui/picture_loader.h"
+#include "../ui/window_main.h"
 #include "get_pb_extension.h"
-#include "lineeditcompleter.h"
-#include "main.h"
-#include "messagelogwidget.h"
 #include "pb/command_concede.pb.h"
 #include "pb/command_deck_select.pb.h"
 #include "pb/command_delete_arrow.pb.h"
@@ -45,18 +55,8 @@
 #include "pb/game_event_container.pb.h"
 #include "pb/game_replay.pb.h"
 #include "pb/response_deck_download.pb.h"
-#include "pending_command.h"
-#include "phasestoolbar.h"
-#include "pictureloader.h"
-#include "player.h"
-#include "playerlistwidget.h"
-#include "replay_timeline_widget.h"
-#include "settingscache.h"
 #include "tab_supervisor.h"
 #include "trice_limits.h"
-#include "window_main.h"
-#include "zoneviewwidget.h"
-#include "zoneviewzone.h"
 
 #include <QAction>
 #include <QCompleter>

cockatrice/src/client/tabs/tab_game.h

@@ -1,10 +1,10 @@
 #ifndef TAB_GAME_H
 #define TAB_GAME_H
 
+#include "../../client/tearoff_menu.h"
 #include "pb/event_leave.pb.h"
 #include "pb/serverinfo_game.pb.h"
 #include "tab.h"
-#include "tearoffmenu.h"
 
 #include <QCompleter>
 #include <QMap>

cockatrice/src/client/tabs/tab_logs.cpp

@@ -1,11 +1,11 @@
 #include "tab_logs.h"
 
-#include "abstractclient.h"
-#include "customlineedit.h"
-#include "dlg_manage_sets.h"
+#include "../../deck/custom_line_edit.h"
+#include "../../dialogs/dlg_manage_sets.h"
+#include "../../server/pending_command.h"
+#include "../game_logic/abstract_client.h"
 #include "pb/moderator_commands.pb.h"
 #include "pb/response_viewlog_history.pb.h"
-#include "pending_command.h"
 #include "trice_limits.h"
 
 #include <QCheckBox>

cockatrice/src/client/tabs/tab_message.cpp

@@ -1,15 +1,15 @@
 #include "tab_message.h"
 
-#include "abstractclient.h"
-#include "chatview/chatview.h"
-#include "customlineedit.h"
-#include "main.h"
+#include "../../deck/custom_line_edit.h"
+#include "../../main.h"
+#include "../../server/chat_view/chat_view.h"
+#include "../../server/pending_command.h"
+#include "../../settings/cache_settings.h"
+#include "../game_logic/abstract_client.h"
+#include "../sound_engine.h"
 #include "pb/event_user_message.pb.h"
 #include "pb/serverinfo_user.pb.h"
 #include "pb/session_commands.pb.h"
-#include "pending_command.h"
-#include "settingscache.h"
-#include "soundengine.h"
 #include "trice_limits.h"
 
 #include <QApplication>

cockatrice/src/client/tabs/tab_replays.cpp

@@ -1,6 +1,9 @@
 #include "tab_replays.h"
 
-#include "abstractclient.h"
+#include "../../server/pending_command.h"
+#include "../../server/remote/remote_replay_list_tree_widget.h"
+#include "../../settings/cache_settings.h"
+#include "../game_logic/abstract_client.h"
 #include "pb/command_replay_delete_match.pb.h"
 #include "pb/command_replay_download.pb.h"
 #include "pb/command_replay_modify_match.pb.h"
@@ -8,9 +11,6 @@
 #include "pb/game_replay.pb.h"
 #include "pb/response.pb.h"
 #include "pb/response_replay_download.pb.h"
-#include "pending_command.h"
-#include "remotereplaylist_treewidget.h"
-#include "settingscache.h"
 #include "tab_game.h"
 
 #include <QAction>

cockatrice/src/client/tabs/tab_room.cpp

@@ -1,11 +1,14 @@
 #include "tab_room.h"
 
-#include "abstractclient.h"
-#include "chatview/chatview.h"
-#include "dlg_settings.h"
-#include "gameselector.h"
+#include "../../client/game_logic/abstract_client.h"
+#include "../../dialogs/dlg_settings.h"
+#include "../../game/game_selector.h"
+#include "../../main.h"
+#include "../../server/chat_view/chat_view.h"
+#include "../../server/pending_command.h"
+#include "../../server/user/user_list.h"
+#include "../../settings/cache_settings.h"
 #include "get_pb_extension.h"
-#include "main.h"
 #include "pb/event_join_room.pb.h"
 #include "pb/event_leave_room.pb.h"
 #include "pb/event_list_games.pb.h"
@@ -13,12 +16,9 @@
 #include "pb/event_room_say.pb.h"
 #include "pb/room_commands.pb.h"
 #include "pb/serverinfo_room.pb.h"
-#include "pending_command.h"
-#include "settingscache.h"
 #include "tab_account.h"
 #include "tab_supervisor.h"
 #include "trice_limits.h"
-#include "userlist.h"
 
 #include <QApplication>
 #include <QCompleter>

cockatrice/src/client/tabs/tab_room.h

@@ -1,7 +1,7 @@
 #ifndef TAB_ROOM_H
 #define TAB_ROOM_H
 
-#include "lineeditcompleter.h"
+#include "../ui/line_edit_completer.h"
 #include "tab.h"
 
 #include <QFocusEvent>

cockatrice/src/client/tabs/tab_server.cpp

@@ -1,13 +1,13 @@
 #include "tab_server.h"
 
-#include "abstractclient.h"
+#include "../../client/game_logic/abstract_client.h"
+#include "../../server/pending_command.h"
+#include "../../server/user/user_list.h"
 #include "pb/event_list_rooms.pb.h"
 #include "pb/event_server_message.pb.h"
 #include "pb/response_join_room.pb.h"
 #include "pb/session_commands.pb.h"
-#include "pending_command.h"
 #include "tab_supervisor.h"
-#include "userlist.h"
 
 #include <QCheckBox>
 #include <QDebug>

cockatrice/src/client/tabs/tab_supervisor.cpp

@@ -1,7 +1,10 @@
 #include "tab_supervisor.h"
 
-#include "abstractclient.h"
-#include "main.h"
+#include "../../client/game_logic/abstract_client.h"
+#include "../../main.h"
+#include "../../server/user/user_list.h"
+#include "../../settings/cache_settings.h"
+#include "../ui/pixel_map_generator.h"
 #include "pb/event_game_joined.pb.h"
 #include "pb/event_notify_user.pb.h"
 #include "pb/event_user_message.pb.h"
@@ -11,8 +14,6 @@
 #include "pb/room_event.pb.h"
 #include "pb/serverinfo_room.pb.h"
 #include "pb/serverinfo_user.pb.h"
-#include "pixmapgenerator.h"
-#include "settingscache.h"
 #include "tab_account.h"
 #include "tab_admin.h"
 #include "tab_deck_editor.h"
@@ -23,7 +24,6 @@
 #include "tab_replays.h"
 #include "tab_room.h"
 #include "tab_server.h"
-#include "userlist.h"
 
 #include <QApplication>
 #include <QDebug>

cockatrice/src/client/tabs/tab_supervisor.h

@@ -1,8 +1,8 @@
 #ifndef TAB_SUPERVISOR_H
 #define TAB_SUPERVISOR_H
 
-#include "chatview/userlistProxy.h"
-#include "deck_loader.h"
+#include "../../deck/deck_loader.h"
+#include "../../server/chat_view/user_list_proxy.h"
 
 #include <QAbstractButton>
 #include <QCommonStyle>

cockatrice/src/client/tapped_out_interface.cpp

@@ -1,4 +1,4 @@
-#include "tappedout_interface.h"
+#include "tapped_out_interface.h"
 
 #include "decklist.h"
 

cockatrice/src/client/tapped_out_interface.h

@@ -1,7 +1,7 @@
 #ifndef TAPPEDOUT_INTERFACE_H
 #define TAPPEDOUT_INTERFACE_H
 
-#include "carddatabase.h"
+#include "../game/cards/card_database.h"
 #include "decklist.h"
 
 #include <QObject>

cockatrice/src/client/tearoff_menu.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "settingscache.h"
+#include "../settings/cache_settings.h"
 
 #include <QMenu>
 

cockatrice/src/client/translate_counter_name.cpp

@@ -1,4 +1,4 @@
-#include "translatecountername.h"
+#include "translate_counter_name.h"
 
 const QMap<QString, QString> TranslateCounterName::translated = {
     {"life", QT_TRANSLATE_NOOP("TranslateCounterName", "Life")},

cockatrice/src/client/ui/line_edit_completer.cpp

@@ -1,4 +1,4 @@
-#include "lineeditcompleter.h"
+#include "line_edit_completer.h"
 
 #include <QAbstractItemView>
 #include <QCompleter>

cockatrice/src/client/ui/line_edit_completer.h

@@ -1,7 +1,7 @@
 #ifndef LINEEDITCOMPLETER_H
 #define LINEEDITCOMPLETER_H
 
-#include "customlineedit.h"
+#include "../../deck/custom_line_edit.h"
 
 #include <QFocusEvent>
 #include <QKeyEvent>

cockatrice/src/client/ui/phases_toolbar.cpp

@@ -1,10 +1,10 @@
-#include "phasestoolbar.h"
+#include "phases_toolbar.h"
 
 #include "pb/command_draw_cards.pb.h"
 #include "pb/command_next_turn.pb.h"
 #include "pb/command_set_active_phase.pb.h"
 #include "pb/command_set_card_attr.pb.h"
-#include "pixmapgenerator.h"
+#include "pixel_map_generator.h"
 
 #include <QAction>
 #include <QDebug>

cockatrice/src/client/ui/phases_toolbar.h

@@ -1,7 +1,7 @@
 #ifndef PHASESTOOLBAR_H
 #define PHASESTOOLBAR_H
 
-#include "abstractgraphicsitem.h"
+#include "../../game/board/abstract_graphics_item.h"
 
 #include <QFrame>
 #include <QGraphicsObject>

cockatrice/src/client/ui/picture_loader.cpp

@@ -1,9 +1,9 @@
-#include "pictureloader.h"
+#include "picture_loader.h"
 
-#include "carddatabase.h"
-#include "main.h"
-#include "settingscache.h"
-#include "thememanager.h"
+#include "../../game/cards/card_database.h"
+#include "../../main.h"
+#include "../../settings/cache_settings.h"
+#include "theme_manager.h"
 
 #include <QApplication>
 #include <QBuffer>

cockatrice/src/client/ui/picture_loader.h

@@ -1,7 +1,7 @@
 #ifndef PICTURELOADER_H
 #define PICTURELOADER_H
 
-#include "carddatabase.h"
+#include "../../game/cards/card_database.h"
 
 #include <QList>
 #include <QMap>

cockatrice/src/client/ui/pixel_map_generator.cpp

@@ -1,4 +1,4 @@
-#include "pixmapgenerator.h"
+#include "pixel_map_generator.h"
 
 #include "pb/serverinfo_user.pb.h"
 

cockatrice/src/client/ui/theme_manager.cpp

@@ -1,6 +1,6 @@
-#include "thememanager.h"
+#include "theme_manager.h"
 
-#include "settingscache.h"
+#include "../../settings/cache_settings.h"
 
 #include <QApplication>
 #include <QColor>

cockatrice/src/client/ui/window_main.cpp

@@ -19,32 +19,32 @@
  ***************************************************************************/
 #include "window_main.h"
 
-#include "carddatabase.h"
-#include "dlg_connect.h"
-#include "dlg_edit_tokens.h"
-#include "dlg_forgotpasswordchallenge.h"
-#include "dlg_forgotpasswordrequest.h"
-#include "dlg_forgotpasswordreset.h"
-#include "dlg_manage_sets.h"
-#include "dlg_register.h"
-#include "dlg_settings.h"
-#include "dlg_tip_of_the_day.h"
-#include "dlg_update.h"
-#include "dlg_viewlog.h"
-#include "gettextwithmax.h"
-#include "localclient.h"
-#include "localserver.h"
-#include "localserverinterface.h"
-#include "logger.h"
-#include "main.h"
+#include "../../dialogs/dlg_connect.h"
+#include "../../dialogs/dlg_edit_tokens.h"
+#include "../../dialogs/dlg_forgot_password_challenge.h"
+#include "../../dialogs/dlg_forgot_password_request.h"
+#include "../../dialogs/dlg_forgot_password_reset.h"
+#include "../../dialogs/dlg_manage_sets.h"
+#include "../../dialogs/dlg_register.h"
+#include "../../dialogs/dlg_settings.h"
+#include "../../dialogs/dlg_tip_of_the_day.h"
+#include "../../dialogs/dlg_update.h"
+#include "../../dialogs/dlg_view_log.h"
+#include "../../game/cards/card_database.h"
+#include "../../main.h"
+#include "../../server/local_client.h"
+#include "../../server/local_server.h"
+#include "../../server/local_server_interface.h"
+#include "../../server/remote/remote_client.h"
+#include "../../settings/cache_settings.h"
+#include "../../utility/logger.h"
+#include "../get_text_with_max.h"
+#include "../tabs/tab_game.h"
+#include "../tabs/tab_supervisor.h"
 #include "pb/event_connection_closed.pb.h"
 #include "pb/event_server_shutdown.pb.h"
 #include "pb/game_replay.pb.h"
 #include "pb/room_commands.pb.h"
-#include "remoteclient.h"
-#include "settingscache.h"
-#include "tab_game.h"
-#include "tab_supervisor.h"
 #include "version_string.h"
 
 #include <QAction>

cockatrice/src/client/ui/window_main.h

@@ -20,7 +20,7 @@
 #ifndef WINDOW_H
 #define WINDOW_H
 
-#include "abstractclient.h"
+#include "../game_logic/abstract_client.h"
 #include "pb/response.pb.h"
 
 #include <QList>

cockatrice/src/deck/custom_line_edit.cpp

@@ -1,7 +1,7 @@
-#include "customlineedit.h"
+#include "custom_line_edit.h"
 
-#include "settingscache.h"
-#include "shortcutssettings.h"
+#include "../settings/cache_settings.h"
+#include "../settings/shortcuts_settings.h"
 
 #include <QKeyEvent>
 #include <QLineEdit>

cockatrice/src/deck/deck_list_model.cpp

@@ -1,9 +1,9 @@
-#include "decklistmodel.h"
+#include "deck_list_model.h"
 
-#include "carddatabase.h"
+#include "../game/cards/card_database.h"
+#include "../main.h"
+#include "../settings/cache_settings.h"
 #include "deck_loader.h"
-#include "main.h"
-#include "settingscache.h"
 
 #include <QBrush>
 #include <QFile>

cockatrice/src/deck/deck_loader.cpp

@@ -1,8 +1,8 @@
 #include "deck_loader.h"
 
-#include "carddatabase.h"
+#include "../game/cards/card_database.h"
+#include "../main.h"
 #include "decklist.h"
-#include "main.h"
 
 #include <QDebug>
 #include <QFile>

cockatrice/src/deck/deck_stats_interface.cpp

@@ -1,4 +1,4 @@
-#include "deckstats_interface.h"
+#include "deck_stats_interface.h"
 
 #include "decklist.h"
 

cockatrice/src/deck/deck_stats_interface.h

@@ -1,7 +1,7 @@
 #ifndef DECKSTATS_INTERFACE_H
 #define DECKSTATS_INTERFACE_H
 
-#include "carddatabase.h"
+#include "../game/cards/card_database.h"
 #include "decklist.h"
 
 #include <QObject>

cockatrice/src/deck/deck_view.cpp

@@ -1,10 +1,10 @@
-#include "deckview.h"
+#include "deck_view.h"
 
-#include "carddatabase.h"
+#include "../client/ui/theme_manager.h"
+#include "../game/cards/card_database.h"
+#include "../main.h"
+#include "../settings/cache_settings.h"
 #include "decklist.h"
-#include "main.h"
-#include "settingscache.h"
-#include "thememanager.h"
 
 #include <QApplication>
 #include <QGraphicsSceneMouseEvent>
@@ -517,4 +517,4 @@ void DeckView::setDeck(const DeckList &_deck)
 void DeckView::resetSideboardPlan()
 {
     deckViewScene->resetSideboardPlan();
-}
+}

cockatrice/src/deck/deck_view.h

@@ -1,7 +1,7 @@
 #ifndef DECKVIEW_H
 #define DECKVIEW_H
 
-#include "abstractcarddragitem.h"
+#include "../game/cards/abstract_card_drag_item.h"
 #include "pb/move_card_to_zone.pb.h"
 
 #include <QGraphicsScene>

cockatrice/src/dialogs/dlg_connect.cpp

@@ -1,8 +1,8 @@
 #include "dlg_connect.h"
 
-#include "settingscache.h"
+#include "../server/user/user_info_connection.h"
+#include "../settings/cache_settings.h"
 #include "trice_limits.h"
-#include "userconnection_information.h"
 
 #include <QCheckBox>
 #include <QComboBox>
@@ -361,4 +361,4 @@ void DlgConnect::actForgotPassword()
 
     emit sigStartForgotPasswordRequest();
     reject();
-}
+}

cockatrice/src/dialogs/dlg_connect.h

@@ -1,8 +1,8 @@
 #ifndef DLG_CONNECT_H
 #define DLG_CONNECT_H
 
-#include "handle_public_servers.h"
-#include "userconnection_information.h"
+#include "../server/handle_public_servers.h"
+#include "../server/user/user_info_connection.h"
 
 #include <QDialog>
 #include <QLineEdit>

cockatrice/src/dialogs/dlg_create_game.cpp

@@ -1,9 +1,9 @@
-#include "dlg_creategame.h"
+#include "dlg_create_game.h"
 
+#include "../client/tabs/tab_room.h"
+#include "../server/pending_command.h"
+#include "../settings/cache_settings.h"
 #include "pb/serverinfo_game.pb.h"
-#include "pending_command.h"
-#include "settingscache.h"
-#include "tab_room.h"
 #include "trice_limits.h"
 
 #include <QApplication>

cockatrice/src/dialogs/dlg_create_token.cpp

@@ -1,10 +1,10 @@
 #include "dlg_create_token.h"
 
-#include "carddatabasemodel.h"
-#include "cardinfopicture.h"
+#include "../game/cards/card_database_model.h"
+#include "../game/cards/card_info_picture.h"
+#include "../main.h"
+#include "../settings/cache_settings.h"
 #include "decklist.h"
-#include "main.h"
-#include "settingscache.h"
 #include "trice_limits.h"
 
 #include <QCheckBox>

cockatrice/src/dialogs/dlg_edit_password.cpp

@@ -1,6 +1,6 @@
 #include "dlg_edit_password.h"
 
-#include "settingscache.h"
+#include "../settings/cache_settings.h"
 #include "trice_limits.h"
 
 #include <QDialogButtonBox>

cockatrice/src/dialogs/dlg_edit_tokens.cpp

@@ -1,9 +1,9 @@
 #include "dlg_edit_tokens.h"
 
-#include "carddatabase.h"
-#include "carddatabasemodel.h"
-#include "gettextwithmax.h"
-#include "main.h"
+#include "../client/get_text_with_max.h"
+#include "../game/cards/card_database.h"
+#include "../game/cards/card_database_model.h"
+#include "../main.h"
 #include "trice_limits.h"
 
 #include <QAction>

cockatrice/src/dialogs/dlg_edit_tokens.h

@@ -1,7 +1,7 @@
 #ifndef DLG_EDIT_TOKENS_H
 #define DLG_EDIT_TOKENS_H
 
-#include "carddatabase.h"
+#include "../game/cards/card_database.h"
 
 #include <QDialog>
 

cockatrice/src/dialogs/dlg_edit_user.cpp

@@ -1,6 +1,6 @@
 #include "dlg_edit_user.h"
 
-#include "settingscache.h"
+#include "../settings/cache_settings.h"
 #include "trice_limits.h"
 
 #include <QDebug>

cockatrice/src/dialogs/dlg_filter_games.h

@@ -1,7 +1,7 @@
 #ifndef DLG_FILTER_GAMES_H
 #define DLG_FILTER_GAMES_H
 
-#include "gamesmodel.h"
+#include "../game/games_model.h"
 
 #include <QCheckBox>
 #include <QComboBox>

cockatrice/src/dialogs/dlg_forgot_password_challenge.cpp

@@ -1,6 +1,6 @@
-#include "dlg_forgotpasswordchallenge.h"
+#include "dlg_forgot_password_challenge.h"
 
-#include "settingscache.h"
+#include "../settings/cache_settings.h"
 #include "trice_limits.h"
 
 #include <QCheckBox>

cockatrice/src/dialogs/dlg_forgot_password_request.cpp

@@ -1,6 +1,6 @@
-#include "dlg_forgotpasswordrequest.h"
+#include "dlg_forgot_password_request.h"
 
-#include "settingscache.h"
+#include "../settings/cache_settings.h"
 #include "trice_limits.h"
 
 #include <QCheckBox>

cockatrice/src/dialogs/dlg_forgot_password_reset.cpp

@@ -1,6 +1,6 @@
-#include "dlg_forgotpasswordreset.h"
+#include "dlg_forgot_password_reset.h"
 
-#include "settingscache.h"
+#include "../settings/cache_settings.h"
 #include "trice_limits.h"
 
 #include <QCheckBox>

cockatrice/src/dialogs/dlg_load_deck_from_clipboard.cpp

@@ -1,7 +1,7 @@
 #include "dlg_load_deck_from_clipboard.h"
 
-#include "deck_loader.h"
-#include "settingscache.h"
+#include "../deck/deck_loader.h"
+#include "../settings/cache_settings.h"
 
 #include <QApplication>
 #include <QClipboard>

cockatrice/src/dialogs/dlg_load_remote_deck.cpp

@@ -1,7 +1,7 @@
 #include "dlg_load_remote_deck.h"
 
-#include "main.h"
-#include "remotedecklist_treewidget.h"
+#include "../main.h"
+#include "../server/remote/remote_decklist_tree_widget.h"
 
 #include <QDialogButtonBox>
 #include <QHBoxLayout>

cockatrice/src/dialogs/dlg_manage_sets.cpp

@@ -1,10 +1,10 @@
 #include "dlg_manage_sets.h"
 
-#include "customlineedit.h"
-#include "main.h"
-#include "pictureloader.h"
-#include "setsmodel.h"
-#include "settingscache.h"
+#include "../client/network/sets_model.h"
+#include "../client/ui/picture_loader.h"
+#include "../deck/custom_line_edit.h"
+#include "../main.h"
+#include "../settings/cache_settings.h"
 
 #include <QAction>
 #include <QDebug>