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

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

20
cockatrice/src/cardframe.cpp
View file

@ -1,10 +1,10 @@
#include "cardframe.h"
#include "carditem.h"
#include "carddatabase.h"
#include "main.h"
#include "cardinfopicture.h"
#include "cardinfotext.h"
#include "carditem.h"
#include "main.h"
#include "settingscache.h"
#include <QSplitter>
@ -68,11 +68,10 @@ void CardFrame::retranslateUi()
void CardFrame::setViewMode(int mode)
{
if(currentIndex() != mode)
if (currentIndex() != mode)
setCurrentIndex(mode);
switch (mode)
{
switch (mode) {
case ImageOnlyView:
case TextOnlyView:
tab1Layout->addWidget(pic);
@ -91,15 +90,13 @@ void CardFrame::setViewMode(int mode)
void CardFrame::setCard(CardInfo *card)
{
if (info)
{
if (info) {
disconnect(info, nullptr, this, nullptr);
}
info = card;
if (info)
{
if (info) {
connect(info, SIGNAL(destroyed()), this, SLOT(clear()));
}
@ -114,13 +111,12 @@ void CardFrame::setCard(const QString &cardName)
void CardFrame::setCard(AbstractCardItem *card)
{
if (card)
{
if (card) {
setCard(card->getInfo());
}
}
void CardFrame::clear()
{
setCard((CardInfo*) nullptr);
setCard((CardInfo *)nullptr);
}