From 57a64c97fd4f8451eb0a53b3842f4cb7891c838d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Thu, 27 Feb 2025 16:10:29 +0100 Subject: [PATCH] Directly use an AbstractTabDeckEditor as parent. --- .../src/client/tabs/abstract_tab_deck_editor.cpp | 10 +++++----- .../deck_editor/deck_editor_card_info_dock_widget.cpp | 4 ++-- .../deck_editor/deck_editor_card_info_dock_widget.h | 2 +- .../deck_editor_database_display_widget.cpp | 4 ++-- .../deck_editor/deck_editor_database_display_widget.h | 2 +- .../deck_editor/deck_editor_deck_dock_widget.cpp | 4 ++-- .../widgets/deck_editor/deck_editor_deck_dock_widget.h | 2 +- .../deck_editor/deck_editor_filter_dock_widget.cpp | 4 ++-- .../deck_editor/deck_editor_filter_dock_widget.h | 2 +- .../deck_editor_printing_selector_dock_widget.cpp | 5 ++--- .../deck_editor_printing_selector_dock_widget.h | 2 +- 11 files changed, 20 insertions(+), 21 deletions(-) diff --git a/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp index e1555b84a..89014c5f0 100644 --- a/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp +++ b/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp @@ -42,11 +42,11 @@ AbstractTabDeckEditor::AbstractTabDeckEditor(TabSupervisor *_tabSupervisor) : Ta { setDockOptions(QMainWindow::AnimatedDocks | QMainWindow::AllowNestedDocks | QMainWindow::AllowTabbedDocks); - databaseDisplayDockWidget = new DeckEditorDatabaseDisplayWidget(this, this); - deckDockWidget = new DeckEditorDeckDockWidget(this, this); - cardInfoDockWidget = new DeckEditorCardInfoDockWidget(this, this); - filterDockWidget = new DeckEditorFilterDockWidget(this, this); - printingSelectorDockWidget = new DeckEditorPrintingSelectorDockWidget(this, this); + databaseDisplayDockWidget = new DeckEditorDatabaseDisplayWidget(this); + deckDockWidget = new DeckEditorDeckDockWidget(this); + cardInfoDockWidget = new DeckEditorCardInfoDockWidget(this); + filterDockWidget = new DeckEditorFilterDockWidget(this); + printingSelectorDockWidget = new DeckEditorPrintingSelectorDockWidget(this); connect(deckDockWidget, &DeckEditorDeckDockWidget::deckChanged, this, &AbstractTabDeckEditor::onDeckChanged); connect(deckDockWidget, &DeckEditorDeckDockWidget::cardChanged, this, &AbstractTabDeckEditor::updateCard); diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp index ee12f37ef..0fe4ae76d 100644 --- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp +++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp @@ -4,8 +4,8 @@ #include -DeckEditorCardInfoDockWidget::DeckEditorCardInfoDockWidget(QWidget *parent, AbstractTabDeckEditor *_deckEditor) - : QDockWidget(parent), deckEditor(_deckEditor) +DeckEditorCardInfoDockWidget::DeckEditorCardInfoDockWidget(AbstractTabDeckEditor *parent) + : QDockWidget(parent), deckEditor(parent) { setObjectName("cardInfoDock"); diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.h b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.h index c92800dfb..455df1e88 100644 --- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.h +++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_card_info_dock_widget.h @@ -11,7 +11,7 @@ class DeckEditorCardInfoDockWidget : public QDockWidget { Q_OBJECT public: - explicit DeckEditorCardInfoDockWidget(QWidget *parent, AbstractTabDeckEditor *deckEditor); + explicit DeckEditorCardInfoDockWidget(AbstractTabDeckEditor *parent); void createCardInfoDock(); void retranslateUi(); diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp index d8ca8d1cf..f239debb4 100644 --- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp +++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp @@ -21,8 +21,8 @@ static bool canBeCommander(const CardInfoPtr &cardInfo) cardInfo->getText().contains("can be your commander", Qt::CaseInsensitive); } -DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(QWidget *parent, AbstractTabDeckEditor *_deckEditor) - : QWidget(parent), deckEditor(_deckEditor) +DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(AbstractTabDeckEditor *parent) + : QWidget(parent), deckEditor(parent) { setObjectName("centralWidget"); diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h index 4167a926e..bb587f72d 100644 --- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h +++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h @@ -15,7 +15,7 @@ class DeckEditorDatabaseDisplayWidget : public QWidget Q_OBJECT public: - explicit DeckEditorDatabaseDisplayWidget(QWidget *parent, AbstractTabDeckEditor *_deckEditor); + explicit DeckEditorDatabaseDisplayWidget(AbstractTabDeckEditor *parent); AbstractTabDeckEditor *deckEditor; SearchLineEdit *searchEdit; CardDatabaseModel *databaseModel; diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp index 342c431d9..6f3c9e513 100644 --- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp +++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp @@ -11,8 +11,8 @@ #include #include -DeckEditorDeckDockWidget::DeckEditorDeckDockWidget(QWidget *parent, AbstractTabDeckEditor *_deckEditor) - : QDockWidget(parent), deckEditor(_deckEditor) +DeckEditorDeckDockWidget::DeckEditorDeckDockWidget(AbstractTabDeckEditor *parent) + : QDockWidget(parent), deckEditor(parent) { setObjectName("deckDock"); diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.h b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.h index d2d3f05e4..0500b5fca 100644 --- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.h +++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.h @@ -19,7 +19,7 @@ class DeckEditorDeckDockWidget : public QDockWidget { Q_OBJECT public: - explicit DeckEditorDeckDockWidget(QWidget *parent, AbstractTabDeckEditor *_deckEditor); + explicit DeckEditorDeckDockWidget(AbstractTabDeckEditor *parent); DeckListModel *deckModel; QTreeView *deckView; QComboBox *bannerCardComboBox; diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp index 7f8ec3403..8bfc5342e 100644 --- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp +++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp @@ -9,8 +9,8 @@ #include #include -DeckEditorFilterDockWidget::DeckEditorFilterDockWidget(QWidget *parent, AbstractTabDeckEditor *_deckEditor) - : QDockWidget(parent), deckEditor(_deckEditor) +DeckEditorFilterDockWidget::DeckEditorFilterDockWidget(AbstractTabDeckEditor *parent) + : QDockWidget(parent), deckEditor(parent) { setObjectName("filterDock"); diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.h b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.h index a5152a9df..861ed9865 100644 --- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.h +++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.h @@ -13,7 +13,7 @@ class DeckEditorFilterDockWidget : public QDockWidget { Q_OBJECT public: - explicit DeckEditorFilterDockWidget(QWidget *parent, AbstractTabDeckEditor *_deckEditor); + explicit DeckEditorFilterDockWidget(AbstractTabDeckEditor *parent); void createFiltersDock(); void retranslateUi(); QAction *aClearFilterAll, *aClearFilterOne; diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp index beba1070c..732c74cf2 100644 --- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp +++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp @@ -4,9 +4,8 @@ #include -DeckEditorPrintingSelectorDockWidget::DeckEditorPrintingSelectorDockWidget(QWidget *parent, - AbstractTabDeckEditor *_deckEditor) - : QDockWidget(parent), deckEditor(_deckEditor) +DeckEditorPrintingSelectorDockWidget::DeckEditorPrintingSelectorDockWidget(AbstractTabDeckEditor *parent) + : QDockWidget(parent), deckEditor(parent) { setObjectName("printingSelectorDock"); diff --git a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h index 0323bfee7..ffc4297cb 100644 --- a/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h +++ b/cockatrice/src/client/ui/widgets/deck_editor/deck_editor_printing_selector_dock_widget.h @@ -11,7 +11,7 @@ class DeckEditorPrintingSelectorDockWidget : public QDockWidget { Q_OBJECT public: - explicit DeckEditorPrintingSelectorDockWidget(QWidget *parent, AbstractTabDeckEditor *_deckEditor); + explicit DeckEditorPrintingSelectorDockWidget(AbstractTabDeckEditor *parent); void createPrintingSelectorDock(); void retranslateUi(); PrintingSelector *printingSelector;