From 319b5d88b2ad4e91ce3ca974dd1f97ed786f23ec Mon Sep 17 00:00:00 2001 From: Matt Lowe Date: Fri, 6 Mar 2015 18:48:45 +0100 Subject: [PATCH] Removed redundant constructor Removed constructor that was not needed. Also removes annoying "error" output when compiling. --- common/decklist.cpp | 4 ++-- common/decklist.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/common/decklist.cpp b/common/decklist.cpp index 0b2558b5..3bf61927 100644 --- a/common/decklist.cpp +++ b/common/decklist.cpp @@ -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; } diff --git a/common/decklist.h b/common/decklist.h index c2037205..b3140edb 100644 --- a/common/decklist.h +++ b/common/decklist.h @@ -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; }