jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-11 16:44:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "Reimplemented PictureLoader as a singleton"

Browse source
This commit is contained in:
Zach 2015-09-23 03:17:33 -04:00
parent 064c89ba5c
commit d5adec53a2
21 changed files with 705 additions and 657 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cockatrice/src/cardinfopicture.cpp
View file

@ -6,7 +6,6 @@
#include "carditem.h"
#include "carddatabase.h"
#include "pictureloader.h"
#include "main.h"
CardInfoPicture::CardInfoPicture(QWidget *parent)
@ -22,8 +21,7 @@ void CardInfoPicture::setCard(CardInfo *card)
if (info)
disconnect(info, 0, this, 0);
info = card;
if(info)
connect(info, SIGNAL(pixmapUpdated()), this, SLOT(updatePixmap()));
connect(info, SIGNAL(pixmapUpdated()), this, SLOT(updatePixmap()));
updatePixmap();
}
@ -42,13 +40,13 @@ void CardInfoPicture::updatePixmap()
void CardInfoPicture::loadPixmap()
{
if(info)
PictureLoader::getPixmap(resizedPixmap, info, size());
info->getPixmap(size(), resizedPixmap);
else
resizedPixmap = QPixmap();
if (resizedPixmap.isNull())
PictureLoader::getPixmap(resizedPixmap, db->getCard(), size());
db->getCard()->getPixmap(size(), resizedPixmap);
}
void CardInfoPicture::paintEvent(QPaintEvent *)