jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-15 19:47:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Clang-format (#3028)

Browse source 
* 1/3 Add .clang-format file and travis compilation check

* 2/3 Run clang-format

* 3/3 Fix compilation problems due to include reordering

* 3bis/3 AfterControlStatement: false
This commit is contained in:
ctrlaltca 2018-01-27 10:41:32 +01:00 • committed by GitHub
parent 8dbdd24c8e
commit b29bd9e070
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
272 changed files with 13378 additions and 9535 deletions
Download patch file Download diff file Expand all files Collapse all files

21
cockatrice/src/cardinfopicture.cpp
View file

@ -1,33 +1,28 @@
#include "cardinfopicture.h"
#include <QWidget>
#include <QPainter>
#include <QStyle>
#include <QWidget>
#include "carditem.h"
#include "carddatabase.h"
#include "pictureloader.h"
#include "carditem.h"
#include "main.h"
#include "pictureloader.h"
CardInfoPicture::CardInfoPicture(QWidget *parent)
: QWidget(parent),
info(nullptr),
pixmapDirty(true)
CardInfoPicture::CardInfoPicture(QWidget *parent) : QWidget(parent), info(nullptr), pixmapDirty(true)
{
setMinimumHeight(100);
}
void CardInfoPicture::setCard(CardInfo *card)
{
if (info)
{
if (info) {
disconnect(info, nullptr, this, nullptr);
}
info = card;
if (info)
{
if (info) {
connect(info, SIGNAL(pixmapUpdated()), this, SLOT(updatePixmap()));
}
@ -47,7 +42,7 @@ void CardInfoPicture::updatePixmap()
void CardInfoPicture::loadPixmap()
{
if(info)
if (info)
PictureLoader::getPixmap(resizedPixmap, info, size());
else
PictureLoader::getCardBackPixmap(resizedPixmap, size());
@ -58,7 +53,7 @@ void CardInfoPicture::paintEvent(QPaintEvent *)
if (width() == 0 || height() == 0)
return;
if(pixmapDirty)
if (pixmapDirty)
loadPixmap();
QPainter painter(this);