mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-04-27 07:48:01 -07:00
Major Directory Refactoring (#5118)
* refactored cardzone.cpp, added doc and changed if to switch case * started moving every files into different folders * remove undercase to match with other files naming convention * refactored dialog files * ran format.sh * refactored client/tabs folder * refactored client/tabs folder * refactored client/tabs folder * refactored client folder * refactored carddbparser * refactored dialogs * Create sonar-project.properties temporary file for lint * Create build.yml temporary file for lint * removed all files from root directory * removed all files from root directory * added current branch to workflow * fixed most broken import * fixed issues while renaming files * fixed oracle importer * fixed dbconverter * updated translations * made sub-folders for client * removed linter * removed linter folder * fixed oracle import * revert card_zone documentation * renamed db parser files name and deck_view imports * fixed dlg file issue * ran format file and fixed test file * fixed carddb test files * moved player folder in game * updated translations and format files * fixed peglib import * format cmake files * removing vcpkg to try to add it back later * tried fixing vcpkg file * renamed filter to filters and moved database parser to cards folder * reverted translation files * reverted oracle translated * Update cockatrice/src/dialogs/dlg_register.cpp Co-authored-by: tooomm <tooomm@users.noreply.github.com> * Update cockatrice/src/client/ui/window_main.cpp Co-authored-by: tooomm <tooomm@users.noreply.github.com> * removed empty line at file start * removed useless include from tab_supervisor.cpp * refactored cardzone.cpp, added doc and changed if to switch case * started moving every files into different folders * remove undercase to match with other files naming convention * refactored dialog files * ran format.sh * refactored client/tabs folder * refactored client folder * refactored carddbparser * refactored dialogs * removed all files from root directory * Create sonar-project.properties temporary file for lint * Create build.yml temporary file for lint * added current branch to workflow * fixed most broken import * fixed issues while renaming files * fixed oracle importer * fixed dbconverter * updated translations * made sub-folders for client * removed linter * removed linter folder * fixed oracle import * revert card_zone documentation * renamed db parser files name and deck_view imports * fixed dlg file issue * ran format file and fixed test file * fixed carddb test files * moved player folder in game * updated translations and format files * fixed peglib import * reverted translation files * format cmake files * removing vcpkg to try to add it back later * tried fixing vcpkg file * pre-updating of cockatrice changes * removed empty line at file start * reverted oracle translated * Update cockatrice/src/dialogs/dlg_register.cpp Co-authored-by: tooomm <tooomm@users.noreply.github.com> * Update cockatrice/src/client/ui/window_main.cpp Co-authored-by: tooomm <tooomm@users.noreply.github.com> * removed useless include from tab_supervisor.cpp --------- Co-authored-by: tooomm <tooomm@users.noreply.github.com>
This commit is contained in:
parent
d1e0f9dfc5
commit
fa999880ee
261 changed files with 735 additions and 729 deletions
|
|
@ -5,20 +5,24 @@ set(TEST_QT_MODULES ${COCKATRICE_QT_VERSION_NAME}::Concurrent ${COCKATRICE_QT_VE
|
|||
)
|
||||
|
||||
if(Qt6_FOUND)
|
||||
qt6_wrap_cpp(MOCKS_SOURCES ../../cockatrice/src/settingscache.h ../../cockatrice/src/settings/carddatabasesettings.h)
|
||||
qt6_wrap_cpp(
|
||||
MOCKS_SOURCES ../../cockatrice/src/settings/cache_settings.h ../../cockatrice/src/settings/card_database_settings.h
|
||||
)
|
||||
elseif(Qt5_FOUND)
|
||||
qt5_wrap_cpp(MOCKS_SOURCES ../../cockatrice/src/settingscache.h ../../cockatrice/src/settings/carddatabasesettings.h)
|
||||
qt5_wrap_cpp(
|
||||
MOCKS_SOURCES ../../cockatrice/src/settings/cache_settings.h ../../cockatrice/src/settings/card_database_settings.h
|
||||
)
|
||||
endif()
|
||||
|
||||
add_executable(
|
||||
carddatabase_test
|
||||
${MOCKS_SOURCES}
|
||||
${VERSION_STRING_CPP}
|
||||
../../cockatrice/src/carddatabase.cpp
|
||||
../../cockatrice/src/carddbparser/carddatabaseparser.cpp
|
||||
../../cockatrice/src/carddbparser/cockatricexml3.cpp
|
||||
../../cockatrice/src/carddbparser/cockatricexml4.cpp
|
||||
../../cockatrice/src/settings/settingsmanager.cpp
|
||||
../../cockatrice/src/game/cards/card_database.cpp
|
||||
../../cockatrice/src/game/cards/card_database_parser/card_database_parser.cpp
|
||||
../../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp
|
||||
../../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp
|
||||
../../cockatrice/src/settings/settings_manager.cpp
|
||||
carddatabase_test.cpp
|
||||
mocks.cpp
|
||||
)
|
||||
|
|
@ -26,14 +30,14 @@ add_executable(
|
|||
filter_string_test
|
||||
${MOCKS_SOURCES}
|
||||
${VERSION_STRING_CPP}
|
||||
../../cockatrice/src/carddatabase.cpp
|
||||
../../cockatrice/src/carddbparser/carddatabaseparser.cpp
|
||||
../../cockatrice/src/carddbparser/cockatricexml3.cpp
|
||||
../../cockatrice/src/carddbparser/cockatricexml4.cpp
|
||||
../../cockatrice/src/cardfilter.cpp
|
||||
../../cockatrice/src/filter_string.cpp
|
||||
../../cockatrice/src/filtertree.cpp
|
||||
../../cockatrice/src/settings/settingsmanager.cpp
|
||||
../../cockatrice/src/game/cards/card_database.cpp
|
||||
../../cockatrice/src/game/cards/card_database_parser/card_database_parser.cpp
|
||||
../../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp
|
||||
../../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp
|
||||
../../cockatrice/src/game/filters/filter_card.cpp
|
||||
../../cockatrice/src/game/filters/filter_string.cpp
|
||||
../../cockatrice/src/game/filters/filter_tree.cpp
|
||||
../../cockatrice/src/settings/settings_manager.cpp
|
||||
filter_string_test.cpp
|
||||
mocks.cpp
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "../../cockatrice/src/filter_string.h"
|
||||
#include "../../cockatrice/src/game/filters/filter_string.h"
|
||||
#include "mocks.h"
|
||||
|
||||
#include "gtest/gtest.h"
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@
|
|||
|
||||
#define PICTURELOADER_H
|
||||
|
||||
#include "../../cockatrice/src/carddatabase.h"
|
||||
#include "../../cockatrice/src/settingscache.h"
|
||||
#include "../../cockatrice/src/game/cards/card_database.h"
|
||||
#include "../../cockatrice/src/settings/cache_settings.h"
|
||||
|
||||
extern SettingsCache *settingsCache;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue