From a83e6cdf48b4008a374024c0efde716ecff98461 Mon Sep 17 00:00:00 2001 From: Peng Liu Date: Mon, 11 Aug 2014 13:47:47 -0400 Subject: [PATCH] Removed unused variable, bool stripped, from classes and functions. --- cockatrice/src/carddatabase.cpp | 10 +++++----- cockatrice/src/carddatabase.h | 6 ++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/cockatrice/src/carddatabase.cpp b/cockatrice/src/carddatabase.cpp index b389e6ec..b67f733d 100644 --- a/cockatrice/src/carddatabase.cpp +++ b/cockatrice/src/carddatabase.cpp @@ -76,8 +76,8 @@ void SetList::sortByKey() qSort(begin(), end(), CompareFunctor()); } -PictureToLoad::PictureToLoad(CardInfo *_card, bool _stripped, bool _hq) - : card(_card), stripped(_stripped), setIndex(0), hq(_hq) +PictureToLoad::PictureToLoad(CardInfo *_card, bool _hq) + : card(_card), setIndex(0), hq(_hq) { if (card) { sortedSets = card->getSets(); @@ -308,11 +308,11 @@ void PictureLoader::picDownloadFinished(QNetworkReply *reply) startNextPicDownload(); } -void PictureLoader::loadImage(CardInfo *card, bool stripped) +void PictureLoader::loadImage(CardInfo *card) { QMutexLocker locker(&mutex); - loadQueue.append(PictureToLoad(card, stripped)); + loadQueue.append(PictureToLoad(card)); emit startLoadQueue(); } @@ -938,7 +938,7 @@ void CardDatabase::cacheCardPixmaps(const QStringList &cardNames) void CardDatabase::loadImage(CardInfo *card) { - pictureLoader->loadImage(card, false); + pictureLoader->loadImage(card); } void CardDatabase::imageLoaded(CardInfo *card, QImage image) diff --git a/cockatrice/src/carddatabase.h b/cockatrice/src/carddatabase.h index 91abac59..7cf94443 100644 --- a/cockatrice/src/carddatabase.h +++ b/cockatrice/src/carddatabase.h @@ -47,14 +47,12 @@ public: class PictureToLoad { private: CardInfo *card; - bool stripped; SetList sortedSets; int setIndex; bool hq; public: - PictureToLoad(CardInfo *_card = 0, bool _stripped = false, bool _hq = true); + PictureToLoad(CardInfo *_card = 0, bool _hq = true); CardInfo *getCard() const { return card; } - bool getStripped() const { return stripped; } QString getSetName() const; bool nextSet(); bool getHq() const { return hq; } @@ -79,7 +77,7 @@ public: void setPicsPath(const QString &path); void setPicDownload(bool _picDownload); void setPicDownloadHq(bool _picDownloadHq); - void loadImage(CardInfo *card, bool stripped); + void loadImage(CardInfo *card); private slots: void picDownloadFinished(QNetworkReply *reply); public slots: