jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-27 00:53:55 -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/zoneviewwidget.h
View file

@ -1,8 +1,8 @@
#ifndef ZONEVIEWWIDGET_H
#define ZONEVIEWWIDGET_H
#include <QGraphicsWidget>
#include <QCheckBox>
#include <QGraphicsWidget>
class QLabel;
class QPushButton;
@ -18,7 +18,8 @@ class QGraphicsSceneMouseEvent;
class QGraphicsSceneWheelEvent;
class QStyleOption;
class ZoneViewWidget : public QGraphicsWidget {
class ZoneViewWidget : public QGraphicsWidget
{
Q_OBJECT
private:
ZoneViewZone *zone;
@ -30,7 +31,7 @@ private:
QCheckBox sortByTypeCheckBox;
QCheckBox shuffleCheckBox;
QCheckBox pileViewCheckBox;
bool canBeShuffled;
int extraHeight;
Player *player;
@ -45,10 +46,20 @@ private slots:
void handleScrollBarChange(int value);
void zoneDeleted();
void moveEvent(QGraphicsSceneMoveEvent * /* event */);
public:
ZoneViewWidget(Player *_player, CardZone *_origZone, int numberCards = 0, bool _revealZone = false, bool _writeableRevealZone = false, const QList<const ServerInfo_Card *> &cardList = QList<const ServerInfo_Card *>());
ZoneViewZone *getZone() const { return zone; }
ZoneViewWidget(Player *_player,
CardZone *_origZone,
int numberCards = 0,
bool _revealZone = false,
bool _writeableRevealZone = false,
const QList<const ServerInfo_Card *> &cardList = QList<const ServerInfo_Card *>());
ZoneViewZone *getZone() const
{
return zone;
}
void retranslateUi();
protected:
void closeEvent(QCloseEvent *event);
void initStyleOption(QStyleOption *option) const;