aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #803 from poixen/removed_constructor

Browse source 
Removed constructor
This commit is contained in:
poixen 2015-03-07 11:50:41 +01:00
commit 93286f6d18
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/decklist.cpp
View file

@ -586,7 +586,7 @@ bool DeckList::loadFromStream_Plain(QTextStream &in)
}
++okRows;
new DecklistCardNode(cardName, number, zone);
new DecklistCardNode(cardName, number, 0, zone);
}
updateDeckHash();
return (okRows > 0);
@ -687,7 +687,7 @@ DecklistCardNode *DeckList::addCard(const QString &cardName, const QString &zone
if (!zoneNode)
zoneNode = new InnerDecklistNode(zoneName, root);
DecklistCardNode *node = new DecklistCardNode(cardName, 1, zoneNode);
DecklistCardNode *node = new DecklistCardNode(cardName, 1, 0, zoneNode);
updateDeckHash();
return node;
}

1
common/decklist.h
View file

@ -110,7 +110,6 @@ private:
float price;
public:
DecklistCardNode(const QString &_name = QString(), int _number = 1, float _price = 0, InnerDecklistNode *_parent = 0) : AbstractDecklistCardNode(_parent), name(_name), number(_number), price(_price) { }
DecklistCardNode(const QString &_name = QString(), int _number = 1, InnerDecklistNode *_parent = 0) : AbstractDecklistCardNode(_parent), name(_name), number(_number), price(0) { }
DecklistCardNode(DecklistCardNode *other, InnerDecklistNode *_parent);
int getNumber() const { return number; }
void setNumber(int _number) { number = _number; }