mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-08 17:13:57 -07:00
Replace CardInfo* and Carset* with smart pointers (#3053)
* Replace CardInfo* and Carset* with smart pointers * fixes to help memory & c++11 stuff
This commit is contained in:
parent
3e418ba3c6
commit
517420cccb
37 changed files with 409 additions and 342 deletions
|
|
@ -5,7 +5,8 @@
|
|||
#include <QFrame>
|
||||
#include <QStringList>
|
||||
|
||||
class CardInfo;
|
||||
#include "carddatabase.h"
|
||||
|
||||
class CardInfoPicture;
|
||||
class CardInfoText;
|
||||
class AbstractCardItem;
|
||||
|
|
@ -16,7 +17,7 @@ class CardInfoWidget : public QFrame
|
|||
|
||||
private:
|
||||
qreal aspectRatio;
|
||||
CardInfo *info;
|
||||
CardInfoPtr info;
|
||||
CardInfoPicture *pic;
|
||||
CardInfoText *text;
|
||||
|
||||
|
|
@ -24,7 +25,7 @@ public:
|
|||
CardInfoWidget(const QString &cardName, QWidget *parent = 0, Qt::WindowFlags f = 0);
|
||||
|
||||
public slots:
|
||||
void setCard(CardInfo *card);
|
||||
void setCard(CardInfoPtr card);
|
||||
void setCard(const QString &cardName);
|
||||
void setCard(AbstractCardItem *card);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue