Turn things in common into separate libs.

Took 2 hours 27 minutes

cockatrice/CMakeLists.txt

@@ -270,9 +270,11 @@ set(cockatrice_SOURCES
     src/interface/utility/sequence_edit.cpp
 )
 
-add_subdirectory(libs/settings)
+add_subdirectory(${CMAKE_SOURCE_DIR}/libs/pb ${CMAKE_BINARY_DIR}/libs/pb)
-add_subdirectory(libs/card)
+add_subdirectory(${CMAKE_SOURCE_DIR}/libs/server ${CMAKE_BINARY_DIR}/libs/server)
-add_subdirectory(libs/utility)
+add_subdirectory(${CMAKE_SOURCE_DIR}/libs/settings ${CMAKE_BINARY_DIR}/libs/settings)
+add_subdirectory(${CMAKE_SOURCE_DIR}/libs/card ${CMAKE_BINARY_DIR}/libs/card)
+add_subdirectory(${CMAKE_SOURCE_DIR}/libs/utility ${CMAKE_BINARY_DIR}/libs/utility)
 add_subdirectory(sounds)
 add_subdirectory(themes)
 configure_file(
@@ -365,9 +367,9 @@ elseif(Qt5_FOUND)
 endif()
 
 if(Qt5_FOUND)
-  target_link_libraries(cockatrice cardlib utility cockatrice_common ${COCKATRICE_QT_MODULES})
+  target_link_libraries(cockatrice cardlib utility serverlib cockatrice_common ${COCKATRICE_QT_MODULES})
 else()
-  target_link_libraries(cockatrice PUBLIC cardlib utility cockatrice_common ${COCKATRICE_QT_MODULES})
+  target_link_libraries(cockatrice PUBLIC cardlib utility serverlib cockatrice_common ${COCKATRICE_QT_MODULES})
 endif()
 
 if(UNIX)

cockatrice/src/client/get_text_with_max.h

@@ -7,7 +7,7 @@
 #ifndef GETTEXTWITHMAX_H
 #define GETTEXTWITHMAX_H
 
-#include "trice_limits.h"
+#include "../../../libs/utility/include/utility/trice_limits.h"
 
 #include <QInputDialog>
 

cockatrice/src/client/tapped_out_interface.cpp

@@ -1,7 +1,7 @@
 #include "tapped_out_interface.h"
 
-#include "deck_list.h"
+#include "../../../libs/deck/deck_list.h"
-#include "deck_list_card_node.h"
+#include "../../../libs/deck/deck_list_card_node.h"
 
 #include <QDesktopServices>
 #include <QMessageBox>

cockatrice/src/client/tapped_out_interface.h

@@ -7,8 +7,8 @@
 #ifndef TAPPEDOUT_INTERFACE_H
 #define TAPPEDOUT_INTERFACE_H
 
+#include "../../../libs/deck/deck_list.h"
 #include "card/card_database/card_database.h"
-#include "deck_list.h"
 
 #include <QLoggingCategory>
 #include <QObject>

cockatrice/src/deck/deck_list_model.h

@@ -1,10 +1,10 @@
 #ifndef DECKLISTMODEL_H
 #define DECKLISTMODEL_H
 
-#include "abstract_deck_list_card_node.h"
+#include "../../../libs/deck/abstract_deck_list_card_node.h"
+#include "../../../libs/deck/deck_list.h"
+#include "../../../libs/deck/deck_list_card_node.h"
 #include "card/card_printing/exact_card.h"
-#include "deck_list.h"
-#include "deck_list_card_node.h"
 
 #include <QAbstractItemModel>
 #include <QList>

cockatrice/src/deck/deck_loader.cpp

@@ -1,10 +1,10 @@
 #include "deck_loader.h"
 
+#include "../../../libs/deck/deck_list.h"
+#include "../../../libs/deck/deck_list_card_node.h"
 #include "../main.h"
 #include "card/card_database/card_database.h"
 #include "card/card_database/card_database_manager.h"
-#include "deck_list.h"
-#include "deck_list_card_node.h"
 
 #include <QApplication>
 #include <QClipboard>

cockatrice/src/deck/deck_loader.h

@@ -7,7 +7,7 @@
 #ifndef DECK_LOADER_H
 #define DECK_LOADER_H
 
-#include "deck_list.h"
+#include "../../../libs/deck/deck_list.h"
 
 #include <QLoggingCategory>
 

cockatrice/src/deck/deck_stats_interface.cpp

@@ -1,7 +1,7 @@
 #include "deck_stats_interface.h"
 
-#include "deck_list.h"
+#include "../../../libs/deck/deck_list.h"
-#include "deck_list_card_node.h"
+#include "../../../libs/deck/deck_list_card_node.h"
 
 #include <QDesktopServices>
 #include <QMessageBox>

cockatrice/src/deck/deck_stats_interface.h

@@ -7,8 +7,8 @@
 #ifndef DECKSTATS_INTERFACE_H
 #define DECKSTATS_INTERFACE_H
 
+#include "../../../libs/deck/deck_list.h"
 #include "card/card_database/card_database.h"
-#include "deck_list.h"
 
 #include <QObject>
 

cockatrice/src/dialogs/dlg_connect.cpp

@@ -1,7 +1,7 @@
 #include "dlg_connect.h"
 
+#include "../../../libs/utility/include/utility/trice_limits.h"
 #include "settings/cache_settings.h"
-#include "trice_limits.h"
 
 #include <QCheckBox>
 #include <QComboBox>

cockatrice/src/dialogs/dlg_create_game.cpp

@@ -1,10 +1,10 @@
 #include "dlg_create_game.h"
 
+#include "../../../libs/utility/include/utility/trice_limits.h"
 #include "../server/pending_command.h"
 #include "../tabs/tab_room.h"
 #include "pb/serverinfo_game.pb.h"
 #include "settings/cache_settings.h"
-#include "trice_limits.h"
 
 #include <QApplication>
 #include <QCheckBox>

cockatrice/src/dialogs/dlg_edit_avatar.cpp

@@ -1,6 +1,6 @@
 #include "dlg_edit_avatar.h"
 
-#include "trice_limits.h"
+#include "../../../libs/utility/include/utility/trice_limits.h"
 
 #include <QBuffer>
 #include <QDebug>

cockatrice/src/dialogs/dlg_edit_password.cpp

@@ -1,7 +1,7 @@
 #include "dlg_edit_password.h"
 
+#include "../../../libs/utility/include/utility/trice_limits.h"
 #include "settings/cache_settings.h"
-#include "trice_limits.h"
 
 #include <QDialogButtonBox>
 #include <QGridLayout>

cockatrice/src/dialogs/dlg_edit_tokens.cpp

@@ -1,12 +1,12 @@
 #include "dlg_edit_tokens.h"
 
+#include "../../../libs/utility/include/utility/trice_limits.h"
 #include "../client/get_text_with_max.h"
 #include "../main.h"
 #include "card/card_database/card_database.h"
 #include "card/card_database/card_database_manager.h"
 #include "card/card_database/model/card_database_model.h"
 #include "card/card_database/model/token/token_edit_model.h"
-#include "trice_limits.h"
 
 #include <QAction>
 #include <QComboBox>

cockatrice/src/dialogs/dlg_edit_user.cpp

@@ -1,7 +1,7 @@
 #include "dlg_edit_user.h"
 
+#include "../../../libs/utility/include/utility/trice_limits.h"
 #include "settings/cache_settings.h"
-#include "trice_limits.h"
 
 #include <QDebug>
 #include <QDialogButtonBox>

cockatrice/src/dialogs/dlg_forgot_password_challenge.cpp

@@ -1,7 +1,7 @@
 #include "dlg_forgot_password_challenge.h"
 
+#include "../../../libs/utility/include/utility/trice_limits.h"
 #include "settings/cache_settings.h"
-#include "trice_limits.h"
 
 #include <QCheckBox>
 #include <QDebug>

cockatrice/src/dialogs/dlg_forgot_password_request.cpp

@@ -1,7 +1,7 @@
 #include "dlg_forgot_password_request.h"
 
+#include "../../../libs/utility/include/utility/trice_limits.h"
 #include "settings/cache_settings.h"
-#include "trice_limits.h"
 
 #include <QCheckBox>
 #include <QDebug>

cockatrice/src/dialogs/dlg_forgot_password_reset.cpp

@@ -1,7 +1,7 @@
 #include "dlg_forgot_password_reset.h"
 
+#include "../../../libs/utility/include/utility/trice_limits.h"
 #include "settings/cache_settings.h"
-#include "trice_limits.h"
 
 #include <QCheckBox>
 #include <QDebug>

cockatrice/src/dialogs/dlg_register.cpp

@@ -1,8 +1,8 @@
 #include "dlg_register.h"
 
+#include "../../../libs/utility/include/utility/trice_limits.h"
 #include "pb/serverinfo_user.pb.h"
 #include "settings/cache_settings.h"
-#include "trice_limits.h"
 
 #include <QCheckBox>
 #include <QDebug>

cockatrice/src/game/board/abstract_card_item.h

@@ -7,9 +7,9 @@
 #ifndef ABSTRACTCARDITEM_H
 #define ABSTRACTCARDITEM_H
 
+#include "../../../../libs/utility/include/utility/card_ref.h"
 #include "arrow_target.h"
 #include "card/card_printing/exact_card.h"
-#include "card_ref.h"
 #include "graphics_item_type.h"
 
 class Player;

cockatrice/src/game/board/abstract_counter.cpp

@@ -1,8 +1,8 @@
 #include "abstract_counter.h"
 
+#include "../../../../libs/utility/include/utility/expression.h"
 #include "../../tabs/tab_game.h"
 #include "../player/player.h"
-#include "expression.h"
 #include "pb/command_inc_counter.pb.h"
 #include "pb/command_set_counter.pb.h"
 #include "settings/cache_settings.h"

cockatrice/src/game/deckview/deck_view.cpp

@@ -1,9 +1,9 @@
 #include "deck_view.h"
 
+#include "../../../../libs/deck/deck_list.h"
+#include "../../../../libs/deck/deck_list_card_node.h"
 #include "../../interface/theme_manager.h"
 #include "card/card_info.h"
-#include "deck_list.h"
-#include "deck_list_card_node.h"
 #include "settings/cache_settings.h"
 
 #include <QApplication>

cockatrice/src/game/deckview/deck_view_container.cpp

@@ -1,5 +1,6 @@
 #include "deck_view_container.h"
 
+#include "../../../../libs/utility/include/utility/trice_limits.h"
 #include "../../deck/deck_loader.h"
 #include "../../dialogs/dlg_load_deck.h"
 #include "../../dialogs/dlg_load_deck_from_clipboard.h"
@@ -18,7 +19,6 @@
 #include "pb/command_set_sideboard_plan.pb.h"
 #include "pb/response_deck_download.pb.h"
 #include "settings/cache_settings.h"
-#include "trice_limits.h"
 
 #include <QMessageBox>
 #include <QMouseEvent>

cockatrice/src/game/dialogs/dlg_create_token.cpp

@@ -1,13 +1,13 @@
 #include "dlg_create_token.h"
 
+#include "../../../../libs/deck/deck_list.h"
+#include "../../../../libs/utility/include/utility/trice_limits.h"
 #include "../../interface/widgets/cards/card_info_picture_widget.h"
 #include "../../main.h"
 #include "card/card_database/card_database_manager.h"
 #include "card/card_database/model/card_database_model.h"
 #include "card/card_database/model/token/token_display_model.h"
-#include "deck_list.h"
 #include "settings/cache_settings.h"
-#include "trice_limits.h"
 
 #include <QCheckBox>
 #include <QCloseEvent>

cockatrice/src/game/dialogs/dlg_roll_dice.cpp

@@ -1,6 +1,6 @@
 #include "dlg_roll_dice.h"
 
-#include "trice_limits.h"
+#include "../../../../libs/utility/include/utility/trice_limits.h"
 
 #include <QDialogButtonBox>
 #include <QLabel>

cockatrice/src/game/game_event_handler.cpp

@@ -1,10 +1,10 @@
 #include "game_event_handler.h"
 
+#include "../../../libs/server/get_pb_extension.h"
 #include "../server/abstract_client.h"
 #include "../server/pending_command.h"
 #include "../tabs/tab_game.h"
 #include "abstract_game.h"
-#include "get_pb_extension.h"
 #include "log/message_log_widget.h"
 #include "pb/command_concede.pb.h"
 #include "pb/command_delete_arrow.pb.h"

cockatrice/src/game/log/message_log_widget.h

@@ -7,10 +7,10 @@
 #ifndef MESSAGELOGWIDGET_H
 #define MESSAGELOGWIDGET_H
 
+#include "../../../../libs/server/include/user_level.h"
 #include "../../client/translation.h"
 #include "../../server/chat_view/chat_view.h"
 #include "../zones/logic/card_zone_logic.h"
-#include "user_level.h"
 
 class AbstractGame;
 class CardItem;

cockatrice/src/game/player/menu/hand_menu.cpp

@@ -1,11 +1,11 @@
 #include "hand_menu.h"
 
-#include "../../../settings/cache_settings.h"
-#include "../../../settings/shortcuts_settings.h"
 #include "../../abstract_game.h"
 #include "../../zones/hand_zone.h"
 #include "../player.h"
 #include "../player_actions.h"
+#include "settings/cache_settings.h"
+#include "settings/shortcuts_settings.h"
 
 #include <QAction>
 #include <QMenu>

cockatrice/src/game/player/menu/library_menu.cpp

@@ -1,11 +1,11 @@
 #include "library_menu.h"
 
-#include "../../../settings/cache_settings.h"
-#include "../../../settings/shortcuts_settings.h"
 #include "../../../tabs/tab_game.h"
 #include "../../abstract_game.h"
 #include "../player.h"
 #include "../player_actions.h"
+#include "settings/cache_settings.h"
+#include "settings/shortcuts_settings.h"
 
 #include <QAction>
 #include <QMenu>

cockatrice/src/game/player/player_actions.cpp

@@ -1,5 +1,6 @@
 #include "player_actions.h"
 
+#include "../../../../libs/utility/include/utility/trice_limits.h"
 #include "../../../common/pb/context_move_card.pb.h"
 #include "../../client/get_text_with_max.h"
 #include "../../tabs/tab_game.h"
@@ -25,7 +26,6 @@
 #include "pb/command_set_card_counter.pb.h"
 #include "pb/command_shuffle.pb.h"
 #include "pb/command_undo_draw.pb.h"
-#include "trice_limits.h"
 
 // milliseconds in between triggers of the move top cards until action
 static constexpr int MOVE_TOP_CARD_UNTIL_INTERVAL = 100;

cockatrice/src/interface/pixel_map_generator.h

@@ -7,7 +7,7 @@
 #ifndef PIXMAPGENERATOR_H
 #define PIXMAPGENERATOR_H
 
-#include "user_level.h"
+#include "../../../libs/server/include/user_level.h"
 
 #include <QIcon>
 #include <QLoggingCategory>

cockatrice/src/interface/widgets/cards/card_info_display_widget.h

@@ -7,8 +7,8 @@
 #ifndef CARDINFOWIDGET_H
 #define CARDINFOWIDGET_H
 
+#include "../../../../../libs/utility/include/utility/card_ref.h"
 #include "card/card_printing/exact_card.h"
-#include "card_ref.h"
 
 #include <QComboBox>
 #include <QFrame>

cockatrice/src/interface/widgets/cards/card_info_frame_widget.h

@@ -7,8 +7,8 @@
 #ifndef CARDFRAME_H
 #define CARDFRAME_H
 
+#include "../../../../../libs/utility/include/utility/card_ref.h"
 #include "card/card_printing/exact_card.h"
-#include "card_ref.h"
 
 #include <QPushButton>
 #include <QTabWidget>

cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h

@@ -13,11 +13,11 @@
 #include "mana_curve_widget.h"
 #include "mana_devotion_widget.h"
 
+#include <../../../../../libs/deck/deck_list.h>
 #include <QHBoxLayout>
 #include <QScrollArea>
 #include <QVBoxLayout>
 #include <QWidget>
-#include <deck_list.h>
 
 class DeckAnalyticsWidget : public QWidget
 {

cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp

@@ -6,9 +6,9 @@
 #include "card/card_database/card_database.h"
 #include "card/card_database/card_database_manager.h"
 
+#include <../../../../../libs/deck/deck_list.h>
 #include <QHash>
 #include <QRegularExpression>
-#include <deck_list.h>
 
 ManaBaseWidget::ManaBaseWidget(QWidget *parent, DeckListModel *_deckListModel)
     : QWidget(parent), deckListModel(_deckListModel)

cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h

@@ -10,9 +10,9 @@
 #include "../../../deck/deck_list_model.h"
 #include "../general/display/banner_widget.h"
 
+#include <../../../../../libs/deck/deck_list.h>
 #include <QHBoxLayout>
 #include <QWidget>
-#include <deck_list.h>
 #include <utility>
 
 class ManaBaseWidget : public QWidget

cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp

@@ -7,7 +7,7 @@
 #include "card/card_database/card_database.h"
 #include "card/card_database/card_database_manager.h"
 
-#include <deck_list.h>
+#include <../../../../../libs/deck/deck_list.h>
 #include <unordered_map>
 
 ManaCurveWidget::ManaCurveWidget(QWidget *parent, DeckListModel *_deckListModel)

cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp

@@ -7,7 +7,7 @@
 #include "card/card_database/card_database.h"
 #include "card/card_database/card_database_manager.h"
 
-#include <deck_list.h>
+#include <../../../../../libs/deck/deck_list.h>
 #include <iostream>
 #include <regex>
 #include <string>

cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h

@@ -10,9 +10,9 @@
 #include "../../../deck/deck_list_model.h"
 #include "../general/display/banner_widget.h"
 
+#include <../../../../../libs/deck/deck_list.h>
 #include <QHBoxLayout>
 #include <QWidget>
-#include <deck_list.h>
 #include <utility>
 
 class ManaDevotionWidget : public QWidget

cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp

@@ -3,13 +3,13 @@
 #include "card/card_database/card_database_manager.h"
 #include "settings/cache_settings.h"
 
+#include <../../../../../libs/utility/include/utility/trice_limits.h>
 #include <QComboBox>
 #include <QDockWidget>
 #include <QHeaderView>
 #include <QLabel>
 #include <QSplitter>
 #include <QTextEdit>
-#include <trice_limits.h>
 
 DeckEditorDeckDockWidget::DeckEditorDeckDockWidget(AbstractTabDeckEditor *parent)
     : QDockWidget(parent), deckEditor(parent)

cockatrice/src/main.cpp

@@ -20,15 +20,15 @@
 
 #include "main.h"
 
+#include "../../libs/rng/include/rng/rng_sfmt.h"
+#include "../../libs/utility/include/utility/featureset.h"
 #include "QtNetwork/QNetworkInterface"
 #include "client/network/spoiler_background_updater.h"
 #include "client/sound_engine.h"
 #include "dialogs/dlg_settings.h"
-#include "featureset.h"
 #include "interface/pixel_map_generator.h"
 #include "interface/theme_manager.h"
 #include "interface/window_main.h"
-#include "rng_sfmt.h"
 #include "settings/cache_settings.h"
 #include "utility/logger.h"
 #include "version_string.h"

cockatrice/src/server/abstract_client.cpp

@@ -1,7 +1,7 @@
 #include "abstract_client.h"
 
-#include "featureset.h"
+#include "../../../libs/server/get_pb_extension.h"
-#include "get_pb_extension.h"
+#include "../../../libs/utility/include/utility/featureset.h"
 #include "pb/commands.pb.h"
 #include "pb/event_add_to_list.pb.h"
 #include "pb/event_connection_closed.pb.h"

cockatrice/src/server/chat_view/chat_view.cpp

@@ -1,5 +1,6 @@
 #include "chat_view.h"
 
+#include "../../../../libs/server/include/user_level.h"
 #include "../../client/sound_engine.h"
 #include "../../interface/pixel_map_generator.h"
 #include "../../tabs/tab_account.h"
@@ -7,7 +8,6 @@
 #include "../user/user_list_manager.h"
 #include "../user/user_list_proxy.h"
 #include "settings/cache_settings.h"
-#include "user_level.h"
 
 #include <QApplication>
 #include <QDateTime>

cockatrice/src/server/chat_view/chat_view.h

@@ -8,10 +8,10 @@
 #ifndef CHATVIEW_H
 #define CHATVIEW_H
 
+#include "../../../../libs/server/include/room_message_type.h"
+#include "../../../../libs/server/include/user_level.h"
 #include "../../tabs/tab_supervisor.h"
 #include "../user/user_list_widget.h"
-#include "room_message_type.h"
-#include "user_level.h"
 
 #include <QAction>
 #include <QColor>

cockatrice/src/server/local_client.cpp

@@ -1,6 +1,6 @@
 #include "local_client.h"
 
-#include "debug_pb_message.h"
+#include "../../../libs/server/debug_pb_message.h"
 #include "local_server_interface.h"
 #include "pb/session_commands.pb.h"
 

cockatrice/src/server/remote/remote_client.cpp

@@ -1,9 +1,9 @@
 #include "remote_client.h"
 
+#include "../../../../libs/server/debug_pb_message.h"
+#include "../../../../libs/utility/passwordhasher.h"
 #include "../../main.h"
 #include "../pending_command.h"
-#include "debug_pb_message.h"
-#include "passwordhasher.h"
 #include "pb/event_server_identification.pb.h"
 #include "pb/response_activate.pb.h"
 #include "pb/response_forgotpasswordrequest.pb.h"

cockatrice/src/server/user/user_context_menu.h

@@ -7,7 +7,7 @@
 #ifndef USER_CONTEXT_MENU_H
 #define USER_CONTEXT_MENU_H
 
-#include "user_level.h"
+#include "../../../../libs/server/include/user_level.h"
 
 #include <QObject>
 

cockatrice/src/server/user/user_info_box.cpp

@@ -1,5 +1,6 @@
 #include "user_info_box.h"
 
+#include "../../../../libs/utility/passwordhasher.h"
 #include "../../client/get_text_with_max.h"
 #include "../../dialogs/dlg_edit_avatar.h"
 #include "../../dialogs/dlg_edit_password.h"
@@ -7,7 +8,6 @@
 #include "../../interface/pixel_map_generator.h"
 #include "../abstract_client.h"
 #include "../pending_command.h"
-#include "passwordhasher.h"
 #include "pb/response_get_user_info.pb.h"
 #include "pb/serverinfo_user.pb.h"
 #include "pb/session_commands.pb.h"

cockatrice/src/server/user/user_list_widget.cpp

@@ -1,5 +1,6 @@
 #include "user_list_widget.h"
 
+#include "../../../../libs/utility/include/utility/trice_limits.h"
 #include "../../interface/pixel_map_generator.h"
 #include "../../tabs/tab_account.h"
 #include "../../tabs/tab_supervisor.h"
@@ -10,7 +11,6 @@
 #include "pb/response_get_games_of_user.pb.h"
 #include "pb/response_get_user_info.pb.h"
 #include "pb/session_commands.pb.h"
-#include "trice_limits.h"
 #include "user_context_menu.h"
 #include "user_list_manager.h"
 

cockatrice/src/server/user/user_list_widget.h

@@ -7,8 +7,8 @@
 #ifndef USERLIST_H
 #define USERLIST_H
 
+#include "../../../../libs/server/include/user_level.h"
 #include "pb/moderator_commands.pb.h"
-#include "user_level.h"
 
 #include <QComboBox>
 #include <QDialog>

cockatrice/src/tabs/abstract_tab_deck_editor.cpp

@@ -1,5 +1,6 @@
 #include "abstract_tab_deck_editor.h"
 
+#include "../../../libs/utility/include/utility/trice_limits.h"
 #include "../client/tapped_out_interface.h"
 #include "../deck/deck_stats_interface.h"
 #include "../dialogs/dlg_load_deck.h"
@@ -16,7 +17,6 @@
 #include "pb/response.pb.h"
 #include "settings/cache_settings.h"
 #include "tab_supervisor.h"
-#include "trice_limits.h"
 
 #include <QAction>
 #include <QApplication>

cockatrice/src/tabs/tab.h

@@ -7,7 +7,7 @@
 #ifndef TAB_H
 #define TAB_H
 
-#include "card_ref.h"
+#include "../../../libs/utility/include/utility/card_ref.h"
 
 #include <QMainWindow>
 

cockatrice/src/tabs/tab_account.cpp

@@ -1,5 +1,6 @@
 #include "tab_account.h"
 
+#include "../../../libs/utility/include/utility/trice_limits.h"
 #include "../client/sound_engine.h"
 #include "../deck/custom_line_edit.h"
 #include "../server/abstract_client.h"
@@ -14,7 +15,6 @@
 #include "pb/response_list_users.pb.h"
 #include "pb/session_commands.pb.h"
 #include "tab_supervisor.h"
-#include "trice_limits.h"
 
 #include <QPushButton>
 #include <QVBoxLayout>

cockatrice/src/tabs/tab_admin.cpp

@@ -1,11 +1,11 @@
 #include "tab_admin.h"
 
+#include "../../../libs/utility/include/utility/trice_limits.h"
 #include "../server/abstract_client.h"
 #include "../server/pending_command.h"
 #include "pb/admin_commands.pb.h"
 #include "pb/event_replay_added.pb.h"
 #include "pb/moderator_commands.pb.h"
-#include "trice_limits.h"
 
 #include <QDialogButtonBox>
 #include <QGridLayout>

cockatrice/src/tabs/tab_deck_editor.cpp

@@ -1,5 +1,6 @@
 #include "tab_deck_editor.h"
 
+#include "../../../libs/utility/include/utility/trice_limits.h"
 #include "../client/deck_editor_menu.h"
 #include "../client/tapped_out_interface.h"
 #include "../dialogs/dlg_load_deck.h"
@@ -15,7 +16,6 @@
 #include "card/card_database/model/card_database_model.h"
 #include "settings/cache_settings.h"
 #include "tab_supervisor.h"
-#include "trice_limits.h"
 
 #include <QAction>
 #include <QApplication>

cockatrice/src/tabs/tab_deck_storage.cpp

@@ -1,10 +1,10 @@
 #include "tab_deck_storage.h"
 
+#include "../../../libs/deck/deck_list.h"
 #include "../client/get_text_with_max.h"
 #include "../deck/deck_loader.h"
 #include "../server/pending_command.h"
 #include "../server/remote/remote_decklist_tree_widget.h"
-#include "deck_list.h"
 #include "pb/command_deck_del.pb.h"
 #include "pb/command_deck_del_dir.pb.h"
 #include "pb/command_deck_download.pb.h"

cockatrice/src/tabs/tab_game.cpp

@@ -1,5 +1,6 @@
 #include "tab_game.h"
 
+#include "../../../libs/utility/include/utility/trice_limits.h"
 #include "../client/network/replay_timeline_widget.h"
 #include "../dialogs/dlg_create_game.h"
 #include "../game/board/arrow_item.h"
@@ -30,7 +31,6 @@
 #include "pb/serverinfo_user.pb.h"
 #include "settings/cache_settings.h"
 #include "tab_supervisor.h"
-#include "trice_limits.h"
 
 #include <QAction>
 #include <QCompleter>

cockatrice/src/tabs/tab_logs.cpp

@@ -1,12 +1,12 @@
 #include "tab_logs.h"
 
+#include "../../../libs/utility/include/utility/trice_limits.h"
 #include "../deck/custom_line_edit.h"
 #include "../dialogs/dlg_manage_sets.h"
 #include "../server/abstract_client.h"
 #include "../server/pending_command.h"
 #include "pb/moderator_commands.pb.h"
 #include "pb/response_viewlog_history.pb.h"
-#include "trice_limits.h"
 
 #include <QCheckBox>
 #include <QDialogButtonBox>

cockatrice/src/tabs/tab_message.cpp

@@ -1,5 +1,6 @@
 #include "tab_message.h"
 
+#include "../../../libs/utility/include/utility/trice_limits.h"
 #include "../client/sound_engine.h"
 #include "../deck/custom_line_edit.h"
 #include "../main.h"
@@ -11,7 +12,6 @@
 #include "pb/serverinfo_user.pb.h"
 #include "pb/session_commands.pb.h"
 #include "settings/cache_settings.h"
-#include "trice_limits.h"
 
 #include <QApplication>
 #include <QDebug>

cockatrice/src/tabs/tab_room.cpp

@@ -1,5 +1,7 @@
 #include "tab_room.h"
 
+#include "../../../libs/server/get_pb_extension.h"
+#include "../../../libs/utility/include/utility/trice_limits.h"
 #include "../dialogs/dlg_settings.h"
 #include "../main.h"
 #include "../server/abstract_client.h"
@@ -8,7 +10,6 @@
 #include "../server/pending_command.h"
 #include "../server/user/user_list_manager.h"
 #include "../server/user/user_list_widget.h"
-#include "get_pb_extension.h"
 #include "pb/event_join_room.pb.h"
 #include "pb/event_leave_room.pb.h"
 #include "pb/event_list_games.pb.h"
@@ -19,7 +20,6 @@
 #include "settings/cache_settings.h"
 #include "tab_account.h"
 #include "tab_supervisor.h"
-#include "trice_limits.h"
 
 #include <QApplication>
 #include <QCompleter>

cockatrice/src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp

@@ -1,5 +1,6 @@
 #include "tab_deck_editor_visual.h"
 
+#include "../../../../libs/utility/include/utility/trice_limits.h"
 #include "../../deck/deck_list_model.h"
 #include "../../deck/deck_stats_interface.h"
 #include "../../filters/filter_builder.h"
@@ -14,7 +15,6 @@
 #include "pb/command_deck_upload.pb.h"
 #include "settings/cache_settings.h"
 #include "tab_deck_editor_visual_tab_widget.h"
-#include "trice_limits.h"
 
 #include <QAction>
 #include <QApplication>

common/CMakeLists.txt

@@ -2,48 +2,12 @@
 #
 # provides the common library
 
-add_subdirectory(pb)
-
 set(common_SOURCES
-    abstract_deck_list_card_node.cpp
-    abstract_deck_list_node.cpp
-    debug_pb_message.cpp
-    deck_list_card_node.cpp
-    deck_list.cpp
-    expression.cpp
-    featureset.cpp
-    get_pb_extension.cpp
-    inner_deck_list_node.cpp
-    passwordhasher.cpp
-    rng_abstract.cpp
-    rng_sfmt.cpp
-    server/game/server_abstract_participant.cpp
-    server/game/server_arrow.cpp
-    server/game/server_arrowtarget.cpp
-    server/game/server_card.cpp
-    server/game/server_cardzone.cpp
-    server/game/server_counter.cpp
-    server/game/server_game.cpp
-    server/game/server_player.cpp
-    server/game/server_spectator.cpp
-    server/server.cpp
-    server/server_abstractuserinterface.cpp
-    server/server_database_interface.cpp
-    server/server_protocolhandler.cpp
-    server/server_remoteuserinterface.cpp
-    server/server_response_containers.cpp
-    server/server_room.cpp
-    serverinfo_user_container.cpp
-    sfmt/SFMT.c
 )
 
 set(ORACLE_LIBS)
 
-include_directories(pb)
-include_directories(sfmt)
-include_directories(${PROTOBUF_INCLUDE_DIR})
 include_directories(${${COCKATRICE_QT_VERSION_NAME}Core_INCLUDE_DIRS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 add_library(cockatrice_common ${common_SOURCES} ${common_MOC_SRCS})
-target_link_libraries(cockatrice_common PUBLIC cockatrice_protocol)

common/server/game/server_arrowtarget.cpp

@@ -1,2 +0,0 @@
-
-#include "server_arrowtarget.h"

common/server/server_database_interface.cpp

@@ -1,2 +0,0 @@
-
-#include "server_database_interface.h"

libs/card/CMakeLists.txt

@@ -55,9 +55,9 @@ qt_add_library(cardlib STATIC
 )
 
 target_include_directories(cardlib
-    PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
+    PUBLIC include
     PUBLIC ${CMAKE_SOURCE_DIR}/common
-    PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/libs/settings/include
+    PUBLIC ${CMAKE_SOURCE_DIR}/libs/settings/include
     PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/filters
 )
 

libs/card/include/card/card_database/card_database.h

@@ -7,10 +7,10 @@
 #ifndef CARDDATABASE_H
 #define CARDDATABASE_H
 
-#include "../../common/card_ref.h"
 #include "card/card_database/card_database_loader.h"
 #include "card/card_set/card_set_list.h"
 #include "card_database_querier.h"
+#include "utility/card_ref.h"
 
 #include <QBasicMutex>
 #include <QDate>

libs/card/include/card/card_database/card_database_querier.h

@@ -7,9 +7,9 @@
 #ifndef COCKATRICE_CARD_DATABASE_QUERIER_H
 #define COCKATRICE_CARD_DATABASE_QUERIER_H
 
-#include "../../common/card_ref.h"
 #include "card/card_info.h"
 #include "card/card_printing/exact_card.h"
+#include "utility/card_ref.h"
 
 #include <QObject>