diff --git a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp b/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp index 90a10396e..3fdfed9f1 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp +++ b/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp @@ -61,7 +61,6 @@ void FlatCardGroupDisplayWidget::onCardAddition(const QModelIndex &parent, int f void FlatCardGroupDisplayWidget::onCardRemoval(const QModelIndex &parent, int first, int last) { - Q_UNUSED(parent); Q_UNUSED(first); Q_UNUSED(last); if (parent == trackedIndex) { diff --git a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp b/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp index d9a2b206a..fc94e2af0 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp +++ b/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp @@ -64,7 +64,6 @@ void OverlappedCardGroupDisplayWidget::onCardAddition(const QModelIndex &parent, void OverlappedCardGroupDisplayWidget::onCardRemoval(const QModelIndex &parent, int first, int last) { - Q_UNUSED(parent); Q_UNUSED(first); Q_UNUSED(last); if (parent == trackedIndex) { diff --git a/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp b/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp index 7d250c370..d6383f5e9 100644 --- a/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp +++ b/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp @@ -35,8 +35,7 @@ DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent, banner->setBuddy(cardGroupContainer); displayCards(); - // connect(deckListModel, &DeckListModel::dataChanged, this, &DeckCardZoneDisplayWidget::displayCards); - // connect(deckListModel, &DeckListModel::dataChanged, this, &DeckCardZoneDisplayWidget::decklistDataChanged); + connect(deckListModel, &QAbstractItemModel::rowsInserted, this, &DeckCardZoneDisplayWidget::onCategoryAddition); connect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &DeckCardZoneDisplayWidget::onCategoryRemoval); } @@ -60,27 +59,27 @@ void DeckCardZoneDisplayWidget::constructAppropriateWidget(QPersistentModelIndex return; } if (displayType == DisplayType::Overlap) { - auto *display_widget = new OverlappedCardGroupDisplayWidget( + auto *displayWidget = new OverlappedCardGroupDisplayWidget( cardGroupContainer, deckListModel, index, zoneName, categoryName, activeGroupCriteria, activeSortCriteria, subBannerOpacity, cardSizeWidget); - connect(display_widget, SIGNAL(cardClicked(QMouseEvent *, CardInfoPictureWithTextOverlayWidget *)), this, + connect(displayWidget, SIGNAL(cardClicked(QMouseEvent *, CardInfoPictureWithTextOverlayWidget *)), this, SLOT(onClick(QMouseEvent *, CardInfoPictureWithTextOverlayWidget *))); - connect(display_widget, SIGNAL(cardHovered(CardInfoPtr)), this, SLOT(onHover(CardInfoPtr))); - connect(display_widget, &CardGroupDisplayWidget::cleanupRequested, this, + connect(displayWidget, SIGNAL(cardHovered(CardInfoPtr)), this, SLOT(onHover(CardInfoPtr))); + connect(displayWidget, &CardGroupDisplayWidget::cleanupRequested, this, &DeckCardZoneDisplayWidget::cleanupInvalidCardGroup); - cardGroupLayout->addWidget(display_widget); - indexToWidgetMap.insert(index, display_widget); + cardGroupLayout->addWidget(displayWidget); + indexToWidgetMap.insert(index, displayWidget); } else if (displayType == DisplayType::Flat) { - auto *display_widget = + auto *displayWidget = new FlatCardGroupDisplayWidget(cardGroupContainer, deckListModel, index, zoneName, categoryName, activeGroupCriteria, activeSortCriteria, subBannerOpacity, cardSizeWidget); - connect(display_widget, SIGNAL(cardClicked(QMouseEvent *, CardInfoPictureWithTextOverlayWidget *)), this, + connect(displayWidget, SIGNAL(cardClicked(QMouseEvent *, CardInfoPictureWithTextOverlayWidget *)), this, SLOT(onClick(QMouseEvent *, CardInfoPictureWithTextOverlayWidget *))); - connect(display_widget, SIGNAL(cardHovered(CardInfoPtr)), this, SLOT(onHover(CardInfoPtr))); - connect(display_widget, &CardGroupDisplayWidget::cleanupRequested, this, + connect(displayWidget, SIGNAL(cardHovered(CardInfoPtr)), this, SLOT(onHover(CardInfoPtr))); + connect(displayWidget, &CardGroupDisplayWidget::cleanupRequested, this, &DeckCardZoneDisplayWidget::cleanupInvalidCardGroup); - cardGroupLayout->addWidget(display_widget); - indexToWidgetMap.insert(index, display_widget); + cardGroupLayout->addWidget(displayWidget); + indexToWidgetMap.insert(index, displayWidget); } }