From 819c24683f1585fc03b742262b99a77dc767bee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Sat, 16 Nov 2024 00:37:20 +0100 Subject: [PATCH] Don't inline setUUID and mimic setName for AbstractCardItem. --- cockatrice/src/game/cards/abstract_card_item.cpp | 13 +++++++++++++ cockatrice/src/game/cards/abstract_card_item.h | 5 +---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/cockatrice/src/game/cards/abstract_card_item.cpp b/cockatrice/src/game/cards/abstract_card_item.cpp index 7908460ab..e1da7263b 100644 --- a/cockatrice/src/game/cards/abstract_card_item.cpp +++ b/cockatrice/src/game/cards/abstract_card_item.cpp @@ -188,6 +188,19 @@ void AbstractCardItem::setName(const QString &_name) cardInfoUpdated(); } +void AbstractCardItem::setUUID(const QString &_uuid) +{ + if (uuid == _uuid) + return; + + emit deleteCardInfoPopup(name); + if (info) + disconnect(info.data(), nullptr, this, nullptr); + uuid = _uuid; + + cardInfoUpdated(); +} + void AbstractCardItem::setHovered(bool _hovered) { if (isHovered == _hovered) diff --git a/cockatrice/src/game/cards/abstract_card_item.h b/cockatrice/src/game/cards/abstract_card_item.h index 32371af7d..9bea9dcd9 100644 --- a/cockatrice/src/game/cards/abstract_card_item.h +++ b/cockatrice/src/game/cards/abstract_card_item.h @@ -81,10 +81,7 @@ public: { return uuid; } - void setUUID(QString _uuid) - { - uuid = _uuid; - } + void setUUID(const QString &_uuid = QString()); qreal getRealZValue() const { return realZValue;