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

Fix pbs and some other stuff.

Browse source 
Took 1 hour 5 minutes
This commit is contained in:
Lukas Brübach 2025-10-04 20:06:57 +02:00
parent 01378b8314
commit 408b732854
84 changed files with 181 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cockatrice/CMakeLists.txt
View file

@ -270,7 +270,9 @@ set(cockatrice_SOURCES
src/interface/utility/sequence_edit.cpp
)
add_subdirectory(${CMAKE_SOURCE_DIR}/libs/deck_list ${CMAKE_BINARY_DIR}/libs/deck_list)
add_subdirectory(${CMAKE_SOURCE_DIR}/libs/pb ${CMAKE_BINARY_DIR}/libs/pb)
add_subdirectory(${CMAKE_SOURCE_DIR}/libs/rng ${CMAKE_BINARY_DIR}/libs/rng)
add_subdirectory(${CMAKE_SOURCE_DIR}/libs/server ${CMAKE_BINARY_DIR}/libs/server)
add_subdirectory(${CMAKE_SOURCE_DIR}/libs/settings ${CMAKE_BINARY_DIR}/libs/settings)
add_subdirectory(${CMAKE_SOURCE_DIR}/libs/card ${CMAKE_BINARY_DIR}/libs/card)
@ -367,9 +369,9 @@ elseif(Qt5_FOUND)
endif()
if(Qt5_FOUND)
target_link_libraries(cockatrice cardlib utility serverlib cockatrice_common ${COCKATRICE_QT_MODULES})
target_link_libraries(cockatrice cardlib cockatrice_deck_list utility serverlib cockatrice_rng cockatrice_common ${COCKATRICE_QT_MODULES})
else()
target_link_libraries(cockatrice PUBLIC cardlib utility serverlib cockatrice_common ${COCKATRICE_QT_MODULES})
target_link_libraries(cockatrice PUBLIC cardlib cockatrice_deck_list utility serverlib cockatrice_rng cockatrice_common ${COCKATRICE_QT_MODULES})
endif()
if(UNIX)

4
cockatrice/src/client/tapped_out_interface.cpp
View file

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

2
cockatrice/src/client/tapped_out_interface.h
View file

@ -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/deck_list.h"
#include <QLoggingCategory>
#include <QObject>

6
cockatrice/src/deck/deck_list_model.h
View file

@ -1,10 +1,10 @@
#ifndef DECKLISTMODEL_H
#define DECKLISTMODEL_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/abstract_deck_list_card_node.h"
#include "deck_list/deck_list.h"
#include "deck_list/deck_list_card_node.h"
#include <QAbstractItemModel>
#include <QList>

4
cockatrice/src/deck/deck_loader.cpp
View file

@ -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/deck_list.h"
#include "deck_list/deck_list_card_node.h"
#include <QApplication>
#include <QClipboard>

2
cockatrice/src/deck/deck_loader.h
View file

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

4
cockatrice/src/deck/deck_stats_interface.cpp
View file

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

2
cockatrice/src/deck/deck_stats_interface.h
View file

@ -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/deck_list.h"
#include <QObject>

2
cockatrice/src/game/board/arrow_item.cpp
View file

@ -6,11 +6,11 @@
#include "../zones/card_zone.h"
#include "card/card_info.h"
#include "card_item.h"
#include "color.h"
#include "pb/command_attach_card.pb.h"
#include "pb/command_create_arrow.pb.h"
#include "pb/command_delete_arrow.pb.h"
#include "settings/cache_settings.h"
#include "utility/color.h"
#include <QDebug>
#include <QGraphicsScene>

4
cockatrice/src/game/deckview/deck_view.cpp
View file

@ -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/deck_list.h"
#include "deck_list/deck_list_card_node.h"
#include "settings/cache_settings.h"
#include <QApplication>

4
cockatrice/src/game/dialogs/dlg_create_token.cpp
View file

@ -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/deck_list.h"
#include "settings/cache_settings.h"
#include "utility/trice_limits.h"
#include <QCheckBox>
#include <QCloseEvent>

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

@ -1,6 +1,6 @@
#include "game_event_handler.h"
#include "../../../libs/server/get_pb_extension.h"
#include "../../../libs/server/include/server/get_pb_extension.h"
#include "../server/abstract_client.h"
#include "../server/pending_command.h"
#include "../tabs/tab_game.h"

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

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

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

@ -12,7 +12,6 @@
#include "../zones/stack_zone.h"
#include "../zones/table_zone.h"
#include "../zones/view_zone.h"
#include "color.h"
#include "pb/command_attach_card.pb.h"
#include "pb/command_set_card_counter.pb.h"
#include "pb/event_create_arrow.pb.h"
@ -22,6 +21,7 @@
#include "pb/serverinfo_user.pb.h"
#include "pb/serverinfo_zone.pb.h"
#include "player_target.h"
#include "utility/color.h"
#include <QDebug>
#include <QMenu>

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

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

2
cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h
View file

@ -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/deck_list.h>
class DeckAnalyticsWidget : public QWidget
{

2
cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp
View file

@ -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/deck_list.h>
ManaBaseWidget::ManaBaseWidget(QWidget *parent, DeckListModel *_deckListModel)
: QWidget(parent), deckListModel(_deckListModel)

2
cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h
View file

@ -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/deck_list.h>
#include <utility>
class ManaBaseWidget : public QWidget

2
cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp
View file

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

2
cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp
View file

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

2
cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h
View file

@ -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/deck_list.h>
#include <utility>
class ManaDevotionWidget : public QWidget

2
cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
View file

@ -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 <utility/trice_limits.h>
DeckEditorDeckDockWidget::DeckEditorDeckDockWidget(AbstractTabDeckEditor *parent)
: QDockWidget(parent), deckEditor(parent)

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

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

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

@ -1,6 +1,6 @@
#include "chat_view.h"
#include "../../../../libs/server/include/user_level.h"
#include "../../../../libs/server/include/server/user_level.h"
#include "../../client/sound_engine.h"
#include "../../interface/pixel_map_generator.h"
#include "../../tabs/tab_account.h"

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

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

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

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

4
cockatrice/src/server/remote/remote_client.cpp
View file

@ -1,7 +1,5 @@
#include "remote_client.h"
#include "../../../../libs/server/debug_pb_message.h"
#include "../../../../libs/utility/passwordhasher.h"
#include "../../main.h"
#include "../pending_command.h"
#include "pb/event_server_identification.pb.h"
@ -12,7 +10,9 @@
#include "pb/response_register.pb.h"
#include "pb/server_message.pb.h"
#include "pb/session_commands.pb.h"
#include "server/debug_pb_message.h"
#include "settings/cache_settings.h"
#include "utility/passwordhasher.h"
#include "version_string.h"
#include <QCryptographicHash>

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

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

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

@ -1,6 +1,5 @@
#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"
@ -11,6 +10,7 @@
#include "pb/response_get_user_info.pb.h"
#include "pb/serverinfo_user.pb.h"
#include "pb/session_commands.pb.h"
#include "utility/passwordhasher.h"
#include <QDateTime>
#include <QGridLayout>

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

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

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

@ -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/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"

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

@ -1,6 +1,6 @@
#include "tab_room.h"
#include "../../../libs/server/get_pb_extension.h"
#include "../../../libs/server/include/server/get_pb_extension.h"
#include "../../../libs/utility/include/utility/trice_limits.h"
#include "../dialogs/dlg_settings.h"
#include "../main.h"