Convert rest of source to 4-space indent

1bc48a78 · Matt Kelly · a171df74 · 1bc48a78 · 1bc48a78 · 1bc48a78
Commit 1bc48a78 authored Feb 11, 2014 by Matt Kelly
--- a/cockatrice/src/cardinfowidget.h
+++ b/cockatrice/src/cardinfowidget.h
@@ -14,51 +14,51 @@ class QResizeEvent;
 class QMouseEvent;

 class CardInfoWidget : public QFrame {
-	Q_OBJECT
+    Q_OBJECT

 public:
-	enum ResizeMode { ModeDeckEditor, ModeGameTab, ModePopUp };
+    enum ResizeMode { ModeDeckEditor, ModeGameTab, ModePopUp };

 private:
-	int pixmapWidth;
-	qreal cardHeightOffset;
-	qreal aspectRatio;
-	// XXX: Why isn't this an eunm?
-	int minimized; // 0 - card, 1 - oracle only, 2 - full
-	ResizeMode mode;
+    int pixmapWidth;
+    qreal cardHeightOffset;
+    qreal aspectRatio;
+    // XXX: Why isn't this an eunm?
+    int minimized; // 0 - card, 1 - oracle only, 2 - full
+    ResizeMode mode;

-	QComboBox *dropList;
-	QLabel *cardPicture;
-	QLabel *nameLabel1, *nameLabel2;
-	QLabel *manacostLabel1, *manacostLabel2;
-	QLabel *cardtypeLabel1, *cardtypeLabel2;
-	QLabel *powtoughLabel1, *powtoughLabel2;
-	QLabel *loyaltyLabel1, *loyaltyLabel2;
-	QTextEdit *textLabel;
+    QComboBox *dropList;
+    QLabel *cardPicture;
+    QLabel *nameLabel1, *nameLabel2;
+    QLabel *manacostLabel1, *manacostLabel2;
+    QLabel *cardtypeLabel1, *cardtypeLabel2;
+    QLabel *powtoughLabel1, *powtoughLabel2;
+    QLabel *loyaltyLabel1, *loyaltyLabel2;
+    QTextEdit *textLabel;

-	bool shouldShowPowTough();
-	bool shouldShowLoyalty();
+    bool shouldShowPowTough();
+    bool shouldShowLoyalty();

-	CardInfo *info;
-	void setMinimized(int _minimized);
+    CardInfo *info;
+    void setMinimized(int _minimized);

 public:
-	CardInfoWidget(ResizeMode _mode, const QString &cardName = QString(), QWidget *parent = 0, Qt::WindowFlags f = 0);
-	void retranslateUi();
-	QString getCardName() const;
+    CardInfoWidget(ResizeMode _mode, const QString &cardName = QString(), QWidget *parent = 0, Qt::WindowFlags f = 0);
+    void retranslateUi();
+    QString getCardName() const;

 public slots:
-	void setCard(CardInfo *card);
-	void setCard(const QString &cardName);
-	void setCard(AbstractCardItem *card);
+    void setCard(CardInfo *card);
+    void setCard(const QString &cardName);
+    void setCard(AbstractCardItem *card);

 private slots:
-	void clear();
-	void updatePixmap();
-	void minimizeClicked(int newMinimized);
+    void clear();
+    void updatePixmap();
+    void minimizeClicked(int newMinimized);

 protected:
-	void resizeEvent(QResizeEvent *event);
+    void resizeEvent(QResizeEvent *event);
 };

 #endif
