From 1c1721956bff74cf869386da881daa12209f31dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Fri, 18 Apr 2025 23:05:43 +0200 Subject: [PATCH] Change to QVariant map directly. --- .../deck_preview/deck_preview_widget.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp index 52cd4b166..556968d2b 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp @@ -231,12 +231,8 @@ void DeckPreviewWidget::updateBannerCardComboBox() int row = 0; for (const auto &pair : pairList) { - QVariantMap dataMap; - dataMap["name"] = pair.first; - dataMap["uuid"] = pair.second; - QStandardItem *item = new QStandardItem(pair.first); - item->setData(dataMap, Qt::UserRole); + item->setData(QVariant::fromValue(pair), Qt::UserRole); model->setItem(row++, 0, item); } @@ -264,11 +260,11 @@ void DeckPreviewWidget::updateBannerCardComboBox() void DeckPreviewWidget::setBannerCard(int /* changedIndex */) { - QVariantMap itemData = bannerCardComboBox->itemData(bannerCardComboBox->currentIndex()).toMap(); - deckLoader->setBannerCard(QPair(itemData["name"].toString(), itemData["uuid"].toString())); + QVariant itemData = bannerCardComboBox->itemData(bannerCardComboBox->currentIndex()); + deckLoader->setBannerCard(QPair(bannerCardComboBox->currentText(), itemData.toString())); deckLoader->saveToFile(filePath, DeckLoader::getFormatFromName(filePath)); bannerCardDisplayWidget->setCard(CardDatabaseManager::getInstance()->getCardByNameAndProviderId( - itemData["name"].toString(), itemData["uuid"].toString())); + bannerCardComboBox->currentText(), itemData.toString())); } void DeckPreviewWidget::imageClickedEvent(QMouseEvent *event, DeckPreviewCardPictureWidget *instance)