jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-02 19:43:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Include card_info.h over card_database.h if able (#5841)

Browse source 
* Move a typedef to card_info.h

* Include card_info.h over card_database.h if able
This commit is contained in:
RickyRister 2025-04-16 21:38:57 -07:00 • committed by GitHub
parent 854208ea0a
commit 2189fc0a96
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
37 changed files with 37 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/game/board/arrow_item.cpp
View file

@ -2,7 +2,7 @@
#include "arrow_item.h"
#include "../../settings/cache_settings.h"
#include "../cards/card_database.h"
#include "../cards/card_info.h"
#include "../cards/card_item.h"
#include "../player/player.h"
#include "../player/player_target.h"

2
cockatrice/src/game/cards/abstract_card_item.h
View file

@ -2,7 +2,7 @@
#define ABSTRACTCARDITEM_H
#include "../board/arrow_target.h"
#include "card_database.h"
#include "card_info.h"
class Player;

3
cockatrice/src/game/cards/card_database.h
View file

@ -28,9 +28,6 @@ enum LoadStatus
NoCards
};
typedef QHash<QString, CardInfoPtr> CardNameMap;
typedef QHash<QString, CardSetPtr> SetNameMap;
class CardDatabase : public QObject
{
Q_OBJECT

2
cockatrice/src/game/cards/card_database_parser/card_database_parser.h
View file

@ -1,7 +1,7 @@
#ifndef CARDDATABASE_PARSER_H
#define CARDDATABASE_PARSER_H
#include "../card_database.h"
#include "../card_info.h"
#include <QIODevice>
#include <QString>

3
cockatrice/src/game/cards/card_info.h
View file

@ -25,6 +25,9 @@ typedef QSharedPointer<CardInfo> CardInfoPtr;
typedef QSharedPointer<CardSet> CardSetPtr;
typedef QMap<QString, QList<CardInfoPerSet>> CardInfoPerSetMap;
typedef QHash<QString, CardInfoPtr> CardNameMap;
typedef QHash<QString, CardSetPtr> SetNameMap;
Q_DECLARE_METATYPE(CardInfoPtr)
class CardSet : public QList<CardInfoPtr>

2
cockatrice/src/game/cards/card_item.cpp
View file

@ -8,8 +8,8 @@
#include "../zones/card_zone.h"
#include "../zones/table_zone.h"
#include "../zones/view_zone.h"
#include "card_database.h"
#include "card_drag_item.h"
#include "card_info.h"
#include "pb/serverinfo_card.pb.h"
#include <QApplication>

2
cockatrice/src/game/cards/card_list.cpp
View file

@ -1,6 +1,6 @@
#include "card_list.h"
#include "card_database.h"
#include "card_info.h"
#include "card_item.h"
#include <QDebug>

2
cockatrice/src/game/deckview/deck_view.cpp
View file

@ -1,7 +1,7 @@
#include "deck_view.h"
#include "../../client/ui/theme_manager.h"
#include "../../game/cards/card_database.h"
#include "../../game/cards/card_info.h"
#include "../../settings/cache_settings.h"
#include "decklist.h"

2
cockatrice/src/game/filters/filter_string.h
View file

@ -1,7 +1,7 @@
#ifndef FILTER_STRING_H
#define FILTER_STRING_H
#include "../cards/card_database.h"
#include "../cards/card_info.h"
#include "filter_tree.h"
#include <QLoggingCategory>

2
cockatrice/src/game/player/player.h
View file

@ -4,7 +4,7 @@
#include "../../client/tearoff_menu.h"
#include "../../dialogs/dlg_create_token.h"
#include "../board/abstract_graphics_item.h"
#include "../cards/card_database.h"
#include "../cards/card_info.h"
#include "../filters/filter_string.h"
#include "pb/card_attributes.pb.h"
#include "pb/game_event.pb.h"

2
cockatrice/src/game/zones/table_zone.cpp
View file

@ -3,8 +3,8 @@
#include "../../client/ui/theme_manager.h"
#include "../../settings/cache_settings.h"
#include "../board/arrow_item.h"
#include "../cards/card_database.h"
#include "../cards/card_drag_item.h"
#include "../cards/card_info.h"
#include "../cards/card_item.h"
#include "../player/player.h"
#include "pb/command_move_card.pb.h"

2
cockatrice/src/game/zones/view_zone.cpp
View file

@ -1,8 +1,8 @@
#include "view_zone.h"
#include "../../server/pending_command.h"
#include "../cards/card_database.h"
#include "../cards/card_drag_item.h"
#include "../cards/card_info.h"
#include "../cards/card_item.h"
#include "../player/player.h"
#include "pb/command_dump_zone.pb.h"