jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

16
cockatrice/src/tab_deck_editor.cpp
View file

@ -1,6 +1,5 @@
#include "tab_deck_editor.h"
#include "abstractclient.h"
#include "carddatabase.h"
#include "carddatabasemodel.h"
#include "cardframe.h"
#include "decklistmodel.h"
@ -872,11 +871,13 @@ void TabDeckEditor::recursiveExpand(const QModelIndex &index)
deckView->expand(index);
}
CardInfo *TabDeckEditor::currentCardInfo() const
CardInfoPtr TabDeckEditor::currentCardInfo() const
{
const QModelIndex currentIndex = databaseView->selectionModel()->currentIndex();
if (!currentIndex.isValid())
return NULL;
if (!currentIndex.isValid()) {
return {};
}
const QString cardName = currentIndex.sibling(currentIndex.row(), 0).data().toString();
return db->getCard(cardName);
@ -884,9 +885,7 @@ CardInfo *TabDeckEditor::currentCardInfo() const
void TabDeckEditor::addCardHelper(QString zoneName)
{
const CardInfo *info;
info = currentCardInfo();
const CardInfoPtr info = currentCardInfo();
if (!info)
return;
if (info->getIsToken())
@ -961,10 +960,9 @@ void TabDeckEditor::offsetCountAtIndex(const QModelIndex &idx, int offset)
void TabDeckEditor::decrementCardHelper(QString zoneName)
{
const CardInfo *info;
const CardInfoPtr info = currentCardInfo();
QModelIndex idx;
info = currentCardInfo();
if (!info)
return;
if (info->getIsToken())