diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index d89d9d229..68fff8a90 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -7,7 +7,6 @@ project(Cockatrice VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${ set(cockatrice_SOURCES ${VERSION_STRING_CPP} # sort by alphabetical order, so that there is no debate about where to add new sources to the list - src/client/game_logic/key_signals.cpp src/client/get_text_with_max.cpp src/client/menus/deck_editor/deck_editor_menu.cpp src/client/network/client_update_checker.cpp @@ -256,6 +255,7 @@ set(cockatrice_SOURCES src/settings/shortcut_treeview.cpp src/settings/shortcuts_settings.cpp src/utility/card_info_comparator.cpp + src/utility/key_signals.cpp src/utility/levenshtein.cpp src/utility/logger.cpp src/utility/sequence_edit.cpp diff --git a/cockatrice/src/client/tabs/tab_deck_editor.h b/cockatrice/src/client/tabs/tab_deck_editor.h index 710689b8e..c5a7f5302 100644 --- a/cockatrice/src/client/tabs/tab_deck_editor.h +++ b/cockatrice/src/client/tabs/tab_deck_editor.h @@ -2,7 +2,7 @@ #define WINDOW_DECKEDITOR_H #include "../../game/cards/card_info.h" -#include "../game_logic/key_signals.h" +#include "../../utility/key_signals.h" #include "../ui/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h" #include "abstract_tab_deck_editor.h" diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h index 053929bef..4e8711b30 100644 --- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h +++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h @@ -3,7 +3,7 @@ #include "../../../../deck/custom_line_edit.h" #include "../../../../game/cards/card_database_model.h" -#include "../../../game_logic/key_signals.h" +#include "../../../../utility/key_signals.h" #include "../../../tabs/abstract_tab_deck_editor.h" #include diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.h b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.h index 0530b87a0..b81bf6096 100644 --- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.h +++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.h @@ -3,7 +3,7 @@ #include "../../../../deck/custom_line_edit.h" #include "../../../../game/cards/card_info.h" -#include "../../../game_logic/key_signals.h" +#include "../../../../utility/key_signals.h" #include "../../../tabs/abstract_tab_deck_editor.h" #include "../visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h" diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.h b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.h index 9cd8d8d6f..46d7f5de1 100644 --- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.h +++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.h @@ -1,7 +1,7 @@ #ifndef DECK_EDITOR_FILTER_DOCK_WIDGET_H #define DECK_EDITOR_FILTER_DOCK_WIDGET_H -#include "../../../game_logic/key_signals.h" +#include "../../../../utility/key_signals.h" #include "../../../tabs/abstract_tab_deck_editor.h" #include diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h index 9b729069f..eb30bd88f 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h +++ b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h @@ -6,7 +6,7 @@ #include "../../../../game/cards/card_database.h" #include "../../../../game/cards/card_database_model.h" #include "../../../../game/filters/filter_tree_model.h" -#include "../../../game_logic/key_signals.h" +#include "../../../../utility/key_signals.h" #include "../../../tabs/abstract_tab_deck_editor.h" #include "../../layouts/flow_layout.h" #include "../cards/card_info_picture_with_text_overlay_widget.h" diff --git a/cockatrice/src/client/game_logic/key_signals.cpp b/cockatrice/src/utility/key_signals.cpp similarity index 100% rename from cockatrice/src/client/game_logic/key_signals.cpp rename to cockatrice/src/utility/key_signals.cpp diff --git a/cockatrice/src/client/game_logic/key_signals.h b/cockatrice/src/utility/key_signals.h similarity index 100% rename from cockatrice/src/client/game_logic/key_signals.h rename to cockatrice/src/utility/key_signals.h