mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-06-11 08:34:52 -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
|
|
@ -16,22 +16,22 @@ set(oracle_SOURCES
|
|||
src/oracleimporter.cpp
|
||||
src/pagetemplates.cpp
|
||||
src/qt-json/json.cpp
|
||||
../cockatrice/src/carddatabase.cpp
|
||||
../cockatrice/src/pictureloader.cpp
|
||||
../cockatrice/src/carddbparser/carddatabaseparser.cpp
|
||||
../cockatrice/src/carddbparser/cockatricexml3.cpp
|
||||
../cockatrice/src/carddbparser/cockatricexml4.cpp
|
||||
../cockatrice/src/settingscache.cpp
|
||||
../cockatrice/src/shortcutssettings.cpp
|
||||
../cockatrice/src/settings/carddatabasesettings.cpp
|
||||
../cockatrice/src/settings/serverssettings.cpp
|
||||
../cockatrice/src/settings/settingsmanager.cpp
|
||||
../cockatrice/src/settings/messagesettings.cpp
|
||||
../cockatrice/src/settings/gamefilterssettings.cpp
|
||||
../cockatrice/src/settings/layoutssettings.cpp
|
||||
../cockatrice/src/settings/downloadsettings.cpp
|
||||
../cockatrice/src/thememanager.cpp
|
||||
../cockatrice/src/releasechannel.cpp
|
||||
../cockatrice/src/game/cards/card_database.cpp
|
||||
../cockatrice/src/client/ui/picture_loader.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/cache_settings.cpp
|
||||
../cockatrice/src/settings/shortcuts_settings.cpp
|
||||
../cockatrice/src/settings/card_database_settings.cpp
|
||||
../cockatrice/src/settings/servers_settings.cpp
|
||||
../cockatrice/src/settings/settings_manager.cpp
|
||||
../cockatrice/src/settings/message_settings.cpp
|
||||
../cockatrice/src/settings/game_filters_settings.cpp
|
||||
../cockatrice/src/settings/layouts_settings.cpp
|
||||
../cockatrice/src/settings/download_settings.cpp
|
||||
../cockatrice/src/client/ui/theme_manager.cpp
|
||||
../cockatrice/src/client/network/release_channel.cpp
|
||||
${VERSION_STRING_CPP}
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#include "main.h"
|
||||
|
||||
#include "client/ui/theme_manager.h"
|
||||
#include "oraclewizard.h"
|
||||
#include "settingscache.h"
|
||||
#include "thememanager.h"
|
||||
#include "settings/cache_settings.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QCommandLineParser>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#include "oracleimporter.h"
|
||||
|
||||
#include "carddbparser/cockatricexml4.h"
|
||||
#include "game/cards/card_database_parser/cockatrice_xml_4.h"
|
||||
#include "qt-json/json.h"
|
||||
|
||||
#include <QtWidgets>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
#include <QMap>
|
||||
#include <QVariant>
|
||||
#include <carddatabase.h>
|
||||
#include <game/cards/card_database.h>
|
||||
#include <utility>
|
||||
|
||||
// many users prefer not to see these sets with non english arts
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include "main.h"
|
||||
#include "oracleimporter.h"
|
||||
#include "settingscache.h"
|
||||
#include "settings/cache_settings.h"
|
||||
#include "version_string.h"
|
||||
|
||||
#include <QAbstractButton>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue