mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-17 16:02:14 -07:00
Change to QVariant map directly.
This commit is contained in:
parent
b960e9edbf
commit
1c1721956b
1 changed files with 4 additions and 8 deletions
|
|
@ -231,12 +231,8 @@ void DeckPreviewWidget::updateBannerCardComboBox()
|
||||||
|
|
||||||
int row = 0;
|
int row = 0;
|
||||||
for (const auto &pair : pairList) {
|
for (const auto &pair : pairList) {
|
||||||
QVariantMap dataMap;
|
|
||||||
dataMap["name"] = pair.first;
|
|
||||||
dataMap["uuid"] = pair.second;
|
|
||||||
|
|
||||||
QStandardItem *item = new QStandardItem(pair.first);
|
QStandardItem *item = new QStandardItem(pair.first);
|
||||||
item->setData(dataMap, Qt::UserRole);
|
item->setData(QVariant::fromValue(pair), Qt::UserRole);
|
||||||
model->setItem(row++, 0, item);
|
model->setItem(row++, 0, item);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -264,11 +260,11 @@ void DeckPreviewWidget::updateBannerCardComboBox()
|
||||||
|
|
||||||
void DeckPreviewWidget::setBannerCard(int /* changedIndex */)
|
void DeckPreviewWidget::setBannerCard(int /* changedIndex */)
|
||||||
{
|
{
|
||||||
QVariantMap itemData = bannerCardComboBox->itemData(bannerCardComboBox->currentIndex()).toMap();
|
QVariant itemData = bannerCardComboBox->itemData(bannerCardComboBox->currentIndex());
|
||||||
deckLoader->setBannerCard(QPair<QString, QString>(itemData["name"].toString(), itemData["uuid"].toString()));
|
deckLoader->setBannerCard(QPair<QString, QString>(bannerCardComboBox->currentText(), itemData.toString()));
|
||||||
deckLoader->saveToFile(filePath, DeckLoader::getFormatFromName(filePath));
|
deckLoader->saveToFile(filePath, DeckLoader::getFormatFromName(filePath));
|
||||||
bannerCardDisplayWidget->setCard(CardDatabaseManager::getInstance()->getCardByNameAndProviderId(
|
bannerCardDisplayWidget->setCard(CardDatabaseManager::getInstance()->getCardByNameAndProviderId(
|
||||||
itemData["name"].toString(), itemData["uuid"].toString()));
|
bannerCardComboBox->currentText(), itemData.toString()));
|
||||||
}
|
}
|
||||||
|
|
||||||
void DeckPreviewWidget::imageClickedEvent(QMouseEvent *event, DeckPreviewCardPictureWidget *instance)
|
void DeckPreviewWidget::imageClickedEvent(QMouseEvent *event, DeckPreviewCardPictureWidget *instance)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue