gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2025-12-05 20:39:59 -08:00
Code Issues Packages Projects Releases Wiki Activity

Core qt module for libs (#6278)

Browse Source 
* Move logger and key signals from libcockatrice_utility to Cockatrice.

Took 9 minutes

* Only link Qt::Core instead of COCKATRICE_QT_MODULES to libraries, if possible.

Took 2 minutes

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
BruebachL
2025-11-05 18:51:08 +01:00
committed by GitHub
parent adff828415
commit f24c36d6b1
19 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/FindQtRuntime.cmake
View File

@@ -115,4 +115,7 @@ string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" ORACLE_QT_MO
string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" DB_CONVERTER_QT_MODULES "${_DBCONVERTER_NEEDED}") string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" DB_CONVERTER_QT_MODULES "${_DBCONVERTER_NEEDED}")
string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" TEST_QT_MODULES "${_TEST_NEEDED}") string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" TEST_QT_MODULES "${_TEST_NEEDED}")
# Core-only export (useful for headless libs)
set(QT_CORE_MODULE "${COCKATRICE_QT_VERSION_NAME}::Core")
message(STATUS "Found Qt ${${COCKATRICE_QT_VERSION_NAME}_VERSION} at: ${${COCKATRICE_QT_VERSION_NAME}_DIR}") message(STATUS "Found Qt ${${COCKATRICE_QT_VERSION_NAME}_VERSION} at: ${${COCKATRICE_QT_VERSION_NAME}_DIR}")

2
cockatrice/CMakeLists.txt
View File

@@ -258,6 +258,8 @@ set(cockatrice_SOURCES
src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp
src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
src/interface/key_signals.cpp
src/interface/logger.cpp
) )
add_subdirectory(sounds) add_subdirectory(sounds)

0
libcockatrice_utility/libcockatrice/utility/key_signals.cpp → cockatrice/src/interface/key_signals.cpp
View File

0
libcockatrice_utility/libcockatrice/utility/key_signals.h → cockatrice/src/interface/key_signals.h
View File

0
libcockatrice_utility/libcockatrice/utility/logger.cpp → cockatrice/src/interface/logger.cpp
View File

0
libcockatrice_utility/libcockatrice/utility/logger.h → cockatrice/src/interface/logger.h
View File

2
cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h
View File

@@ -9,13 +9,13 @@
#define DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H #define DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H
#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h" #include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
#include "../../key_signals.h"
#include "../utility/custom_line_edit.h" #include "../utility/custom_line_edit.h"
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QWidget> #include <QWidget>
#include <libcockatrice/models/database/card_database_display_model.h> #include <libcockatrice/models/database/card_database_display_model.h>
#include <libcockatrice/models/database/card_database_model.h> #include <libcockatrice/models/database/card_database_model.h>
#include <libcockatrice/utility/key_signals.h>
class AbstractTabDeckEditor; class AbstractTabDeckEditor;
class DeckEditorDatabaseDisplayWidget : public QWidget class DeckEditorDatabaseDisplayWidget : public QWidget

2
cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h
View File

@@ -9,6 +9,7 @@
#define DECK_EDITOR_DECK_DOCK_WIDGET_H #define DECK_EDITOR_DECK_DOCK_WIDGET_H
#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h" #include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
#include "../../key_signals.h"
#include "../utility/custom_line_edit.h" #include "../utility/custom_line_edit.h"
#include "../visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h" #include "../visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
@@ -18,7 +19,6 @@
#include <QTextEdit> #include <QTextEdit>
#include <QTreeView> #include <QTreeView>
#include <libcockatrice/card/card_info.h> #include <libcockatrice/card/card_info.h>
#include <libcockatrice/utility/key_signals.h>
class DeckListModel; class DeckListModel;
class AbstractTabDeckEditor; class AbstractTabDeckEditor;

2
cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h
View File

@@ -9,10 +9,10 @@
#define DECK_EDITOR_FILTER_DOCK_WIDGET_H #define DECK_EDITOR_FILTER_DOCK_WIDGET_H
#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h" #include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
#include "../../key_signals.h"
#include <QDockWidget> #include <QDockWidget>
#include <QTreeView> #include <QTreeView>
#include <libcockatrice/utility/key_signals.h>
class FilterTreeModel; class FilterTreeModel;
class AbstractTabDeckEditor; class AbstractTabDeckEditor;

3
cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp
View File

@@ -1,12 +1,13 @@
#include "dlg_view_log.h" #include "dlg_view_log.h"
#include "../../logger.h"
#include <QClipboard> #include <QClipboard>
#include <QPlainTextEdit> #include <QPlainTextEdit>
#include <QPushButton> #include <QPushButton>
#include <QRegularExpression> #include <QRegularExpression>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <libcockatrice/settings/cache_settings.h> #include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/utility/logger.h>
DlgViewLog::DlgViewLog(QWidget *parent) : QDialog(parent) DlgViewLog::DlgViewLog(QWidget *parent) : QDialog(parent)
{ {

2
cockatrice/src/interface/widgets/tabs/tab_deck_editor.h
View File

@@ -1,11 +1,11 @@
#ifndef WINDOW_DECKEDITOR_H #ifndef WINDOW_DECKEDITOR_H
#define WINDOW_DECKEDITOR_H #define WINDOW_DECKEDITOR_H
#include "../../key_signals.h"
#include "../interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h" #include "../interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
#include "abstract_tab_deck_editor.h" #include "abstract_tab_deck_editor.h"
#include <libcockatrice/card/card_info.h> #include <libcockatrice/card/card_info.h>
#include <libcockatrice/utility/key_signals.h>
class CardDatabaseModel; class CardDatabaseModel;
class CardDatabaseDisplayModel; class CardDatabaseDisplayModel;

2
cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h
View File

@@ -9,6 +9,7 @@
#include "../../../filters/filter_tree_model.h" #include "../../../filters/filter_tree_model.h"
#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h" #include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
#include "../../key_signals.h"
#include "../../layouts/flow_layout.h" #include "../../layouts/flow_layout.h"
#include "../cards/card_info_picture_with_text_overlay_widget.h" #include "../cards/card_info_picture_with_text_overlay_widget.h"
#include "../cards/card_size_widget.h" #include "../cards/card_size_widget.h"
@@ -30,7 +31,6 @@
#include <libcockatrice/card/database/card_database.h> #include <libcockatrice/card/database/card_database.h>
#include <libcockatrice/models/database/card_database_model.h> #include <libcockatrice/models/database/card_database_model.h>
#include <libcockatrice/models/deck_list/deck_list_model.h> #include <libcockatrice/models/deck_list/deck_list_model.h>
#include <libcockatrice/utility/key_signals.h>
#include <qscrollarea.h> #include <qscrollarea.h>
inline Q_LOGGING_CATEGORY(VisualDatabaseDisplayLog, "visual_database_display"); inline Q_LOGGING_CATEGORY(VisualDatabaseDisplayLog, "visual_database_display");

2
cockatrice/src/interface/window_main.cpp
View File

@@ -36,6 +36,7 @@
#include "../interface/widgets/tabs/tab_game.h" #include "../interface/widgets/tabs/tab_game.h"
#include "../interface/widgets/tabs/tab_supervisor.h" #include "../interface/widgets/tabs/tab_supervisor.h"
#include "../main.h" #include "../main.h"
#include "logger.h"
#include "version_string.h" #include "version_string.h"
#include "widgets/utility/get_text_with_max.h" #include "widgets/utility/get_text_with_max.h"
@@ -71,7 +72,6 @@
#include <libcockatrice/protocol/pb/game_replay.pb.h> #include <libcockatrice/protocol/pb/game_replay.pb.h>
#include <libcockatrice/protocol/pb/room_commands.pb.h> #include <libcockatrice/protocol/pb/room_commands.pb.h>
#include <libcockatrice/settings/cache_settings.h> #include <libcockatrice/settings/cache_settings.h>
#include <libcockatrice/utility/logger.h>
#define GITHUB_PAGES_URL "https://cockatrice.github.io" #define GITHUB_PAGES_URL "https://cockatrice.github.io"
#define GITHUB_CONTRIBUTORS_URL "https://github.com/Cockatrice/Cockatrice/graphs/contributors?type=c" #define GITHUB_CONTRIBUTORS_URL "https://github.com/Cockatrice/Cockatrice/graphs/contributors?type=c"

2
cockatrice/src/main.cpp
View File

@@ -23,6 +23,7 @@
#include "QtNetwork/QNetworkInterface" #include "QtNetwork/QNetworkInterface"
#include "client/network/update/card_spoiler/spoiler_background_updater.h" #include "client/network/update/card_spoiler/spoiler_background_updater.h"
#include "client/sound_engine.h" #include "client/sound_engine.h"
#include "interface/logger.h"
#include "interface/pixel_map_generator.h" #include "interface/pixel_map_generator.h"
#include "interface/theme_manager.h" #include "interface/theme_manager.h"
#include "interface/widgets/dialogs/dlg_settings.h" #include "interface/widgets/dialogs/dlg_settings.h"
@@ -44,7 +45,6 @@
#include <libcockatrice/protocol/featureset.h> #include <libcockatrice/protocol/featureset.h>
#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/logger.h>
QTranslator *translator, *qtTranslator; QTranslator *translator, *qtTranslator;
RNG_Abstract *rng; RNG_Abstract *rng;

2
libcockatrice_card/CMakeLists.txt
View File

@@ -52,5 +52,5 @@ target_include_directories(
target_link_libraries( target_link_libraries(
libcockatrice_card libcockatrice_card
PUBLIC libcockatrice_settings PUBLIC libcockatrice_settings
PUBLIC ${COCKATRICE_QT_MODULES} PUBLIC ${QT_CORE_MODULE}
) )

4
libcockatrice_deck_list/CMakeLists.txt
View File

@@ -25,6 +25,4 @@ add_dependencies(libcockatrice_deck_list libcockatrice_protocol)
target_include_directories(libcockatrice_deck_list PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(libcockatrice_deck_list PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries( target_link_libraries(libcockatrice_deck_list PUBLIC libcockatrice_protocol libcockatrice_utility ${QT_CORE_MODULE})
libcockatrice_deck_list PUBLIC libcockatrice_protocol libcockatrice_utility ${COCKATRICE_QT_MODULES}
)

4
libcockatrice_protocol/CMakeLists.txt
View File

@@ -17,9 +17,7 @@ target_sources(libcockatrice_protocol PRIVATE ${SOURCES} ${HEADERS})
add_dependencies(libcockatrice_protocol libcockatrice_protocol_pb) add_dependencies(libcockatrice_protocol libcockatrice_protocol_pb)
# Link the actual generated protobuf library # Link the actual generated protobuf library
target_link_libraries( target_link_libraries(libcockatrice_protocol PUBLIC ${QT_CORE_MODULE} libcockatrice_protocol_pb libcockatrice_utility)
libcockatrice_protocol PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_protocol_pb libcockatrice_utility
)
# Expose include paths # Expose include paths
target_include_directories( target_include_directories(

2
libcockatrice_rng/CMakeLists.txt
View File

@@ -17,4 +17,4 @@ add_library(
target_include_directories(libcockatrice_rng PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(libcockatrice_rng PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(libcockatrice_rng PUBLIC ${COCKATRICE_QT_MODULES}) target_link_libraries(libcockatrice_rng PUBLIC ${QT_CORE_MODULE})

17
libcockatrice_utility/CMakeLists.txt
View File

@@ -5,27 +5,20 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)
set(UTILITY_SOURCES set(UTILITY_SOURCES libcockatrice/utility/expression.cpp libcockatrice/utility/levenshtein.cpp
libcockatrice/utility/expression.cpp libcockatrice/utility/key_signals.cpp libcockatrice/utility/levenshtein.cpp libcockatrice/utility/passwordhasher.cpp
libcockatrice/utility/logger.cpp libcockatrice/utility/passwordhasher.cpp
) )
set(UTILITY_HEADERS set(UTILITY_HEADERS
libcockatrice/utility/color.h libcockatrice/utility/color.h libcockatrice/utility/expression.h libcockatrice/utility/levenshtein.h
libcockatrice/utility/expression.h libcockatrice/utility/macros.h libcockatrice/utility/passwordhasher.h libcockatrice/utility/trice_limits.h
libcockatrice/utility/key_signals.h
libcockatrice/utility/levenshtein.h
libcockatrice/utility/logger.h
libcockatrice/utility/macros.h
libcockatrice/utility/passwordhasher.h
libcockatrice/utility/trice_limits.h
) )
add_library(libcockatrice_utility STATIC ${UTILITY_SOURCES} ${UTILITY_HEADERS}) add_library(libcockatrice_utility STATIC ${UTILITY_SOURCES} ${UTILITY_HEADERS})
target_include_directories(libcockatrice_utility PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(libcockatrice_utility PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(libcockatrice_utility PUBLIC libcockatrice_rng ${COCKATRICE_QT_MODULES}) target_link_libraries(libcockatrice_utility PUBLIC libcockatrice_rng ${QT_CORE_MODULE})
set(ORACLE_LIBS) set(ORACLE_LIBS)