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

qt 4.5 compile fix

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2010-04-21 22:41:52 +02:00
parent cb045907cb
commit bda9768b1d
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cockatrice/src/carddatabase.cpp
View file

@ -331,22 +331,20 @@ void CardDatabase::startPicDownload(CardInfo *card)
void CardDatabase::startNextPicDownload() void CardDatabase::startNextPicDownload()
{ {
if (cardsToDownload.isEmpty()) { if (cardsToDownload.isEmpty()) {
cardBeingDownloaded = 0;
downloadRunning = false; downloadRunning = false;
return; return;
} }
downloadRunning = true; downloadRunning = true;
CardInfo *card = cardsToDownload.takeFirst(); cardBeingDownloaded = cardsToDownload.takeFirst();
QNetworkRequest req(QUrl(card->getPicURL())); QNetworkRequest req(QUrl(cardBeingDownloaded->getPicURL()));
req.setOriginatingObject(card);
networkManager->get(req); networkManager->get(req);
} }
void CardDatabase::picDownloadFinished(QNetworkReply *reply) void CardDatabase::picDownloadFinished(QNetworkReply *reply)
{ {
CardInfo *card = static_cast<CardInfo *>(reply->request().originatingObject());
QString picsPath = settingsCache->getPicsPath(); QString picsPath = settingsCache->getPicsPath();
const QByteArray &picData = reply->readAll(); const QByteArray &picData = reply->readAll();
QPixmap testPixmap; QPixmap testPixmap;
@ -357,13 +355,13 @@ void CardDatabase::picDownloadFinished(QNetworkReply *reply)
return; return;
dir.mkdir("downloadedPics"); dir.mkdir("downloadedPics");
} }
QFile newPic(picsPath + "/downloadedPics/" + card->getCorrectedName() + ".full.jpg"); QFile newPic(picsPath + "/downloadedPics/" + cardBeingDownloaded->getCorrectedName() + ".full.jpg");
if (!newPic.open(QIODevice::WriteOnly)) if (!newPic.open(QIODevice::WriteOnly))
return; return;
newPic.write(picData); newPic.write(picData);
newPic.close(); newPic.close();
card->updatePixmapCache(); cardBeingDownloaded->updatePixmapCache();
} }
reply->deleteLater(); reply->deleteLater();

2
cockatrice/src/carddatabase.h
View file

@ -7,6 +7,7 @@
#include <QDataStream> #include <QDataStream>
#include <QList> #include <QList>
#include <QXmlStreamReader> #include <QXmlStreamReader>
#include <QNetworkRequest>
class CardDatabase; class CardDatabase;
class CardInfo; class CardInfo;
@ -96,6 +97,7 @@ protected:
QHash<QString, CardSet *> setHash; QHash<QString, CardSet *> setHash;
QNetworkAccessManager *networkManager; QNetworkAccessManager *networkManager;
QList<CardInfo *> cardsToDownload; QList<CardInfo *> cardsToDownload;
CardInfo *cardBeingDownloaded;
bool downloadRunning; bool downloadRunning;
CardInfo *noCard; CardInfo *noCard;
private: private: