jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-18 08:22:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some pointer chaining.

Browse source
This commit is contained in:
Lukas Brübach 2025-02-26 19:25:30 +01:00
parent 1e9888779c
commit cf9b32a6f0
5 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cockatrice/src/client/tabs/tab_generic_deck_editor.cpp
View file

@ -528,4 +528,9 @@ bool TabGenericDeckEditor::isBlankNewDeck() const
{ {
DeckLoader *const deck = deckDockWidget->deckModel->getDeckList(); DeckLoader *const deck = deckDockWidget->deckModel->getDeckList();
return !modified && deck->getLastFileName().isEmpty() && deck->getLastRemoteDeckId() == -1; return !modified && deck->getLastFileName().isEmpty() && deck->getLastRemoteDeckId() == -1;
}
void TabGenericDeckEditor::filterTreeChanged(FilterTree *filterTree)
{
databaseDisplayDockWidget->setFilterTree(filterTree);
} }

3
cockatrice/src/client/tabs/tab_generic_deck_editor.h
View file

@ -130,6 +130,9 @@ public slots:
void actDecrementCardFromSideboard(CardInfoPtr info); void actDecrementCardFromSideboard(CardInfoPtr info);
void actDecrementCardFromSideboardFromDatabase(); void actDecrementCardFromSideboardFromDatabase();
void actOpenRecent(const QString &fileName); void actOpenRecent(const QString &fileName);
void filterTreeChanged(FilterTree *filterTree);
void closeRequest(bool forced = false) override; void closeRequest(bool forced = false) override;
virtual void showPrintingSelector() = 0; virtual void showPrintingSelector() = 0;
virtual void dockTopLevelChanged(bool topLevel) = 0; virtual void dockTopLevelChanged(bool topLevel) = 0;

6
cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.cpp
View file

@ -60,6 +60,7 @@ DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(QWidget *parent
databaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), true, this); databaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), true, this);
databaseModel->setObjectName("databaseModel"); databaseModel->setObjectName("databaseModel");
databaseDisplayModel = new CardDatabaseDisplayModel(this); databaseDisplayModel = new CardDatabaseDisplayModel(this);
databaseDisplayModel->setObjectName("databaseDisplayModel");
databaseDisplayModel->setSourceModel(databaseModel); databaseDisplayModel->setSourceModel(databaseModel);
databaseDisplayModel->setFilterKeyColumn(0); databaseDisplayModel->setFilterKeyColumn(0);
@ -228,6 +229,11 @@ void DeckEditorDatabaseDisplayWidget::showSearchSyntaxHelp()
browser->show(); browser->show();
} }
void DeckEditorDatabaseDisplayWidget::setFilterTree(FilterTree *filterTree)
{
databaseDisplayModel->setFilterTree(filterTree);
}
void DeckEditorDatabaseDisplayWidget::retranslateUi() void DeckEditorDatabaseDisplayWidget::retranslateUi()
{ {
aAddCard->setText(tr("Add card to &maindeck")); aAddCard->setText(tr("Add card to &maindeck"));

1
cockatrice/src/client/ui/widgets/deck_editor/deck_editor_database_display_widget.h
View file

@ -23,6 +23,7 @@ public:
public slots: public slots:
CardInfoPtr currentCardInfo() const; CardInfoPtr currentCardInfo() const;
void setFilterTree(FilterTree *filterTree);
private: private:
KeySignals searchKeySignals; KeySignals searchKeySignals;

3
cockatrice/src/client/ui/widgets/deck_editor/deck_editor_filter_dock_widget.cpp
View file

@ -24,8 +24,7 @@ void DeckEditorFilterDockWidget::createFiltersDock()
{ {
filterModel = new FilterTreeModel(); filterModel = new FilterTreeModel();
filterModel->setObjectName("filterModel"); filterModel->setObjectName("filterModel");
deckEditor->databaseDisplayDockWidget->databaseDisplayModel->setFilterTree(filterModel->filterTree()); deckEditor->filterTreeChanged(filterModel->filterTree());
deckEditor->databaseDisplayDockWidget->databaseDisplayModel->setObjectName("databaseDisplayModel");
filterView = new QTreeView; filterView = new QTreeView;
filterView->setObjectName("filterView"); filterView->setObjectName("filterView");
filterView->setModel(filterModel); filterView->setModel(filterModel);