jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-14 22:42:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Move libcockatrice_server to libcockatrice_network/server/remote

Browse source 
Took 1 hour 41 minutes

Took 39 seconds

Took 4 minutes
This commit is contained in:
Lukas Brübach 2025-10-08 15:29:44 +02:00
parent eb7c4cae6c
commit 133c02f973
118 changed files with 218 additions and 338 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -329,9 +329,9 @@ endif()
include(CPack) include(CPack)
add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_protocol ${CMAKE_BINARY_DIR}/libcockatrice_protocol) add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_protocol ${CMAKE_BINARY_DIR}/libcockatrice_protocol)
add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_network ${CMAKE_BINARY_DIR}/libcockatrice_network)
add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_deck_list ${CMAKE_BINARY_DIR}/libcockatrice_deck_list) add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_deck_list ${CMAKE_BINARY_DIR}/libcockatrice_deck_list)
add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_rng ${CMAKE_BINARY_DIR}/libcockatrice_rng) add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_rng ${CMAKE_BINARY_DIR}/libcockatrice_rng)
add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_server ${CMAKE_BINARY_DIR}/libcockatrice_server)
add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_settings ${CMAKE_BINARY_DIR}/libcockatrice_settings) add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_settings ${CMAKE_BINARY_DIR}/libcockatrice_settings)
add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_card ${CMAKE_BINARY_DIR}/libcockatrice_card) add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_card ${CMAKE_BINARY_DIR}/libcockatrice_card)
add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_utility ${CMAKE_BINARY_DIR}/libcockatrice_utility) add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_utility ${CMAKE_BINARY_DIR}/libcockatrice_utility)

16
cockatrice/CMakeLists.txt
View file

@ -205,16 +205,10 @@ set(cockatrice_SOURCES
src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
src/interface/window_main.cpp src/interface/window_main.cpp
src/main.cpp src/main.cpp
../libcockatrice_network/libcockatrice/client/abstract/abstract_client.cpp
src/server/chat_view/chat_view.cpp src/server/chat_view/chat_view.cpp
src/server/game_selector.cpp src/server/game_selector.cpp
src/server/games_model.cpp src/server/games_model.cpp
src/server/handle_public_servers.cpp src/server/handle_public_servers.cpp
../libcockatrice_network/libcockatrice/client/local/local_client.cpp
../libcockatrice_network/libcockatrice/server/local/local_server.cpp
../libcockatrice_network/libcockatrice/server/local/local_server_interface.cpp
../libcockatrice_protocol/libcockatrice/protocol/pending_command.cpp
../libcockatrice_network/libcockatrice/client/remote/remote_client.cpp
src/server/remote/remote_decklist_tree_widget.cpp src/server/remote/remote_decklist_tree_widget.cpp
src/server/remote/remote_replay_list_tree_widget.cpp src/server/remote/remote_replay_list_tree_widget.cpp
src/server/user/user_context_menu.cpp src/server/user/user_context_menu.cpp
@ -317,12 +311,6 @@ set(DESKTOPDIR
CACHE STRING "desktop file destination" CACHE STRING "desktop file destination"
) )
# Include directories
include_directories(../common)
include_directories(${PROTOBUF_INCLUDE_DIR})
include_directories(${CMAKE_BINARY_DIR}/common)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
set(COCKATRICE_MAC_QM_INSTALL_DIR "cockatrice.app/Contents/Resources/translations") set(COCKATRICE_MAC_QM_INSTALL_DIR "cockatrice.app/Contents/Resources/translations")
set(COCKATRICE_UNIX_QM_INSTALL_DIR "share/cockatrice/translations") set(COCKATRICE_UNIX_QM_INSTALL_DIR "share/cockatrice/translations")
set(COCKATRICE_WIN32_QM_INSTALL_DIR "translations") set(COCKATRICE_WIN32_QM_INSTALL_DIR "translations")
@ -367,13 +355,13 @@ if(Qt5_FOUND)
libcockatrice_card libcockatrice_card
libcockatrice_deck_list libcockatrice_deck_list
libcockatrice_utility libcockatrice_utility
libcockatrice_server libcockatrice_network
libcockatrice_rng libcockatrice_rng
${COCKATRICE_QT_MODULES} ${COCKATRICE_QT_MODULES}
) )
else() else()
target_link_libraries( target_link_libraries(
cockatrice PUBLIC libcockatrice_card libcockatrice_deck_list libcockatrice_utility libcockatrice_server cockatrice PUBLIC libcockatrice_card libcockatrice_deck_list libcockatrice_utility libcockatrice_network
libcockatrice_rng ${COCKATRICE_QT_MODULES} libcockatrice_rng ${COCKATRICE_QT_MODULES}
) )
endif() endif()

2
cockatrice/src/dialogs/dlg_create_game.cpp
View file

@ -1,6 +1,5 @@
#include "dlg_create_game.h" #include "dlg_create_game.h"
#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../tabs/tab_room.h" #include "../tabs/tab_room.h"
#include <QApplication> #include <QApplication>
@ -17,6 +16,7 @@
#include <QSpinBox> #include <QSpinBox>
#include <QWizard> #include <QWizard>
#include <libcockatrice/protocol/pb/serverinfo_game.pb.h> #include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
#include <libcockatrice/protocol/pending_command.h>
#include <libcockatrice/settings/cache_settings.h> #include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/utility/trice_limits.h> #include <libcockatrice/utility/trice_limits.h>

2
cockatrice/src/game/board/card_item.h
View file

@ -10,7 +10,7 @@
#include "../zones/logic/card_zone_logic.h" #include "../zones/logic/card_zone_logic.h"
#include "abstract_card_item.h" #include "abstract_card_item.h"
#include <libcockatrice/server/game/server_card.h> #include <libcockatrice/network/server/remote/game/server_card.h>
class CardDatabase; class CardDatabase;
class CardDragItem; class CardDragItem;

6
cockatrice/src/game/game_event_handler.cpp
View file

@ -1,11 +1,11 @@
#include "game_event_handler.h" #include "game_event_handler.h"
#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../tabs/tab_game.h" #include "../tabs/tab_game.h"
#include "abstract_game.h" #include "abstract_game.h"
#include "log/message_log_widget.h" #include "log/message_log_widget.h"
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/get_pb_extension.h>
#include <libcockatrice/protocol/pb/command_concede.pb.h> #include <libcockatrice/protocol/pb/command_concede.pb.h>
#include <libcockatrice/protocol/pb/command_delete_arrow.pb.h> #include <libcockatrice/protocol/pb/command_delete_arrow.pb.h>
#include <libcockatrice/protocol/pb/command_game_say.pb.h> #include <libcockatrice/protocol/pb/command_game_say.pb.h>
@ -28,7 +28,7 @@
#include <libcockatrice/protocol/pb/event_set_active_phase.pb.h> #include <libcockatrice/protocol/pb/event_set_active_phase.pb.h>
#include <libcockatrice/protocol/pb/event_set_active_player.pb.h> #include <libcockatrice/protocol/pb/event_set_active_player.pb.h>
#include <libcockatrice/protocol/pb/game_event_container.pb.h> #include <libcockatrice/protocol/pb/game_event_container.pb.h>
#include <libcockatrice/server/get_pb_extension.h> #include <libcockatrice/protocol/pending_command.h>
GameEventHandler::GameEventHandler(AbstractGame *_game) : QObject(_game), game(_game) GameEventHandler::GameEventHandler(AbstractGame *_game) : QObject(_game), game(_game)
{ {

3
cockatrice/src/game/game_state.h
View file

@ -7,10 +7,9 @@
#ifndef COCKATRICE_GAME_STATE_H #ifndef COCKATRICE_GAME_STATE_H
#define COCKATRICE_GAME_STATE_H #define COCKATRICE_GAME_STATE_H
#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include <QObject> #include <QObject>
#include <QTimer> #include <QTimer>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pb/serverinfo_game.pb.h> #include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
class AbstractGame; class AbstractGame;

2
cockatrice/src/game/log/message_log_widget.h
View file

@ -11,7 +11,7 @@
#include "../../server/chat_view/chat_view.h" #include "../../server/chat_view/chat_view.h"
#include "../zones/logic/card_zone_logic.h" #include "../zones/logic/card_zone_logic.h"
#include <libcockatrice/server/user_level.h> #include <libcockatrice/network/server/remote/user_level.h>
class AbstractGame; class AbstractGame;
class CardItem; class CardItem;

2
cockatrice/src/game/player/player_list_widget.cpp
View file

@ -1,6 +1,5 @@
#include "player_list_widget.h" #include "player_list_widget.h"
#include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../../interface/pixel_map_generator.h" #include "../../interface/pixel_map_generator.h"
#include "../../server/user/user_context_menu.h" #include "../../server/user/user_context_menu.h"
#include "../../server/user/user_list_manager.h" #include "../../server/user/user_list_manager.h"
@ -13,6 +12,7 @@
#include <QHeaderView> #include <QHeaderView>
#include <QMenu> #include <QMenu>
#include <QMouseEvent> #include <QMouseEvent>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pb/command_kick_from_game.pb.h> #include <libcockatrice/protocol/pb/command_kick_from_game.pb.h>
#include <libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h> #include <libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h>
#include <libcockatrice/protocol/pb/session_commands.pb.h> #include <libcockatrice/protocol/pb/session_commands.pb.h>

2
cockatrice/src/interface/pixel_map_generator.h
View file

@ -11,7 +11,7 @@
#include <QLoggingCategory> #include <QLoggingCategory>
#include <QMap> #include <QMap>
#include <QPixmap> #include <QPixmap>
#include <libcockatrice/server/user_level.h> #include <libcockatrice/network/server/remote/user_level.h>
inline Q_LOGGING_CATEGORY(PixelMapGeneratorLog, "pixel_map_generator"); inline Q_LOGGING_CATEGORY(PixelMapGeneratorLog, "pixel_map_generator");

2
cockatrice/src/interface/widgets/general/home_widget.cpp
View file

@ -1,6 +1,5 @@
#include "home_widget.h" #include "home_widget.h"
#include "../../../../../libcockatrice_network/libcockatrice/client/remote/remote_client.h"
#include "../../../tabs/tab_supervisor.h" #include "../../../tabs/tab_supervisor.h"
#include "../../window_main.h" #include "../../window_main.h"
#include "background_sources.h" #include "background_sources.h"
@ -11,6 +10,7 @@
#include <QPushButton> #include <QPushButton>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <libcockatrice/card/card_database/card_database_manager.h> #include <libcockatrice/card/card_database/card_database_manager.h>
#include <libcockatrice/network/client/remote/remote_client.h>
#include <libcockatrice/settings/cache_settings.h> #include <libcockatrice/settings/cache_settings.h>
HomeWidget::HomeWidget(QWidget *parent, TabSupervisor *_tabSupervisor) HomeWidget::HomeWidget(QWidget *parent, TabSupervisor *_tabSupervisor)

2
cockatrice/src/interface/widgets/general/home_widget.h
View file

@ -7,7 +7,6 @@
#ifndef HOME_WIDGET_H #ifndef HOME_WIDGET_H
#define HOME_WIDGET_H #define HOME_WIDGET_H
#include "../../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../../../tabs/tab_supervisor.h" #include "../../../tabs/tab_supervisor.h"
#include "../cards/card_info_picture_art_crop_widget.h" #include "../cards/card_info_picture_art_crop_widget.h"
#include "home_styled_button.h" #include "home_styled_button.h"
@ -15,6 +14,7 @@
#include <QGridLayout> #include <QGridLayout>
#include <QGroupBox> #include <QGroupBox>
#include <QWidget> #include <QWidget>
#include <libcockatrice/network/client/abstract/abstract_client.h>
class HomeWidget : public QWidget class HomeWidget : public QWidget
{ {

8
cockatrice/src/interface/window_main.cpp
View file

@ -19,9 +19,6 @@
***************************************************************************/ ***************************************************************************/
#include "window_main.h" #include "window_main.h"
#include "../../../libcockatrice_network/libcockatrice/client/local/local_client.h"
#include "../../../libcockatrice_network/libcockatrice/client/remote/remote_client.h"
#include "../../../libcockatrice_network/libcockatrice/server/local/local_server.h"
#include "../client/get_text_with_max.h" #include "../client/get_text_with_max.h"
#include "../client/network/client_update_checker.h" #include "../client/network/client_update_checker.h"
#include "../client/network/release_channel.h" #include "../client/network/release_channel.h"
@ -38,7 +35,6 @@
#include "../dialogs/dlg_update.h" #include "../dialogs/dlg_update.h"
#include "../dialogs/dlg_view_log.h" #include "../dialogs/dlg_view_log.h"
#include "../main.h" #include "../main.h"
#include "../server/local_server_interface.h"
#include "../tabs/tab_game.h" #include "../tabs/tab_game.h"
#include "../tabs/tab_supervisor.h" #include "../tabs/tab_supervisor.h"
#include "version_string.h" #include "version_string.h"
@ -66,6 +62,10 @@
#include <QtNetwork> #include <QtNetwork>
#include <libcockatrice/card/card_database/card_database.h> #include <libcockatrice/card/card_database/card_database.h>
#include <libcockatrice/card/card_database/card_database_manager.h> #include <libcockatrice/card/card_database/card_database_manager.h>
#include <libcockatrice/network/client/local/local_client.h>
#include <libcockatrice/network/client/remote/remote_client.h>
#include <libcockatrice/network/server/local/local_server.h>
#include <libcockatrice/network/server/local/local_server_interface.h>
#include <libcockatrice/protocol/pb/event_connection_closed.pb.h> #include <libcockatrice/protocol/pb/event_connection_closed.pb.h>
#include <libcockatrice/protocol/pb/event_server_shutdown.pb.h> #include <libcockatrice/protocol/pb/event_server_shutdown.pb.h>
#include <libcockatrice/protocol/pb/game_replay.pb.h> #include <libcockatrice/protocol/pb/game_replay.pb.h>

3
cockatrice/src/interface/window_main.h
View file

@ -25,8 +25,6 @@
#ifndef WINDOW_H #ifndef WINDOW_H
#define WINDOW_H #define WINDOW_H
#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include <QList> #include <QList>
#include <QLoggingCategory> #include <QLoggingCategory>
#include <QMainWindow> #include <QMainWindow>
@ -34,6 +32,7 @@
#include <QProcess> #include <QProcess>
#include <QSystemTrayIcon> #include <QSystemTrayIcon>
#include <QtNetwork> #include <QtNetwork>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pb/response.pb.h> #include <libcockatrice/protocol/pb/response.pb.h>
inline Q_LOGGING_CATEGORY(WindowMainLog, "window_main"); inline Q_LOGGING_CATEGORY(WindowMainLog, "window_main");

2
cockatrice/src/main.cpp
View file

@ -29,6 +29,7 @@
#include "interface/window_main.h" #include "interface/window_main.h"
#include "version_string.h" #include "version_string.h"
#include <../../libcockatrice_protocol/libcockatrice/protocol/featureset.h>
#include <QApplication> #include <QApplication>
#include <QCryptographicHash> #include <QCryptographicHash>
#include <QDateTime> #include <QDateTime>
@ -43,7 +44,6 @@
#include <QtPlugin> #include <QtPlugin>
#include <libcockatrice/rng/rng_sfmt.h> #include <libcockatrice/rng/rng_sfmt.h>
#include <libcockatrice/settings/cache_settings.h> #include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/utility/featureset.h>
#include <libcockatrice/utility/logger.h> #include <libcockatrice/utility/logger.h>
QTranslator *translator, *qtTranslator; QTranslator *translator, *qtTranslator;

2
cockatrice/src/server/chat_view/chat_view.cpp
View file

@ -12,7 +12,7 @@
#include <QDesktopServices> #include <QDesktopServices>
#include <QMouseEvent> #include <QMouseEvent>
#include <QScrollBar> #include <QScrollBar>
#include <libcockatrice/server/user_level.h> #include <libcockatrice/network/server/remote/user_level.h>
#include <libcockatrice/settings/cache_settings.h> #include <libcockatrice/settings/cache_settings.h>
const QColor DEFAULT_MENTION_COLOR = QColor(194, 31, 47); const QColor DEFAULT_MENTION_COLOR = QColor(194, 31, 47);

4
cockatrice/src/server/chat_view/chat_view.h
View file

@ -16,8 +16,8 @@
#include <QTextBrowser> #include <QTextBrowser>
#include <QTextCursor> #include <QTextCursor>
#include <QTextFragment> #include <QTextFragment>
#include <libcockatrice/server/room_message_type.h> #include <libcockatrice/network/server/remote/room_message_type.h>
#include <libcockatrice/server/user_level.h> #include <libcockatrice/network/server/remote/user_level.h>
class AbstractGame; class AbstractGame;
class QTextTable; class QTextTable;

4
cockatrice/src/server/game_selector.cpp
View file

@ -1,7 +1,5 @@
#include "game_selector.h" #include "game_selector.h"
#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../client/get_text_with_max.h" #include "../client/get_text_with_max.h"
#include "../dialogs/dlg_create_game.h" #include "../dialogs/dlg_create_game.h"
#include "../dialogs/dlg_filter_games.h" #include "../dialogs/dlg_filter_games.h"
@ -23,9 +21,11 @@
#include <QPushButton> #include <QPushButton>
#include <QTreeView> #include <QTreeView>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pb/response.pb.h> #include <libcockatrice/protocol/pb/response.pb.h>
#include <libcockatrice/protocol/pb/room_commands.pb.h> #include <libcockatrice/protocol/pb/room_commands.pb.h>
#include <libcockatrice/protocol/pb/serverinfo_game.pb.h> #include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
#include <libcockatrice/protocol/pending_command.h>
GameSelector::GameSelector(AbstractClient *_client, GameSelector::GameSelector(AbstractClient *_client,
TabSupervisor *_tabSupervisor, TabSupervisor *_tabSupervisor,

5
cockatrice/src/server/remote/remote_decklist_tree_widget.cpp
View file

@ -1,14 +1,13 @@
#include "remote_decklist_tree_widget.h" #include "remote_decklist_tree_widget.h"
#include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include <QFileIconProvider> #include <QFileIconProvider>
#include <QHeaderView> #include <QHeaderView>
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pb/command_deck_list.pb.h> #include <libcockatrice/protocol/pb/command_deck_list.pb.h>
#include <libcockatrice/protocol/pb/response_deck_list.pb.h> #include <libcockatrice/protocol/pb/response_deck_list.pb.h>
#include <libcockatrice/protocol/pb/serverinfo_deckstorage.pb.h> #include <libcockatrice/protocol/pb/serverinfo_deckstorage.pb.h>
#include <libcockatrice/protocol/pending_command.h>
RemoteDeckList_TreeModel::DirectoryNode::DirectoryNode(const QString &_name, RemoteDeckList_TreeModel::DirectoryNode::DirectoryNode(const QString &_name,
RemoteDeckList_TreeModel::DirectoryNode *_parent) RemoteDeckList_TreeModel::DirectoryNode *_parent)

5
cockatrice/src/server/remote/remote_replay_list_tree_widget.cpp
View file

@ -1,14 +1,13 @@
#include "remote_replay_list_tree_widget.h" #include "remote_replay_list_tree_widget.h"
#include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include <QFileIconProvider> #include <QFileIconProvider>
#include <QHeaderView> #include <QHeaderView>
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pb/command_replay_list.pb.h> #include <libcockatrice/protocol/pb/command_replay_list.pb.h>
#include <libcockatrice/protocol/pb/response_replay_list.pb.h> #include <libcockatrice/protocol/pb/response_replay_list.pb.h>
#include <libcockatrice/protocol/pb/serverinfo_replay.pb.h> #include <libcockatrice/protocol/pb/serverinfo_replay.pb.h>
#include <libcockatrice/protocol/pending_command.h>
const int RemoteReplayList_TreeModel::numberOfColumns = 6; const int RemoteReplayList_TreeModel::numberOfColumns = 6;

4
cockatrice/src/server/user/user_context_menu.cpp
View file

@ -1,7 +1,5 @@
#include "user_context_menu.h" #include "user_context_menu.h"
#include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../../tabs/tab_account.h" #include "../../tabs/tab_account.h"
#include "../../tabs/tab_game.h" #include "../../tabs/tab_game.h"
#include "../../tabs/tab_supervisor.h" #include "../../tabs/tab_supervisor.h"
@ -18,6 +16,7 @@
#include <QSignalMapper> #include <QSignalMapper>
#include <QtGui> #include <QtGui>
#include <QtWidgets> #include <QtWidgets>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pb/command_kick_from_game.pb.h> #include <libcockatrice/protocol/pb/command_kick_from_game.pb.h>
#include <libcockatrice/protocol/pb/commands.pb.h> #include <libcockatrice/protocol/pb/commands.pb.h>
#include <libcockatrice/protocol/pb/moderator_commands.pb.h> #include <libcockatrice/protocol/pb/moderator_commands.pb.h>
@ -28,6 +27,7 @@
#include <libcockatrice/protocol/pb/response_warn_history.pb.h> #include <libcockatrice/protocol/pb/response_warn_history.pb.h>
#include <libcockatrice/protocol/pb/response_warn_list.pb.h> #include <libcockatrice/protocol/pb/response_warn_list.pb.h>
#include <libcockatrice/protocol/pb/session_commands.pb.h> #include <libcockatrice/protocol/pb/session_commands.pb.h>
#include <libcockatrice/protocol/pending_command.h>
UserContextMenu::UserContextMenu(TabSupervisor *_tabSupervisor, QWidget *parent, AbstractGame *_game) UserContextMenu::UserContextMenu(TabSupervisor *_tabSupervisor, QWidget *parent, AbstractGame *_game)
: QObject(parent), client(_tabSupervisor->getClient()), tabSupervisor(_tabSupervisor), : QObject(parent), client(_tabSupervisor->getClient()), tabSupervisor(_tabSupervisor),

2
cockatrice/src/server/user/user_context_menu.h
View file

@ -8,7 +8,7 @@
#define USER_CONTEXT_MENU_H #define USER_CONTEXT_MENU_H
#include <QObject> #include <QObject>
#include <libcockatrice/server/user_level.h> #include <libcockatrice/network/server/remote/user_level.h>
class AbstractGame; class AbstractGame;
class UserListProxy; class UserListProxy;

4
cockatrice/src/server/user/user_info_box.cpp
View file

@ -1,7 +1,5 @@
#include "user_info_box.h" #include "user_info_box.h"
#include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../../client/get_text_with_max.h" #include "../../client/get_text_with_max.h"
#include "../../dialogs/dlg_edit_avatar.h" #include "../../dialogs/dlg_edit_avatar.h"
#include "../../dialogs/dlg_edit_password.h" #include "../../dialogs/dlg_edit_password.h"
@ -14,9 +12,11 @@
#include <QInputDialog> #include <QInputDialog>
#include <QLabel> #include <QLabel>
#include <QMessageBox> #include <QMessageBox>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pb/response_get_user_info.pb.h> #include <libcockatrice/protocol/pb/response_get_user_info.pb.h>
#include <libcockatrice/protocol/pb/serverinfo_user.pb.h> #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
#include <libcockatrice/protocol/pb/session_commands.pb.h> #include <libcockatrice/protocol/pb/session_commands.pb.h>
#include <libcockatrice/protocol/pending_command.h>
#include <libcockatrice/utility/passwordhasher.h> #include <libcockatrice/utility/passwordhasher.h>
UserInfoBox::UserInfoBox(AbstractClient *_client, bool _editable, QWidget *parent, Qt::WindowFlags flags) UserInfoBox::UserInfoBox(AbstractClient *_client, bool _editable, QWidget *parent, Qt::WindowFlags flags)

4
cockatrice/src/server/user/user_list_manager.cpp
View file

@ -1,16 +1,16 @@
#include "user_list_manager.h" #include "user_list_manager.h"
#include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../../client/sound_engine.h" #include "../../client/sound_engine.h"
#include "user_info_box.h" #include "user_info_box.h"
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pb/event_add_to_list.pb.h> #include <libcockatrice/protocol/pb/event_add_to_list.pb.h>
#include <libcockatrice/protocol/pb/event_remove_from_list.pb.h> #include <libcockatrice/protocol/pb/event_remove_from_list.pb.h>
#include <libcockatrice/protocol/pb/event_user_joined.pb.h> #include <libcockatrice/protocol/pb/event_user_joined.pb.h>
#include <libcockatrice/protocol/pb/event_user_left.pb.h> #include <libcockatrice/protocol/pb/event_user_left.pb.h>
#include <libcockatrice/protocol/pb/response_list_users.pb.h> #include <libcockatrice/protocol/pb/response_list_users.pb.h>
#include <libcockatrice/protocol/pb/session_commands.pb.h> #include <libcockatrice/protocol/pb/session_commands.pb.h>
#include <libcockatrice/protocol/pending_command.h>
UserListManager::UserListManager(AbstractClient *_client, QObject *parent) UserListManager::UserListManager(AbstractClient *_client, QObject *parent)
: QObject(parent), client(_client), ownUserInfo(nullptr) : QObject(parent), client(_client), ownUserInfo(nullptr)

4
cockatrice/src/server/user/user_list_widget.cpp
View file

@ -1,7 +1,5 @@
#include "user_list_widget.h" #include "user_list_widget.h"
#include "../../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../../interface/pixel_map_generator.h" #include "../../interface/pixel_map_generator.h"
#include "../../tabs/tab_account.h" #include "../../tabs/tab_account.h"
#include "../../tabs/tab_supervisor.h" #include "../../tabs/tab_supervisor.h"
@ -25,10 +23,12 @@
#include <QSpinBox> #include <QSpinBox>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QWidget> #include <QWidget>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pb/moderator_commands.pb.h> #include <libcockatrice/protocol/pb/moderator_commands.pb.h>
#include <libcockatrice/protocol/pb/response_get_games_of_user.pb.h> #include <libcockatrice/protocol/pb/response_get_games_of_user.pb.h>
#include <libcockatrice/protocol/pb/response_get_user_info.pb.h> #include <libcockatrice/protocol/pb/response_get_user_info.pb.h>
#include <libcockatrice/protocol/pb/session_commands.pb.h> #include <libcockatrice/protocol/pb/session_commands.pb.h>
#include <libcockatrice/protocol/pending_command.h>
#include <libcockatrice/utility/trice_limits.h> #include <libcockatrice/utility/trice_limits.h>
BanDialog::BanDialog(const ServerInfo_User &info, QWidget *parent) : QDialog(parent) BanDialog::BanDialog(const ServerInfo_User &info, QWidget *parent) : QDialog(parent)

2
cockatrice/src/server/user/user_list_widget.h
View file

@ -13,8 +13,8 @@
#include <QStyledItemDelegate> #include <QStyledItemDelegate>
#include <QTextEdit> #include <QTextEdit>
#include <QTreeWidgetItem> #include <QTreeWidgetItem>
#include <libcockatrice/network/server/remote/user_level.h>
#include <libcockatrice/protocol/pb/moderator_commands.pb.h> #include <libcockatrice/protocol/pb/moderator_commands.pb.h>
#include <libcockatrice/server/user_level.h>
class QTreeWidget; class QTreeWidget;
class ServerInfo_User; class ServerInfo_User;

4
cockatrice/src/tabs/abstract_tab_deck_editor.cpp
View file

@ -1,7 +1,5 @@
#include "abstract_tab_deck_editor.h" #include "abstract_tab_deck_editor.h"
#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../client/tapped_out_interface.h" #include "../client/tapped_out_interface.h"
#include "../deck/deck_stats_interface.h" #include "../deck/deck_stats_interface.h"
#include "../dialogs/dlg_load_deck.h" #include "../dialogs/dlg_load_deck.h"
@ -35,8 +33,10 @@
#include <QUrl> #include <QUrl>
#include <libcockatrice/card/card_database/card_database_manager.h> #include <libcockatrice/card/card_database/card_database_manager.h>
#include <libcockatrice/card/card_database/model/card_database_model.h> #include <libcockatrice/card/card_database/model/card_database_model.h>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pb/command_deck_upload.pb.h> #include <libcockatrice/protocol/pb/command_deck_upload.pb.h>
#include <libcockatrice/protocol/pb/response.pb.h> #include <libcockatrice/protocol/pb/response.pb.h>
#include <libcockatrice/protocol/pending_command.h>
#include <libcockatrice/settings/cache_settings.h> #include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/utility/trice_limits.h> #include <libcockatrice/utility/trice_limits.h>

4
cockatrice/src/tabs/tab_account.cpp
View file

@ -1,7 +1,5 @@
#include "tab_account.h" #include "tab_account.h"
#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../client/sound_engine.h" #include "../client/sound_engine.h"
#include "../deck/custom_line_edit.h" #include "../deck/custom_line_edit.h"
#include "../server/user/user_info_box.h" #include "../server/user/user_info_box.h"
@ -11,12 +9,14 @@
#include <QPushButton> #include <QPushButton>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pb/event_add_to_list.pb.h> #include <libcockatrice/protocol/pb/event_add_to_list.pb.h>
#include <libcockatrice/protocol/pb/event_remove_from_list.pb.h> #include <libcockatrice/protocol/pb/event_remove_from_list.pb.h>
#include <libcockatrice/protocol/pb/event_user_joined.pb.h> #include <libcockatrice/protocol/pb/event_user_joined.pb.h>
#include <libcockatrice/protocol/pb/event_user_left.pb.h> #include <libcockatrice/protocol/pb/event_user_left.pb.h>
#include <libcockatrice/protocol/pb/response_list_users.pb.h> #include <libcockatrice/protocol/pb/response_list_users.pb.h>
#include <libcockatrice/protocol/pb/session_commands.pb.h> #include <libcockatrice/protocol/pb/session_commands.pb.h>
#include <libcockatrice/protocol/pending_command.h>
#include <libcockatrice/utility/trice_limits.h> #include <libcockatrice/utility/trice_limits.h>
TabAccount::TabAccount(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User &userInfo) TabAccount::TabAccount(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User &userInfo)

5
cockatrice/src/tabs/tab_admin.cpp
View file

@ -1,8 +1,5 @@
#include "tab_admin.h" #include "tab_admin.h"
#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <QGridLayout> #include <QGridLayout>
#include <QGroupBox> #include <QGroupBox>
@ -11,9 +8,11 @@
#include <QMessageBox> #include <QMessageBox>
#include <QPushButton> #include <QPushButton>
#include <QSpinBox> #include <QSpinBox>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pb/admin_commands.pb.h> #include <libcockatrice/protocol/pb/admin_commands.pb.h>
#include <libcockatrice/protocol/pb/event_replay_added.pb.h> #include <libcockatrice/protocol/pb/event_replay_added.pb.h>
#include <libcockatrice/protocol/pb/moderator_commands.pb.h> #include <libcockatrice/protocol/pb/moderator_commands.pb.h>
#include <libcockatrice/protocol/pending_command.h>
#include <libcockatrice/utility/trice_limits.h> #include <libcockatrice/utility/trice_limits.h>
ShutdownDialog::ShutdownDialog(QWidget *parent) : QDialog(parent) ShutdownDialog::ShutdownDialog(QWidget *parent) : QDialog(parent)

4
cockatrice/src/tabs/tab_deck_editor.cpp
View file

@ -1,7 +1,5 @@
#include "tab_deck_editor.h" #include "tab_deck_editor.h"
#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../client/deck_editor_menu.h" #include "../client/deck_editor_menu.h"
#include "../client/tapped_out_interface.h" #include "../client/tapped_out_interface.h"
#include "../dialogs/dlg_load_deck.h" #include "../dialogs/dlg_load_deck.h"
@ -36,6 +34,8 @@
#include <QVBoxLayout> #include <QVBoxLayout>
#include <libcockatrice/card/card_database/card_database_manager.h> #include <libcockatrice/card/card_database/card_database_manager.h>
#include <libcockatrice/card/card_database/model/card_database_model.h> #include <libcockatrice/card/card_database/model/card_database_model.h>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pending_command.h>
#include <libcockatrice/settings/cache_settings.h> #include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/utility/trice_limits.h> #include <libcockatrice/utility/trice_limits.h>

2
cockatrice/src/tabs/tab_deck_storage.cpp
View file

@ -1,6 +1,5 @@
#include "tab_deck_storage.h" #include "tab_deck_storage.h"
#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../client/get_text_with_max.h" #include "../client/get_text_with_max.h"
#include "../deck/deck_loader.h" #include "../deck/deck_loader.h"
#include "../server/remote/remote_decklist_tree_widget.h" #include "../server/remote/remote_decklist_tree_widget.h"
@ -28,6 +27,7 @@
#include <libcockatrice/protocol/pb/response.pb.h> #include <libcockatrice/protocol/pb/response.pb.h>
#include <libcockatrice/protocol/pb/response_deck_download.pb.h> #include <libcockatrice/protocol/pb/response_deck_download.pb.h>
#include <libcockatrice/protocol/pb/response_deck_upload.pb.h> #include <libcockatrice/protocol/pb/response_deck_upload.pb.h>
#include <libcockatrice/protocol/pending_command.h>
#include <libcockatrice/settings/cache_settings.h> #include <libcockatrice/settings/cache_settings.h>
TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor, TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor,

3
cockatrice/src/tabs/tab_deck_storage.h
View file

@ -8,10 +8,11 @@
#ifndef TAB_DECK_STORAGE_H #ifndef TAB_DECK_STORAGE_H
#define TAB_DECK_STORAGE_H #define TAB_DECK_STORAGE_H
#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../server/remote/remote_decklist_tree_widget.h" #include "../server/remote/remote_decklist_tree_widget.h"
#include "tab.h" #include "tab.h"
#include <libcockatrice/network/client/abstract/abstract_client.h>
class ServerInfo_User; class ServerInfo_User;
class AbstractClient; class AbstractClient;
class QTreeView; class QTreeView;

2
cockatrice/src/tabs/tab_game.cpp
View file

@ -1,6 +1,5 @@
#include "tab_game.h" #include "tab_game.h"
#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../client/network/replay_timeline_widget.h" #include "../client/network/replay_timeline_widget.h"
#include "../dialogs/dlg_create_game.h" #include "../dialogs/dlg_create_game.h"
#include "../game/board/arrow_item.h" #include "../game/board/arrow_item.h"
@ -40,6 +39,7 @@
#include <QWidget> #include <QWidget>
#include <libcockatrice/card/card_database/card_database.h> #include <libcockatrice/card/card_database/card_database.h>
#include <libcockatrice/card/card_database/card_database_manager.h> #include <libcockatrice/card/card_database/card_database_manager.h>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pb/event_game_joined.pb.h> #include <libcockatrice/protocol/pb/event_game_joined.pb.h>
#include <libcockatrice/protocol/pb/game_replay.pb.h> #include <libcockatrice/protocol/pb/game_replay.pb.h>
#include <libcockatrice/protocol/pb/serverinfo_player.pb.h> #include <libcockatrice/protocol/pb/serverinfo_player.pb.h>

2
cockatrice/src/tabs/tab_home.h
View file

@ -7,11 +7,11 @@
#ifndef TAB_HOME_H #ifndef TAB_HOME_H
#define TAB_HOME_H #define TAB_HOME_H
#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../interface/widgets/general/home_widget.h" #include "../interface/widgets/general/home_widget.h"
#include "tab.h" #include "tab.h"
#include <QHBoxLayout> #include <QHBoxLayout>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <qgroupbox.h> #include <qgroupbox.h>
class AbstractClient; class AbstractClient;

4
cockatrice/src/tabs/tab_logs.cpp
View file

@ -1,7 +1,5 @@
#include "tab_logs.h" #include "tab_logs.h"
#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../deck/custom_line_edit.h" #include "../deck/custom_line_edit.h"
#include "../dialogs/dlg_manage_sets.h" #include "../dialogs/dlg_manage_sets.h"
@ -17,8 +15,10 @@
#include <QTabWidget> #include <QTabWidget>
#include <QtGui> #include <QtGui>
#include <QtWidgets> #include <QtWidgets>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pb/moderator_commands.pb.h> #include <libcockatrice/protocol/pb/moderator_commands.pb.h>
#include <libcockatrice/protocol/pb/response_viewlog_history.pb.h> #include <libcockatrice/protocol/pb/response_viewlog_history.pb.h>
#include <libcockatrice/protocol/pending_command.h>
#include <libcockatrice/utility/trice_limits.h> #include <libcockatrice/utility/trice_limits.h>
TabLog::TabLog(TabSupervisor *_tabSupervisor, AbstractClient *_client) : Tab(_tabSupervisor), client(_client) TabLog::TabLog(TabSupervisor *_tabSupervisor, AbstractClient *_client) : Tab(_tabSupervisor), client(_client)

4
cockatrice/src/tabs/tab_message.cpp
View file

@ -1,7 +1,5 @@
#include "tab_message.h" #include "tab_message.h"
#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../client/sound_engine.h" #include "../client/sound_engine.h"
#include "../deck/custom_line_edit.h" #include "../deck/custom_line_edit.h"
#include "../main.h" #include "../main.h"
@ -13,9 +11,11 @@
#include <QMenu> #include <QMenu>
#include <QSystemTrayIcon> #include <QSystemTrayIcon>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pb/event_user_message.pb.h> #include <libcockatrice/protocol/pb/event_user_message.pb.h>
#include <libcockatrice/protocol/pb/serverinfo_user.pb.h> #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
#include <libcockatrice/protocol/pb/session_commands.pb.h> #include <libcockatrice/protocol/pb/session_commands.pb.h>
#include <libcockatrice/protocol/pending_command.h>
#include <libcockatrice/settings/cache_settings.h> #include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/utility/trice_limits.h> #include <libcockatrice/utility/trice_limits.h>

4
cockatrice/src/tabs/tab_replays.cpp
View file

@ -1,7 +1,5 @@
#include "tab_replays.h" #include "tab_replays.h"
#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../server/remote/remote_replay_list_tree_widget.h" #include "../server/remote/remote_replay_list_tree_widget.h"
#include "tab_game.h" #include "tab_game.h"
@ -19,6 +17,7 @@
#include <QTreeView> #include <QTreeView>
#include <QUrl> #include <QUrl>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pb/command_replay_delete_match.pb.h> #include <libcockatrice/protocol/pb/command_replay_delete_match.pb.h>
#include <libcockatrice/protocol/pb/command_replay_download.pb.h> #include <libcockatrice/protocol/pb/command_replay_download.pb.h>
#include <libcockatrice/protocol/pb/command_replay_get_code.pb.h> #include <libcockatrice/protocol/pb/command_replay_get_code.pb.h>
@ -29,6 +28,7 @@
#include <libcockatrice/protocol/pb/response.pb.h> #include <libcockatrice/protocol/pb/response.pb.h>
#include <libcockatrice/protocol/pb/response_replay_download.pb.h> #include <libcockatrice/protocol/pb/response_replay_download.pb.h>
#include <libcockatrice/protocol/pb/response_replay_get_code.pb.h> #include <libcockatrice/protocol/pb/response_replay_get_code.pb.h>
#include <libcockatrice/protocol/pending_command.h>
#include <libcockatrice/settings/cache_settings.h> #include <libcockatrice/settings/cache_settings.h>
TabReplays::TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User *currentUserInfo) TabReplays::TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User *currentUserInfo)

3
cockatrice/src/tabs/tab_replays.h
View file

@ -8,9 +8,10 @@
#ifndef TAB_REPLAYS_H #ifndef TAB_REPLAYS_H
#define TAB_REPLAYS_H #define TAB_REPLAYS_H
#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "tab.h" #include "tab.h"
#include <libcockatrice/network/client/abstract/abstract_client.h>
class ServerInfo_User; class ServerInfo_User;
class Response; class Response;
class AbstractClient; class AbstractClient;

6
cockatrice/src/tabs/tab_room.cpp
View file

@ -1,7 +1,5 @@
#include "tab_room.h" #include "tab_room.h"
#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../dialogs/dlg_settings.h" #include "../dialogs/dlg_settings.h"
#include "../main.h" #include "../main.h"
#include "../server/chat_view/chat_view.h" #include "../server/chat_view/chat_view.h"
@ -11,6 +9,7 @@
#include "tab_account.h" #include "tab_account.h"
#include "tab_supervisor.h" #include "tab_supervisor.h"
#include <../../../libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.h>
#include <QApplication> #include <QApplication>
#include <QCompleter> #include <QCompleter>
#include <QLabel> #include <QLabel>
@ -22,6 +21,7 @@
#include <QToolButton> #include <QToolButton>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QtCore/qdatetime.h> #include <QtCore/qdatetime.h>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pb/event_join_room.pb.h> #include <libcockatrice/protocol/pb/event_join_room.pb.h>
#include <libcockatrice/protocol/pb/event_leave_room.pb.h> #include <libcockatrice/protocol/pb/event_leave_room.pb.h>
#include <libcockatrice/protocol/pb/event_list_games.pb.h> #include <libcockatrice/protocol/pb/event_list_games.pb.h>
@ -29,7 +29,7 @@
#include <libcockatrice/protocol/pb/event_room_say.pb.h> #include <libcockatrice/protocol/pb/event_room_say.pb.h>
#include <libcockatrice/protocol/pb/room_commands.pb.h> #include <libcockatrice/protocol/pb/room_commands.pb.h>
#include <libcockatrice/protocol/pb/serverinfo_room.pb.h> #include <libcockatrice/protocol/pb/serverinfo_room.pb.h>
#include <libcockatrice/server/get_pb_extension.h> #include <libcockatrice/protocol/pending_command.h>
#include <libcockatrice/settings/cache_settings.h> #include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/utility/trice_limits.h> #include <libcockatrice/utility/trice_limits.h>

4
cockatrice/src/tabs/tab_server.cpp
View file

@ -1,7 +1,5 @@
#include "tab_server.h" #include "tab_server.h"
#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include "../server/user/user_list_widget.h" #include "../server/user/user_list_widget.h"
#include "tab_supervisor.h" #include "tab_supervisor.h"
@ -16,10 +14,12 @@
#include <QTextEdit> #include <QTextEdit>
#include <QTreeView> #include <QTreeView>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pb/event_list_rooms.pb.h> #include <libcockatrice/protocol/pb/event_list_rooms.pb.h>
#include <libcockatrice/protocol/pb/event_server_message.pb.h> #include <libcockatrice/protocol/pb/event_server_message.pb.h>
#include <libcockatrice/protocol/pb/response_join_room.pb.h> #include <libcockatrice/protocol/pb/response_join_room.pb.h>
#include <libcockatrice/protocol/pb/session_commands.pb.h> #include <libcockatrice/protocol/pb/session_commands.pb.h>
#include <libcockatrice/protocol/pending_command.h>
RoomSelector::RoomSelector(AbstractClient *_client, QWidget *parent) : QGroupBox(parent), client(_client) RoomSelector::RoomSelector(AbstractClient *_client, QWidget *parent) : QGroupBox(parent), client(_client)
{ {

2
cockatrice/src/tabs/tab_supervisor.cpp
View file

@ -1,6 +1,5 @@
#include "tab_supervisor.h" #include "tab_supervisor.h"
#include "../../../libcockatrice_network/libcockatrice/client/abstract/abstract_client.h"
#include "../interface/pixel_map_generator.h" #include "../interface/pixel_map_generator.h"
#include "../main.h" #include "../main.h"
#include "../server/user/user_list_manager.h" #include "../server/user/user_list_manager.h"
@ -26,6 +25,7 @@
#include <QMessageBox> #include <QMessageBox>
#include <QPainter> #include <QPainter>
#include <QSystemTrayIcon> #include <QSystemTrayIcon>
#include <libcockatrice/network/client/abstract/abstract_client.h>
#include <libcockatrice/protocol/pb/event_game_joined.pb.h> #include <libcockatrice/protocol/pb/event_game_joined.pb.h>
#include <libcockatrice/protocol/pb/event_notify_user.pb.h> #include <libcockatrice/protocol/pb/event_notify_user.pb.h>
#include <libcockatrice/protocol/pb/event_user_message.pb.h> #include <libcockatrice/protocol/pb/event_user_message.pb.h>

7
libcockatrice_network/CMakeLists.txt
View file

@ -2,15 +2,16 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)
add_subdirectory(libcockatrice/client) add_subdirectory(libcockatrice/network/client)
add_subdirectory(libcockatrice/network/server)
add_library( add_library(
libcockatrice_network INTERFACE libcockatrice_network INTERFACE
) )
target_include_directories(libcockatrice_network PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(libcockatrice_network INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries( target_link_libraries(
libcockatrice_network PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client libcockatrice_network INTERFACE ${COCKATRICE_QT_MODULES} libcockatrice_network_client libcockatrice_network_server
) )

31
libcockatrice_network/libcockatrice/CMakeLists.txt
View file

@ -1,31 +0,0 @@
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON)
set(HEADERS
local_client.h
)
set(SOURCES
local_client.cpp
)
if (Qt6_FOUND)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
elseif (Qt5_FOUND)
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif ()
add_library(
libcockatrice_network_client_local STATIC
${MOC_SOURCES}
${SOURCES}
)
# add_dependencies(libcockatrice_server libcockatrice_protocol_wrapper)
target_include_directories(libcockatrice_network_client_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(
libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES}
)

17
libcockatrice_network/libcockatrice/client/CMakeLists.txt
View file

@ -1,17 +0,0 @@
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON)
add_subdirectory(abstract)
add_subdirectory(local)
add_subdirectory(remote)
add_library(
libcockatrice_network_client INTERFACE
)
target_include_directories(libcockatrice_network_client PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(
libcockatrice_network_client PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client_abstract libcockatrice_network_client_local libcockatrice_network_client_remote
)

17
libcockatrice_network/libcockatrice/network/client/CMakeLists.txt Normal file
View file

@ -0,0 +1,17 @@
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON)
add_subdirectory(abstract)
add_subdirectory(local)
add_subdirectory(remote)
add_library(
libcockatrice_network_client INTERFACE
)
target_include_directories(libcockatrice_network_client INTERFACE .)
target_link_libraries(
libcockatrice_network_client INTERFACE ${COCKATRICE_QT_MODULES} libcockatrice_network_client_abstract libcockatrice_network_client_local libcockatrice_network_client_remote
)

6
libcockatrice_network/libcockatrice/client/abstract/CMakeLists.txt → libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt
View file

@ -22,10 +22,10 @@ add_library(
${SOURCES} ${SOURCES}
) )
add_dependencies(libcockatrice_network_client_abstract libcockatrice_protocol) add_dependencies(libcockatrice_network_client_abstract libcockatrice_protocol libcockatrice_network_server_remote)
target_include_directories(libcockatrice_network_client_abstract PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(libcockatrice_network_client_abstract PUBLIC .)
target_link_libraries( target_link_libraries(
libcockatrice_network_client_abstract PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_protocol libcockatrice_network_client_abstract PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_protocol libcockatrice_network_server_remote
) )

7
libcockatrice_network/libcockatrice/client/abstract/abstract_client.cpp → libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp
View file

@ -1,8 +1,8 @@
#include "abstract_client.h" #include "abstract_client.h"
#include "../../../../libcockatrice_protocol/libcockatrice/protocol/pending_command.h"
#include <google/protobuf/descriptor.h> #include <google/protobuf/descriptor.h>
#include <libcockatrice/protocol/featureset.h>
#include <libcockatrice/protocol/get_pb_extension.h>
#include <libcockatrice/protocol/pb/commands.pb.h> #include <libcockatrice/protocol/pb/commands.pb.h>
#include <libcockatrice/protocol/pb/event_add_to_list.pb.h> #include <libcockatrice/protocol/pb/event_add_to_list.pb.h>
#include <libcockatrice/protocol/pb/event_connection_closed.pb.h> #include <libcockatrice/protocol/pb/event_connection_closed.pb.h>
@ -18,8 +18,7 @@
#include <libcockatrice/protocol/pb/event_user_left.pb.h> #include <libcockatrice/protocol/pb/event_user_left.pb.h>
#include <libcockatrice/protocol/pb/event_user_message.pb.h> #include <libcockatrice/protocol/pb/event_user_message.pb.h>
#include <libcockatrice/protocol/pb/server_message.pb.h> #include <libcockatrice/protocol/pb/server_message.pb.h>
#include <libcockatrice/server/get_pb_extension.h> #include <libcockatrice/protocol/pending_command.h>
#include <libcockatrice/utility/featureset.h>
AbstractClient::AbstractClient(QObject *parent) AbstractClient::AbstractClient(QObject *parent)
: QObject(parent), nextCmdId(0), status(StatusDisconnected), serverSupportsPasswordHash(false) : QObject(parent), nextCmdId(0), status(StatusDisconnected), serverSupportsPasswordHash(false)

0
libcockatrice_network/libcockatrice/client/abstract/abstract_client.h → libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h
View file

2
libcockatrice_network/libcockatrice/client/local/CMakeLists.txt → libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt
View file

@ -24,7 +24,7 @@ add_library(
add_dependencies(libcockatrice_network_client_local libcockatrice_network_client_abstract) add_dependencies(libcockatrice_network_client_local libcockatrice_network_client_abstract)
target_include_directories(libcockatrice_network_client_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(libcockatrice_network_client_local PUBLIC .)
target_link_libraries( target_link_libraries(
libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client_abstract libcockatrice_network_client_local PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client_abstract

2
libcockatrice_network/libcockatrice/client/local/local_client.cpp → libcockatrice_network/libcockatrice/network/client/local/local_client.cpp
View file

@ -2,8 +2,8 @@
#include "../../server/local/local_server_interface.h" #include "../../server/local/local_server_interface.h"
#include <libcockatrice/protocol/debug_pb_message.h>
#include <libcockatrice/protocol/pb/session_commands.pb.h> #include <libcockatrice/protocol/pb/session_commands.pb.h>
#include <libcockatrice/server/debug_pb_message.h>
LocalClient::LocalClient(LocalServerInterface *_lsi, LocalClient::LocalClient(LocalServerInterface *_lsi,
const QString &_playerName, const QString &_playerName,

0
libcockatrice_network/libcockatrice/client/local/local_client.h → libcockatrice_network/libcockatrice/network/client/local/local_client.h
View file

6
libcockatrice_network/libcockatrice/client/remote/CMakeLists.txt → libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt
View file

@ -22,10 +22,10 @@ add_library(
${SOURCES} ${SOURCES}
) )
add_dependencies(libcockatrice_network_client_remote libcockatrice_network_client_abstract) add_dependencies(libcockatrice_network_client_remote libcockatrice_network_client_abstract libcockatrice_protocol)
target_include_directories(libcockatrice_network_client_remote PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(libcockatrice_network_client_remote PUBLIC .)
target_link_libraries( target_link_libraries(
libcockatrice_network_client_remote PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client_abstract libcockatrice_network_client_remote PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_client_abstract libcockatrice_settings libcockatrice_utility libcockatrice_protocol
) )

2
libcockatrice_network/libcockatrice/client/remote/remote_client.cpp → libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp
View file

@ -12,6 +12,7 @@
#include <QThread> #include <QThread>
#include <QTimer> #include <QTimer>
#include <QWebSocket> #include <QWebSocket>
#include <libcockatrice/protocol/debug_pb_message.h>
#include <libcockatrice/protocol/pb/event_server_identification.pb.h> #include <libcockatrice/protocol/pb/event_server_identification.pb.h>
#include <libcockatrice/protocol/pb/response_activate.pb.h> #include <libcockatrice/protocol/pb/response_activate.pb.h>
#include <libcockatrice/protocol/pb/response_forgotpasswordrequest.pb.h> #include <libcockatrice/protocol/pb/response_forgotpasswordrequest.pb.h>
@ -20,7 +21,6 @@
#include <libcockatrice/protocol/pb/response_register.pb.h> #include <libcockatrice/protocol/pb/response_register.pb.h>
#include <libcockatrice/protocol/pb/server_message.pb.h> #include <libcockatrice/protocol/pb/server_message.pb.h>
#include <libcockatrice/protocol/pb/session_commands.pb.h> #include <libcockatrice/protocol/pb/session_commands.pb.h>
#include <libcockatrice/server/debug_pb_message.h>
#include <libcockatrice/settings/cache_settings.h> #include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/utility/passwordhasher.h> #include <libcockatrice/utility/passwordhasher.h>

0
libcockatrice_network/libcockatrice/client/remote/remote_client.h → libcockatrice_network/libcockatrice/network/client/remote/remote_client.h
View file

16
libcockatrice_network/libcockatrice/network/server/CMakeLists.txt Normal file
View file

@ -0,0 +1,16 @@
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON)
add_subdirectory(local)
add_subdirectory(remote)
add_library(
libcockatrice_network_server INTERFACE
)
target_include_directories(libcockatrice_network_server INTERFACE .)
target_link_libraries(
libcockatrice_network_server INTERFACE ${COCKATRICE_QT_MODULES} libcockatrice_network_server_local libcockatrice_network_server_remote
)

6
libcockatrice_network/libcockatrice/server/local/CMakeLists.txt → libcockatrice_network/libcockatrice/network/server/local/CMakeLists.txt
View file

@ -24,8 +24,10 @@ add_library(
${SOURCES} ${SOURCES}
) )
target_include_directories(libcockatrice_network_server_local PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) add_dependencies(libcockatrice_network_server_local libcockatrice_protocol)
target_include_directories(libcockatrice_network_server_local PUBLIC .)
target_link_libraries( target_link_libraries(
libcockatrice_network_server_local PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_network_server_local PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_protocol
) )

4
libcockatrice_network/libcockatrice/server/local/local_server.cpp → libcockatrice_network/libcockatrice/network/server/local/local_server.cpp
View file

@ -1,8 +1,8 @@
#include "../../../cockatrice/src/server/local_server.h" #include "local_server.h"
#include "local_server_interface.h" #include "local_server_interface.h"
#include <libcockatrice/server/server_room.h> #include <../remote/server_room.h>
LocalServer::LocalServer(QObject *parent) : Server(parent) LocalServer::LocalServer(QObject *parent) : Server(parent)
{ {

4
libcockatrice_network/libcockatrice/server/local/local_server.h → libcockatrice_network/libcockatrice/network/server/local/local_server.h
View file

@ -7,8 +7,8 @@
#ifndef LOCALSERVER_H #ifndef LOCALSERVER_H
#define LOCALSERVER_H #define LOCALSERVER_H
#include <libcockatrice/server/server.h> #include <../remote/server.h>
#include <libcockatrice/server/server_database_interface.h> #include <../remote/server_database_interface.h>
class LocalServerInterface; class LocalServerInterface;

2
libcockatrice_network/libcockatrice/server/local/local_server_interface.cpp → libcockatrice_network/libcockatrice/network/server/local/local_server_interface.cpp
View file

@ -1,4 +1,4 @@
#include "../../../cockatrice/src/server/local_server_interface.h" #include "local_server_interface.h"
#include "local_server.h" #include "local_server.h"

2
libcockatrice_network/libcockatrice/server/local/local_server_interface.h → libcockatrice_network/libcockatrice/network/server/local/local_server_interface.h
View file

@ -7,7 +7,7 @@
#ifndef LOCALSERVERINTERFACE_H #ifndef LOCALSERVERINTERFACE_H
#define LOCALSERVERINTERFACE_H #define LOCALSERVERINTERFACE_H
#include <libcockatrice/server/server_protocolhandler.h> #include <../remote/server_protocolhandler.h>
class LocalServer; class LocalServer;

63
libcockatrice_network/libcockatrice/network/server/remote/CMakeLists.txt Normal file
View file

@ -0,0 +1,63 @@
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON)
set(HEADERS
game/server_abstract_participant.h
game/server_abstract_player.h
game/server_arrow.h
game/server_arrowtarget.h
game/server_card.h
game/server_cardzone.h
game/server_counter.h
game/server_game.h
game/server_player.h
game/server_spectator.h
server.h
server_abstractuserinterface.h
server_database_interface.h
server_protocolhandler.h
server_remoteuserinterface.h
server_response_containers.h
server_room.h
serverinfo_user_container.h
)
if (Qt6_FOUND)
qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
elseif (Qt5_FOUND)
qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
endif ()
add_library(
libcockatrice_network_server_remote STATIC
${MOC_SOURCES}
game/server_abstract_participant.cpp
game/server_abstract_player.cpp
game/server_arrow.cpp
game/server_arrowtarget.cpp
game/server_card.cpp
game/server_cardzone.cpp
game/server_counter.cpp
game/server_game.cpp
game/server_player.cpp
game/server_spectator.cpp
server.cpp
server_abstractuserinterface.cpp
server_database_interface.cpp
server_protocolhandler.cpp
server_remoteuserinterface.cpp
server_response_containers.cpp
server_room.cpp
serverinfo_user_container.cpp
)
add_dependencies(libcockatrice_network_server_remote libcockatrice_protocol)
target_include_directories(libcockatrice_network_server_remote PUBLIC .)
# Make cockatrice_server depend on cockatrice_protocol
target_link_libraries(
libcockatrice_network_server_remote PUBLIC libcockatrice_protocol libcockatrice_utility libcockatrice_rng
libcockatrice_deck_list ${COCKATRICE_QT_MODULES}
)

2
libcockatrice_server/libcockatrice/server/game/server_abstract_participant.cpp → libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.cpp
View file

@ -1,6 +1,6 @@
#include "server_abstract_participant.h" #include "server_abstract_participant.h"
#include "../get_pb_extension.h" #include "../../../../libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.h"
#include "../server.h" #include "../server.h"
#include "../server_abstractuserinterface.h" #include "../server_abstractuserinterface.h"
#include "../server_database_interface.h" #include "../server_database_interface.h"

0
libcockatrice_server/libcockatrice/server/game/server_abstract_participant.h → libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_participant.h
View file

0
libcockatrice_server/libcockatrice/server/game/server_abstract_player.cpp → libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp
View file

0
libcockatrice_server/libcockatrice/server/game/server_abstract_player.h → libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.h
View file

0
libcockatrice_server/libcockatrice/server/game/server_arrow.cpp → libcockatrice_network/libcockatrice/network/server/remote/game/server_arrow.cpp
View file

0
libcockatrice_server/libcockatrice/server/game/server_arrow.h → libcockatrice_network/libcockatrice/network/server/remote/game/server_arrow.h
View file

0
libcockatrice_server/libcockatrice/server/game/server_arrowtarget.cpp → libcockatrice_network/libcockatrice/network/server/remote/game/server_arrowtarget.cpp
View file

0
libcockatrice_server/libcockatrice/server/game/server_arrowtarget.h → libcockatrice_network/libcockatrice/network/server/remote/game/server_arrowtarget.h
View file

0
libcockatrice_server/libcockatrice/server/game/server_card.cpp → libcockatrice_network/libcockatrice/network/server/remote/game/server_card.cpp
View file

0
libcockatrice_server/libcockatrice/server/game/server_card.h → libcockatrice_network/libcockatrice/network/server/remote/game/server_card.h
View file

0
libcockatrice_server/libcockatrice/server/game/server_cardzone.cpp → libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.cpp
View file

0
libcockatrice_server/libcockatrice/server/game/server_cardzone.h → libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.h
View file

0
libcockatrice_server/libcockatrice/server/game/server_counter.cpp → libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.cpp
View file

0
libcockatrice_server/libcockatrice/server/game/server_counter.h → libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.h
View file

0
libcockatrice_server/libcockatrice/server/game/server_game.cpp → libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp
View file

0
libcockatrice_server/libcockatrice/server/game/server_game.h → libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h
View file

0
libcockatrice_server/libcockatrice/server/game/server_move_card_struct.h → libcockatrice_network/libcockatrice/network/server/remote/game/server_move_card_struct.h
View file

2
libcockatrice_server/libcockatrice/server/game/server_player.cpp → libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp
View file

@ -1,6 +1,6 @@
#include "server_player.h" #include "server_player.h"
#include "../get_pb_extension.h" #include "../../../../libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.h"
#include "../server.h" #include "../server.h"
#include "../server_abstractuserinterface.h" #include "../server_abstractuserinterface.h"
#include "../server_database_interface.h" #include "../server_database_interface.h"

0
libcockatrice_server/libcockatrice/server/game/server_player.h → libcockatrice_network/libcockatrice/network/server/remote/game/server_player.h
View file

0
libcockatrice_server/libcockatrice/server/game/server_spectator.cpp → libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.cpp
View file

0
libcockatrice_server/libcockatrice/server/game/server_spectator.h → libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.h
View file

0
libcockatrice_server/libcockatrice/server/room_message_type.h → libcockatrice_network/libcockatrice/network/server/remote/room_message_type.h
View file

5
libcockatrice_server/libcockatrice/server/server.cpp → libcockatrice_network/libcockatrice/network/server/remote/server.cpp
View file

@ -19,7 +19,7 @@
***************************************************************************/ ***************************************************************************/
#include "server.h" #include "server.h"
#include "debug_pb_message.h"
#include "game/server_game.h" #include "game/server_game.h"
#include "game/server_player.h" #include "game/server_player.h"
#include "server_database_interface.h" #include "server_database_interface.h"
@ -30,13 +30,14 @@
#include <QCoreApplication> #include <QCoreApplication>
#include <QDebug> #include <QDebug>
#include <QThread> #include <QThread>
#include <libcockatrice/protocol/featureset.h>
#include <libcockatrice/protocol/debug_pb_message.h>
#include <libcockatrice/protocol/pb/event_connection_closed.pb.h> #include <libcockatrice/protocol/pb/event_connection_closed.pb.h>
#include <libcockatrice/protocol/pb/event_list_rooms.pb.h> #include <libcockatrice/protocol/pb/event_list_rooms.pb.h>
#include <libcockatrice/protocol/pb/event_user_joined.pb.h> #include <libcockatrice/protocol/pb/event_user_joined.pb.h>
#include <libcockatrice/protocol/pb/event_user_left.pb.h> #include <libcockatrice/protocol/pb/event_user_left.pb.h>
#include <libcockatrice/protocol/pb/isl_message.pb.h> #include <libcockatrice/protocol/pb/isl_message.pb.h>
#include <libcockatrice/protocol/pb/session_event.pb.h> #include <libcockatrice/protocol/pb/session_event.pb.h>
#include <libcockatrice/utility/featureset.h>
Server::Server(QObject *parent) : QObject(parent), nextLocalGameId(0), tcpUserCount(0), webSocketUserCount(0) Server::Server(QObject *parent) : QObject(parent), nextLocalGameId(0), tcpUserCount(0), webSocketUserCount(0)
{ {

0
libcockatrice_server/libcockatrice/server/server.h → libcockatrice_network/libcockatrice/network/server/remote/server.h
View file

0
libcockatrice_server/libcockatrice/server/server_abstractuserinterface.cpp → libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp
View file

0
libcockatrice_server/libcockatrice/server/server_abstractuserinterface.h → libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.h
View file

0
libcockatrice_server/libcockatrice/server/server_database_interface.cpp → libcockatrice_network/libcockatrice/network/server/remote/server_database_interface.cpp
View file

0
libcockatrice_server/libcockatrice/server/server_database_interface.h → libcockatrice_network/libcockatrice/network/server/remote/server_database_interface.h
View file

0
libcockatrice_server/libcockatrice/server/server_player_reference.h → libcockatrice_network/libcockatrice/network/server/remote/server_player_reference.h
View file

5
libcockatrice_server/libcockatrice/server/server_protocolhandler.cpp → libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp
View file

@ -1,9 +1,7 @@
#include "server_protocolhandler.h" #include "server_protocolhandler.h"
#include "debug_pb_message.h"
#include "game/server_game.h" #include "game/server_game.h"
#include "game/server_player.h" #include "game/server_player.h"
#include "get_pb_extension.h"
#include "server_database_interface.h" #include "server_database_interface.h"
#include "server_room.h" #include "server_room.h"
@ -11,6 +9,8 @@
#include <QDebug> #include <QDebug>
#include <QtMath> #include <QtMath>
#include <google/protobuf/descriptor.h> #include <google/protobuf/descriptor.h>
#include <libcockatrice/protocol/featureset.h>
#include <libcockatrice/protocol/get_pb_extension.h>
#include <libcockatrice/protocol/pb/commands.pb.h> #include <libcockatrice/protocol/pb/commands.pb.h>
#include <libcockatrice/protocol/pb/event_game_joined.pb.h> #include <libcockatrice/protocol/pb/event_game_joined.pb.h>
#include <libcockatrice/protocol/pb/event_list_rooms.pb.h> #include <libcockatrice/protocol/pb/event_list_rooms.pb.h>
@ -25,7 +25,6 @@
#include <libcockatrice/protocol/pb/response_list_users.pb.h> #include <libcockatrice/protocol/pb/response_list_users.pb.h>
#include <libcockatrice/protocol/pb/response_login.pb.h> #include <libcockatrice/protocol/pb/response_login.pb.h>
#include <libcockatrice/protocol/pb/serverinfo_user.pb.h> #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
#include <libcockatrice/utility/featureset.h>
#include <libcockatrice/utility/trice_limits.h> #include <libcockatrice/utility/trice_limits.h>
Server_ProtocolHandler::Server_ProtocolHandler(Server *_server, Server_ProtocolHandler::Server_ProtocolHandler(Server *_server,

0
libcockatrice_server/libcockatrice/server/server_protocolhandler.h → libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h
View file

0
libcockatrice_server/libcockatrice/server/server_remoteuserinterface.cpp → libcockatrice_network/libcockatrice/network/server/remote/server_remoteuserinterface.cpp
View file

0
libcockatrice_server/libcockatrice/server/server_remoteuserinterface.h → libcockatrice_network/libcockatrice/network/server/remote/server_remoteuserinterface.h
View file

0
libcockatrice_server/libcockatrice/server/server_response_containers.cpp → libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.cpp
View file

0
libcockatrice_server/libcockatrice/server/server_response_containers.h → libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.h
View file

0
libcockatrice_server/libcockatrice/server/server_room.cpp → libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp
View file

0
libcockatrice_server/libcockatrice/server/server_room.h → libcockatrice_network/libcockatrice/network/server/remote/server_room.h
View file

0
libcockatrice_server/libcockatrice/server/serverinfo_user_container.cpp → libcockatrice_network/libcockatrice/network/server/remote/serverinfo_user_container.cpp
View file

0
libcockatrice_server/libcockatrice/server/serverinfo_user_container.h → libcockatrice_network/libcockatrice/network/server/remote/serverinfo_user_container.h
View file

0
libcockatrice_server/libcockatrice/server/user_level.h → libcockatrice_network/libcockatrice/network/server/remote/user_level.h
View file

Some files were not shown because too many files have changed in this diff Show more