--- a/cockatrice/src/carditem.cpp
+++ b/cockatrice/src/carditem.cpp
--- a/cockatrice/src/carditem.h
+++ b/cockatrice/src/carditem.h
@@ -14,75 +14,75 @@ class QColor;
 const int MAX_COUNTERS_ON_CARD = 999;

 class CardItem : public AbstractCardItem {
-	Q_OBJECT
+    Q_OBJECT
 private:
-	CardZone *zone;
-	bool revealedCard;
-	bool attacking;
-	QMap<int, int> counters;
-	QString annotation;
-	QString pt;
-	bool destroyOnZoneChange;
-	bool doesntUntap;
-	QPoint gridPoint;
-	CardDragItem *dragItem;
-	CardItem *attachedTo;
-	QList<CardItem *> attachedCards;
-	
-	QMenu *cardMenu, *ptMenu, *moveMenu;
+    CardZone *zone;
+    bool revealedCard;
+    bool attacking;
+    QMap<int, int> counters;
+    QString annotation;
+    QString pt;
+    bool destroyOnZoneChange;
+    bool doesntUntap;
+    QPoint gridPoint;
+    CardDragItem *dragItem;
+    CardItem *attachedTo;
+    QList<CardItem *> attachedCards;
+    
+    QMenu *cardMenu, *ptMenu, *moveMenu;

-	void prepareDelete();
+    void prepareDelete();
 public slots:
-	void deleteLater();
+    void deleteLater();
 public:
-	enum { Type = typeCard };
-	int type() const { return Type; }
-	CardItem(Player *_owner, const QString &_name = QString(), int _cardid = -1, bool revealedCard = false, QGraphicsItem *parent = 0);
-	~CardItem();
-	void retranslateUi();
-	CardZone *getZone() const { return zone; }
-	void setZone(CardZone *_zone);
-	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
-	QPoint getGridPoint() const { return gridPoint; }
-	void setGridPoint(const QPoint &_gridPoint) { gridPoint = _gridPoint; }
-	QPoint getGridPos() const { return gridPoint; }
-	Player *getOwner() const { return owner; }
-	void setOwner(Player *_owner) { owner = _owner; }
-	bool getRevealedCard() const { return revealedCard; }
-	bool getAttacking() const { return attacking; }
-	void setAttacking(bool _attacking);
-	const QMap<int, int> &getCounters() const { return counters; }
-	void setCounter(int _id, int _value);
-	QString getAnnotation() const { return annotation; }
-	void setAnnotation(const QString &_annotation);
-	bool getDoesntUntap() const { return doesntUntap; }
-	void setDoesntUntap(bool _doesntUntap);
-	QString getPT() const { return pt; }
-	void setPT(const QString &_pt);
-	bool getDestroyOnZoneChange() const { return destroyOnZoneChange; }
-	void setDestroyOnZoneChange(bool _destroy) { destroyOnZoneChange = _destroy; }
-	CardItem *getAttachedTo() const { return attachedTo; }
-	void setAttachedTo(CardItem *_attachedTo);
-	void addAttachedCard(CardItem *card) { attachedCards.append(card); }
-	void removeAttachedCard(CardItem *card) { attachedCards.removeAt(attachedCards.indexOf(card)); }
-	const QList<CardItem *> &getAttachedCards() const { return attachedCards; }
-	void resetState();
-	void processCardInfo(const ServerInfo_Card &info);
+    enum { Type = typeCard };
+    int type() const { return Type; }
+    CardItem(Player *_owner, const QString &_name = QString(), int _cardid = -1, bool revealedCard = false, QGraphicsItem *parent = 0);
+    ~CardItem();
+    void retranslateUi();
+    CardZone *getZone() const { return zone; }
+    void setZone(CardZone *_zone);
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    QPoint getGridPoint() const { return gridPoint; }
+    void setGridPoint(const QPoint &_gridPoint) { gridPoint = _gridPoint; }
+    QPoint getGridPos() const { return gridPoint; }
+    Player *getOwner() const { return owner; }
+    void setOwner(Player *_owner) { owner = _owner; }
+    bool getRevealedCard() const { return revealedCard; }
+    bool getAttacking() const { return attacking; }
+    void setAttacking(bool _attacking);
+    const QMap<int, int> &getCounters() const { return counters; }
+    void setCounter(int _id, int _value);
+    QString getAnnotation() const { return annotation; }
+    void setAnnotation(const QString &_annotation);
+    bool getDoesntUntap() const { return doesntUntap; }
+    void setDoesntUntap(bool _doesntUntap);
+    QString getPT() const { return pt; }
+    void setPT(const QString &_pt);
+    bool getDestroyOnZoneChange() const { return destroyOnZoneChange; }
+    void setDestroyOnZoneChange(bool _destroy) { destroyOnZoneChange = _destroy; }
+    CardItem *getAttachedTo() const { return attachedTo; }
+    void setAttachedTo(CardItem *_attachedTo);
+    void addAttachedCard(CardItem *card) { attachedCards.append(card); }
+    void removeAttachedCard(CardItem *card) { attachedCards.removeAt(attachedCards.indexOf(card)); }
+    const QList<CardItem *> &getAttachedCards() const { return attachedCards; }
+    void resetState();
+    void processCardInfo(const ServerInfo_Card &info);

-	QMenu *getCardMenu() const { return cardMenu; }
-	QMenu *getPTMenu() const { return ptMenu; }
-	QMenu *getMoveMenu() const { return moveMenu; }
-	
-	bool animationEvent();
-	CardDragItem *createDragItem(int _id, const QPointF &_pos, const QPointF &_scenePos, bool faceDown);
-	void deleteDragItem();
-	void drawArrow(const QColor &arrowColor);
-	void playCard(bool faceDown);
+    QMenu *getCardMenu() const { return cardMenu; }
+    QMenu *getPTMenu() const { return ptMenu; }
+    QMenu *getMoveMenu() const { return moveMenu; }
+    
+    bool animationEvent();
+    CardDragItem *createDragItem(int _id, const QPointF &_pos, const QPointF &_scenePos, bool faceDown);
+    void deleteDragItem();
+    void drawArrow(const QColor &arrowColor);
+    void playCard(bool faceDown);
 protected:
-	void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
-	void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
-	void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
-	QVariant itemChange(GraphicsItemChange change, const QVariant &value);
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+    void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
+    QVariant itemChange(GraphicsItemChange change, const QVariant &value);
 };

 #endif
--- a/cockatrice/src/cardlist.cpp
+++ b/cockatrice/src/cardlist.cpp
@@ -3,57 +3,57 @@
 #include "carddatabase.h"

 CardList::CardList(bool _contentsKnown)
-	: QList<CardItem *>(), contentsKnown(_contentsKnown)
+    : QList<CardItem *>(), contentsKnown(_contentsKnown)
 {
 }

 CardItem *CardList::findCard(const int id, const bool remove, int *position)
 {
-	if (!contentsKnown) {
-		if (empty())
-			return 0;
-		CardItem *temp = at(0);
-		if (remove)
-			removeAt(0);
-		if (position)
-			*position = id;
-		return temp;
-	} else
-		for (int i = 0; i < size(); i++) {
-			CardItem *temp = at(i);
-			if (temp->getId() == id) {
-				if (remove)
-					removeAt(i);
-				if (position)
-					*position = i;
-				return temp;
-			}
-		}
-	return 0;
+    if (!contentsKnown) {
+        if (empty())
+            return 0;
+        CardItem *temp = at(0);
+        if (remove)
+            removeAt(0);
+        if (position)
+            *position = id;
+        return temp;
+    } else
+        for (int i = 0; i < size(); i++) {
+            CardItem *temp = at(i);
+            if (temp->getId() == id) {
+                if (remove)
+                    removeAt(i);
+                if (position)
+                    *position = i;
+                return temp;
+            }
+        }
+    return 0;
 }

 class CardList::compareFunctor {
 private:
-	int flags;
+    int flags;
 public:
-	compareFunctor(int _flags) : flags(_flags)
-	{
-	}
-	inline bool operator()(CardItem *a, CardItem *b) const
-	{
-		if (flags & SortByType) {
-			QString t1 = a->getInfo()->getMainCardType();
-			QString t2 = b->getInfo()->getMainCardType();
-			if ((t1 == t2) && (flags & SortByName))
-				return a->getName() < b->getName();
-			return t1 < t2;
-		} else
-			return a->getName() < b->getName();
-	}
+    compareFunctor(int _flags) : flags(_flags)
+    {
+    }
+    inline bool operator()(CardItem *a, CardItem *b) const
+    {
+        if (flags & SortByType) {
+            QString t1 = a->getInfo()->getMainCardType();
+            QString t2 = b->getInfo()->getMainCardType();
+            if ((t1 == t2) && (flags & SortByName))
+                return a->getName() < b->getName();
+            return t1 < t2;
+        } else
+            return a->getName() < b->getName();
+    }
 };

 void CardList::sort(int flags)
 {
-	compareFunctor cf(flags);
-	qSort(begin(), end(), cf);
+    compareFunctor cf(flags);
+    qSort(begin(), end(), cf);
 }
--- a/cockatrice/src/cardlist.h
+++ b/cockatrice/src/cardlist.h
@@ -7,15 +7,15 @@ class CardItem;

 class CardList : public QList<CardItem *> {
 private:
-	class compareFunctor;
+    class compareFunctor;
 protected:
-	bool contentsKnown;
+    bool contentsKnown;
 public:
-	enum SortFlags { SortByName = 1, SortByType = 2 };
-	CardList(bool _contentsKnown);
-	CardItem *findCard(const int id, const bool remove, int *position = NULL);
-	bool getContentsKnown() const { return contentsKnown; }
-	void sort(int flags = SortByName);
+    enum SortFlags { SortByName = 1, SortByType = 2 };
+    CardList(bool _contentsKnown);
+    CardItem *findCard(const int id, const bool remove, int *position = NULL);
+    bool getContentsKnown() const { return contentsKnown; }
+    void sort(int flags = SortByName);
 };

 #endif
--- a/cockatrice/src/cardzone.h
+++ b/cockatrice/src/cardzone.h
@@ -14,56 +14,56 @@ class QPainter;
 class CardDragItem;

 class CardZone : public AbstractGraphicsItem {
-	Q_OBJECT
+    Q_OBJECT
 protected:
-	Player *player;
-	QString name;
-	CardList cards;
-	ZoneViewZone *view;
-	QMenu *menu;
-	QAction *doubleClickAction;
-	bool hasCardAttr;
-	bool isShufflable;
-	bool isView;
-	bool alwaysRevealTopCard;
-	void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
-	void mousePressEvent(QGraphicsSceneMouseEvent *event);
-	virtual void addCardImpl(CardItem *card, int x, int y) = 0;
+    Player *player;
+    QString name;
+    CardList cards;
+    ZoneViewZone *view;
+    QMenu *menu;
+    QAction *doubleClickAction;
+    bool hasCardAttr;
+    bool isShufflable;
+    bool isView;
+    bool alwaysRevealTopCard;
+    void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
+    void mousePressEvent(QGraphicsSceneMouseEvent *event);
+    virtual void addCardImpl(CardItem *card, int x, int y) = 0;
 signals:
-	void cardCountChanged();
+    void cardCountChanged();
 public slots:
-	void moveAllToZone();
-	bool showContextMenu(const QPoint &screenPos);
+    void moveAllToZone();
+    bool showContextMenu(const QPoint &screenPos);
 public:
-	enum { Type = typeZone };
-	int type() const { return Type; }
-	virtual void handleDropEvent(const QList<CardDragItem *> &dragItem, CardZone *startZone, const QPoint &dropPoint) = 0;
-	CardZone(Player *_player, const QString &_name, bool _hasCardAttr, bool _isShufflable, bool _contentsKnown, QGraphicsItem *parent = 0, bool _isView = false);
-	~CardZone();
-	void retranslateUi();
-	void clearContents();
-	bool getHasCardAttr() const { return hasCardAttr; }
-	bool getIsShufflable() const { return isShufflable; }
-	QMenu *getMenu() const { return menu; }
-	void setMenu(QMenu *_menu, QAction *_doubleClickAction = 0) { menu = _menu; doubleClickAction = _doubleClickAction; }
-	QString getName() const { return name; }
-	QString getTranslatedName(bool hisOwn, GrammaticalCase gc) const;
-	Player *getPlayer() const { return player; }
-	bool contentsKnown() const { return cards.getContentsKnown(); }
-	const CardList &getCards() const { return cards; }
-	void addCard(CardItem *card, bool reorganize, int x, int y = -1);
-	// getCard() finds a card by id.
-	CardItem *getCard(int cardId, const QString &cardName);
-	// takeCard() finds a card by position and removes it from the zone and from all of its views.
-	virtual CardItem *takeCard(int position, int cardId, bool canResize = true);
-	void removeCard(CardItem *card);
-	ZoneViewZone *getView() const { return view; }
-	void setView(ZoneViewZone *_view) { view = _view; }
-	virtual void reorganizeCards() = 0;
-	virtual QPointF closestGridPoint(const QPointF &point);
-	bool getIsView() const { return isView; }
-	bool getAlwaysRevealTopCard() const { return alwaysRevealTopCard; }
-	void setAlwaysRevealTopCard(bool _alwaysRevealTopCard) { alwaysRevealTopCard = _alwaysRevealTopCard; }
+    enum { Type = typeZone };
+    int type() const { return Type; }
+    virtual void handleDropEvent(const QList<CardDragItem *> &dragItem, CardZone *startZone, const QPoint &dropPoint) = 0;
+    CardZone(Player *_player, const QString &_name, bool _hasCardAttr, bool _isShufflable, bool _contentsKnown, QGraphicsItem *parent = 0, bool _isView = false);
+    ~CardZone();
+    void retranslateUi();
+    void clearContents();
+    bool getHasCardAttr() const { return hasCardAttr; }
+    bool getIsShufflable() const { return isShufflable; }
+    QMenu *getMenu() const { return menu; }
+    void setMenu(QMenu *_menu, QAction *_doubleClickAction = 0) { menu = _menu; doubleClickAction = _doubleClickAction; }
+    QString getName() const { return name; }
+    QString getTranslatedName(bool hisOwn, GrammaticalCase gc) const;
+    Player *getPlayer() const { return player; }
+    bool contentsKnown() const { return cards.getContentsKnown(); }
+    const CardList &getCards() const { return cards; }
+    void addCard(CardItem *card, bool reorganize, int x, int y = -1);
+    // getCard() finds a card by id.
+    CardItem *getCard(int cardId, const QString &cardName);
+    // takeCard() finds a card by position and removes it from the zone and from all of its views.
+    virtual CardItem *takeCard(int position, int cardId, bool canResize = true);
+    void removeCard(CardItem *card);
+    ZoneViewZone *getView() const { return view; }
+    void setView(ZoneViewZone *_view) { view = _view; }
+    virtual void reorganizeCards() = 0;
+    virtual QPointF closestGridPoint(const QPointF &point);
+    bool getIsView() const { return isView; }
+    bool getAlwaysRevealTopCard() const { return alwaysRevealTopCard; }
+    void setAlwaysRevealTopCard(bool _alwaysRevealTopCard) { alwaysRevealTopCard = _alwaysRevealTopCard; }
 };

 #endif
--- a/cockatrice/src/chatview.cpp
+++ b/cockatrice/src/chatview.cpp
--- a/cockatrice/src/chatview.h
+++ b/cockatrice/src/chatview.h
@@ -14,40 +14,40 @@ class TabSupervisor;
 class TabGame;

 class ChatView : public QTextBrowser {
-	Q_OBJECT
+    Q_OBJECT
 protected:
-	const TabSupervisor * const tabSupervisor;
-	TabGame * const game;
+    const TabSupervisor * const tabSupervisor;
+    TabGame * const game;
 private:
-	enum HoveredItemType { HoveredNothing, HoveredUrl, HoveredCard, HoveredUser };
-	UserContextMenu *userContextMenu;
-	QString lastSender;
-	bool evenNumber;
-	bool showTimestamps;
-	HoveredItemType hoveredItemType;
-	QString hoveredContent;
-	QTextFragment getFragmentUnderMouse(const QPoint &pos) const;
-	QTextCursor prepareBlock(bool same = false);
-	void appendCardTag(QTextCursor &cursor, const QString &cardName);
-	void appendUrlTag(QTextCursor &cursor, QString url);
+    enum HoveredItemType { HoveredNothing, HoveredUrl, HoveredCard, HoveredUser };
+    UserContextMenu *userContextMenu;
+    QString lastSender;
+    bool evenNumber;
+    bool showTimestamps;
+    HoveredItemType hoveredItemType;
+    QString hoveredContent;
+    QTextFragment getFragmentUnderMouse(const QPoint &pos) const;
+    QTextCursor prepareBlock(bool same = false);
+    void appendCardTag(QTextCursor &cursor, const QString &cardName);
+    void appendUrlTag(QTextCursor &cursor, QString url);
 private slots:
-	void openLink(const QUrl &link);
+    void openLink(const QUrl &link);
 public:
-	ChatView(const TabSupervisor *_tabSupervisor, TabGame *_game, bool _showTimestamps, QWidget *parent = 0);
-	void retranslateUi();
-	void appendHtml(const QString &html);
-	void appendMessage(QString message, QString sender = QString(), UserLevelFlags userLevel = UserLevelFlags(), bool playerBold = false);
+    ChatView(const TabSupervisor *_tabSupervisor, TabGame *_game, bool _showTimestamps, QWidget *parent = 0);
+    void retranslateUi();
+    void appendHtml(const QString &html);
+    void appendMessage(QString message, QString sender = QString(), UserLevelFlags userLevel = UserLevelFlags(), bool playerBold = false);
 protected:
-	void enterEvent(QEvent *event);
-	void leaveEvent(QEvent *event);
-	void mouseMoveEvent(QMouseEvent *event);
-	void mousePressEvent(QMouseEvent *event);
-	void mouseReleaseEvent(QMouseEvent *event);
+    void enterEvent(QEvent *event);
+    void leaveEvent(QEvent *event);
+    void mouseMoveEvent(QMouseEvent *event);
+    void mousePressEvent(QMouseEvent *event);
+    void mouseReleaseEvent(QMouseEvent *event);
 signals:
-	void openMessageDialog(const QString &userName, bool focus);
-	void cardNameHovered(QString cardName);
-	void showCardInfoPopup(QPoint pos, QString cardName);
-	void deleteCardInfoPopup(QString cardName);
+    void openMessageDialog(const QString &userName, bool focus);
+    void cardNameHovered(QString cardName);
+    void showCardInfoPopup(QPoint pos, QString cardName);
+    void deleteCardInfoPopup(QString cardName);
 };

 #endif
--- a/cockatrice/src/counter_general.cpp
+++ b/cockatrice/src/counter_general.cpp
@@ -3,34 +3,34 @@
 #include <QPainter>

 GeneralCounter::GeneralCounter(Player *_player, int _id, const QString &_name, const QColor &_color, int _radius, int _value, QGraphicsItem *parent)
-	: AbstractCounter(_player, _id, _name, true, _value, parent), color(_color), radius(_radius)
+    : AbstractCounter(_player, _id, _name, true, _value, parent), color(_color), radius(_radius)
 {
-	setCacheMode(DeviceCoordinateCache);
+    setCacheMode(DeviceCoordinateCache);
 }

 QRectF GeneralCounter::boundingRect() const
 {
-	return QRectF(0, 0, radius * 2, radius * 2);
+    return QRectF(0, 0, radius * 2, radius * 2);
 }

 void GeneralCounter::paint(QPainter *painter, const QStyleOptionGraphicsItem */*option*/, QWidget */*widget*/)
 {
-	QRectF mapRect = painter->combinedTransform().mapRect(boundingRect());
-	int translatedHeight = mapRect.size().height();
-	qreal scaleFactor = translatedHeight / boundingRect().height();
-	QPixmap pixmap = CounterPixmapGenerator::generatePixmap(translatedHeight, name, hovered);
-	
-	painter->save();
-	painter->resetTransform();
-	painter->drawPixmap(QPoint(0, 0), pixmap);
+    QRectF mapRect = painter->combinedTransform().mapRect(boundingRect());
+    int translatedHeight = mapRect.size().height();
+    qreal scaleFactor = translatedHeight / boundingRect().height();
+    QPixmap pixmap = CounterPixmapGenerator::generatePixmap(translatedHeight, name, hovered);
+    
+    painter->save();
+    painter->resetTransform();
+    painter->drawPixmap(QPoint(0, 0), pixmap);

-	if (value) {
-		QFont f("Serif");
-		f.setPixelSize(qMax((int) (radius * scaleFactor), 10));
-		f.setWeight(QFont::Bold);
-		painter->setPen(Qt::black);
-		painter->setFont(f);
-		painter->drawText(mapRect, Qt::AlignCenter, QString::number(value));
-	}
-	painter->restore();
+    if (value) {
+        QFont f("Serif");
+        f.setPixelSize(qMax((int) (radius * scaleFactor), 10));
+        f.setWeight(QFont::Bold);
+        painter->setPen(Qt::black);
+        painter->setFont(f);
+        painter->drawText(mapRect, Qt::AlignCenter, QString::number(value));
+    }
+    painter->restore();
 }
--- a/cockatrice/src/counter_general.h
+++ b/cockatrice/src/counter_general.h
@@ -4,14 +4,14 @@
 #include "abstractcounter.h"

 class GeneralCounter : public AbstractCounter {
-	Q_OBJECT
+    Q_OBJECT
 private:
-	QColor color;
-	int radius;
+    QColor color;
+    int radius;
 public:
-	GeneralCounter(Player *_player, int _id, const QString &_name, const QColor &_color, int _radius, int _value, QGraphicsItem *parent = 0);
-	QRectF boundingRect() const;
-	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    GeneralCounter(Player *_player, int _id, const QString &_name, const QColor &_color, int _radius, int _value, QGraphicsItem *parent = 0);
+    QRectF boundingRect() const;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
 };

 #endif
--- a/cockatrice/src/deck_loader.cpp
+++ b/cockatrice/src/deck_loader.cpp
--- a/cockatrice/src/deck_loader.h
+++ b/cockatrice/src/deck_loader.h
@@ -4,30 +4,30 @@
 #include "decklist.h"

 class DeckLoader : public DeckList {
-	Q_OBJECT
+    Q_OBJECT
 signals:
-	void deckLoaded();
+    void deckLoaded();
 public:
-	enum FileFormat { PlainTextFormat, CockatriceFormat };
-	static const QStringList fileNameFilters;
+    enum FileFormat { PlainTextFormat, CockatriceFormat };
+    static const QStringList fileNameFilters;
 private:
-	QString lastFileName;
-	FileFormat lastFileFormat;
-	int lastRemoteDeckId;
+    QString lastFileName;
+    FileFormat lastFileFormat;
+    int lastRemoteDeckId;
 public:
-	DeckLoader();
-	DeckLoader(const QString &nativeString);
-	DeckLoader(const DeckList &other);
-	DeckLoader(const DeckLoader &other);
-	const QString &getLastFileName() const { return lastFileName; }
-	FileFormat getLastFileFormat() const { return lastFileFormat; }
-	int getLastRemoteDeckId() const { return lastRemoteDeckId; }
-	
-	static FileFormat getFormatFromName(const QString &fileName);
-	
-	bool loadFromFile(const QString &fileName, FileFormat fmt);
-	bool loadFromRemote(const QString &nativeString, int remoteDeckId);
-	bool saveToFile(const QString &fileName, FileFormat fmt);
+    DeckLoader();
+    DeckLoader(const QString &nativeString);
+    DeckLoader(const DeckList &other);
+    DeckLoader(const DeckLoader &other);
+    const QString &getLastFileName() const { return lastFileName; }
+    FileFormat getLastFileFormat() const { return lastFileFormat; }
+    int getLastRemoteDeckId() const { return lastRemoteDeckId; }
+    
+    static FileFormat getFormatFromName(const QString &fileName);
+    
+    bool loadFromFile(const QString &fileName, FileFormat fmt);
+    bool loadFromRemote(const QString &nativeString, int remoteDeckId);
+    bool saveToFile(const QString &fileName, FileFormat fmt);
 };

 #endif
--- a/cockatrice/src/decklistmodel.cpp
+++ b/cockatrice/src/decklistmodel.cpp
--- a/cockatrice/src/decklistmodel.h
+++ b/cockatrice/src/decklistmodel.h
--- a/cockatrice/src/deckstats_interface.cpp
+++ b/cockatrice/src/deckstats_interface.cpp
--- a/cockatrice/src/deckstats_interface.h
+++ b/cockatrice/src/deckstats_interface.h
--- a/cockatrice/src/deckview.cpp
+++ b/cockatrice/src/deckview.cpp
--- a/cockatrice/src/deckview.h
+++ b/cockatrice/src/deckview.h
--- a/cockatrice/src/dlg_cardsearch.cpp
+++ b/cockatrice/src/dlg_cardsearch.cpp
--- a/cockatrice/src/dlg_cardsearch.h
+++ b/cockatrice/src/dlg_cardsearch.h