No folder for database models.

Took 6 minutes
This commit is contained in:
Lukas Brübach 2025-09-25 16:19:50 +02:00
parent 1ce20e5165
commit fc9b2e2b14
22 changed files with 23 additions and 23 deletions

View file

@ -23,10 +23,10 @@ set(cockatrice_SOURCES
src/client/update_downloader.cpp src/client/update_downloader.cpp
src/database/card_database.cpp src/database/card_database.cpp
src/database/card_database_manager.cpp src/database/card_database_manager.cpp
src/database/model/card_database_model.cpp
src/database/model/card_database_display_model.cpp
src/database/model/card/card_completer_proxy_model.cpp src/database/model/card/card_completer_proxy_model.cpp
src/database/model/card/card_search_model.cpp src/database/model/card/card_search_model.cpp
src/database/model/database/card_database_model.cpp
src/database/model/database/card_database_display_model.cpp
src/database/model/token/token_display_model.cpp src/database/model/token/token_display_model.cpp
src/database/model/token/token_edit_model.cpp src/database/model/token/token_edit_model.cpp
src/database/parser/card_database_parser.cpp src/database/parser/card_database_parser.cpp

View file

@ -1,7 +1,7 @@
#include "card_search_model.h" #include "card_search_model.h"
#include "../../../utility/levenshtein.h" #include "../../../utility/levenshtein.h"
#include "../database/card_database_model.h" #include "../card_database_model.h"
#include <algorithm> #include <algorithm>

View file

@ -1,7 +1,7 @@
#ifndef CARD_SEARCH_MODEL_H #ifndef CARD_SEARCH_MODEL_H
#define CARD_SEARCH_MODEL_H #define CARD_SEARCH_MODEL_H
#include "../database/card_database_display_model.h" #include "../card_database_display_model.h"
#include <QAbstractListModel> #include <QAbstractListModel>

View file

@ -1,7 +1,7 @@
#ifndef COCKATRICE_CARD_DATABASE_DISPLAY_MODEL_H #ifndef COCKATRICE_CARD_DATABASE_DISPLAY_MODEL_H
#define COCKATRICE_CARD_DATABASE_DISPLAY_MODEL_H #define COCKATRICE_CARD_DATABASE_DISPLAY_MODEL_H
#include "../../../filters/filter_string.h" #include "../../filters/filter_string.h"
#include <QList> #include <QList>
#include <QSet> #include <QSet>

View file

@ -1,7 +1,7 @@
#ifndef CARDDATABASEMODEL_H #ifndef CARDDATABASEMODEL_H
#define CARDDATABASEMODEL_H #define CARDDATABASEMODEL_H
#include "../../card_database.h" #include "../card_database.h"
#include <QAbstractListModel> #include <QAbstractListModel>
#include <QList> #include <QList>

View file

@ -1,6 +1,6 @@
#include "token_display_model.h" #include "token_display_model.h"
#include "../database/card_database_model.h" #include "../card_database_model.h"
TokenDisplayModel::TokenDisplayModel(QObject *parent) : CardDatabaseDisplayModel(parent) TokenDisplayModel::TokenDisplayModel(QObject *parent) : CardDatabaseDisplayModel(parent)
{ {

View file

@ -1,7 +1,7 @@
#ifndef COCKATRICE_TOKEN_DISPLAY_MODEL_H #ifndef COCKATRICE_TOKEN_DISPLAY_MODEL_H
#define COCKATRICE_TOKEN_DISPLAY_MODEL_H #define COCKATRICE_TOKEN_DISPLAY_MODEL_H
#include "../database/card_database_display_model.h" #include "../card_database_display_model.h"
class TokenDisplayModel : public CardDatabaseDisplayModel class TokenDisplayModel : public CardDatabaseDisplayModel
{ {

View file

@ -1,6 +1,6 @@
#include "token_edit_model.h" #include "token_edit_model.h"
#include "../database/card_database_model.h" #include "../card_database_model.h"
TokenEditModel::TokenEditModel(QObject *parent) : CardDatabaseDisplayModel(parent) TokenEditModel::TokenEditModel(QObject *parent) : CardDatabaseDisplayModel(parent)
{ {

View file

@ -1,7 +1,7 @@
#ifndef COCKATRICE_TOKEN_EDIT_MODEL_H #ifndef COCKATRICE_TOKEN_EDIT_MODEL_H
#define COCKATRICE_TOKEN_EDIT_MODEL_H #define COCKATRICE_TOKEN_EDIT_MODEL_H
#include "../database/card_database_display_model.h" #include "../card_database_display_model.h"
class TokenEditModel : public CardDatabaseDisplayModel class TokenEditModel : public CardDatabaseDisplayModel
{ {

View file

@ -3,7 +3,7 @@
#include "../client/get_text_with_max.h" #include "../client/get_text_with_max.h"
#include "../database/card_database.h" #include "../database/card_database.h"
#include "../database/card_database_manager.h" #include "../database/card_database_manager.h"
#include "../database/model/database/card_database_model.h" #include "../database/model/card_database_model.h"
#include "../database/model/token/token_edit_model.h" #include "../database/model/token/token_edit_model.h"
#include "../main.h" #include "../main.h"
#include "trice_limits.h" #include "trice_limits.h"

View file

@ -1,7 +1,7 @@
#include "dlg_create_token.h" #include "dlg_create_token.h"
#include "../../database/card_database_manager.h" #include "../../database/card_database_manager.h"
#include "../../database/model/database/card_database_model.h" #include "../../database/model/card_database_model.h"
#include "../../database/model/token/token_display_model.h" #include "../../database/model/token/token_display_model.h"
#include "../../interface/widgets/cards/card_info_picture_widget.h" #include "../../interface/widgets/cards/card_info_picture_widget.h"
#include "../../main.h" #include "../../main.h"

View file

@ -1,8 +1,8 @@
#ifndef DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H #ifndef DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H
#define DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H #define DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H
#include "../../../database/model/database/card_database_display_model.h" #include "../../../database/model/card_database_display_model.h"
#include "../../../database/model/database/card_database_model.h" #include "../../../database/model/card_database_model.h"
#include "../../../deck/custom_line_edit.h" #include "../../../deck/custom_line_edit.h"
#include "../../../tabs/abstract_tab_deck_editor.h" #include "../../../tabs/abstract_tab_deck_editor.h"
#include "../../../utility/key_signals.h" #include "../../../utility/key_signals.h"

View file

@ -1,6 +1,6 @@
#include "deck_editor_filter_dock_widget.h" #include "deck_editor_filter_dock_widget.h"
#include "../../../database/model/database/card_database_model.h" #include "../../../database/model/card_database_model.h"
#include "../../../filters/filter_builder.h" #include "../../../filters/filter_builder.h"
#include "../../../filters/filter_tree_model.h" #include "../../../filters/filter_tree_model.h"
#include "../../../settings/cache_settings.h" #include "../../../settings/cache_settings.h"

View file

@ -2,7 +2,7 @@
#define VISUAL_DATABASE_DISPLAY_WIDGET_H #define VISUAL_DATABASE_DISPLAY_WIDGET_H
#include "../../../database/card_database.h" #include "../../../database/card_database.h"
#include "../../../database/model/database/card_database_model.h" #include "../../../database/model/card_database_model.h"
#include "../../../deck/custom_line_edit.h" #include "../../../deck/custom_line_edit.h"
#include "../../../deck/deck_list_model.h" #include "../../../deck/deck_list_model.h"
#include "../../../filters/filter_tree_model.h" #include "../../../filters/filter_tree_model.h"

View file

@ -4,7 +4,7 @@
#include "../../../database/card_database_manager.h" #include "../../../database/card_database_manager.h"
#include "../../../database/model/card/card_completer_proxy_model.h" #include "../../../database/model/card/card_completer_proxy_model.h"
#include "../../../database/model/card/card_search_model.h" #include "../../../database/model/card/card_search_model.h"
#include "../../../database/model/database/card_database_model.h" #include "../../../database/model/card_database_model.h"
#include "../../../deck/deck_list_model.h" #include "../../../deck/deck_list_model.h"
#include "../../../deck/deck_loader.h" #include "../../../deck/deck_loader.h"
#include "../../../main.h" #include "../../../main.h"

View file

@ -3,8 +3,8 @@
#include "../../../database/card_database.h" #include "../../../database/card_database.h"
#include "../../../database/model/card/card_completer_proxy_model.h" #include "../../../database/model/card/card_completer_proxy_model.h"
#include "../../../database/model/database/card_database_display_model.h" #include "../../../database/model/card_database_display_model.h"
#include "../../../database/model/database/card_database_model.h" #include "../../../database/model/card_database_model.h"
#include "../../../deck/deck_list_model.h" #include "../../../deck/deck_list_model.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"

View file

@ -2,7 +2,7 @@
#include "../client/tapped_out_interface.h" #include "../client/tapped_out_interface.h"
#include "../database/card_database_manager.h" #include "../database/card_database_manager.h"
#include "../database/model/database/card_database_model.h" #include "../database/model/card_database_model.h"
#include "../deck/deck_stats_interface.h" #include "../deck/deck_stats_interface.h"
#include "../dialogs/dlg_load_deck.h" #include "../dialogs/dlg_load_deck.h"
#include "../dialogs/dlg_load_deck_from_clipboard.h" #include "../dialogs/dlg_load_deck_from_clipboard.h"

View file

@ -3,7 +3,7 @@
#include "../client/deck_editor_menu.h" #include "../client/deck_editor_menu.h"
#include "../client/tapped_out_interface.h" #include "../client/tapped_out_interface.h"
#include "../database/card_database_manager.h" #include "../database/card_database_manager.h"
#include "../database/model/database/card_database_model.h" #include "../database/model/card_database_model.h"
#include "../dialogs/dlg_load_deck.h" #include "../dialogs/dlg_load_deck.h"
#include "../dialogs/dlg_load_deck_from_clipboard.h" #include "../dialogs/dlg_load_deck_from_clipboard.h"
#include "../filters/filter_builder.h" #include "../filters/filter_builder.h"

View file

@ -1,6 +1,6 @@
#include "tab_deck_editor_visual.h" #include "tab_deck_editor_visual.h"
#include "../../database/model/database/card_database_model.h" #include "../../database/model/card_database_model.h"
#include "../../deck/deck_list_model.h" #include "../../deck/deck_list_model.h"
#include "../../deck/deck_stats_interface.h" #include "../../deck/deck_stats_interface.h"
#include "../../filters/filter_builder.h" #include "../../filters/filter_builder.h"

View file

@ -1,6 +1,6 @@
#include "tab_deck_storage_visual.h" #include "tab_deck_storage_visual.h"
#include "../../database/model/database/card_database_model.h" #include "../../database/model/card_database_model.h"
#include "../../interface/widgets/cards/deck_preview_card_picture_widget.h" #include "../../interface/widgets/cards/deck_preview_card_picture_widget.h"
#include "../../interface/widgets/visual_deck_storage/visual_deck_storage_widget.h" #include "../../interface/widgets/visual_deck_storage/visual_deck_storage_widget.h"
#include "../tab_supervisor.h" #include "../tab_supervisor.h"