[Tooling] Apply include-what-you-use across the tree (#7396)

* [DeckList] Apply include-what-you-use to libcockatrice_deck_list

* [IWYU] Apply include-what-you-use across the tree

Run one whole-tree IWYU pass over the libcockatrice_* libraries, the
Cockatrice client, Oracle, Servatrice and the test suite, so each
translation unit includes what it uses directly and forward-declares
what it does not need.

IWYU only analyses real translation units, never the moc code CMake
generates from Q_OBJECT headers, so it strips includes that moc output
silently relies on. Where a type is passed by value (or nested in a
QList/QMap) in a signal or slot signature, the generated moc code needs
the complete type; those includes are kept with an explanatory
`// IWYU pragma: keep`. The same holds for Q_DECLARE_METATYPE targets
such as QSqlDatabase.

A handful of includes are added by hand where callers brace-initialize a
const-reference parameter, which also requires the complete type.

Applied as a single commit on purpose: stripping includes from the
libcockatrice_* headers is precisely what breaks the client, test and
server translation units, and the fixes for those live in the same
translation units. Splitting by component would therefore leave
intermediate commits that do not compile.

All 426 modified Q_OBJECT/Q_GADGET headers were verified to be
moc-self-contained by compiling each generated moc_*.cpp standalone;
several built only because of moc include ordering in
mocs_compilation.cpp before the keep-includes were added.

* [Tooling] Emit public Qt headers and fix IWYU fallout CI found

Three problems the local build could not see, all because a green local
build only proves the configuration it was run under.

Private Qt headers. IWYU emitted private, lowercase Qt headers, and
qtypes.h does not exist at all before Qt 6.9, so the Debian 12 and
Ubuntu 24.04 jobs on Qt 6.4.2 failed to compile. The generator only
emitted a mapping when the capital header name mirrored the private one
(QAbstractAnimation for qabstractanimation.h), so qtypes.h, which is
wrapped by QtTypes instead, got no mapping and kept the private
spelling. Map it explicitly to <QtTypes>, which is public since Qt 5 and
provides the same typedefs either way, and rewrite the 100 affected
includes.

Do not generalize this to "prefer any Qt* wrapper". The table is
generated from whichever Qt is installed, and the wrappers are not
equally old: QtLogging only appeared in Qt 6.8 and QtMinMax in 6.5, so
that heuristic trades one breakage for another. Every other lowercase
header still in the tree has shipped publicly since Qt 5, so those are
left alone.

Platform-guarded includes. IWYU only sees the preprocessor configuration
it is handed, so it dropped an include that only the macOS branch of
main.cpp needs, and the macOS jobs failed on an undeclared
UrlSchemeEventFilter. Restore the include. Force-compiling every file
that carries a platform guard under Q_OS_MAC, Q_OS_MACOS and __APPLE__
reports nothing else, so the macOS branches are covered rather than
assumed.

shellcheck. Drop a leftover variable and stop assigning the
include-what-you-use lookup, which was only ever an existence check.

* [Tooling] Map Qt 6.5+ split headers to QtGlobal for Qt 6.4 compatibility

IWYU emitted QtTypes, QtPreprocessorSupport, QtVersionChecks, QtAssert,
QtMinMax, QtClassHelperMacros, QtEnvironmentVariables and QtTranslation.
Qt 6.5 split those declarations out of qglobal.h into separate headers, so
neither the Qt* wrapper nor the q*.h private name exists on the oldest Qt we
support (6.4.2), and Debian 12 / Ubuntu 24.04 fail with "No such file or
directory". qtypes.h is worse still: it only appeared in Qt 6.9.

QtGlobal is the one spelling that works across the whole supported range. It
has been public since Qt 5, defines these declarations itself up to Qt 6.4, and
includes the split headers from Qt 6.5 on, so redirect all eight private
headers to it and collapse the affected includes in the tree.

Curated overrides now take precedence over the name-mirroring rule, which
cannot know about Qt version floors because the mapping is generated from
whatever Qt is installed. That rule was mapping qtversionchecks.h to
<QtVersionChecks> even with an override present, because the override was only
consulted as a fallback. A curated key that matches nothing is now a hard
error rather than a silent fallback, and the redirected headers are no longer
advertised as the home of a symbol.

Verified every Qt include in the tree resolves against the real
qt6-base-dev 6.4.2 package: 15 distinct includes, 0 missing.

* [Tooling] Map QOverload to QtGlobal and drop the QMetaMethodArgument include

Two more headers IWYU emitted do not exist on Qt 6.4.2:

QOverload was split out of qglobal.h in Qt 6.5, so on 6.4.2 it is declared in
qglobal.h directly and the standalone header is a hard error. QtGlobal covers
both, so map qoverload.h to it like the other 6.5+ split headers.

QMetaMethodArgument is never referenced anywhere in the tree. It is a bare
forwarder for qobjectdefs.h that our generator advertised as a class symbol,
which is how IWYU came to add the include at all. The symbol mappings are
generated from header names, so they cannot tell a forwarder that happens to be
capitalised from a real class; removing the unused include is the fix, and the
generic case stays a known limitation of the generator.

Extending the audit to every Q* header (an earlier pass only matched headers
starting with "Qt" or lowercase q*.h, so it missed all of them) against the real
qt6-base-dev, qt6-multimedia-dev, qt6-declarative-dev, qt6-svg-dev and
qt6-websockets-dev 6.4.2 packages: 341 distinct Qt includes, 0 missing.

* [Game] Give moc the complete CardItem type in player_actions.h

player_actions.h forward declares CardItem but passes QList<CardItem *> by
value in actPlay/actPlayFacedown/actHide. moc instantiates the metatype for
those parameters, and on Qt 6.4 that expands to sizeof(CardItem), so Ubuntu
24.04 fails with "invalid application of 'sizeof' to incomplete type
'CardItem'". Newer Qt tolerates the incomplete type, which is why only the
6.4.2 jobs failed.

Include the defining header with an IWYU pragma keep, matching how the other
MOC-required includes in this area are handled.

* [Game] Give moc the complete ServerInfo_Card type

player_logic.h, game_scene.h, view_zone.h and view_zone_widget.h forward
declare ServerInfo_Card but pass QList<const ServerInfo_Card *> through signal
and slot signatures. moc instantiates the metatype for those parameters, which
Qt 6.4 expands to sizeof(ServerInfo_Card), so the connect in game_scene.cpp
fails on Debian 12 and Ubuntu 24.04 with "invalid application of 'sizeof' to
incomplete type 'const ServerInfo_Card'". Newer Qt tolerates it, so only the
6.4.2 jobs failed.

Include the generated protobuf header with an IWYU pragma keep, following the
pattern already used for ServerInfo_Player and ServerInfo_User in
game_event_handler.h.

* [Client] Complete the types Qt 6.4 needs for connect and moc

Qt 6.4 expands QMetaType::fromType on the normalised argument list of a
PMF connect and on moc-generated metatypes, which requires sizeof on every
signal and slot parameter. Newer Qt tolerates forward declarations there,
so only the Debian 12 and Ubuntu 24.04 jobs failed, with
"invalid application of 'sizeof' to incomplete type" for QMouseEvent,
QPrinter and GameReplay.

Replace the forward declarations with the real includes:

- QMouseEvent in the nine widget headers that pass it through signals
- QPrinter in abstract_tab_deck_editor.cpp, for the actPrintDeck lambda
- game_replay.pb.h in tab_replays.h. GameReplay is a protobuf message, so
  the project's game/replay.h only forward declares it and cannot supply
  the complete type.

Found by recompiling all 1918 project TUs against the Debian Qt 6.4.2
headers, which reproduces those two CI jobs locally in one pass.

* [Client] Complete Release and QMenu for Qt 6.4 moc and connect

Continuing the Qt 6.4 complete-type sweep:

- window_main.cpp connects ClientUpdateChecker::finishedCheck to
  MainWindow::checkClientUpdatesFinished, whose Release * parameter made
  moc 6.4 instantiate the metatype. GameReplay turned out to be a protobuf
  message, so Release likewise needed release_channel.h in the three
  headers declaring those signals: window_main.h, dlg_update.h and
  client_update_checker.h.
- moc 6.4 also needs sizeof(QMenu) for the QList<QMenu *> carried by
  TabSupervisor::setMenu and MainWindow::updateTabMenu.

Verified by regenerating moc output with the Debian moc 6.4.2 for all 434
Q_OBJECT/Q_GADGET classes and compiling it, plus recompiling all 1612
source TUs, against the Qt 6.4.2 headers: no remaining failures.

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>

cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp

@@ -1,15 +1,24 @@
 #include "color_identity_widget.h"
 
 #include "../../../../client/settings/cache_settings.h"
+#include "libcockatrice/card/card_info.h"
 #include "mana_symbol_widget.h"
 
+#include <QChar>
 #include <QHBoxLayout>
-#include <QLabel>
+#include <QLayoutItem>
+#include <QList>
+#include <QObject>
 #include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QRegularExpressionMatchIterator>
 #include <QResizeEvent>
+#include <QSharedPointer>
 #include <QSize>
+#include <QtGlobal>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
 #include <libcockatrice/utility/qt_utils.h>
+#include <qnamespace.h>
 
 ColorIdentityWidget::ColorIdentityWidget(QWidget *parent, const QString &_colorIdentity)
     : QWidget(parent), colorIdentity(_colorIdentity)

cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.h

@@ -7,9 +7,13 @@
 #ifndef COLOR_IDENTITY_WIDGET_H
 #define COLOR_IDENTITY_WIDGET_H
 
-#include <QHBoxLayout>
+#include <QString>
+#include <QStringList>
 #include <QWidget>
 #include <libcockatrice/card/card_info.h>
+#include <qtmetamacros.h>
+
+class QHBoxLayout;
 
 class ColorIdentityWidget : public QWidget
 {

cockatrice/src/interface/widgets/cards/additional_info/deck_color_identity.cpp

@@ -1,6 +1,11 @@
 #include "deck_color_identity.h"
 
+#include "libcockatrice/card/card_info.h"
+
+#include <QChar>
+#include <QList>
 #include <QSet>
+#include <QStringList>
 #include <libcockatrice/card/database/card_database_querier.h>
 #include <libcockatrice/deck_list/deck_list.h>
 #include <libcockatrice/deck_list/tree/inner_deck_list_node.h>

cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.cpp

@@ -1,12 +1,16 @@
 #include "mana_cost_widget.h"
 
+#include "libcockatrice/card/card_info.h"
 #include "mana_symbol_widget.h"
 
 #include <QHBoxLayout>
-#include <QLabel>
+#include <QList>
+#include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QRegularExpressionMatchIterator>
 #include <QResizeEvent>
 #include <QSize>
-#include <qregularexpression.h>
+#include <QtGlobal>
 
 ManaCostWidget::ManaCostWidget(QWidget *parent, CardInfoPtr _card) : QWidget(parent), card(_card)
 {

cockatrice/src/interface/widgets/cards/additional_info/mana_cost_widget.h

@@ -7,9 +7,13 @@
 #ifndef MANA_COST_WIDGET_H
 #define MANA_COST_WIDGET_H
 
-#include <QHBoxLayout>
+#include <QString>
+#include <QStringList>
 #include <QWidget>
 #include <libcockatrice/card/card_info.h>
+#include <qtmetamacros.h>
+
+class QHBoxLayout;
 
 class ManaCostWidget : public QWidget
 {

cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp

@@ -3,8 +3,16 @@
 #include "../../../../client/settings/cache_settings.h"
 #include "../../../pixel_map_generator.h"
 
+#include <QGraphicsOpacityEffect>
+#include <QPixmap>
 #include <QResizeEvent>
+#include <QSharedPointer>
+#include <QSize>
+#include <QtGlobal>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
+#include <utility>
+
+class QWidget;
 
 ManaSymbolWidget::ManaSymbolWidget(QWidget *parent, QString _symbol, bool _isActive, bool _mayBeToggled)
     : QLabel(parent), symbol(std::move(_symbol)), isActive(_isActive), mayBeToggled(_mayBeToggled)

cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.h

@@ -7,8 +7,13 @@
 #ifndef MANA_SYMBOL_WIDGET_H
 #define MANA_SYMBOL_WIDGET_H
 
-#include <QGraphicsOpacityEffect>
+#include <QChar>
 #include <QLabel>
+#include <QString>
+#include <qtmetamacros.h>
+
+class QGraphicsOpacityEffect;
+class QWidget;
 
 class ManaSymbolWidget : public QLabel
 {

cockatrice/src/interface/widgets/cards/art_crop_attribution.cpp

@@ -1,8 +1,17 @@
 #include "art_crop_attribution.h"
 
+#include "libcockatrice/card/printing/printing_info.h"
+
+#include <QColor>
+#include <QFont>
 #include <QFontMetrics>
 #include <QObject>
 #include <QPainter>
+#include <QPointF>
+#include <QRectF>
+#include <QSizeF>
+#include <QString>
+#include <QtGlobal>
 #include <libcockatrice/card/printing/exact_card.h>
 
 QString buildArtAttribution(const ExactCard &card)

cockatrice/src/interface/widgets/cards/art_crop_attribution.h

@@ -1,7 +1,8 @@
 #ifndef COCKATRICE_ART_CROP_ATTRIBUTION_H
 #define COCKATRICE_ART_CROP_ATTRIBUTION_H
 
-#include <QStringView>
+#include <QtGlobal>
+#include <qnamespace.h>
 
 class ExactCard;
 class QPainter;

cockatrice/src/interface/widgets/cards/card_art_utils.cpp

@@ -1,7 +1,10 @@
 #include "card_art_utils.h"
 
+#include "libcockatrice/card/card_info.h"
+
 #include <QTransform>
 #include <libcockatrice/card/printing/exact_card.h>
+#include <qnamespace.h>
 
 namespace CardArtUtils
 {

cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp

@@ -1,13 +1,33 @@
 #include "card_group_display_widget.h"
 
 #include "../../../../client/settings/cache_settings.h"
+#include "../../general/display/banner_widget.h"
+#include "../card_info_picture_widget.h"
 #include "../card_info_picture_with_text_overlay_widget.h"
+#include "../card_size_widget.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
 
-#include <QResizeEvent>
+#include <QAbstractItemModel>
+#include <QAbstractProxyModel>
+#include <QDebug>
+#include <QItemSelection>
+#include <QItemSelectionModel>
+#include <QItemSelectionRange>
+#include <QModelIndex>
+#include <QObject>
+#include <QSharedPointer>
+#include <QSize>
+#include <QSlider>
+#include <QStringLiteral>
+#include <QVariant>
+#include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
 #include <libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.h>
 #include <libcockatrice/settings/cards_display_settings.h>
+#include <qnamespace.h>
+#include <utility>
 
 CardGroupDisplayWidget::CardGroupDisplayWidget(QWidget *parent,
                                                DeckListModel *_deckListModel,

cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h

@@ -7,15 +7,24 @@
 #ifndef CARD_GROUP_DISPLAY_WIDGET_H
 #define CARD_GROUP_DISPLAY_WIDGET_H
 
-#include "../../general/display/banner_widget.h"
-#include "../card_info_picture_with_text_overlay_widget.h"
-#include "../card_size_widget.h"
-
-#include <QItemSelectionModel>
-#include <QLabel>
+#include <QList>
+#include <QMap>
+#include <QMouseEvent>
+#include <QPersistentModelIndex>
+#include <QString>
+#include <QStringList>
 #include <QVBoxLayout>
+#include <QVector>
 #include <QWidget>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <qtmetamacros.h>
+
+class BannerWidget;
+class CardSizeWidget;
+class DeckListModel;
+class ExactCard;
+class QItemSelection;
+class QItemSelectionModel;
+class QModelIndex;
 
 class CardGroupDisplayWidget : public QWidget
 {

cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp

@@ -1,10 +1,20 @@
 #include "flat_card_group_display_widget.h"
 
-#include <QResizeEvent>
-#include <libcockatrice/card/database/card_database_manager.h>
+#include "../../general/display/banner_widget.h"
+#include "../../general/layout_containers/flow_widget.h"
+
+#include <QAbstractItemModel>
+#include <QList>
+#include <QMap>
+#include <QVBoxLayout>
+#include <QWidget>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <qnamespace.h>
 #include <utility>
 
+class CardSizeWidget;
+class QItemSelectionModel;
+
 FlatCardGroupDisplayWidget::FlatCardGroupDisplayWidget(QWidget *parent,
                                                        DeckListModel *_deckListModel,
                                                        QItemSelectionModel *_selectionModel,

cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.h

@@ -10,6 +10,16 @@
 #include "../../general/layout_containers/flow_widget.h"
 #include "card_group_display_widget.h"
 
+#include <QPersistentModelIndex>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
+
+class CardSizeWidget;
+class DeckListModel;
+class QItemSelectionModel;
+class QWidget;
+
 class FlatCardGroupDisplayWidget : public CardGroupDisplayWidget
 {
     Q_OBJECT

cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp

@@ -1,8 +1,20 @@
 #include "overlapped_card_group_display_widget.h"
 
+#include "../../general/display/banner_widget.h"
+#include "../../general/layout_containers/overlap_widget.h"
+#include "../card_size_widget.h"
+
+#include <QAbstractItemModel>
+#include <QList>
+#include <QMap>
 #include <QResizeEvent>
-#include <libcockatrice/card/database/card_database_manager.h>
+#include <QSlider>
+#include <QVBoxLayout>
+#include <QWidget>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <qnamespace.h>
+
+class QItemSelectionModel;
 
 OverlappedCardGroupDisplayWidget::OverlappedCardGroupDisplayWidget(QWidget *parent,
                                                                    DeckListModel *_deckListModel,

cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.h

@@ -10,6 +10,16 @@
 #include "../../general/layout_containers/overlap_widget.h"
 #include "card_group_display_widget.h"
 
+#include <QPersistentModelIndex>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
+
+class CardSizeWidget;
+class DeckListModel;
+class QItemSelectionModel;
+class QWidget;
+
 class OverlappedCardGroupDisplayWidget : public CardGroupDisplayWidget
 {
     Q_OBJECT

cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp

@@ -1,14 +1,25 @@
 #include "card_info_display_widget.h"
 
-#include "../../../game_graphics/board/card_item.h"
+#include "../../../game_graphics/board/abstract_card_item.h"
+#include "../../../game_graphics/card_dimensions.h"
 #include "card_info_picture_widget.h"
 #include "card_info_text_widget.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/utility/card_ref.h"
 
-#include <QApplication>
+#include <QGuiApplication>
+#include <QObject>
+#include <QRect>
 #include <QScreen>
+#include <QSize>
+#include <QString>
 #include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database_manager.h>
 
+class QWidget;
+
 CardInfoDisplayWidget::CardInfoDisplayWidget(const CardRef &cardRef, QWidget *parent, Qt::WindowFlags flags)
     : QFrame(parent, flags), aspectRatio(CardDimensions::HEIGHT_F / CardDimensions::WIDTH_F)
 {

cockatrice/src/interface/widgets/cards/card_info_display_widget.h

@@ -7,15 +7,17 @@
 #ifndef CARDINFOWIDGET_H
 #define CARDINFOWIDGET_H
 
-#include <QComboBox>
 #include <QFrame>
-#include <QStringList>
+#include <QtGlobal>
 #include <libcockatrice/card/printing/exact_card.h>
-#include <libcockatrice/utility/card_ref.h>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
 
 class CardInfoPictureWidget;
 class CardInfoTextWidget;
 class AbstractCardItem;
+class QWidget;
+struct CardRef;
 
 class CardInfoDisplayWidget : public QFrame
 {

cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp

@@ -1,16 +1,27 @@
 #include "card_info_frame_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../../game_graphics/board/card_item.h"
-#include "card_info_display_widget.h"
+#include "../../../game_graphics/board/abstract_card_item.h"
 #include "card_info_picture_widget.h"
 #include "card_info_text_widget.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
 
+#include <QList>
+#include <QObject>
+#include <QPushButton>
 #include <QSplitter>
 #include <QVBoxLayout>
+#include <QWidget>
+#include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/settings/cards_display_settings.h>
+#include <libcockatrice/utility/card_ref.h>
+#include <qnamespace.h>
+
+struct CardRef;
 
 CardInfoFrameWidget::CardInfoFrameWidget(QWidget *parent)
     : QTabWidget(parent), viewTransformationButton(nullptr), cardTextOnly(false)

cockatrice/src/interface/widgets/cards/card_info_frame_widget.h

@@ -7,16 +7,19 @@
 #ifndef CARDFRAME_H
 #define CARDFRAME_H
 
-#include <QPushButton>
+#include <QString>
 #include <QTabWidget>
 #include <libcockatrice/card/printing/exact_card.h>
-#include <libcockatrice/utility/card_ref.h>
+#include <qtmetamacros.h>
 
 class AbstractCardItem;
 class CardInfoPictureWidget;
 class CardInfoTextWidget;
 class QVBoxLayout;
 class QSplitter;
+class QPushButton;
+class QWidget;
+struct CardRef;
 
 class CardInfoFrameWidget : public QTabWidget
 {

cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.cpp

@@ -1,6 +1,12 @@
 #include "card_info_picture_art_crop_widget.h"
 
 #include "../../../interface/card_picture_loader/card_picture_loader.h"
+#include "libcockatrice/card/printing/exact_card.h"
+
+#include <QRect>
+#include <QSize>
+
+class QWidget;
 
 CardInfoPictureArtCropWidget::CardInfoPictureArtCropWidget(QWidget *parent)
     : CardInfoPictureWidget(parent, false, false)

cockatrice/src/interface/widgets/cards/card_info_picture_art_crop_widget.h

@@ -9,6 +9,11 @@
 
 #include "card_info_picture_widget.h"
 
+#include <QPixmap>
+#include <qtmetamacros.h>
+
+class QWidget;
+
 class CardInfoPictureArtCropWidget : public CardInfoPictureWidget
 {
     Q_OBJECT

cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp

@@ -2,10 +2,17 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../interface/card_picture_loader/card_picture_loader.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/printing/exact_card.h"
 
 #include <QPainterPath>
+#include <QPoint>
+#include <QRect>
+#include <QSize>
 #include <QStylePainter>
+#include <QtGlobal>
 #include <libcockatrice/settings/cards_display_settings.h>
+#include <qnamespace.h>
 
 /**
  * @brief Constructs a CardPictureEnlargedWidget.

cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.h

@@ -8,8 +8,12 @@
 #ifndef CARD_PICTURE_ENLARGED_WIDGET_H
 #define CARD_PICTURE_ENLARGED_WIDGET_H
 
+#include <QPixmap>
 #include <QWidget>
 #include <libcockatrice/card/printing/exact_card.h>
+#include <qtmetamacros.h>
+
+class QSize;
 
 class CardInfoPictureEnlargedWidget final : public QWidget
 {

cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp

@@ -1,21 +1,47 @@
 #include "card_info_picture_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../../game_graphics/board/card_item.h"
 #include "../../../interface/card_picture_loader/card_picture_loader.h"
 #include "../../../interface/widgets/tabs/tab_supervisor.h"
 #include "../../window_main.h"
+#include "../tabs/abstract_tab_deck_editor.h"
 #include "card_art_utils.h"
+#include "card_info_picture_enlarged_widget.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
 
+#include <QAbstractAnimation>
+#include <QAction>
+#include <QApplication>
+#include <QByteArray>
+#include <QCursor>
+#include <QDebug>
+#include <QEasingCurve>
+#include <QGuiApplication>
+#include <QList>
 #include <QMenu>
 #include <QMouseEvent>
+#include <QObject>
+#include <QPainterPath>
+#include <QPropertyAnimation>
+#include <QRect>
 #include <QScreen>
+#include <QSharedPointer>
+#include <QSize>
+#include <QString>
 #include <QStylePainter>
+#include <QTimer>
 #include <QWidget>
+#include <QtGlobal>
+#include <algorithm>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/settings/cards_display_settings.h>
-#include <utility>
+#include <qlogging.h>
+#include <qnamespace.h>
 
 static constexpr qreal MTG_CARD_ASPECT_RATIO = 1.396;
 // static constexpr qreal YUGIOH_CARD_ASPECT_RATIO = 1.457;

cockatrice/src/interface/widgets/cards/card_info_picture_widget.h

@@ -7,15 +7,20 @@
 #ifndef CARD_INFO_PICTURE_H
 #define CARD_INFO_PICTURE_H
 
-#include "card_info_picture_enlarged_widget.h"
-
-#include <QPropertyAnimation>
+#include <QLoggingCategory>
+#include <QMouseEvent>
+#include <QPixmap>
+#include <QPoint>
 #include <QWidget>
 #include <libcockatrice/card/printing/exact_card.h>
+#include <qtmetamacros.h>
+
+class CardInfoPictureEnlargedWidget;
+class QPropertyAnimation;
+class QTimer;
 
 inline Q_LOGGING_CATEGORY(CardInfoPictureWidgetLog, "card_info_picture_widget");
 
-class AbstractCardItem;
 class QMenu;
 
 class CardInfoPictureWidget : public QWidget

cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp

@@ -1,8 +1,24 @@
 #include "card_info_picture_with_text_overlay_widget.h"
 
+#include <QBrush>
+#include <QChar>
+#include <QFont>
 #include <QFontMetrics>
+#include <QList>
+#include <QPainter>
 #include <QPainterPath>
+#include <QPalette>
+#include <QPen>
+#include <QPixmap>
+#include <QPoint>
+#include <QRect>
+#include <QSize>
+#include <QSizePolicy>
+#include <QStringList>
 #include <QStylePainter>
+#include <algorithm>
+
+class QWidget;
 
 /**
  * @brief Constructs a CardPictureWithTextOverlay widget.

cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.h

@@ -11,8 +11,14 @@
 #include "card_info_picture_widget.h"
 
 #include <QColor>
-#include <QSize>
+#include <QString>
 #include <QTextOption>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
+
+class QPainter;
+class QRect;
+class QWidget;
 
 class CardInfoPictureWithTextOverlayWidget : public CardInfoPictureWidget
 {

cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp

@@ -1,15 +1,26 @@
 #include "card_info_text_widget.h"
 
-#include "../../../game_graphics/board/card_item.h"
+#include "../../../client/settings/cache_settings.h"
 #include "../../card_localization.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/card/set/card_set.h"
+#include "libcockatrice/settings/cards_display_settings.h"
 
 #include <QGridLayout>
 #include <QLabel>
+#include <QList>
 #include <QScrollArea>
 #include <QScrollBar>
+#include <QSharedPointer>
+#include <QSize>
+#include <QStringList>
 #include <QTextEdit>
+#include <QWidget>
 #include <libcockatrice/card/game_specific_terms.h>
 #include <libcockatrice/card/relation/card_relation.h>
+#include <qnamespace.h>
+#include <qobjectdefs.h>
 
 CardInfoTextWidget::CardInfoTextWidget(QWidget *parent) : QFrame(parent)
 {

cockatrice/src/interface/widgets/cards/card_info_text_widget.h

@@ -10,10 +10,13 @@
 #include "libcockatrice/card/printing/exact_card.h"
 
 #include <QFrame>
-#include <libcockatrice/card/card_info.h>
+#include <QString>
+#include <qtmetamacros.h>
+
 class QLabel;
 class QScrollArea;
 class QTextEdit;
+class QWidget;
 
 class CardInfoTextWidget : public QFrame
 {

cockatrice/src/interface/widgets/cards/card_size_widget.cpp

@@ -1,10 +1,19 @@
 #include "card_size_widget.h"
 
-#include "../printing_selector/printing_selector.h"
-#include "../visual_deck_storage/visual_deck_storage_widget.h"
+#include "../general/layout_containers/flow_widget.h"
 
+#include <QEvent>
+#include <QFlags>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QList>
+#include <QPoint>
 #include <QScrollArea>
+#include <QSizePolicy>
+#include <QSlider>
 #include <QWheelEvent>
+#include <QtGlobal>
+#include <qnamespace.h>
 
 /**
  * @class CardSizeWidget

cockatrice/src/interface/widgets/cards/card_size_widget.h

@@ -9,15 +9,15 @@
 #ifndef CARD_SIZE_WIDGET_H
 #define CARD_SIZE_WIDGET_H
 
-#include "../general/layout_containers/flow_widget.h"
-
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QSlider>
 #include <QTimer>
 #include <QWidget>
+#include <qtmetamacros.h>
 
 class QWheelEvent;
+class FlowWidget;
+class QHBoxLayout;
+class QLabel;
+class QSlider;
 
 class CardSizeWidget : public QWidget
 {

cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp

@@ -1,14 +1,38 @@
 #include "deck_card_zone_display_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../general/display/banner_widget.h"
+#include "../visual_deck_editor/visual_deck_editor_widget.h"
+#include "card_group_display_widgets/card_group_display_widget.h"
 #include "card_group_display_widgets/flat_card_group_display_widget.h"
 #include "card_group_display_widgets/overlapped_card_group_display_widget.h"
+#include "libcockatrice/card/card_info.h"
 #include "libcockatrice/card/database/card_database_manager.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/deck_list/tree/deck_list_card_node.h"
 #include "libcockatrice/settings/cards_display_settings.h"
 
-#include <QResizeEvent>
-#include <algorithm>
+#include <QAbstractItemModel>
+#include <QDebug>
+#include <QItemSelection>
+#include <QItemSelectionModel>
+#include <QItemSelectionRange>
+#include <QLayout>
+#include <QLayoutItem>
+#include <QModelIndex>
+#include <QSharedPointer>
+#include <QSizePolicy>
+#include <QStringLiteral>
+#include <QTimer>
+#include <QVBoxLayout>
+#include <QVariant>
+#include <QtGlobal>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <qnamespace.h>
+
+class CardSizeWidget;
+class QMouseEvent;
 
 DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent,
                                                      DeckListModel *_deckListModel,

cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h

@@ -7,16 +7,27 @@
 #ifndef DECK_CARD_ZONE_DISPLAY_WIDGET_H
 #define DECK_CARD_ZONE_DISPLAY_WIDGET_H
 
-#include "../general/display/banner_widget.h"
-#include "../general/layout_containers/overlap_widget.h"
 #include "../visual_deck_editor/visual_deck_editor_widget.h"
-#include "card_group_display_widgets/card_group_display_widget.h"
-#include "card_info_picture_with_text_overlay_widget.h"
-#include "card_size_widget.h"
 
-#include <QVBoxLayout>
+#include <QHash>
+#include <QList>
+#include <QMouseEvent>
+#include <QPersistentModelIndex>
+#include <QString>
+#include <QStringList>
 #include <QWidget>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <qtmetamacros.h>
+
+class BannerWidget;
+class CardGroupDisplayWidget;
+class CardSizeWidget;
+class DeckListModel;
+class ExactCard;
+class OverlapWidget;
+class QItemSelection;
+class QItemSelectionModel;
+class QModelIndex;
+class QVBoxLayout;
 
 class DeckCardZoneDisplayWidget : public QWidget
 {

cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp

@@ -1,15 +1,15 @@
 #include "deck_preview_card_picture_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "card_info_picture_widget.h"
 
 #include <QApplication>
-#include <QFileInfo>
-#include <QFontMetrics>
 #include <QMouseEvent>
-#include <QPainterPath>
-#include <QStylePainter>
+#include <QTimer>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
 
+class QWidget;
+
 /**
  * @brief Constructs a CardPictureWithTextOverlay widget.
  * @param parent The parent widget.

cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.h

@@ -11,9 +11,12 @@
 #include "card_info_picture_with_text_overlay_widget.h"
 
 #include <QColor>
-#include <QSize>
-#include <QTextOption>
-#include <QTimer>
+#include <QMouseEvent>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
+
+class QTimer;
+class QWidget;
 
 class DeckPreviewCardPictureWidget final : public CardInfoPictureWithTextOverlayWidget
 {

cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.cpp

@@ -1,9 +1,16 @@
 #include "abstract_analytics_panel_widget.h"
 
 #include "../../pixel_map_generator.h"
+#include "../general/display/banner_widget.h"
 #include "deck_list_statistics_analyzer.h"
 
+#include <QDialog>
+#include <QHBoxLayout>
 #include <QPushButton>
+#include <QSizePolicy>
+#include <QStringLiteral>
+#include <QVBoxLayout>
+#include <qnamespace.h>
 
 AbstractAnalyticsPanelWidget::AbstractAnalyticsPanelWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer)
     : QWidget(parent), analyzer(analyzer)

cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.h

@@ -3,12 +3,16 @@
 
 #include "../general/display/banner_widget.h"
 
-#include <QDialog>
 #include <QJsonObject>
-#include <QVBoxLayout>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
 
 class DeckListStatisticsAnalyzer;
+class QDialog;
+class QHBoxLayout;
+class QPushButton;
+class QVBoxLayout;
 
 class AbstractAnalyticsPanelWidget : public QWidget
 {

cockatrice/src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp

@@ -3,8 +3,11 @@
 #include "analytics_panel_widget_factory.h"
 
 #include <QDialogButtonBox>
+#include <QList>
 #include <QVBoxLayout>
 
+class QWidget;
+
 AddAnalyticsPanelDialog::AddAnalyticsPanelDialog(QWidget *parent) : QDialog(parent)
 {
     setWindowTitle(tr("Add Analytics Panel"));

cockatrice/src/interface/widgets/deck_analytics/add_analytics_panel_dialog.h

@@ -2,12 +2,15 @@
 #ifndef COCKATRICE_ADD_ANALYTICS_PANEL_DIALOG_H
 #define COCKATRICE_ADD_ANALYTICS_PANEL_DIALOG_H
 
-#include "analytics_panel_widget_factory.h"
-
 #include <QComboBox>
 #include <QDialog>
-#include <QDialogButtonBox>
-#include <QVBoxLayout>
+#include <QString>
+#include <QVariant>
+#include <qtmetamacros.h>
+
+class QDialogButtonBox;
+class QVBoxLayout;
+class QWidget;
 
 class AddAnalyticsPanelDialog : public QDialog
 {

cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.cpp

@@ -2,6 +2,8 @@
 
 #include "abstract_analytics_panel_widget.h"
 
+#include <QSharedPointer>
+
 AnalyticsPanelWidgetFactory &AnalyticsPanelWidgetFactory::instance()
 {
     static AnalyticsPanelWidgetFactory f;

cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.h

@@ -1,9 +1,9 @@
 #ifndef COCKATRICE_DECK_ANALYTICS_WIDGET_FACTORY_H
 #define COCKATRICE_DECK_ANALYTICS_WIDGET_FACTORY_H
 
+#include <QList>
 #include <QMap>
 #include <QString>
-#include <QStringList>
 #include <QWidget>
 #include <functional>
 

cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_registrar.h

@@ -3,6 +3,8 @@
 
 #include "analytics_panel_widget_factory.h"
 
+#include <QString>
+
 class AnalyticsPanelWidgetRegistrar
 {
 public:

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config.cpp

@@ -1,5 +1,8 @@
 #include "draw_probability_config.h"
 
+#include <QJsonValue>
+#include <QJsonValueRef>
+
 QJsonObject DrawProbabilityConfig::toJson() const
 {
     QJsonObject o;

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp

@@ -5,6 +5,10 @@
 #include <QFormLayout>
 #include <QLabel>
 #include <QSpinBox>
+#include <QString>
+#include <QVariant>
+
+class QWidget;
 
 DrawProbabilityConfigDialog::DrawProbabilityConfigDialog(QWidget *parent) : QDialog(parent)
 {

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.h

@@ -3,11 +3,13 @@
 #include "draw_probability_config.h"
 
 #include <QDialog>
-#include <QFormLayout>
+#include <qtmetamacros.h>
 
 class QComboBox;
 class QSpinBox;
 class QLabel;
+class QFormLayout;
+class QWidget;
 
 class DrawProbabilityConfigDialog : public QDialog
 {

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp

@@ -1,21 +1,40 @@
 #include "draw_probability_widget.h"
 
+#include "../../../general/display/banner_widget.h"
+#include "../../../general/layout_containers/flow_widget.h"
+#include "../../abstract_analytics_panel_widget.h"
+#include "../../deck_list_statistics_analyzer.h"
+#include "deck_list_model.h"
 #include "draw_probability_config_dialog.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/deck_list/tree/deck_list_card_node.h"
 
+#include <QAbstractItemView>
+#include <QChar>
 #include <QComboBox>
 #include <QDialog>
-#include <QDialogButtonBox>
-#include <QFormLayout>
-#include <QHBoxLayout>
 #include <QHeaderView>
+#include <QJsonObject>
 #include <QLabel>
+#include <QList>
 #include <QMap>
+#include <QObject>
+#include <QSharedPointer>
+#include <QSizePolicy>
 #include <QSpinBox>
+#include <QString>
+#include <QStringList>
+#include <QTableWidget>
 #include <QTableWidgetItem>
-#include <QWidget>
+#include <QVBoxLayout>
+#include <QVariant>
+#include <QtGlobal>
 #include <QtMath>
 #include <libcockatrice/card/card_info.h>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <qnamespace.h>
+
+class QWidget;
 
 DrawProbabilityWidget::DrawProbabilityWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer)
     : AbstractAnalyticsPanelWidget(parent, analyzer)

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.h

@@ -1,16 +1,19 @@
 #ifndef COCKATRICE_DRAW_PROBABILITY_WIDGET_H
 #define COCKATRICE_DRAW_PROBABILITY_WIDGET_H
 
-#include "../../../../layouts/flow_layout.h"
-#include "../../../general/layout_containers/flow_widget.h"
 #include "../../abstract_analytics_panel_widget.h"
-#include "../../deck_list_statistics_analyzer.h"
 #include "draw_probability_config.h"
 
-#include <QComboBox>
-#include <QLineEdit>
-#include <QSpinBox>
-#include <QTableWidget>
+#include <qtmetamacros.h>
+
+class DeckListStatisticsAnalyzer;
+class FlowWidget;
+class QComboBox;
+class QLabel;
+class QLineEdit;
+class QSpinBox;
+class QTableWidget;
+class QWidget;
 
 class DrawProbabilityWidget : public AbstractAnalyticsPanelWidget
 {

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config.cpp

@@ -1,5 +1,9 @@
 #include "mana_base_config.h"
 
+#include <QJsonArray>
+#include <QJsonValue>
+#include <QJsonValueRef>
+
 QJsonObject ManaBaseConfig::toJson() const
 {
     QJsonObject jsonObject;

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config.h

@@ -2,8 +2,9 @@
 #ifndef COCKATRICE_MANA_BASE_CONFIG_H
 #define COCKATRICE_MANA_BASE_CONFIG_H
 
-#include <QJsonArray>
 #include <QJsonObject>
+#include <QList>
+#include <QString>
 #include <QStringList>
 
 struct ManaBaseConfig

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp

@@ -1,6 +1,19 @@
 #include "mana_base_config_dialog.h"
 
+#include "../../deck_list_statistics_analyzer.h"
+
+#include <QAbstractItemView>
+#include <QComboBox>
+#include <QDialogButtonBox>
+#include <QHash>
+#include <QLabel>
+#include <QListWidget>
+#include <QListWidgetItem>
 #include <QPushButton>
+#include <QStringList>
+#include <QVBoxLayout>
+
+class QWidget;
 
 ManaBaseConfigDialog::ManaBaseConfigDialog(DeckListStatisticsAnalyzer *analyzer,
                                            ManaBaseConfig initial,

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.h

@@ -2,18 +2,20 @@
 #ifndef COCKATRICE_MANA_BASE_ADD_DIALOG_H
 #define COCKATRICE_MANA_BASE_ADD_DIALOG_H
 
-#include "../../deck_list_statistics_analyzer.h"
 #include "mana_base_config.h"
 
-#include <QCheckBox>
-#include <QComboBox>
 #include <QDialog>
-#include <QDialogButtonBox>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QLabel>
-#include <QListWidget>
-#include <QVBoxLayout>
+#include <QList>
+#include <QString>
+#include <qtmetamacros.h>
+
+class DeckListStatisticsAnalyzer;
+class QComboBox;
+class QDialogButtonBox;
+class QLabel;
+class QListWidget;
+class QVBoxLayout;
+class QWidget;
 
 class ManaBaseConfigDialog : public QDialog
 {

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp

@@ -3,12 +3,27 @@
 #include "../../../general/display/charts/bars/bar_widget.h"
 #include "../../../general/display/charts/bars/color_bar.h"
 #include "../../../general/display/charts/pies/color_pie.h"
+#include "../../abstract_analytics_panel_widget.h"
 #include "../../analytics_panel_widget_registrar.h"
+#include "../../deck_list_statistics_analyzer.h"
 #include "mana_base_config_dialog.h"
 
+#include <QColor>
 #include <QDialog>
-#include <QListWidget>
+#include <QHBoxLayout>
+#include <QHash>
+#include <QLayoutItem>
+#include <QMap>
+#include <QObject>
+#include <QPair>
+#include <QSharedPointer>
+#include <QSize>
+#include <QVBoxLayout>
+#include <QWidget>
+#include <algorithm>
 #include <libcockatrice/utility/color.h>
+#include <qnamespace.h>
+#include <utility>
 
 namespace
 {

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.h

@@ -7,16 +7,17 @@
 #ifndef MANA_BASE_WIDGET_H
 #define MANA_BASE_WIDGET_H
 
-#include "../../../general/display/banner_widget.h"
 #include "../../abstract_analytics_panel_widget.h"
-#include "../../deck_list_statistics_analyzer.h"
 #include "mana_base_config.h"
 
-#include <QHBoxLayout>
-#include <QWidget>
-#include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
-#include <utility>
+#include <QJsonObject>
+#include <QList>
+#include <QString>
+#include <qtmetamacros.h>
+
+class DeckListStatisticsAnalyzer;
+class QHBoxLayout;
+class QWidget;
 
 class ManaBaseWidget : public AbstractAnalyticsPanelWidget
 {

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.cpp

@@ -1,9 +1,21 @@
 #include "mana_curve_category_widget.h"
 
+#include "../../../general/display/charts/bars/bar_chart_widget.h"
 #include "libcockatrice/utility/color.h"
 #include "libcockatrice/utility/qt_utils.h"
 #include "mana_curve_config.h"
-#include "mana_curve_total_widget.h"
+
+#include <QHBoxLayout>
+#include <QHash>
+#include <QLabel>
+#include <QList>
+#include <QSharedPointer>
+#include <QSize>
+#include <QSizePolicy>
+#include <QString>
+#include <QVBoxLayout>
+#include <QVector>
+#include <algorithm>
 
 constexpr int MIN_ROW_HEIGHT = 100; // Minimum readable height per row
 

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.h

@@ -1,12 +1,14 @@
 #ifndef COCKATRICE_MANA_CURVE_CATEGORY_WIDGET_H
 #define COCKATRICE_MANA_CURVE_CATEGORY_WIDGET_H
 
-#include "../../../general/display/charts/bars/bar_chart_widget.h"
-#include "mana_curve_config.h"
-
-#include <QHBoxLayout>
-#include <QLabel>
+#include <QStringList>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class QString;
+class QVBoxLayout;
+struct ManaCurveConfig;
+template <typename Key, typename T> class QHash;
 
 class ManaCurveCategoryWidget : public QWidget
 {

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config.cpp

@@ -1,5 +1,9 @@
 #include "mana_curve_config.h"
 
+#include <QJsonArray>
+#include <QJsonValue>
+#include <QJsonValueRef>
+
 QJsonObject ManaCurveConfig::toJson() const
 {
     QJsonObject jsonObject;

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config.h

@@ -2,8 +2,9 @@
 #ifndef COCKATRICE_MANA_CURVE_CONFIG_H
 #define COCKATRICE_MANA_CURVE_CONFIG_H
 
-#include <QJsonArray>
 #include <QJsonObject>
+#include <QList>
+#include <QString>
 #include <QStringList>
 
 struct ManaCurveConfig

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp

@@ -1,12 +1,22 @@
 #include "mana_curve_config_dialog.h"
 
+#include "../../deck_list_statistics_analyzer.h"
+
+#include <QAbstractItemView>
 #include <QCheckBox>
 #include <QComboBox>
 #include <QDialogButtonBox>
+#include <QHash>
 #include <QLabel>
+#include <QList>
 #include <QListWidget>
+#include <QListWidgetItem>
+#include <QString>
+#include <QStringList>
 #include <QVBoxLayout>
 
+class QWidget;
+
 ManaCurveConfigDialog::ManaCurveConfigDialog(DeckListStatisticsAnalyzer *analyzer, QWidget *parent)
     : QDialog(parent), analyzer(analyzer)
 {

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.h

@@ -1,16 +1,18 @@
 #ifndef COCKATRICE_MANA_CURVE_ADD_DIALOG_H
 #define COCKATRICE_MANA_CURVE_ADD_DIALOG_H
 
-#include "../../deck_list_statistics_analyzer.h"
 #include "mana_curve_config.h"
 
 #include <QDialog>
-#include <QDialogButtonBox>
-#include <QLabel>
+#include <qtmetamacros.h>
 
 class QListWidget;
 class QCheckBox;
 class QComboBox;
+class DeckListStatisticsAnalyzer;
+class QDialogButtonBox;
+class QLabel;
+class QWidget;
 
 class ManaCurveConfigDialog : public QDialog
 {

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.cpp

@@ -2,10 +2,18 @@
 
 #include "../../../general/display/charts/bars/bar_chart_widget.h"
 #include "libcockatrice/utility/color.h"
-#include "libcockatrice/utility/qt_utils.h"
 #include "mana_curve_config.h"
 
 #include <QHBoxLayout>
+#include <QLabel>
+#include <QList>
+#include <QMap>
+#include <QSharedPointer>
+#include <QSize>
+#include <QSizePolicy>
+#include <QVector>
+#include <algorithm>
+#include <compare>
 
 ManaCurveTotalWidget::ManaCurveTotalWidget(QWidget *parent) : QWidget(parent)
 {

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.h

@@ -1,11 +1,15 @@
 #ifndef COCKATRICE_MANA_CURVE_TOTAL_WIDGET_H
 #define COCKATRICE_MANA_CURVE_TOTAL_WIDGET_H
-#include "../../../general/display/charts/bars/bar_chart_widget.h"
-#include "mana_curve_config.h"
-
-#include <QHBoxLayout>
-#include <QLabel>
+#include <QString>
+#include <QStringList>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class BarChartWidget;
+class QHBoxLayout;
+class QLabel;
+struct ManaCurveConfig;
+template <class Key, class T> class QMap;
 
 class ManaCurveTotalWidget : public QWidget
 {

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp

@@ -1,19 +1,23 @@
 #include "mana_curve_widget.h"
 
-#include "../../../general/display/charts/bars/bar_chart_background_widget.h"
-#include "../../../general/display/charts/bars/bar_chart_widget.h"
-#include "../../../general/display/charts/bars/segmented_bar_widget.h"
+#include "../../abstract_analytics_panel_widget.h"
 #include "../../analytics_panel_widget_registrar.h"
 #include "../../deck_list_statistics_analyzer.h"
-#include "libcockatrice/utility/color.h"
-#include "libcockatrice/utility/qt_utils.h"
+#include "mana_curve_category_widget.h"
 #include "mana_curve_config_dialog.h"
+#include "mana_curve_total_widget.h"
 
-#include <QInputDialog>
-#include <QJsonArray>
-#include <QLabel>
-#include <QPushButton>
-#include <QSettings>
+#include <QDialog>
+#include <QHash>
+#include <QMap>
+#include <QObject>
+#include <QSharedPointer>
+#include <QSizePolicy>
+#include <QStringList>
+#include <QVBoxLayout>
+#include <QtGlobal>
+
+class QWidget;
 
 namespace
 {

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.h

@@ -8,14 +8,17 @@
 #define MANA_CURVE_WIDGET_H
 
 #include "../../abstract_analytics_panel_widget.h"
-#include "mana_curve_category_widget.h"
 #include "mana_curve_config.h"
-#include "mana_curve_total_widget.h"
 
-#include <QVBoxLayout>
+#include <QJsonObject>
+#include <QList>
+#include <QString>
+#include <qtmetamacros.h>
 
-class SegmentedBarWidget;
 class DeckListStatisticsAnalyzer;
+class ManaCurveCategoryWidget;
+class ManaCurveTotalWidget;
+class QWidget;
 
 class ManaCurveWidget : public AbstractAnalyticsPanelWidget
 {

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config.cpp

@@ -1,5 +1,9 @@
 #include "mana_devotion_config.h"
 
+#include <QJsonArray>
+#include <QJsonValue>
+#include <QJsonValueRef>
+
 QJsonObject ManaDevotionConfig::toJson() const
 {
     QJsonObject jsonObject;

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config.h

@@ -1,8 +1,9 @@
 #ifndef COCKATRICE_MANA_DEVOTION_CONFIG_H
 #define COCKATRICE_MANA_DEVOTION_CONFIG_H
 
-#include <QJsonArray>
 #include <QJsonObject>
+#include <QList>
+#include <QString>
 #include <QStringList>
 
 struct ManaDevotionConfig

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp

@@ -1,5 +1,19 @@
 #include "mana_devotion_config_dialog.h"
 
+#include "../../deck_list_statistics_analyzer.h"
+
+#include <QAbstractItemView>
+#include <QComboBox>
+#include <QDialogButtonBox>
+#include <QHash>
+#include <QLabel>
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QStringList>
+#include <QVBoxLayout>
+
+class QWidget;
+
 ManaDevotionConfigDialog::ManaDevotionConfigDialog(DeckListStatisticsAnalyzer *analyzer,
                                                    ManaDevotionConfig initial,
                                                    QWidget *parent)

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.h

@@ -2,16 +2,20 @@
 #ifndef COCKATRICE_MANA_DEVOTION_ADD_DIALOG_H
 #define COCKATRICE_MANA_DEVOTION_ADD_DIALOG_H
 
-#include "../../deck_list_statistics_analyzer.h"
 #include "mana_devotion_config.h"
 
-#include <QCheckBox>
-#include <QComboBox>
 #include <QDialog>
-#include <QDialogButtonBox>
-#include <QLabel>
-#include <QListWidget>
-#include <QVBoxLayout>
+#include <QList>
+#include <QString>
+#include <qtmetamacros.h>
+
+class DeckListStatisticsAnalyzer;
+class QComboBox;
+class QDialogButtonBox;
+class QLabel;
+class QListWidget;
+class QVBoxLayout;
+class QWidget;
 
 class ManaDevotionConfigDialog : public QDialog
 {

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp

@@ -3,12 +3,26 @@
 #include "../../../general/display/charts/bars/bar_widget.h"
 #include "../../../general/display/charts/bars/color_bar.h"
 #include "../../../general/display/charts/pies/color_pie.h"
+#include "../../abstract_analytics_panel_widget.h"
 #include "../../analytics_panel_widget_registrar.h"
 #include "../../deck_list_statistics_analyzer.h"
 #include "mana_devotion_config_dialog.h"
 
+#include <QChar>
+#include <QColor>
+#include <QDialog>
+#include <QHBoxLayout>
 #include <QHash>
-#include <QInputDialog>
+#include <QLayoutItem>
+#include <QMap>
+#include <QObject>
+#include <QSharedPointer>
+#include <QSize>
+#include <QVBoxLayout>
+#include <QWidget>
+#include <algorithm>
+#include <qnamespace.h>
+#include <utility>
 
 namespace
 {

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.h

@@ -6,11 +6,17 @@
 
 #ifndef MANA_DEVOTION_WIDGET_H
 #define MANA_DEVOTION_WIDGET_H
-#include "../../../general/display/banner_widget.h"
 #include "../../abstract_analytics_panel_widget.h"
 #include "mana_devotion_config.h"
 
-#include <QHBoxLayout>
+#include <QJsonObject>
+#include <QList>
+#include <QString>
+#include <qtmetamacros.h>
+
+class DeckListStatisticsAnalyzer;
+class QHBoxLayout;
+class QWidget;
 
 class ManaDevotionWidget : public AbstractAnalyticsPanelWidget
 {

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.cpp

@@ -1,5 +1,9 @@
 #include "mana_distribution_config.h"
 
+#include <QJsonArray>
+#include <QJsonValue>
+#include <QJsonValueRef>
+
 QJsonObject ManaDistributionConfig::toJson() const
 {
     QJsonObject o;

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.h

@@ -1,8 +1,8 @@
 #ifndef COCKATRICE_MANA_DISTRIBUTION_CONFIG_H
 #define COCKATRICE_MANA_DISTRIBUTION_CONFIG_H
 
-#include <QJsonArray>
 #include <QJsonObject>
+#include <QList>
 #include <QString>
 #include <QStringList>
 

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp

@@ -1,12 +1,19 @@
 #include "mana_distribution_config_dialog.h"
 
+#include <QAbstractItemView>
 #include <QCheckBox>
 #include <QComboBox>
 #include <QDialogButtonBox>
 #include <QLabel>
+#include <QList>
 #include <QListWidget>
+#include <QListWidgetItem>
+#include <QString>
+#include <QStringList>
 #include <QVBoxLayout>
 
+class QWidget;
+
 static const QStringList kColors = {"W", "U", "B", "R", "G", "C"};
 
 ManaDistributionConfigDialog::ManaDistributionConfigDialog(DeckListStatisticsAnalyzer *analyzer, QWidget *parent)

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.h

@@ -4,14 +4,15 @@
 #include "mana_distribution_config.h"
 
 #include <QDialog>
-#include <QDialogButtonBox>
-#include <QLabel>
-#include <QStringList>
+#include <qtmetamacros.h>
 
 class QComboBox;
 class QListWidget;
 class QCheckBox;
 class DeckListStatisticsAnalyzer;
+class QDialogButtonBox;
+class QLabel;
+class QWidget;
 
 class ManaDistributionConfigDialog : public QDialog
 {

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp

@@ -2,7 +2,10 @@
 
 #include "../../../cards/additional_info/mana_symbol_widget.h"
 
+#include <QLabel>
+#include <QProgressBar>
 #include <QVBoxLayout>
+#include <qnamespace.h>
 
 ManaDistributionSingleDisplayWidget::ManaDistributionSingleDisplayWidget(const QString &colorSymbol, QWidget *parent)
     : QWidget(parent)

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.h

@@ -1,10 +1,12 @@
 #ifndef COCKATRICE_MANA_DISTRIBUTION_SINGLE_DISPLAY_WIDGET_H
 #define COCKATRICE_MANA_DISTRIBUTION_SINGLE_DISPLAY_WIDGET_H
 
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QProgressBar>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class QLabel;
+class QProgressBar;
 
 class ManaDistributionSingleDisplayWidget : public QWidget
 {

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp

@@ -1,12 +1,21 @@
 #include "mana_distribution_widget.h"
 
+#include "../../../general/display/charts/bars/color_bar.h"
+#include "../../../general/display/charts/pies/color_pie.h"
+#include "../../abstract_analytics_panel_widget.h"
 #include "../../analytics_panel_widget_registrar.h"
+#include "../../deck_list_statistics_analyzer.h"
 #include "mana_distribution_config_dialog.h"
+#include "mana_distribution_single_display_widget.h"
 
-#include <QComboBox>
-#include <QDialogButtonBox>
-#include <QLabel>
+#include <QDialog>
+#include <QHBoxLayout>
+#include <QHash>
+#include <QList>
+#include <QSharedPointer>
+#include <QStringList>
 #include <QVBoxLayout>
+#include <QWidget>
 
 namespace
 {

cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.h

@@ -1,17 +1,21 @@
 #ifndef COCKATRICE_MANA_DISTRIBUTION_WIDGET_H
 #define COCKATRICE_MANA_DISTRIBUTION_WIDGET_H
 
-#include "../../../general/display/charts/bars/color_bar.h"
-#include "../../../general/display/charts/pies/color_pie.h"
 #include "../../abstract_analytics_panel_widget.h"
-#include "../../deck_list_statistics_analyzer.h"
 #include "mana_distribution_config.h"
-#include "mana_distribution_single_display_widget.h"
 
-#include <QHBoxLayout>
+#include <QJsonObject>
 #include <QMap>
-#include <QVBoxLayout>
-#include <QWidget>
+#include <QString>
+#include <qtmetamacros.h>
+
+class ColorBar;
+class ColorPie;
+class DeckListStatisticsAnalyzer;
+class ManaDistributionSingleDisplayWidget;
+class QHBoxLayout;
+class QVBoxLayout;
+class QWidget;
 
 class ManaDistributionWidget : public AbstractAnalyticsPanelWidget
 {

cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.cpp

@@ -1,5 +1,6 @@
 #include "deck_analytics_widget.h"
 
+#include "../general/layout_containers/flow_widget.h"
 #include "abstract_analytics_panel_widget.h"
 #include "add_analytics_panel_dialog.h"
 #include "analytics_panel_widget_factory.h"
@@ -9,13 +10,19 @@
 #include "deck_list_statistics_analyzer.h"
 #include "resizable_panel.h"
 
+#include <QCheckBox>
+#include <QDialog>
 #include <QEvent>
+#include <QFrame>
 #include <QJsonArray>
 #include <QJsonDocument>
+#include <QJsonValueRef>
 #include <QPushButton>
 #include <QScrollArea>
 #include <QSettings>
 #include <QVBoxLayout>
+#include <QVariant>
+#include <qnamespace.h>
 
 DeckAnalyticsWidget::DeckAnalyticsWidget(QWidget *parent, DeckListStatisticsAnalyzer *_statsAnalyzer)
     : QWidget(parent), statsAnalyzer(_statsAnalyzer)

cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h

@@ -7,19 +7,22 @@
 #ifndef DECK_ANALYTICS_WIDGET_H
 #define DECK_ANALYTICS_WIDGET_H
 
-#include "../general/layout_containers/flow_widget.h"
-#include "abstract_analytics_panel_widget.h"
-#include "deck_list_statistics_analyzer.h"
-#include "resizable_panel.h"
-
-#include <QCheckBox>
 #include <QJsonObject>
-#include <QScrollArea>
-#include <QVBoxLayout>
+#include <QList>
+#include <QString>
 #include <QVector>
 #include <QWidget>
+#include <qtmetamacros.h>
 
 class LayoutInspector;
+class AbstractAnalyticsPanelWidget;
+class DeckListStatisticsAnalyzer;
+class FlowWidget;
+class QCheckBox;
+class QPushButton;
+class QScrollArea;
+class QVBoxLayout;
+class ResizablePanel;
 
 class DeckAnalyticsWidget : public QWidget
 {

cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.cpp

@@ -1,11 +1,19 @@
 #include "deck_list_statistics_analyzer.h"
 
 #include "deck_list_model.h"
-#include "deck_list_statistics_analyzer.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/deck_list/tree/deck_list_card_node.h"
+#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
 
+#include <QChar>
 #include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QSharedPointer>
+#include <QStringLiteral>
+#include <initializer_list>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/deck_list/deck_list.h>
+#include <utility>
 
 DeckListStatisticsAnalyzer::DeckListStatisticsAnalyzer(QObject *parent,
                                                        DeckListModel *_model,

cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.h

@@ -1,10 +1,12 @@
 #ifndef COCKATRICE_DECK_LIST_STATISTICS_ANALYZER_H
 #define COCKATRICE_DECK_LIST_STATISTICS_ANALYZER_H
 
-#include "deck_list_model.h"
-
 #include <QHash>
+#include <QList>
 #include <QObject>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
 #include <unordered_map>
 
 class DeckListModel;

cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp

@@ -1,11 +1,34 @@
 #include "resizable_panel.h"
 
+#include "abstract_analytics_panel_widget.h"
 #include "libcockatrice/utility/qt_utils.h"
 
+#include <QApplication>
+#include <QByteArray>
 #include <QColor>
+#include <QDrag>
+#include <QDragEnterEvent>
+#include <QDragMoveEvent>
+#include <QDropEvent>
+#include <QEvent>
+#include <QFlags>
+#include <QFrame>
 #include <QHBoxLayout>
+#include <QMimeData>
+#include <QMouseEvent>
+#include <QPalette>
 #include <QPixmap>
+#include <QPointF>
+#include <QPushButton>
+#include <QRect>
+#include <QScrollArea>
+#include <QScrollBar>
+#include <QSize>
+#include <QSizePolicy>
+#include <QTimer>
+#include <QVBoxLayout>
 #include <QtGlobal>
+#include <qnamespace.h>
 
 ResizablePanel::ResizablePanel(const QString &_typeId, AbstractAnalyticsPanelWidget *analyticsPanel, QWidget *parent)
     : QWidget(parent), panel(analyticsPanel), typeId(_typeId)

cockatrice/src/interface/widgets/deck_analytics/resizable_panel.h

@@ -1,19 +1,15 @@
 #ifndef COCKATRICE_RESIZABLE_PANEL_H
 #define COCKATRICE_RESIZABLE_PANEL_H
 
-#include "abstract_analytics_panel_widget.h"
-
-#include <QApplication>
-#include <QDrag>
-#include <QFrame>
-#include <QMimeData>
-#include <QMouseEvent>
-#include <QPushButton>
-#include <QScrollArea>
-#include <QScrollBar>
-#include <QTimer>
-#include <QVBoxLayout>
+#include <QPoint>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class AbstractAnalyticsPanelWidget;
+class QFrame;
+class QPushButton;
+class QTimer;
 
 class ResizablePanel : public QWidget
 {

cockatrice/src/interface/widgets/deck_editor/card_database_view.cpp

@@ -1,17 +1,35 @@
 #include "card_database_view.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../../key_signals.h"
 #include "card_database_display_model.h"
 #include "card_database_model.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database_querier.h"
 
+#include <QAbstractItemModel>
+#include <QAction>
 #include <QApplication>
+#include <QByteArray>
 #include <QClipboard>
+#include <QFlags>
 #include <QHeaderView>
+#include <QItemSelectionModel>
+#include <QList>
 #include <QMenu>
+#include <QModelIndex>
+#include <QModelIndexList>
+#include <QPoint>
+#include <QSharedPointer>
+#include <QVariant>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
 #include <libcockatrice/settings/layouts_settings.h>
+#include <qnamespace.h>
+#include <utility>
+
+class QWidget;
 
 static bool canBeCommander(const CardInfo &cardInfo)
 {

cockatrice/src/interface/widgets/deck_editor/card_database_view.h

@@ -3,12 +3,19 @@
 
 #include "../../key_signals.h"
 
+#include <QPair>
+#include <QString>
+#include <QStringList>
 #include <QTreeView>
 #include <functional>
 #include <libcockatrice/card/card_info.h>
+#include <qtmetamacros.h>
 
-class CardDatabaseModel;
 class CardDatabaseDisplayModel;
+class QModelIndex;
+class QPoint;
+class QWidget;
+template <typename T> class QList;
 
 /**
  * @brief The card database table.

cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp

@@ -2,10 +2,23 @@
 
 #include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
 #include "card_database_view.h"
+#include "deck_editor_database_display_widget.h"
+#include "deck_list_model.h"
 #include "deck_state_manager.h"
 #include "deck_zone_dialog.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
 
-#include <libcockatrice/deck_list/deck_list_node_tree.h>
+#include <QFlags>
+#include <QList>
+#include <QPair>
+#include <QString>
+#include <QStringList>
+#include <QVBoxLayout>
+#include <QWidget>
+#include <functional>
+#include <qnamespace.h>
+#include <utility>
 
 DeckEditorCardDatabaseDockWidget::DeckEditorCardDatabaseDockWidget(AbstractTabDeckEditor *parent) : QDockWidget(parent)
 {

cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.h

@@ -1,12 +1,10 @@
 #ifndef COCKATRICE_DECK_EDITOR_CARD_DATABASE_DOCK_WIDGET_H
 #define COCKATRICE_DECK_EDITOR_CARD_DATABASE_DOCK_WIDGET_H
 
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-
 #include <QDockWidget>
+#include <qtmetamacros.h>
 
 class AbstractTabDeckEditor;
-class CardDatabase;
 class DeckEditorDatabaseDisplayWidget;
 class FilterTree;
 

cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp

@@ -1,8 +1,14 @@
 #include "deck_editor_card_info_dock_widget.h"
 
 #include "../cards/card_info_frame_widget.h"
+#include "../tabs/abstract_tab_deck_editor.h"
 
+#include <QFlags>
 #include <QVBoxLayout>
+#include <QWidget>
+#include <qnamespace.h>
+
+class ExactCard;
 
 DeckEditorCardInfoDockWidget::DeckEditorCardInfoDockWidget(AbstractTabDeckEditor *parent)
     : QDockWidget(parent), deckEditor(parent)

cockatrice/src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.h

@@ -8,12 +8,13 @@
 #ifndef DECK_EDITOR_CARD_INFO_DOCK_WIDGET_H
 #define DECK_EDITOR_CARD_INFO_DOCK_WIDGET_H
 
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-#include "../cards/card_info_frame_widget.h"
-
 #include <QDockWidget>
+#include <qtmetamacros.h>
 
 class AbstractTabDeckEditor;
+class CardInfoFrameWidget;
+class ExactCard;
+
 class DeckEditorCardInfoDockWidget : public QDockWidget
 {
     Q_OBJECT

cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp

@@ -2,19 +2,30 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../filters/syntax_help.h"
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-#include "../../../interface/widgets/tabs/tab_supervisor.h"
+#include "../../key_signals.h"
 #include "../../pixel_map_generator.h"
+#include "../utility/custom_line_edit.h"
+#include "card_database_display_model.h"
+#include "card_database_model.h"
 #include "card_database_view.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
 
-#include <QClipboard>
-#include <QHeaderView>
+#include <QAction>
+#include <QHBoxLayout>
+#include <QIcon>
+#include <QLineEdit>
+#include <QStringLiteral>
 #include <QToolButton>
-#include <QTreeView>
+#include <QVBoxLayout>
 #include <libcockatrice/card/card_localization.h>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/card/relation/card_relation.h>
 #include <libcockatrice/settings/cards_display_settings.h>
+#include <libcockatrice/utility/card_ref.h>
+#include <qnamespace.h>
+
+class FilterTree;
 
 DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(QWidget *parent, CardDatabaseModel *databaseModel)
     : QWidget(parent)

cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h

@@ -8,16 +8,21 @@
 #ifndef DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H
 #define DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H
 
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-#include "../utility/custom_line_edit.h"
+#include "libcockatrice/card/card_info.h"
 
-#include <QHBoxLayout>
+#include <QString>
 #include <QWidget>
-#include <libcockatrice/models/database/card_database_display_model.h>
-#include <libcockatrice/models/database/card_database_model.h>
+#include <qtmetamacros.h>
 
 class CardDatabaseView;
-class AbstractTabDeckEditor;
+class CardDatabaseDisplayModel;
+class CardDatabaseModel;
+class ExactCard;
+class FilterTree;
+class QAction;
+class QHBoxLayout;
+class QVBoxLayout;
+class SearchLineEdit;
 
 class DeckEditorDatabaseDisplayWidget : public QWidget
 {

cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp

@@ -2,28 +2,75 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
+#include "../../key_signals.h"
 #include "../../pixel_map_generator.h"
 #include "../playmat/playmat_settings_dialog.h"
-#include "../settings_page/user_interface_settings_page.h"
+#include "../quick_settings/settings_button_widget.h"
+#include "../tabs/abstract_tab_deck_editor.h"
 #include "../tabs/api/commander_spellbook/commander_bracket_widget.h"
+#include "../utility/custom_line_edit.h"
+#include "../visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
+#include "deck_list_history_manager_widget.h"
+#include "deck_list_model.h"
 #include "deck_list_style_proxy.h"
 #include "deck_state_manager.h"
 #include "deck_zone_dialog.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database.h"
+#include "libcockatrice/card/database/card_database_loader.h"
+#include "libcockatrice/card/database/card_database_querier.h"
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/deck_list/deck_list.h"
+#include "libcockatrice/deck_list/tree/abstract_deck_list_node.h"
+#include "libcockatrice/deck_list/tree/inner_deck_list_node.h"
+#include "libcockatrice/utility/card_ref.h"
+#include "libcockatrice/utility/playmat_params.h"
 
+#include <QAbstractItemModel>
+#include <QAbstractItemView>
+#include <QAction>
+#include <QCheckBox>
 #include <QComboBox>
+#include <QDebug>
+#include <QDialog>
 #include <QDockWidget>
+#include <QFlags>
+#include <QGridLayout>
 #include <QHeaderView>
+#include <QItemSelectionModel>
 #include <QLabel>
+#include <QList>
+#include <QMap>
+#include <QMenu>
 #include <QMessageBox>
+#include <QModelIndex>
+#include <QPair>
+#include <QPoint>
 #include <QPushButton>
+#include <QSet>
+#include <QSharedPointer>
+#include <QSize>
+#include <QSizePolicy>
 #include <QSplitter>
+#include <QStringList>
+#include <QStringLiteral>
 #include <QTextEdit>
+#include <QTimer>
+#include <QToolButton>
+#include <QVBoxLayout>
+#include <QVariant>
+#include <QWidget>
+#include <QtGlobal>
+#include <algorithm>
+#include <compare>
+#include <functional>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list_node_tree.h>
 #include <libcockatrice/settings/deck_editor_settings.h>
-#include <libcockatrice/settings/interface_settings.h>
 #include <libcockatrice/utility/macros.h>
 #include <libcockatrice/utility/string_limits.h>
+#include <qnamespace.h>
+#include <utility>
 
 static int findRestoreIndex(const CardRef &wanted, const QComboBox *combo)
 {

cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h

@@ -8,27 +8,36 @@
 #ifndef DECK_EDITOR_DECK_DOCK_WIDGET_H
 #define DECK_EDITOR_DECK_DOCK_WIDGET_H
 
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
 #include "../../key_signals.h"
-#include "../utility/custom_line_edit.h"
-#include "../visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h"
-#include "deck_list_history_manager_widget.h"
-#include "deck_list_style_proxy.h"
+#include "libcockatrice/card/printing/exact_card.h"
 
-#include <QCheckBox>
-#include <QComboBox>
 #include <QDockWidget>
-#include <QLabel>
-#include <QMenu>
-#include <QPushButton>
-#include <QTextEdit>
+#include <QModelIndexList>
+#include <QString>
 #include <QTreeView>
-#include <libcockatrice/card/card_info.h>
-#include <libcockatrice/deck_list/deck_list.h>
+#include <qtmetamacros.h>
 
 class CommanderBracketWidget;
 class DeckListModel;
 class AbstractTabDeckEditor;
+class DeckListHistoryManagerWidget;
+class DeckListStyleProxy;
+class DeckPreviewDeckTagsDisplayWidget;
+class DeckStateManager;
+class LineEditUnfocusable;
+class QAction;
+class QCheckBox;
+class QComboBox;
+class QItemSelectionModel;
+class QLabel;
+class QMenu;
+class QModelIndex;
+class QPoint;
+class QPushButton;
+class QTextEdit;
+class QTimer;
+class SettingsButtonWidget;
+
 class DeckEditorDeckDockWidget : public QDockWidget
 {
     Q_OBJECT

cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp

@@ -4,11 +4,31 @@
 #include "../../../client/settings/shortcuts_settings.h"
 #include "../../../filters/filter_builder.h"
 #include "../../../filters/filter_tree_model.h"
+#include "../../key_signals.h"
 #include "../../pixel_map_generator.h"
+#include "../tabs/abstract_tab_deck_editor.h"
+#include "libcockatrice/filters/filter_card.h"
 
+#include <QAbstractItemModel>
+#include <QAction>
+#include <QDebug>
+#include <QFlags>
 #include <QGridLayout>
+#include <QItemSelectionModel>
+#include <QList>
 #include <QMenu>
+#include <QModelIndex>
+#include <QModelIndexList>
+#include <QPersistentModelIndex>
+#include <QPoint>
+#include <QString>
+#include <QStringLiteral>
 #include <QToolButton>
+#include <QTreeView>
+#include <QVBoxLayout>
+#include <QVariant>
+#include <QWidget>
+#include <qnamespace.h>
 
 DeckEditorFilterDockWidget::DeckEditorFilterDockWidget(AbstractTabDeckEditor *parent)
     : QDockWidget(parent), deckEditor(parent)

cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h

@@ -8,13 +8,18 @@
 #ifndef DECK_EDITOR_FILTER_DOCK_WIDGET_H
 #define DECK_EDITOR_FILTER_DOCK_WIDGET_H
 
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
 #include "../../key_signals.h"
 
 #include <QDockWidget>
+#include <qtmetamacros.h>
 
 class FilterTreeModel;
 class AbstractTabDeckEditor;
+class QAction;
+class QPoint;
+class QTreeView;
+class QWidget;
+
 class DeckEditorFilterDockWidget : public QDockWidget
 {
     Q_OBJECT

cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp

@@ -2,10 +2,15 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
+#include "../printing_selector/printing_selector.h"
+#include "deck_editor_deck_dock_widget.h"
 #include "printing_disabled_info_widget.h"
 
+#include <QFlags>
 #include <QVBoxLayout>
+#include <QWidget>
 #include <libcockatrice/settings/cards_display_settings.h>
+#include <qnamespace.h>
 
 DeckEditorPrintingSelectorDockWidget::DeckEditorPrintingSelectorDockWidget(AbstractTabDeckEditor *parent)
     : QDockWidget(parent), deckEditor(parent)

cockatrice/src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h

@@ -7,13 +7,13 @@
 #ifndef DECK_EDITOR_PRINTING_SELECTOR_DOCK_WIDGET_H
 #define DECK_EDITOR_PRINTING_SELECTOR_DOCK_WIDGET_H
 
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-#include "../printing_selector/printing_selector.h"
-
 #include <QDockWidget>
+#include <qtmetamacros.h>
 
 class PrintingDisabledInfoWidget;
-class TabDeckEditor;
+class AbstractTabDeckEditor;
+class PrintingSelector;
+class QWidget;
 
 class DeckEditorPrintingSelectorDockWidget : public QDockWidget
 {

cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp

@@ -1,7 +1,28 @@
 #include "deck_list_history_manager_widget.h"
 
 #include "../../pixel_map_generator.h"
+#include "../quick_settings/settings_button_widget.h"
 #include "deck_state_manager.h"
+#include "libcockatrice/deck_list/deck_list_history_manager.h"
+#include "libcockatrice/deck_list/deck_list_memento.h"
+
+#include <QAction>
+#include <QBrush>
+#include <QFlags>
+#include <QHBoxLayout>
+#include <QKeySequence>
+#include <QLabel>
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QSharedPointer>
+#include <QStack>
+#include <QString>
+#include <QStringLiteral>
+#include <QToolButton>
+#include <QVariant>
+#include <qnamespace.h>
+
+class DeckListStyleProxy;
 
 DeckListHistoryManagerWidget::DeckListHistoryManagerWidget(DeckStateManager *_deckStateManager,
                                                            DeckListStyleProxy *_styleProxy,

cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.h

@@ -1,18 +1,20 @@
 #ifndef COCKATRICE_DECK_EDITOR_DECK_LIST_HISTORY_MANAGER_WIDGET_H
 #define COCKATRICE_DECK_EDITOR_DECK_LIST_HISTORY_MANAGER_WIDGET_H
 
+#include <qtmetamacros.h>
+
+class DeckListStyleProxy;
+class QAction;
+class QHBoxLayout;
+class QLabel;
+class QListWidget;
+class QListWidgetItem;
+class QToolButton;
+class SettingsButtonWidget;
 #ifndef COCKATRICE_DECK_UNDO_WIDGET_H
 #define COCKATRICE_DECK_UNDO_WIDGET_H
 
-#include "../quick_settings/settings_button_widget.h"
-#include "deck_list_style_proxy.h"
-
-#include <QAction>
-#include <QHBoxLayout>
-#include <QListWidget>
 #include <QWidget>
-#include <libcockatrice/deck_list/deck_list_history_manager.h>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 class DeckStateManager;