jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-11 08:34:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Replace CardInfo* and Carset* with smart pointers (#3053)

Browse source 
* Replace CardInfo* and Carset* with smart pointers

* fixes to help memory & c++11 stuff
This commit is contained in:
ctrlaltca 2018-02-02 18:52:47 +01:00 • committed by Zach H
parent 3e418ba3c6
commit 517420cccb
37 changed files with 409 additions and 342 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cockatrice/src/cardframe.cpp
View file

@ -1,6 +1,5 @@
#include "cardframe.h"
#include "carddatabase.h"
#include "cardinfopicture.h"
#include "cardinfotext.h"
#include "carditem.h"
@ -88,16 +87,16 @@ void CardFrame::setViewMode(int mode)
settingsCache->setCardInfoViewMode(mode);
}
void CardFrame::setCard(CardInfo *card)
void CardFrame::setCard(CardInfoPtr card)
{
if (info) {
disconnect(info, nullptr, this, nullptr);
disconnect(info.data(), nullptr, this, nullptr);
}
info = card;
if (info) {
connect(info, SIGNAL(destroyed()), this, SLOT(clear()));
connect(info.data(), SIGNAL(destroyed()), this, SLOT(clear()));
}
text->setCard(info);
@ -118,5 +117,5 @@ void CardFrame::setCard(AbstractCardItem *card)
void CardFrame::clear()
{
setCard((CardInfo *)nullptr);
setCard((CardInfoPtr) nullptr);
}