From d6ec869c23b23947dfa79d4f9cff852d19f81871 Mon Sep 17 00:00:00 2001
From: Max-Wilhelm Bruker <m.bruker@digitalmedia.de>
Date: Sat, 1 Aug 2009 15:48:30 +0200
Subject: [PATCH] update pixmap cache

---
 cockatrice/src/carddatabase.cpp | 25 ++++++++++++++++---------
 cockatrice/src/carddatabase.h   |  3 ++-
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/cockatrice/src/carddatabase.cpp b/cockatrice/src/carddatabase.cpp
index bb9a29e6..d6c9097c 100644
--- a/cockatrice/src/carddatabase.cpp
+++ b/cockatrice/src/carddatabase.cpp
@@ -169,15 +169,22 @@ void CardInfo::clearPixmapCache()
 	}
 }
 
+void CardInfo::updatePixmapCache()
+{
+	qDebug(QString("Updating pixmap cache for %1").arg(name).toLatin1());
+	clearPixmapCache();
+	loadPixmap();
+}
+
 QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfo *info)
 {
 	xml.writeStartElement("card");
 	xml.writeTextElement("name", info->getName());
-	
+
 	SetList sets = info->getSets();
 	for (int i = 0; i < sets.size(); i++)
 		xml.writeTextElement("set", sets[i]->getShortName());
-	
+
 	xml.writeTextElement("manacost", info->getManaCost());
 	xml.writeTextElement("type", info->getCardType());
 	if (!info->getPowTough().isEmpty())
@@ -185,7 +192,7 @@ QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfo *info)
 	xml.writeTextElement("tablerow", QString::number(info->getTableRow()));
 	xml.writeTextElement("text", info->getText());
 	xml.writeEndElement(); // card
-	
+
 	return xml;
 }
 
@@ -194,7 +201,7 @@ CardDatabase::CardDatabase(QObject *parent)
 {
 	updateDatabasePath();
 	updatePicsPath();
-	
+
 	noCard = new CardInfo(this);
 	noCard->loadPixmap(); // cache pixmap for card back
 }
@@ -305,7 +312,7 @@ void CardDatabase::importOracleFile(const QString &fileName, CardSet *set)
 			card = cardHash.value(cardname);
 		else {
 			card = new CardInfo(this, cardname, manacost, cardtype, powtough, text.join("\n"));
-			
+
 			int tableRow = 1;
 			QString mainCardType = card->getMainCardType();
 			if (mainCardType == "Land")
@@ -315,7 +322,7 @@ void CardDatabase::importOracleFile(const QString &fileName, CardSet *set)
 			else if (mainCardType == "Creature")
 				tableRow = 3;
 			card->setTableRow(tableRow);
-			
+
 			cardHash.insert(cardname, card);
 		}
 		card->addToSet(set);
@@ -424,7 +431,7 @@ bool CardDatabase::saveToFile(const QString &fileName)
 	QFile file(fileName);
 	file.open(QIODevice::WriteOnly);
 	QXmlStreamWriter xml(&file);
-	
+
 	xml.setAutoFormatting(true);
 	xml.writeStartDocument();
 	xml.writeStartElement("cockatrice_carddatabase");
@@ -435,13 +442,13 @@ bool CardDatabase::saveToFile(const QString &fileName)
 	while (setIterator.hasNext())
 		xml << setIterator.next().value();
 	xml.writeEndElement(); // sets
-	
+
 	xml.writeStartElement("cards");
 	QHashIterator<QString, CardInfo *> cardIterator(cardHash);
 	while (cardIterator.hasNext())
 		xml << cardIterator.next().value();
 	xml.writeEndElement(); // cards
-	
+
 	xml.writeEndElement(); // cockatrice_carddatabase
 	xml.writeEndDocument();
 
diff --git a/cockatrice/src/carddatabase.h b/cockatrice/src/carddatabase.h
index 93627db2..90dd0fee 100644
--- a/cockatrice/src/carddatabase.h
+++ b/cockatrice/src/carddatabase.h
@@ -67,6 +67,7 @@ public:
 	QPixmap *loadPixmap();
 	QPixmap *getPixmap(QSize size);
 	void clearPixmapCache();
+	void updatePixmapCache();
 };
 
 class CardDatabase : public QObject {
@@ -76,7 +77,7 @@ private:
 	QHash<QString, CardSet *> setHash;
 	CardInfo *noCard;
 	QString picsPath, cardDatabasePath;
-	
+
 	void loadCardsFromXml(QXmlStreamReader &xml);
 	void loadSetsFromXml(QXmlStreamReader &xml);
 public: