From bda9768b1d54ad318fd8cccb1e19afa07c4e5ac3 Mon Sep 17 00:00:00 2001
From: Max-Wilhelm Bruker <m.bruker@digitalmedia.de>
Date: Wed, 21 Apr 2010 22:41:52 +0200
Subject: [PATCH] qt 4.5 compile fix

---
 cockatrice/src/carddatabase.cpp | 12 +++++-------
 cockatrice/src/carddatabase.h   |  2 ++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cockatrice/src/carddatabase.cpp b/cockatrice/src/carddatabase.cpp
index 8a2065bb..56c5abb8 100644
--- a/cockatrice/src/carddatabase.cpp
+++ b/cockatrice/src/carddatabase.cpp
@@ -331,22 +331,20 @@ void CardDatabase::startPicDownload(CardInfo *card)
 void CardDatabase::startNextPicDownload()
 {
 	if (cardsToDownload.isEmpty()) {
+		cardBeingDownloaded = 0;
 		downloadRunning = false;
 		return;
 	}
 	
 	downloadRunning = true;
 	
-	CardInfo *card = cardsToDownload.takeFirst();
-	QNetworkRequest req(QUrl(card->getPicURL()));
-	req.setOriginatingObject(card);
+	cardBeingDownloaded = cardsToDownload.takeFirst();
+	QNetworkRequest req(QUrl(cardBeingDownloaded->getPicURL()));
 	networkManager->get(req);
 }
 
 void CardDatabase::picDownloadFinished(QNetworkReply *reply)
 {
-	CardInfo *card = static_cast<CardInfo *>(reply->request().originatingObject());
-	
 	QString picsPath = settingsCache->getPicsPath();
 	const QByteArray &picData = reply->readAll();
 	QPixmap testPixmap;
@@ -357,13 +355,13 @@ void CardDatabase::picDownloadFinished(QNetworkReply *reply)
 				return;
 			dir.mkdir("downloadedPics");
 		}
-		QFile newPic(picsPath + "/downloadedPics/" + card->getCorrectedName() + ".full.jpg");
+		QFile newPic(picsPath + "/downloadedPics/" + cardBeingDownloaded->getCorrectedName() + ".full.jpg");
 		if (!newPic.open(QIODevice::WriteOnly))
 			return;
 		newPic.write(picData);
 		newPic.close();
 		
-		card->updatePixmapCache();
+		cardBeingDownloaded->updatePixmapCache();
 	}
 	
 	reply->deleteLater();
diff --git a/cockatrice/src/carddatabase.h b/cockatrice/src/carddatabase.h
index a544b7e4..8a456df6 100644
--- a/cockatrice/src/carddatabase.h
+++ b/cockatrice/src/carddatabase.h
@@ -7,6 +7,7 @@
 #include <QDataStream>
 #include <QList>
 #include <QXmlStreamReader>
+#include <QNetworkRequest>
 
 class CardDatabase;
 class CardInfo;
@@ -96,6 +97,7 @@ protected:
 	QHash<QString, CardSet *> setHash;
 	QNetworkAccessManager *networkManager;
 	QList<CardInfo *> cardsToDownload;
+	CardInfo *cardBeingDownloaded;
 	bool downloadRunning;
 	CardInfo *noCard;
 private: