Convert rest of source to 4-space indent

cockatrice/src/gamesmodel.cpp

@@ -3,187 +3,187 @@
 #include <QStringList>
 
 GamesModel::GamesModel(const QMap<int, QString> &_rooms, const QMap<int, GameTypeMap> &_gameTypes, QObject *parent)
-	: QAbstractTableModel(parent), rooms(_rooms), gameTypes(_gameTypes)
+    : QAbstractTableModel(parent), rooms(_rooms), gameTypes(_gameTypes)
 {
 }
 
 QVariant GamesModel::data(const QModelIndex &index, int role) const
 {
-	if (!index.isValid())
-		return QVariant();
-	if (role == Qt::UserRole)
-		return index.row();
-	if (role != Qt::DisplayRole)
-		return QVariant();
-	if ((index.row() >= gameList.size()) || (index.column() >= columnCount()))
-		return QVariant();
-	
-	const ServerInfo_Game &g = gameList[index.row()];
-	switch (index.column()) {
-		case 0: return QString::fromStdString(g.description());
-		case 1: return rooms.value(g.room_id());
-		case 2: return QString::fromStdString(g.creator_info().name());
-		case 3: {
-			QStringList result;
-			GameTypeMap gameTypeMap = gameTypes.value(g.room_id());
-			for (int i = g.game_types_size() - 1; i >= 0; --i)
-				result.append(gameTypeMap.value(g.game_types(i)));
-			return result.join(", ");
-		}
-		case 4: return g.with_password() ? ((g.spectators_need_password() || !g.spectators_allowed()) ? tr("yes") : tr("yes, free for spectators")) : tr("no");
-		case 5: {
-			QStringList result;
-			if (g.only_buddies())
-				result.append(tr("buddies only"));
-			if (g.only_registered())
-				result.append(tr("reg. users only"));
-			return result.join(", ");
-		}
-		case 6: return QString("%1/%2").arg(g.player_count()).arg(g.max_players());
-		case 7: return g.spectators_allowed() ? QVariant(g.spectators_count()) : QVariant(tr("not allowed"));
-		default: return QVariant();
-	}
+    if (!index.isValid())
+        return QVariant();
+    if (role == Qt::UserRole)
+        return index.row();
+    if (role != Qt::DisplayRole)
+        return QVariant();
+    if ((index.row() >= gameList.size()) || (index.column() >= columnCount()))
+        return QVariant();
+    
+    const ServerInfo_Game &g = gameList[index.row()];
+    switch (index.column()) {
+        case 0: return QString::fromStdString(g.description());
+        case 1: return rooms.value(g.room_id());
+        case 2: return QString::fromStdString(g.creator_info().name());
+        case 3: {
+            QStringList result;
+            GameTypeMap gameTypeMap = gameTypes.value(g.room_id());
+            for (int i = g.game_types_size() - 1; i >= 0; --i)
+                result.append(gameTypeMap.value(g.game_types(i)));
+            return result.join(", ");
+        }
+        case 4: return g.with_password() ? ((g.spectators_need_password() || !g.spectators_allowed()) ? tr("yes") : tr("yes, free for spectators")) : tr("no");
+        case 5: {
+            QStringList result;
+            if (g.only_buddies())
+                result.append(tr("buddies only"));
+            if (g.only_registered())
+                result.append(tr("reg. users only"));
+            return result.join(", ");
+        }
+        case 6: return QString("%1/%2").arg(g.player_count()).arg(g.max_players());
+        case 7: return g.spectators_allowed() ? QVariant(g.spectators_count()) : QVariant(tr("not allowed"));
+        default: return QVariant();
+    }
 }
 
 QVariant GamesModel::headerData(int section, Qt::Orientation orientation, int role) const
 {
-	if ((role != Qt::DisplayRole) || (orientation != Qt::Horizontal))
-		return QVariant();
-	switch (section) {
-		case 0: return tr("Description");
-		case 1: return tr("Room");
-		case 2: return tr("Creator");
-		case 3: return tr("Game type");
-		case 4: return tr("Password");
-		case 5: return tr("Restrictions");
-		case 6: return tr("Players");
-		case 7: return tr("Spectators");
-		default: return QVariant();
-	}
+    if ((role != Qt::DisplayRole) || (orientation != Qt::Horizontal))
+        return QVariant();
+    switch (section) {
+        case 0: return tr("Description");
+        case 1: return tr("Room");
+        case 2: return tr("Creator");
+        case 3: return tr("Game type");
+        case 4: return tr("Password");
+        case 5: return tr("Restrictions");
+        case 6: return tr("Players");
+        case 7: return tr("Spectators");
+        default: return QVariant();
+    }
 }
 
 const ServerInfo_Game &GamesModel::getGame(int row)
 {
-	Q_ASSERT(row < gameList.size());
-	return gameList[row];
+    Q_ASSERT(row < gameList.size());
+    return gameList[row];
 }
 
 void GamesModel::updateGameList(const ServerInfo_Game &game)
 {
-	for (int i = 0; i < gameList.size(); i++)
-		if (gameList[i].game_id() == game.game_id()) {
-			if (game.closed()) {
-				beginRemoveRows(QModelIndex(), i, i);
-				gameList.removeAt(i);
-				endRemoveRows();
-			} else {
-				gameList[i].MergeFrom(game);
-				emit dataChanged(index(i, 0), index(i, 7));
-			}
-			return;
-		}
-	if (game.player_count() <= 0)
-		return;
-	beginInsertRows(QModelIndex(), gameList.size(), gameList.size());
-	gameList.append(game);
-	endInsertRows();
+    for (int i = 0; i < gameList.size(); i++)
+        if (gameList[i].game_id() == game.game_id()) {
+            if (game.closed()) {
+                beginRemoveRows(QModelIndex(), i, i);
+                gameList.removeAt(i);
+                endRemoveRows();
+            } else {
+                gameList[i].MergeFrom(game);
+                emit dataChanged(index(i, 0), index(i, 7));
+            }
+            return;
+        }
+    if (game.player_count() <= 0)
+        return;
+    beginInsertRows(QModelIndex(), gameList.size(), gameList.size());
+    gameList.append(game);
+    endInsertRows();
 }
 
 GamesProxyModel::GamesProxyModel(QObject *parent, ServerInfo_User *_ownUser)
-	: QSortFilterProxyModel(parent),
+    : QSortFilterProxyModel(parent),
           ownUser(_ownUser),
           unavailableGamesVisible(false),
           maxPlayersFilterMin(-1),
           maxPlayersFilterMax(-1)
 {
-	setDynamicSortFilter(true);
+    setDynamicSortFilter(true);
 }
 
 void GamesProxyModel::setUnavailableGamesVisible(bool _unavailableGamesVisible)
 {
-	unavailableGamesVisible = _unavailableGamesVisible;
-	invalidateFilter();
+    unavailableGamesVisible = _unavailableGamesVisible;
+    invalidateFilter();
 }
 
 void GamesProxyModel::setPasswordProtectedGamesVisible(bool _passwordProtectedGamesVisible)
 {
-	passwordProtectedGamesVisible = _passwordProtectedGamesVisible;
-	invalidateFilter();
+    passwordProtectedGamesVisible = _passwordProtectedGamesVisible;
+    invalidateFilter();
 }
 
 void GamesProxyModel::setGameNameFilter(const QString &_gameNameFilter)
 {
-	gameNameFilter = _gameNameFilter;
-	invalidateFilter();
+    gameNameFilter = _gameNameFilter;
+    invalidateFilter();
 }
 
 void GamesProxyModel::setCreatorNameFilter(const QString &_creatorNameFilter)
 {
-	creatorNameFilter = _creatorNameFilter;
-	invalidateFilter();
+    creatorNameFilter = _creatorNameFilter;
+    invalidateFilter();
 }
 
 void GamesProxyModel::setGameTypeFilter(const QSet<int> &_gameTypeFilter)
 {
-	gameTypeFilter = _gameTypeFilter;
-	invalidateFilter();
+    gameTypeFilter = _gameTypeFilter;
+    invalidateFilter();
 }
 
 void GamesProxyModel::setMaxPlayersFilter(int _maxPlayersFilterMin, int _maxPlayersFilterMax)
 {
-	maxPlayersFilterMin = _maxPlayersFilterMin;
-	maxPlayersFilterMax = _maxPlayersFilterMax;
-	invalidateFilter();
+    maxPlayersFilterMin = _maxPlayersFilterMin;
+    maxPlayersFilterMax = _maxPlayersFilterMax;
+    invalidateFilter();
 }
 
 void GamesProxyModel::resetFilterParameters()
 {
-	unavailableGamesVisible = false;
-	passwordProtectedGamesVisible = false;
-	gameNameFilter = QString();
-	creatorNameFilter = QString();
-	gameTypeFilter.clear();
-	maxPlayersFilterMin = -1;
-	maxPlayersFilterMax = -1;
-	
-	invalidateFilter();
+    unavailableGamesVisible = false;
+    passwordProtectedGamesVisible = false;
+    gameNameFilter = QString();
+    creatorNameFilter = QString();
+    gameTypeFilter.clear();
+    maxPlayersFilterMin = -1;
+    maxPlayersFilterMax = -1;
+    
+    invalidateFilter();
 }
 
 bool GamesProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &/*sourceParent*/) const
 {
-	GamesModel *model = qobject_cast<GamesModel *>(sourceModel());
-	if (!model)
-		return false;
-	
-	const ServerInfo_Game &game = model->getGame(sourceRow);
-	if (!unavailableGamesVisible) {
-		if (game.player_count() == game.max_players())
-			return false;
-		if (game.started())
-			return false;
-		if (!(ownUser->user_level() & ServerInfo_User::IsRegistered))
-			if (game.only_registered())
-				return false;
-	}
-	if (!passwordProtectedGamesVisible && game.with_password())
-		return false;
-	if (!gameNameFilter.isEmpty())
-		if (!QString::fromStdString(game.description()).contains(gameNameFilter, Qt::CaseInsensitive))
-			return false;
-	if (!creatorNameFilter.isEmpty())
-		if (!QString::fromStdString(game.creator_info().name()).contains(creatorNameFilter, Qt::CaseInsensitive))
-			return false;
-	
-	QSet<int> gameTypes;
-	for (int i = 0; i < game.game_types_size(); ++i)
-		gameTypes.insert(game.game_types(i));
-	if (!gameTypeFilter.isEmpty() && gameTypes.intersect(gameTypeFilter).isEmpty())
-		return false;
-	                
-	if ((maxPlayersFilterMin != -1) && (game.max_players() < maxPlayersFilterMin))
-		return false;
-	if ((maxPlayersFilterMax != -1) && (game.max_players() > maxPlayersFilterMax))
-		return false;
-	
-	return true;
+    GamesModel *model = qobject_cast<GamesModel *>(sourceModel());
+    if (!model)
+        return false;
+    
+    const ServerInfo_Game &game = model->getGame(sourceRow);
+    if (!unavailableGamesVisible) {
+        if (game.player_count() == game.max_players())
+            return false;
+        if (game.started())
+            return false;
+        if (!(ownUser->user_level() & ServerInfo_User::IsRegistered))
+            if (game.only_registered())
+                return false;
+    }
+    if (!passwordProtectedGamesVisible && game.with_password())
+        return false;
+    if (!gameNameFilter.isEmpty())
+        if (!QString::fromStdString(game.description()).contains(gameNameFilter, Qt::CaseInsensitive))
+            return false;
+    if (!creatorNameFilter.isEmpty())
+        if (!QString::fromStdString(game.creator_info().name()).contains(creatorNameFilter, Qt::CaseInsensitive))
+            return false;
+    
+    QSet<int> gameTypes;
+    for (int i = 0; i < game.game_types_size(); ++i)
+        gameTypes.insert(game.game_types(i));
+    if (!gameTypeFilter.isEmpty() && gameTypes.intersect(gameTypeFilter).isEmpty())
+        return false;
+                    
+    if ((maxPlayersFilterMin != -1) && (game.max_players() < maxPlayersFilterMin))
+        return false;
+    if ((maxPlayersFilterMax != -1) && (game.max_players() > maxPlayersFilterMax))
+        return false;
+    
+    return true;
 }

cockatrice/src/gamesmodel.h

@@ -11,51 +11,51 @@
 class ServerInfo_User;
 
 class GamesModel : public QAbstractTableModel {
-	Q_OBJECT
+    Q_OBJECT
 private:
-	QList<ServerInfo_Game> gameList;
-	QMap<int, QString> rooms;
-	QMap<int, GameTypeMap> gameTypes;
+    QList<ServerInfo_Game> gameList;
+    QMap<int, QString> rooms;
+    QMap<int, GameTypeMap> gameTypes;
 public:
-	GamesModel(const QMap<int, QString> &_rooms, const QMap<int, GameTypeMap> &_gameTypes, QObject *parent = 0);
-	int rowCount(const QModelIndex &parent = QModelIndex()) const { return parent.isValid() ? 0 : gameList.size(); }
-	int columnCount(const QModelIndex &/*parent*/ = QModelIndex()) const { return 8; }
-	QVariant data(const QModelIndex &index, int role) const;
-	QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
-	
-	const ServerInfo_Game &getGame(int row);
-	void updateGameList(const ServerInfo_Game &game);
-	const QMap<int, GameTypeMap> &getGameTypes() { return gameTypes; }
+    GamesModel(const QMap<int, QString> &_rooms, const QMap<int, GameTypeMap> &_gameTypes, QObject *parent = 0);
+    int rowCount(const QModelIndex &parent = QModelIndex()) const { return parent.isValid() ? 0 : gameList.size(); }
+    int columnCount(const QModelIndex &/*parent*/ = QModelIndex()) const { return 8; }
+    QVariant data(const QModelIndex &index, int role) const;
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+    
+    const ServerInfo_Game &getGame(int row);
+    void updateGameList(const ServerInfo_Game &game);
+    const QMap<int, GameTypeMap> &getGameTypes() { return gameTypes; }
 };
 
 class GamesProxyModel : public QSortFilterProxyModel {
-	Q_OBJECT
+    Q_OBJECT
 private:
-	ServerInfo_User *ownUser;
-	bool unavailableGamesVisible;
-	bool passwordProtectedGamesVisible;
-	QString gameNameFilter, creatorNameFilter;
-	QSet<int> gameTypeFilter;
-	int maxPlayersFilterMin, maxPlayersFilterMax;
+    ServerInfo_User *ownUser;
+    bool unavailableGamesVisible;
+    bool passwordProtectedGamesVisible;
+    QString gameNameFilter, creatorNameFilter;
+    QSet<int> gameTypeFilter;
+    int maxPlayersFilterMin, maxPlayersFilterMax;
 public:
-	GamesProxyModel(QObject *parent = 0, ServerInfo_User *_ownUser = 0);
-	
-	bool getUnavailableGamesVisible() const { return unavailableGamesVisible; }
-	void setUnavailableGamesVisible(bool _unavailableGamesVisible);
-	bool getPasswordProtectedGamesVisible() const { return passwordProtectedGamesVisible; }
-	void setPasswordProtectedGamesVisible(bool _passwordProtectedGamesVisible);
-	QString getGameNameFilter() const { return gameNameFilter; }
-	void setGameNameFilter(const QString &_gameNameFilter);
-	QString getCreatorNameFilter() const { return creatorNameFilter; }
-	void setCreatorNameFilter(const QString &_creatorNameFilter);
-	QSet<int> getGameTypeFilter() const { return gameTypeFilter; }
-	void setGameTypeFilter(const QSet<int> &_gameTypeFilter);
-	int getMaxPlayersFilterMin() const { return maxPlayersFilterMin; }
-	int getMaxPlayersFilterMax() const { return maxPlayersFilterMax; }
-	void setMaxPlayersFilter(int _maxPlayersFilterMin, int _maxPlayersFilterMax);
-	void resetFilterParameters();
+    GamesProxyModel(QObject *parent = 0, ServerInfo_User *_ownUser = 0);
+    
+    bool getUnavailableGamesVisible() const { return unavailableGamesVisible; }
+    void setUnavailableGamesVisible(bool _unavailableGamesVisible);
+    bool getPasswordProtectedGamesVisible() const { return passwordProtectedGamesVisible; }
+    void setPasswordProtectedGamesVisible(bool _passwordProtectedGamesVisible);
+    QString getGameNameFilter() const { return gameNameFilter; }
+    void setGameNameFilter(const QString &_gameNameFilter);
+    QString getCreatorNameFilter() const { return creatorNameFilter; }
+    void setCreatorNameFilter(const QString &_creatorNameFilter);
+    QSet<int> getGameTypeFilter() const { return gameTypeFilter; }
+    void setGameTypeFilter(const QSet<int> &_gameTypeFilter);
+    int getMaxPlayersFilterMin() const { return maxPlayersFilterMin; }
+    int getMaxPlayersFilterMax() const { return maxPlayersFilterMax; }
+    void setMaxPlayersFilter(int _maxPlayersFilterMin, int _maxPlayersFilterMax);
+    void resetFilterParameters();
 protected:
-	bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
 };
 
 #endif

cockatrice/src/gameview.cpp

@@ -5,57 +5,57 @@
 #include <QRubberBand>
 
 GameView::GameView(QGraphicsScene *scene, QWidget *parent)
-	: QGraphicsView(scene, parent), rubberBand(0)
+    : QGraphicsView(scene, parent), rubberBand(0)
 {
-	setBackgroundBrush(QBrush(QColor(0, 0, 0)));
-	setRenderHints(QPainter::TextAntialiasing | QPainter::Antialiasing);
-	setFocusPolicy(Qt::NoFocus);
-	setViewportUpdateMode(BoundingRectViewportUpdate);
-
-	connect(scene, SIGNAL(sceneRectChanged(const QRectF &)), this, SLOT(updateSceneRect(const QRectF &)));
-	
-	connect(scene, SIGNAL(sigStartRubberBand(const QPointF &)), this, SLOT(startRubberBand(const QPointF &)));
-	connect(scene, SIGNAL(sigResizeRubberBand(const QPointF &)), this, SLOT(resizeRubberBand(const QPointF &)));
-	connect(scene, SIGNAL(sigStopRubberBand()), this, SLOT(stopRubberBand()));
-
-	aCloseMostRecentZoneView = new QAction(this);
-	aCloseMostRecentZoneView->setShortcut(tr("Esc"));
-	connect(aCloseMostRecentZoneView, SIGNAL(triggered()), scene, SLOT(closeMostRecentZoneView()));
-	addAction(aCloseMostRecentZoneView);
-
-	rubberBand = new QRubberBand(QRubberBand::Rectangle, this);
+    setBackgroundBrush(QBrush(QColor(0, 0, 0)));
+    setRenderHints(QPainter::TextAntialiasing | QPainter::Antialiasing);
+    setFocusPolicy(Qt::NoFocus);
+    setViewportUpdateMode(BoundingRectViewportUpdate);
+
+    connect(scene, SIGNAL(sceneRectChanged(const QRectF &)), this, SLOT(updateSceneRect(const QRectF &)));
+    
+    connect(scene, SIGNAL(sigStartRubberBand(const QPointF &)), this, SLOT(startRubberBand(const QPointF &)));
+    connect(scene, SIGNAL(sigResizeRubberBand(const QPointF &)), this, SLOT(resizeRubberBand(const QPointF &)));
+    connect(scene, SIGNAL(sigStopRubberBand()), this, SLOT(stopRubberBand()));
+
+    aCloseMostRecentZoneView = new QAction(this);
+    aCloseMostRecentZoneView->setShortcut(tr("Esc"));
+    connect(aCloseMostRecentZoneView, SIGNAL(triggered()), scene, SLOT(closeMostRecentZoneView()));
+    addAction(aCloseMostRecentZoneView);
+
+    rubberBand = new QRubberBand(QRubberBand::Rectangle, this);
 }
 
 void GameView::resizeEvent(QResizeEvent *event)
 {
-	QGraphicsView::resizeEvent(event);
+    QGraphicsView::resizeEvent(event);
 
-	GameScene *s = dynamic_cast<GameScene *>(scene());
-	if (s)
-		s->processViewSizeChange(event->size());
-	
-	updateSceneRect(scene()->sceneRect());
+    GameScene *s = dynamic_cast<GameScene *>(scene());
+    if (s)
+        s->processViewSizeChange(event->size());
+    
+    updateSceneRect(scene()->sceneRect());
 }
 
 void GameView::updateSceneRect(const QRectF &rect)
 {
-	fitInView(rect, Qt::KeepAspectRatio);
+    fitInView(rect, Qt::KeepAspectRatio);
 }
 
 void GameView::startRubberBand(const QPointF &_selectionOrigin)
 {
-	selectionOrigin = _selectionOrigin;
-	rubberBand->setGeometry(QRect(mapFromScene(selectionOrigin), QSize(0, 0)));
-	rubberBand->show();
+    selectionOrigin = _selectionOrigin;
+    rubberBand->setGeometry(QRect(mapFromScene(selectionOrigin), QSize(0, 0)));
+    rubberBand->show();
 }
 
 void GameView::resizeRubberBand(const QPointF &cursorPoint)
 {
-	if (rubberBand)
-		rubberBand->setGeometry(QRect(mapFromScene(selectionOrigin), cursorPoint.toPoint()).normalized());
+    if (rubberBand)
+        rubberBand->setGeometry(QRect(mapFromScene(selectionOrigin), cursorPoint.toPoint()).normalized());
 }
 
 void GameView::stopRubberBand()
 {
-	rubberBand->hide();
+    rubberBand->hide();
 }

cockatrice/src/gameview.h

@@ -6,21 +6,21 @@
 class QRubberBand;
 
 class GameView : public QGraphicsView {
-	Q_OBJECT
+    Q_OBJECT
 private:
-	QAction *aCloseMostRecentZoneView;
-	QRubberBand *rubberBand;
-	QPointF selectionOrigin;
+    QAction *aCloseMostRecentZoneView;
+    QRubberBand *rubberBand;
+    QPointF selectionOrigin;
 protected:
-	void resizeEvent(QResizeEvent *event);
+    void resizeEvent(QResizeEvent *event);
 private slots:
-	void startRubberBand(const QPointF &selectionOrigin);
-	void resizeRubberBand(const QPointF &cursorPoint);
-	void stopRubberBand();
+    void startRubberBand(const QPointF &selectionOrigin);
+    void resizeRubberBand(const QPointF &cursorPoint);
+    void stopRubberBand();
 public slots:
-	void updateSceneRect(const QRectF &rect);
+    void updateSceneRect(const QRectF &rect);
 public:
-	GameView(QGraphicsScene *scene, QWidget *parent = 0);
+    GameView(QGraphicsScene *scene, QWidget *parent = 0);
 };
 
 #endif

cockatrice/src/handcounter.cpp

@@ -6,9 +6,9 @@
 #include "cardzone.h"
 
 HandCounter::HandCounter(QGraphicsItem *parent)
-	: AbstractGraphicsItem(parent), number(0)
+    : AbstractGraphicsItem(parent), number(0)
 {
-	setCacheMode(DeviceCoordinateCache);
+    setCacheMode(DeviceCoordinateCache);
 }
 
 HandCounter::~HandCounter()
@@ -17,43 +17,43 @@ HandCounter::~HandCounter()
 
 void HandCounter::updateNumber()
 {
-	number = static_cast<CardZone *>(sender())->getCards().size();
-	update();
+    number = static_cast<CardZone *>(sender())->getCards().size();
+    update();
 }
 
 QRectF HandCounter::boundingRect() const
 {
-	return QRectF(0, 0, 72, 72);
+    return QRectF(0, 0, 72, 72);
 }
 
 void HandCounter::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/)
 {
-	painter->save();
-	QSize translatedSize = painter->combinedTransform().mapRect(boundingRect()).size().toSize();
-	QPixmap cachedPixmap;
+    painter->save();
+    QSize translatedSize = painter->combinedTransform().mapRect(boundingRect()).size().toSize();
+    QPixmap cachedPixmap;
 #if QT_VERSION >= 0x040600
-	if (!QPixmapCache::find("handCounter" + QString::number(translatedSize.width()), &cachedPixmap)) {
+    if (!QPixmapCache::find("handCounter" + QString::number(translatedSize.width()), &cachedPixmap)) {
 #else
-	if (!QPixmapCache::find("handCounter" + QString::number(translatedSize.width()), cachedPixmap)) {
+    if (!QPixmapCache::find("handCounter" + QString::number(translatedSize.width()), cachedPixmap)) {
 #endif
-		QSvgRenderer svg(QString(":/resources/hand.svg"));
-		cachedPixmap = QPixmap(translatedSize);
-		cachedPixmap.fill(Qt::transparent);
-		QPainter painter(&cachedPixmap);
-		svg.render(&painter, QRectF(0, 0, translatedSize.width(), translatedSize.height()));
-		QPixmapCache::insert("handCounter" + QString::number(translatedSize.width()), cachedPixmap);
-	}
-	painter->resetTransform();
-	painter->drawPixmap(cachedPixmap.rect(), cachedPixmap, cachedPixmap.rect());
-	painter->restore();
-	
-	paintNumberEllipse(number, 24, Qt::white, -1, -1, painter);
+        QSvgRenderer svg(QString(":/resources/hand.svg"));
+        cachedPixmap = QPixmap(translatedSize);
+        cachedPixmap.fill(Qt::transparent);
+        QPainter painter(&cachedPixmap);
+        svg.render(&painter, QRectF(0, 0, translatedSize.width(), translatedSize.height()));
+        QPixmapCache::insert("handCounter" + QString::number(translatedSize.width()), cachedPixmap);
+    }
+    painter->resetTransform();
+    painter->drawPixmap(cachedPixmap.rect(), cachedPixmap, cachedPixmap.rect());
+    painter->restore();
+    
+    paintNumberEllipse(number, 24, Qt::white, -1, -1, painter);
 }
 
 void HandCounter::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
-	if (event->button() == Qt::RightButton) {
-		emit showContextMenu(event->screenPos());
-		event->accept();
-	}
+    if (event->button() == Qt::RightButton) {
+        emit showContextMenu(event->screenPos());
+        event->accept();
+    }
 }

cockatrice/src/handcounter.h

@@ -8,22 +8,22 @@ class QPainter;
 class QPixmap;
 
 class HandCounter : public AbstractGraphicsItem {
-	Q_OBJECT
+    Q_OBJECT
 private:
-	int number;
+    int number;
 protected:
-	void mousePressEvent(QGraphicsSceneMouseEvent *event);
+    void mousePressEvent(QGraphicsSceneMouseEvent *event);
 public slots:
-	void updateNumber();
+    void updateNumber();
 signals:
-	void showContextMenu(const QPoint &screenPos);
+    void showContextMenu(const QPoint &screenPos);
 public:
-	enum { Type = typeOther };
-	int type() const { return Type; }
-	HandCounter(QGraphicsItem *parent = 0);
-	~HandCounter();
-	QRectF boundingRect() const;
-	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    enum { Type = typeOther };
+    int type() const { return Type; }
+    HandCounter(QGraphicsItem *parent = 0);
+    ~HandCounter();
+    QRectF boundingRect() const;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
 };
 
 #endif

cockatrice/src/handzone.cpp

@@ -8,137 +8,137 @@
 #include "pb/command_move_card.pb.h"
 
 HandZone::HandZone(Player *_p, bool _contentsKnown, int _zoneHeight, QGraphicsItem *parent)
-	: SelectZone(_p, "hand", false, false, _contentsKnown, parent), zoneHeight(_zoneHeight)
+    : SelectZone(_p, "hand", false, false, _contentsKnown, parent), zoneHeight(_zoneHeight)
 {
-	connect(settingsCache, SIGNAL(handBgPathChanged()), this, SLOT(updateBgPixmap()));
-	updateBgPixmap();
-	setCacheMode(DeviceCoordinateCache);
+    connect(settingsCache, SIGNAL(handBgPathChanged()), this, SLOT(updateBgPixmap()));
+    updateBgPixmap();
+    setCacheMode(DeviceCoordinateCache);
 }
 
 void HandZone::updateBgPixmap()
 {
-	QString bgPath = settingsCache->getHandBgPath();
-	if (!bgPath.isEmpty())
-		bgPixmap.load(bgPath);
-	update();
+    QString bgPath = settingsCache->getHandBgPath();
+    if (!bgPath.isEmpty())
+        bgPixmap.load(bgPath);
+    update();
 }
 
 void HandZone::addCardImpl(CardItem *card, int x, int /*y*/)
 {
-	if (x == -1)
-		x = cards.size();
-	cards.insert(x, card);
+    if (x == -1)
+        x = cards.size();
+    cards.insert(x, card);
 
-	if (!cards.getContentsKnown()) {
-		card->setId(-1);
-		card->setName();
-	}
-	card->setParentItem(this);
-	card->resetState();
-	card->setVisible(true);
-	card->update();
+    if (!cards.getContentsKnown()) {
+        card->setId(-1);
+        card->setName();
+    }
+    card->setParentItem(this);
+    card->resetState();
+    card->setVisible(true);
+    card->update();
 }
 
 void HandZone::handleDropEvent(const QList<CardDragItem *> &dragItems, CardZone *startZone, const QPoint & dropPoint)
 {
-	QPoint point = dropPoint + scenePos().toPoint();
-	int x = -1;
-	if (settingsCache->getHorizontalHand()) {
-		for (x = 0; x < cards.size(); x++)
-			if (point.x() < ((CardItem *) cards.at(x))->scenePos().x())
-				break;
-	} else {
-		for (x = 0; x < cards.size(); x++)
-			if (point.y() < ((CardItem *) cards.at(x))->scenePos().y())
-				break;
-	}
-	
-	Command_MoveCard cmd;
-	cmd.set_start_player_id(startZone->getPlayer()->getId());
-	cmd.set_start_zone(startZone->getName().toStdString());
-	cmd.set_target_player_id(player->getId());
-	cmd.set_target_zone(getName().toStdString());
-	cmd.set_x(x);
-	cmd.set_y(-1);
-	
-	for (int i = 0; i < dragItems.size(); ++i)
-		cmd.mutable_cards_to_move()->add_card()->set_card_id(dragItems[i]->getId());
-	
-	player->sendGameCommand(cmd);
+    QPoint point = dropPoint + scenePos().toPoint();
+    int x = -1;
+    if (settingsCache->getHorizontalHand()) {
+        for (x = 0; x < cards.size(); x++)
+            if (point.x() < ((CardItem *) cards.at(x))->scenePos().x())
+                break;
+    } else {
+        for (x = 0; x < cards.size(); x++)
+            if (point.y() < ((CardItem *) cards.at(x))->scenePos().y())
+                break;
+    }
+    
+    Command_MoveCard cmd;
+    cmd.set_start_player_id(startZone->getPlayer()->getId());
+    cmd.set_start_zone(startZone->getName().toStdString());
+    cmd.set_target_player_id(player->getId());
+    cmd.set_target_zone(getName().toStdString());
+    cmd.set_x(x);
+    cmd.set_y(-1);
+    
+    for (int i = 0; i < dragItems.size(); ++i)
+        cmd.mutable_cards_to_move()->add_card()->set_card_id(dragItems[i]->getId());
+    
+    player->sendGameCommand(cmd);
 }
 
 QRectF HandZone::boundingRect() const
 {
-	if (settingsCache->getHorizontalHand())
-		return QRectF(0, 0, width, CARD_HEIGHT + 10);
-	else
-		return QRectF(0, 0, 100, zoneHeight);
+    if (settingsCache->getHorizontalHand())
+        return QRectF(0, 0, width, CARD_HEIGHT + 10);
+    else
+        return QRectF(0, 0, 100, zoneHeight);
 }
 
 void HandZone::paint(QPainter *painter, const QStyleOptionGraphicsItem */*option*/, QWidget */*widget*/)
 {
-	if (bgPixmap.isNull())
-		painter->fillRect(boundingRect(), Qt::darkGreen);
-	else
-		painter->fillRect(boundingRect(), QBrush(bgPixmap));
+    if (bgPixmap.isNull())
+        painter->fillRect(boundingRect(), Qt::darkGreen);
+    else
+        painter->fillRect(boundingRect(), QBrush(bgPixmap));
 }
 
 void HandZone::reorganizeCards()
 {
-	if (!cards.isEmpty()) {
-		const int cardCount = cards.size();
-		if (settingsCache->getHorizontalHand()) {
-			const int xPadding = 5;
-			qreal totalWidth = boundingRect().width() - 2 * xPadding;
-			qreal cardWidth = cards.at(0)->boundingRect().width();
-			
-			for (int i = 0; i < cardCount; i++) {
-				CardItem *c = cards.at(i);
-	
-				// If the total width of the cards is smaller than the available width,
-				// the cards do not need to overlap and are displayed in the center of the area.
-				if (cardWidth * cardCount > totalWidth)
-					c->setPos(xPadding + ((qreal) i) * (totalWidth - cardWidth) / (cardCount - 1), 5);
-				else
-					c->setPos(xPadding + ((qreal) i) * cardWidth + (totalWidth - cardCount * cardWidth) / 2, 5);
-				c->setRealZValue(i);
-			}
-		} else {
-			qreal totalWidth = boundingRect().width();
-			qreal totalHeight = boundingRect().height();
-			qreal cardWidth = cards.at(0)->boundingRect().width();
-			qreal cardHeight = cards.at(0)->boundingRect().height();
-			qreal xspace = 5;
-			qreal x1 = xspace;
-			qreal x2 = totalWidth - xspace - cardWidth;
-		
-			for (int i = 0; i < cardCount; i++) {
-				CardItem *c = cards.at(i);
-				qreal x = i % 2 ? x2 : x1;
-				// If the total height of the cards is smaller than the available height,
-				// the cards do not need to overlap and are displayed in the center of the area.
-				if (cardHeight * cardCount > totalHeight)
-					c->setPos(x, ((qreal) i) * (totalHeight - cardHeight) / (cardCount - 1));
-				else
-					c->setPos(x, ((qreal) i) * cardHeight + (totalHeight - cardCount * cardHeight) / 2);
-				c->setRealZValue(i);
-			}
-		}
-	}
-	update();
+    if (!cards.isEmpty()) {
+        const int cardCount = cards.size();
+        if (settingsCache->getHorizontalHand()) {
+            const int xPadding = 5;
+            qreal totalWidth = boundingRect().width() - 2 * xPadding;
+            qreal cardWidth = cards.at(0)->boundingRect().width();
+            
+            for (int i = 0; i < cardCount; i++) {
+                CardItem *c = cards.at(i);
+    
+                // If the total width of the cards is smaller than the available width,
+                // the cards do not need to overlap and are displayed in the center of the area.
+                if (cardWidth * cardCount > totalWidth)
+                    c->setPos(xPadding + ((qreal) i) * (totalWidth - cardWidth) / (cardCount - 1), 5);
+                else
+                    c->setPos(xPadding + ((qreal) i) * cardWidth + (totalWidth - cardCount * cardWidth) / 2, 5);
+                c->setRealZValue(i);
+            }
+        } else {
+            qreal totalWidth = boundingRect().width();
+            qreal totalHeight = boundingRect().height();
+            qreal cardWidth = cards.at(0)->boundingRect().width();
+            qreal cardHeight = cards.at(0)->boundingRect().height();
+            qreal xspace = 5;
+            qreal x1 = xspace;
+            qreal x2 = totalWidth - xspace - cardWidth;
+        
+            for (int i = 0; i < cardCount; i++) {
+                CardItem *c = cards.at(i);
+                qreal x = i % 2 ? x2 : x1;
+                // If the total height of the cards is smaller than the available height,
+                // the cards do not need to overlap and are displayed in the center of the area.
+                if (cardHeight * cardCount > totalHeight)
+                    c->setPos(x, ((qreal) i) * (totalHeight - cardHeight) / (cardCount - 1));
+                else
+                    c->setPos(x, ((qreal) i) * cardHeight + (totalHeight - cardCount * cardHeight) / 2);
+                c->setRealZValue(i);
+            }
+        }
+    }
+    update();
 }
 
 void HandZone::setWidth(qreal _width)
 {
-	if (settingsCache->getHorizontalHand()) {
-		prepareGeometryChange();
-		width = _width;
-		reorganizeCards();
-	}
+    if (settingsCache->getHorizontalHand()) {
+        prepareGeometryChange();
+        width = _width;
+        reorganizeCards();
+    }
 }
 
 void HandZone::updateOrientation()
 {
-	prepareGeometryChange();
-	reorganizeCards();
+    prepareGeometryChange();
+    reorganizeCards();
 }

cockatrice/src/handzone.h

@@ -4,23 +4,23 @@
 #include "selectzone.h"
 
 class HandZone : public SelectZone {
-	Q_OBJECT
+    Q_OBJECT
 private:
-	qreal width, zoneHeight;
-	QPixmap bgPixmap;
+    qreal width, zoneHeight;
+    QPixmap bgPixmap;
 private slots:
-	void updateBgPixmap();
+    void updateBgPixmap();
 public slots:
-	void updateOrientation();
+    void updateOrientation();
 public:
-	HandZone(Player *_p, bool _contentsKnown, int _zoneHeight, QGraphicsItem *parent = 0);
-	void handleDropEvent(const QList<CardDragItem *> &dragItems, CardZone *startZone, const QPoint &dropPoint);
-	QRectF boundingRect() const;
-	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
-	void reorganizeCards();
-	void setWidth(qreal _width);
+    HandZone(Player *_p, bool _contentsKnown, int _zoneHeight, QGraphicsItem *parent = 0);
+    void handleDropEvent(const QList<CardDragItem *> &dragItems, CardZone *startZone, const QPoint &dropPoint);
+    QRectF boundingRect() const;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    void reorganizeCards();
+    void setWidth(qreal _width);
 protected:
-	void addCardImpl(CardItem *card, int x, int y);
+    void addCardImpl(CardItem *card, int x, int y);
 };
 
 #endif

cockatrice/src/localclient.cpp

@@ -4,17 +4,17 @@
 #include "pb/session_commands.pb.h"
 
 LocalClient::LocalClient(LocalServerInterface *_lsi, const QString &_playerName, QObject *parent)
-	: AbstractClient(parent), lsi(_lsi)
+    : AbstractClient(parent), lsi(_lsi)
 {
-	connect(lsi, SIGNAL(itemToClient(const ServerMessage &)), this, SLOT(itemFromServer(const ServerMessage &)));
-	
-	Command_Login loginCmd;
-	loginCmd.set_user_name(_playerName.toStdString());
-	sendCommand(prepareSessionCommand(loginCmd));
-	
-	Command_JoinRoom joinCmd;
-	joinCmd.set_room_id(0);
-	sendCommand(prepareSessionCommand(joinCmd));
+    connect(lsi, SIGNAL(itemToClient(const ServerMessage &)), this, SLOT(itemFromServer(const ServerMessage &)));
+    
+    Command_Login loginCmd;
+    loginCmd.set_user_name(_playerName.toStdString());
+    sendCommand(prepareSessionCommand(loginCmd));
+    
+    Command_JoinRoom joinCmd;
+    joinCmd.set_room_id(0);
+    sendCommand(prepareSessionCommand(joinCmd));
 }
 
 LocalClient::~LocalClient()
@@ -23,10 +23,10 @@ LocalClient::~LocalClient()
 
 void LocalClient::sendCommandContainer(const CommandContainer &cont)
 {
-	lsi->itemFromClient(cont);
+    lsi->itemFromClient(cont);
 }
 
 void LocalClient::itemFromServer(const ServerMessage &item)
 {
-	processProtocolItem(item);
+    processProtocolItem(item);
 }

cockatrice/src/localclient.h

@@ -6,16 +6,16 @@
 class LocalServerInterface;
 
 class LocalClient : public AbstractClient {
-	Q_OBJECT
+    Q_OBJECT
 private:
-	LocalServerInterface *lsi;
+    LocalServerInterface *lsi;
 public:
-	LocalClient(LocalServerInterface *_lsi, const QString &_playerName, QObject *parent = 0);
-	~LocalClient();
-	
-	void sendCommandContainer(const CommandContainer &cont);
+    LocalClient(LocalServerInterface *_lsi, const QString &_playerName, QObject *parent = 0);
+    ~LocalClient();
+    
+    void sendCommandContainer(const CommandContainer &cont);
 private slots:
-	void itemFromServer(const ServerMessage &item);
+    void itemFromServer(const ServerMessage &item);
 };
 
 #endif

cockatrice/src/localserver.cpp

@@ -3,37 +3,37 @@
 #include "server_room.h"
 
 LocalServer::LocalServer(QObject *parent)
-	: Server(false, parent)
+    : Server(false, parent)
 {
-	setDatabaseInterface(new LocalServer_DatabaseInterface(this));
-	addRoom(new Server_Room(0, QString(), QString(), false, QString(), QStringList(), this));
+    setDatabaseInterface(new LocalServer_DatabaseInterface(this));
+    addRoom(new Server_Room(0, QString(), QString(), false, QString(), QStringList(), this));
 }
 
 LocalServer::~LocalServer()
 {
-	prepareDestroy();
+    prepareDestroy();
 }
 
 LocalServerInterface *LocalServer::newConnection()
 {
-	LocalServerInterface *lsi = new LocalServerInterface(this, getDatabaseInterface());
-	addClient(lsi);
-	return lsi;
+    LocalServerInterface *lsi = new LocalServerInterface(this, getDatabaseInterface());
+    addClient(lsi);
+    return lsi;
 }
 
 LocalServer_DatabaseInterface::LocalServer_DatabaseInterface(LocalServer *_localServer)
-	: Server_DatabaseInterface(_localServer), localServer(_localServer)
+    : Server_DatabaseInterface(_localServer), localServer(_localServer)
 {
 }
 
 ServerInfo_User LocalServer_DatabaseInterface::getUserData(const QString &name, bool /*withId*/)
 {
-	ServerInfo_User result;
-	result.set_name(name.toStdString());
-	return result;
+    ServerInfo_User result;
+    result.set_name(name.toStdString());
+    return result;
 }
 
 AuthenticationResult LocalServer_DatabaseInterface::checkUserPassword(Server_ProtocolHandler *handler, const QString &user, const QString &password, QString &reasonStr, int &secondsLeft)
 {
-	return UnknownUser;
+    return UnknownUser;
 }

cockatrice/src/localserver.h

@@ -8,25 +8,25 @@ class LocalServerInterface;
 
 class LocalServer : public Server
 {
-	Q_OBJECT
+    Q_OBJECT
 public:
-	LocalServer(QObject *parent = 0);
-	~LocalServer();
-	
-	LocalServerInterface *newConnection();
+    LocalServer(QObject *parent = 0);
+    ~LocalServer();
+    
+    LocalServerInterface *newConnection();
 };
 
 class LocalServer_DatabaseInterface : public Server_DatabaseInterface {
-	Q_OBJECT
+    Q_OBJECT
 private:
-	LocalServer *localServer;
+    LocalServer *localServer;
 protected:
-	ServerInfo_User getUserData(const QString &name, bool withId = false);
+    ServerInfo_User getUserData(const QString &name, bool withId = false);
 public:
-	LocalServer_DatabaseInterface(LocalServer *_localServer);
-	AuthenticationResult checkUserPassword(Server_ProtocolHandler *handler, const QString &user, const QString &password, QString &reasonStr, int &secondsLeft);
-	int getNextGameId() { return localServer->getNextLocalGameId(); }
-	int getNextReplayId() { return -1; }
+    LocalServer_DatabaseInterface(LocalServer *_localServer);
+    AuthenticationResult checkUserPassword(Server_ProtocolHandler *handler, const QString &user, const QString &password, QString &reasonStr, int &secondsLeft);
+    int getNextGameId() { return localServer->getNextLocalGameId(); }
+    int getNextReplayId() { return -1; }
 };
 
 #endif

cockatrice/src/localserverinterface.cpp

@@ -3,7 +3,7 @@
 #include <QDebug>
 
 LocalServerInterface::LocalServerInterface(LocalServer *_server, Server_DatabaseInterface *_databaseInterface)
-	: Server_ProtocolHandler(_server, _databaseInterface, _server)
+    : Server_ProtocolHandler(_server, _databaseInterface, _server)
 {
 }
 
@@ -13,10 +13,10 @@ LocalServerInterface::~LocalServerInterface()
 
 void LocalServerInterface::transmitProtocolItem(const ServerMessage &item)
 {
-	emit itemToClient(item);
+    emit itemToClient(item);
 }
 
 void LocalServerInterface::itemFromClient(const CommandContainer &item)
 {
-	processCommandContainer(item);
+    processCommandContainer(item);
 }

cockatrice/src/localserverinterface.h

@@ -7,17 +7,17 @@ class LocalServer;
 
 class LocalServerInterface : public Server_ProtocolHandler
 {
-	Q_OBJECT
+    Q_OBJECT
 public:
-	LocalServerInterface(LocalServer *_server, Server_DatabaseInterface *_databaseInterface);
-	~LocalServerInterface();
-	
-	QString getAddress() const { return QString(); }
-	void transmitProtocolItem(const ServerMessage &item);
+    LocalServerInterface(LocalServer *_server, Server_DatabaseInterface *_databaseInterface);
+    ~LocalServerInterface();
+    
+    QString getAddress() const { return QString(); }
+    void transmitProtocolItem(const ServerMessage &item);
 signals:
-	void itemToClient(const ServerMessage &item);
+    void itemToClient(const ServerMessage &item);
 public slots:
-	void itemFromClient(const CommandContainer &item);
+    void itemFromClient(const CommandContainer &item);
 };
 
 #endif

cockatrice/src/main.cpp

@@ -56,118 +56,118 @@ QString translationPath = QString();
 
 void myMessageOutput(QtMsgType /*type*/, const char *msg)
 {
-	static FILE *f = NULL;
-	if (!f)
-		f = fopen("qdebug.txt", "w");
-	fprintf(f, "%s\n", msg);
-	fflush(f);
+    static FILE *f = NULL;
+    if (!f)
+        f = fopen("qdebug.txt", "w");
+    fprintf(f, "%s\n", msg);
+    fflush(f);
 }
 
 void installNewTranslator()
 {
-	QString lang = settingsCache->getLang();
+    QString lang = settingsCache->getLang();
 
-	qtTranslator->load("qt_" + lang, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
-	qApp->installTranslator(qtTranslator);
-	translator->load(translationPrefix + "_" + lang, translationPath);
-	qApp->installTranslator(translator);
+    qtTranslator->load("qt_" + lang, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+    qApp->installTranslator(qtTranslator);
+    translator->load(translationPrefix + "_" + lang, translationPath);
+    qApp->installTranslator(translator);
 }
 
 int main(int argc, char *argv[])
 {
-	QApplication app(argc, argv);
-	
-	if (app.arguments().contains("--debug-output"))
-		qInstallMsgHandler(myMessageOutput);
+    QApplication app(argc, argv);
+    
+    if (app.arguments().contains("--debug-output"))
+        qInstallMsgHandler(myMessageOutput);
 #ifdef Q_OS_MAC
-	QDir baseDir(app.applicationDirPath());
-	baseDir.cdUp();
-	baseDir.cdUp();
-	baseDir.cdUp();
-	QDir pluginsDir = baseDir;
-	pluginsDir.cd("PlugIns");
-	app.addLibraryPath(pluginsDir.absolutePath());
+    QDir baseDir(app.applicationDirPath());
+    baseDir.cdUp();
+    baseDir.cdUp();
+    baseDir.cdUp();
+    QDir pluginsDir = baseDir;
+    pluginsDir.cd("PlugIns");
+    app.addLibraryPath(pluginsDir.absolutePath());
 #endif
 #ifdef Q_OS_WIN
-	app.addLibraryPath(app.applicationDirPath() + "/plugins");
+    app.addLibraryPath(app.applicationDirPath() + "/plugins");
 #endif
-	QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
+    QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
 
-	QCoreApplication::setOrganizationName("Cockatrice");
-	QCoreApplication::setOrganizationDomain("cockatrice.de");
-	QCoreApplication::setApplicationName("Cockatrice");
-	
-	if (translationPath.isEmpty()) {
+    QCoreApplication::setOrganizationName("Cockatrice");
+    QCoreApplication::setOrganizationDomain("cockatrice.de");
+    QCoreApplication::setApplicationName("Cockatrice");
+    
+    if (translationPath.isEmpty()) {
 #ifdef Q_OS_MAC
-		QDir translationsDir = baseDir;
-		translationsDir.cd("translations");
-		translationPath = translationsDir.absolutePath();
+        QDir translationsDir = baseDir;
+        translationsDir.cd("translations");
+        translationPath = translationsDir.absolutePath();
 #endif
 #ifdef Q_OS_WIN
-		translationPath = app.applicationDirPath() + "/translations";
+        translationPath = app.applicationDirPath() + "/translations";
 #endif
-	}
-	
-	rng = new RNG_SFMT;
-	settingsCache = new SettingsCache;
-	db = new CardDatabase;
+    }
+    
+    rng = new RNG_SFMT;
+    settingsCache = new SettingsCache;
+    db = new CardDatabase;
 
-	qtTranslator = new QTranslator;
-	translator = new QTranslator;
-	installNewTranslator();
-	
-	qsrand(QDateTime::currentDateTime().toTime_t());
-	
-	bool startMainProgram = true;
-	const QString dataDir = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
-	if (!db->getLoadSuccess())
-		if (db->loadCardDatabase(dataDir + "/cards.xml"))
-			settingsCache->setCardDatabasePath(dataDir + "/cards.xml");
-	if (settingsCache->getTokenDatabasePath().isEmpty())
-		settingsCache->setTokenDatabasePath(dataDir + "/tokens.xml");
-	if (!QDir(settingsCache->getDeckPath()).exists() || settingsCache->getDeckPath().isEmpty()) {
-		QDir().mkpath(dataDir + "/decks");
-		settingsCache->setDeckPath(dataDir + "/decks");
-	}
-	if (!QDir(settingsCache->getReplaysPath()).exists() || settingsCache->getReplaysPath().isEmpty()) {
-		QDir().mkpath(dataDir + "/replays");
-		settingsCache->setReplaysPath(dataDir + "/replays");
-	}
-	if (!QDir(settingsCache->getPicsPath()).exists() || settingsCache->getPicsPath().isEmpty()) {
-		QDir().mkpath(dataDir + "/pics");
-		settingsCache->setPicsPath(dataDir + "/pics");
-	}
-	if (!db->getLoadSuccess() || !QDir(settingsCache->getDeckPath()).exists() || settingsCache->getDeckPath().isEmpty() || settingsCache->getPicsPath().isEmpty() || !QDir(settingsCache->getPicsPath()).exists()) {
-		DlgSettings dlgSettings;
-		dlgSettings.show();
-		app.exec();
-		startMainProgram = (db->getLoadSuccess() && QDir(settingsCache->getDeckPath()).exists() && !settingsCache->getDeckPath().isEmpty() && QDir(settingsCache->getPicsPath()).exists() && !settingsCache->getPicsPath().isEmpty());
-	}
-	
-	if (startMainProgram) {
-		qDebug("main(): starting main program");
-		soundEngine = new SoundEngine;
-		qDebug("main(): SoundEngine constructor finished");
+    qtTranslator = new QTranslator;
+    translator = new QTranslator;
+    installNewTranslator();
+    
+    qsrand(QDateTime::currentDateTime().toTime_t());
+    
+    bool startMainProgram = true;
+    const QString dataDir = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
+    if (!db->getLoadSuccess())
+        if (db->loadCardDatabase(dataDir + "/cards.xml"))
+            settingsCache->setCardDatabasePath(dataDir + "/cards.xml");
+    if (settingsCache->getTokenDatabasePath().isEmpty())
+        settingsCache->setTokenDatabasePath(dataDir + "/tokens.xml");
+    if (!QDir(settingsCache->getDeckPath()).exists() || settingsCache->getDeckPath().isEmpty()) {
+        QDir().mkpath(dataDir + "/decks");
+        settingsCache->setDeckPath(dataDir + "/decks");
+    }
+    if (!QDir(settingsCache->getReplaysPath()).exists() || settingsCache->getReplaysPath().isEmpty()) {
+        QDir().mkpath(dataDir + "/replays");
+        settingsCache->setReplaysPath(dataDir + "/replays");
+    }
+    if (!QDir(settingsCache->getPicsPath()).exists() || settingsCache->getPicsPath().isEmpty()) {
+        QDir().mkpath(dataDir + "/pics");
+        settingsCache->setPicsPath(dataDir + "/pics");
+    }
+    if (!db->getLoadSuccess() || !QDir(settingsCache->getDeckPath()).exists() || settingsCache->getDeckPath().isEmpty() || settingsCache->getPicsPath().isEmpty() || !QDir(settingsCache->getPicsPath()).exists()) {
+        DlgSettings dlgSettings;
+        dlgSettings.show();
+        app.exec();
+        startMainProgram = (db->getLoadSuccess() && QDir(settingsCache->getDeckPath()).exists() && !settingsCache->getDeckPath().isEmpty() && QDir(settingsCache->getPicsPath()).exists() && !settingsCache->getPicsPath().isEmpty());
+    }
+    
+    if (startMainProgram) {
+        qDebug("main(): starting main program");
+        soundEngine = new SoundEngine;
+        qDebug("main(): SoundEngine constructor finished");
 
-		MainWindow ui;
-		qDebug("main(): MainWindow constructor finished");
-		
-		QIcon icon(":/resources/appicon.svg");
-		ui.setWindowIcon(icon);
-		
-		ui.show();
-		qDebug("main(): ui.show() finished");
-		
-		app.exec();
-	}
-	
-	qDebug("Event loop finished, terminating...");
-	delete db;
-	delete settingsCache;
-	delete rng;
-	PingPixmapGenerator::clear();
-	CountryPixmapGenerator::clear();
-	UserLevelPixmapGenerator::clear();
-	
-	return 0;
+        MainWindow ui;
+        qDebug("main(): MainWindow constructor finished");
+        
+        QIcon icon(":/resources/appicon.svg");
+        ui.setWindowIcon(icon);
+        
+        ui.show();
+        qDebug("main(): ui.show() finished");
+        
+        app.exec();
+    }
+    
+    qDebug("Event loop finished, terminating...");
+    delete db;
+    delete settingsCache;
+    delete rng;
+    PingPixmapGenerator::clear();
+    CountryPixmapGenerator::clear();
+    UserLevelPixmapGenerator::clear();
+    
+    return 0;
 }

cockatrice/src/messagelogwidget.cpp

@@ -11,867 +11,867 @@
 
 QString MessageLogWidget::sanitizeHtml(QString dirty) const
 {
-	return dirty
-		.replace("&", "&")
-		.replace("<", "&lt;")
-		.replace(">", "&gt;")
-		.replace("\"", "&quot;");
+    return dirty
+        .replace("&", "&amp;")
+        .replace("<", "&lt;")
+        .replace(">", "&gt;")
+        .replace("\"", "&quot;");
 }
 
 QString MessageLogWidget::cardLink(const QString &cardName) const
 {
-	return QString("<a href=\"card://%1\">%2</a>").arg(cardName).arg(cardName);
+    return QString("<a href=\"card://%1\">%2</a>").arg(cardName).arg(cardName);
 }
 
 bool MessageLogWidget::isFemale(Player *player) const
 {
-	return player->getUserInfo()->gender() == ServerInfo_User::Female;
+    return player->getUserInfo()->gender() == ServerInfo_User::Female;
 }
 
 bool MessageLogWidget::userIsFemale() const
 {
-	return (tabSupervisor && tabSupervisor->getUserInfo() && (tabSupervisor->getUserInfo()->gender() & ServerInfo_User::Female));
+    return (tabSupervisor && tabSupervisor->getUserInfo() && (tabSupervisor->getUserInfo()->gender() & ServerInfo_User::Female));
 }
 
 void MessageLogWidget::logGameJoined(int gameId)
 {
-	if (userIsFemale())
-		appendHtml(tr("You have joined game #%1.", "female").arg(gameId));
-	else
-		appendHtml(tr("You have joined game #%1.", "male").arg(gameId));
+    if (userIsFemale())
+        appendHtml(tr("You have joined game #%1.", "female").arg(gameId));
+    else
+        appendHtml(tr("You have joined game #%1.", "male").arg(gameId));
 }
 
 void MessageLogWidget::logReplayStarted(int gameId)
 {
-	if (userIsFemale())
-		appendHtml(tr("You are watching a replay of game #%1.", "female").arg(gameId));
-	else
-		appendHtml(tr("You are watching a replay of game #%1.", "male").arg(gameId));
+    if (userIsFemale())
+        appendHtml(tr("You are watching a replay of game #%1.", "female").arg(gameId));
+    else
+        appendHtml(tr("You are watching a replay of game #%1.", "male").arg(gameId));
 }
 
 void MessageLogWidget::logJoin(Player *player)
 {
-	soundEngine->cuckoo();
-	if (isFemale(player))
-		appendHtml(tr("%1 has joined the game.", "female").arg(sanitizeHtml(player->getName())));
-	else
-		appendHtml(tr("%1 has joined the game.", "male").arg(sanitizeHtml(player->getName())));
+    soundEngine->cuckoo();
+    if (isFemale(player))
+        appendHtml(tr("%1 has joined the game.", "female").arg(sanitizeHtml(player->getName())));
+    else
+        appendHtml(tr("%1 has joined the game.", "male").arg(sanitizeHtml(player->getName())));
 }
 
 void MessageLogWidget::logLeave(Player *player)
 {
-	if (isFemale(player))
-		appendHtml(tr("%1 has left the game.", "female").arg(sanitizeHtml(player->getName())));
-	else
-		appendHtml(tr("%1 has left the game.", "male").arg(sanitizeHtml(player->getName())));
+    if (isFemale(player))
+        appendHtml(tr("%1 has left the game.", "female").arg(sanitizeHtml(player->getName())));
+    else
+        appendHtml(tr("%1 has left the game.", "male").arg(sanitizeHtml(player->getName())));
 }
 
 void MessageLogWidget::logGameClosed()
 {
-	appendHtml(tr("The game has been closed."));
+    appendHtml(tr("The game has been closed."));
 }
 
 void MessageLogWidget::logKicked()
 {
-	appendHtml(tr("You have been kicked out of the game."));
+    appendHtml(tr("You have been kicked out of the game."));
 }
 
 void MessageLogWidget::logJoinSpectator(QString name)
 {
-	appendHtml(tr("%1 is now watching the game.").arg(sanitizeHtml(name)));
+    appendHtml(tr("%1 is now watching the game.").arg(sanitizeHtml(name)));
 }
 
 void MessageLogWidget::logLeaveSpectator(QString name)
 {
-	appendHtml(tr("%1 is not watching the game any more.").arg(sanitizeHtml(name)));
+    appendHtml(tr("%1 is not watching the game any more.").arg(sanitizeHtml(name)));
 }
 
 void MessageLogWidget::logDeckSelect(Player *player, QString deckHash)
 {
-	if (isFemale(player))
-		appendHtml(tr("%1 has loaded a deck (%2).", "female").arg(sanitizeHtml(player->getName())).arg(deckHash));
-	else
-		appendHtml(tr("%1 has loaded a deck (%2).", "male").arg(sanitizeHtml(player->getName())).arg(deckHash));
+    if (isFemale(player))
+        appendHtml(tr("%1 has loaded a deck (%2).", "female").arg(sanitizeHtml(player->getName())).arg(deckHash));
+    else
+        appendHtml(tr("%1 has loaded a deck (%2).", "male").arg(sanitizeHtml(player->getName())).arg(deckHash));
 }
 
 void MessageLogWidget::logReadyStart(Player *player)
 {
-	if (isFemale(player))
-		appendHtml(tr("%1 is ready to start the game.", "female").arg(sanitizeHtml(player->getName())));
-	else
-		appendHtml(tr("%1 is ready to start the game.", "male").arg(sanitizeHtml(player->getName())));
+    if (isFemale(player))
+        appendHtml(tr("%1 is ready to start the game.", "female").arg(sanitizeHtml(player->getName())));
+    else
+        appendHtml(tr("%1 is ready to start the game.", "male").arg(sanitizeHtml(player->getName())));
 }
 
 void MessageLogWidget::logNotReadyStart(Player *player)
 {
-	if (isFemale(player))
-		appendHtml(tr("%1 is not ready to start the game any more.", "female").arg(sanitizeHtml(player->getName())));
-	else
-		appendHtml(tr("%1 is not ready to start the game any more.", "male").arg(sanitizeHtml(player->getName())));
+    if (isFemale(player))
+        appendHtml(tr("%1 is not ready to start the game any more.", "female").arg(sanitizeHtml(player->getName())));
+    else
+        appendHtml(tr("%1 is not ready to start the game any more.", "male").arg(sanitizeHtml(player->getName())));
 }
 
 void MessageLogWidget::logSetSideboardLock(Player *player, bool locked)
 {
-	if (locked) {
-		if (isFemale(player))
-			appendHtml(tr("%1 has locked her sideboard.", "female").arg(sanitizeHtml(player->getName())));
-		else
-			appendHtml(tr("%1 has locked his sideboard.", "male").arg(sanitizeHtml(player->getName())));
-	} else {
-		if (isFemale(player))
-			appendHtml(tr("%1 has unlocked her sideboard.", "female").arg(sanitizeHtml(player->getName())));
-		else
-			appendHtml(tr("%1 has unlocked his sideboard.", "male").arg(sanitizeHtml(player->getName())));
-	}
+    if (locked) {
+        if (isFemale(player))
+            appendHtml(tr("%1 has locked her sideboard.", "female").arg(sanitizeHtml(player->getName())));
+        else
+            appendHtml(tr("%1 has locked his sideboard.", "male").arg(sanitizeHtml(player->getName())));
+    } else {
+        if (isFemale(player))
+            appendHtml(tr("%1 has unlocked her sideboard.", "female").arg(sanitizeHtml(player->getName())));
+        else
+            appendHtml(tr("%1 has unlocked his sideboard.", "male").arg(sanitizeHtml(player->getName())));
+    }
 }
 
 void MessageLogWidget::logConcede(Player *player)
 {
-	if (isFemale(player))
-		appendHtml(tr("%1 has conceded the game.", "female").arg(sanitizeHtml(player->getName())));
-	else
-		appendHtml(tr("%1 has conceded the game.", "male").arg(sanitizeHtml(player->getName())));
+    if (isFemale(player))
+        appendHtml(tr("%1 has conceded the game.", "female").arg(sanitizeHtml(player->getName())));
+    else
+        appendHtml(tr("%1 has conceded the game.", "male").arg(sanitizeHtml(player->getName())));
 }
 
 void MessageLogWidget::logGameStart()
 {
-	appendHtml(tr("The game has started."));
+    appendHtml(tr("The game has started."));
 }
 
 void MessageLogWidget::logConnectionStateChanged(Player *player, bool connectionState)
 {
-	if (connectionState) {
-		if (isFemale(player))
-			appendHtml(tr("%1 has restored connection to the game.", "female").arg(sanitizeHtml(player->getName())));
-		else
-			appendHtml(tr("%1 has restored connection to the game.", "male").arg(sanitizeHtml(player->getName())));
-	} else {
-		if (isFemale(player))
-			appendHtml(tr("%1 has lost connection to the game.", "female").arg(sanitizeHtml(player->getName())));
-		else
-			appendHtml(tr("%1 has lost connection to the game.", "male").arg(sanitizeHtml(player->getName())));
-	}
+    if (connectionState) {
+        if (isFemale(player))
+            appendHtml(tr("%1 has restored connection to the game.", "female").arg(sanitizeHtml(player->getName())));
+        else
+            appendHtml(tr("%1 has restored connection to the game.", "male").arg(sanitizeHtml(player->getName())));
+    } else {
+        if (isFemale(player))
+            appendHtml(tr("%1 has lost connection to the game.", "female").arg(sanitizeHtml(player->getName())));
+        else
+            appendHtml(tr("%1 has lost connection to the game.", "male").arg(sanitizeHtml(player->getName())));
+    }
 }
 
 void MessageLogWidget::logSay(Player *player, QString message)
 {
-	appendMessage(message, player->getName(), UserLevelFlags(player->getUserInfo()->user_level()), true);
+    appendMessage(message, player->getName(), UserLevelFlags(player->getUserInfo()->user_level()), true);
 }
 
 void MessageLogWidget::logSpectatorSay(QString spectatorName, UserLevelFlags spectatorUserLevel, QString message)
 {
-	appendMessage(message, spectatorName, spectatorUserLevel, false);
+    appendMessage(message, spectatorName, spectatorUserLevel, false);
 }
 
 void MessageLogWidget::logShuffle(Player *player, CardZone *zone)
 {
-	soundEngine->shuffle();
-	if (currentContext != MessageContext_Mulligan) {
-		appendHtml((isFemale(player)
-			? tr("%1 shuffles %2.", "female")
-			: tr("%1 shuffles %2.", "male")
-		).arg(sanitizeHtml(player->getName()))
-		 .arg(zone->getTranslatedName(true, CaseShuffleZone)));
-	}
+    soundEngine->shuffle();
+    if (currentContext != MessageContext_Mulligan) {
+        appendHtml((isFemale(player)
+            ? tr("%1 shuffles %2.", "female")
+            : tr("%1 shuffles %2.", "male")
+        ).arg(sanitizeHtml(player->getName()))
+         .arg(zone->getTranslatedName(true, CaseShuffleZone)));
+    }
 }
 
 void MessageLogWidget::logRollDie(Player *player, int sides, int roll)
 {
-	if (isFemale(player))
-		appendHtml(tr("%1 rolls a %2 with a %3-sided die.", "female").arg(sanitizeHtml(player->getName())).arg(roll).arg(sides));
-	else
-		appendHtml(tr("%1 rolls a %2 with a %3-sided die.", "male").arg(sanitizeHtml(player->getName())).arg(roll).arg(sides));
+    if (isFemale(player))
+        appendHtml(tr("%1 rolls a %2 with a %3-sided die.", "female").arg(sanitizeHtml(player->getName())).arg(roll).arg(sides));
+    else
+        appendHtml(tr("%1 rolls a %2 with a %3-sided die.", "male").arg(sanitizeHtml(player->getName())).arg(roll).arg(sides));
 }
 
 void MessageLogWidget::logDrawCards(Player *player, int number)
 {
-	if (currentContext == MessageContext_Mulligan)
-		mulliganPlayer = player;
-	else {
-		soundEngine->draw();
-		if (isFemale(player))
-			appendHtml(tr("%1 draws %n card(s).", "female", number).arg(sanitizeHtml(player->getName())));
-		else
-			appendHtml(tr("%1 draws %n card(s).", "male", number).arg(sanitizeHtml(player->getName())));
-	}
+    if (currentContext == MessageContext_Mulligan)
+        mulliganPlayer = player;
+    else {
+        soundEngine->draw();
+        if (isFemale(player))
+            appendHtml(tr("%1 draws %n card(s).", "female", number).arg(sanitizeHtml(player->getName())));
+        else
+            appendHtml(tr("%1 draws %n card(s).", "male", number).arg(sanitizeHtml(player->getName())));
+    }
 }
 
 void MessageLogWidget::logUndoDraw(Player *player, QString cardName)
 {
-	if (cardName.isEmpty())
-		appendHtml((isFemale(player) ? tr("%1 undoes her last draw.") : tr("%1 undoes his last draw.")).arg(sanitizeHtml(player->getName())));
-	else
-		appendHtml((isFemale(player) ? tr("%1 undoes her last draw (%2).") : tr("%1 undoes his last draw (%2).")).arg(sanitizeHtml(player->getName())).arg(QString("<a href=\"card://%1\">%2</a>").arg(sanitizeHtml(cardName)).arg(sanitizeHtml(cardName))));
+    if (cardName.isEmpty())
+        appendHtml((isFemale(player) ? tr("%1 undoes her last draw.") : tr("%1 undoes his last draw.")).arg(sanitizeHtml(player->getName())));
+    else
+        appendHtml((isFemale(player) ? tr("%1 undoes her last draw (%2).") : tr("%1 undoes his last draw (%2).")).arg(sanitizeHtml(player->getName())).arg(QString("<a href=\"card://%1\">%2</a>").arg(sanitizeHtml(cardName)).arg(sanitizeHtml(cardName))));
 }
 
 QPair<QString, QString> MessageLogWidget::getFromStr(CardZone *zone, QString cardName, int position, bool ownerChange) const
 {
-	bool cardNameContainsStartZone = false;
-	QString fromStr;
-	QString startName = zone->getName();
-	
-	if (startName == "table")
-		fromStr = tr(" from table");
-	else if (startName == "grave")
-		fromStr = tr(" from graveyard");
-	else if (startName == "rfg")
-		fromStr = tr(" from exile");
-	else if (startName == "hand")
-		fromStr = tr(" from hand");
-	else if (startName == "deck") {
-		if (position >= zone->getCards().size() - 1) {
-			if (cardName.isEmpty()) {
-				if (ownerChange)
-					cardName = tr("the bottom card of %1's library").arg(zone->getPlayer()->getName());
-				else
-					cardName = isFemale(zone->getPlayer()) ? tr("the bottom card of her library") : tr("the bottom card of his library");
-				cardNameContainsStartZone = true;
-			} else {
-				if (ownerChange)
-					fromStr = tr(" from the bottom of %1's library").arg(zone->getPlayer()->getName());
-				else
-					fromStr = isFemale(zone->getPlayer()) ? tr(" from the bottom of her library") : tr(" from the bottom of his library");
-			}
-		} else if (position == 0) {
-			if (cardName.isEmpty()) {
-				if (ownerChange)
-					cardName = tr("the top card of %1's library").arg(zone->getPlayer()->getName());
-				else
-					cardName = isFemale(zone->getPlayer()) ? tr("the top card of her library") : tr("the top card of his library");
-				cardNameContainsStartZone = true;
-			} else {
-				if (ownerChange)
-					fromStr = tr(" from the top of %1's library").arg(zone->getPlayer()->getName());
-				else
-					fromStr = isFemale(zone->getPlayer()) ? tr(" from the top of her library") : tr(" from the top of his library");
-			}
-		} else {
-			if (ownerChange)
-				fromStr = tr(" from %1's library").arg(zone->getPlayer()->getName());
-			else
-				fromStr = tr(" from library");
-		}
-	} else if (startName == "sb")
-		fromStr = tr(" from sideboard");
-	else if (startName == "stack")
-		fromStr = tr(" from the stack");
-
-	if (!cardNameContainsStartZone)
-		cardName.clear();
-	return QPair<QString, QString>(cardName, fromStr);
+    bool cardNameContainsStartZone = false;
+    QString fromStr;
+    QString startName = zone->getName();
+    
+    if (startName == "table")
+        fromStr = tr(" from table");
+    else if (startName == "grave")
+        fromStr = tr(" from graveyard");
+    else if (startName == "rfg")
+        fromStr = tr(" from exile");
+    else if (startName == "hand")
+        fromStr = tr(" from hand");
+    else if (startName == "deck") {
+        if (position >= zone->getCards().size() - 1) {
+            if (cardName.isEmpty()) {
+                if (ownerChange)
+                    cardName = tr("the bottom card of %1's library").arg(zone->getPlayer()->getName());
+                else
+                    cardName = isFemale(zone->getPlayer()) ? tr("the bottom card of her library") : tr("the bottom card of his library");
+                cardNameContainsStartZone = true;
+            } else {
+                if (ownerChange)
+                    fromStr = tr(" from the bottom of %1's library").arg(zone->getPlayer()->getName());
+                else
+                    fromStr = isFemale(zone->getPlayer()) ? tr(" from the bottom of her library") : tr(" from the bottom of his library");
+            }
+        } else if (position == 0) {
+            if (cardName.isEmpty()) {
+                if (ownerChange)
+                    cardName = tr("the top card of %1's library").arg(zone->getPlayer()->getName());
+                else
+                    cardName = isFemale(zone->getPlayer()) ? tr("the top card of her library") : tr("the top card of his library");
+                cardNameContainsStartZone = true;
+            } else {
+                if (ownerChange)
+                    fromStr = tr(" from the top of %1's library").arg(zone->getPlayer()->getName());
+                else
+                    fromStr = isFemale(zone->getPlayer()) ? tr(" from the top of her library") : tr(" from the top of his library");
+            }
+        } else {
+            if (ownerChange)
+                fromStr = tr(" from %1's library").arg(zone->getPlayer()->getName());
+            else
+                fromStr = tr(" from library");
+        }
+    } else if (startName == "sb")
+        fromStr = tr(" from sideboard");
+    else if (startName == "stack")
+        fromStr = tr(" from the stack");
+
+    if (!cardNameContainsStartZone)
+        cardName.clear();
+    return QPair<QString, QString>(cardName, fromStr);
 }
 
 void MessageLogWidget::doMoveCard(LogMoveCard &attributes)
 {
-	bool ownerChange = attributes.startZone->getPlayer() != attributes.targetZone->getPlayer();
-	QString startName = attributes.startZone->getName();
-	QString targetName = attributes.targetZone->getName();
-	if (((startName == "table") && (targetName == "table") && (attributes.startZone == attributes.targetZone)) || ((startName == "hand") && (targetName == "hand")))
-		return;
-	QString cardName = attributes.cardName;
-	QPair<QString, QString> temp = getFromStr(attributes.startZone, cardName, attributes.oldX, ownerChange);
-	bool cardNameContainsStartZone = false;
-	if (!temp.first.isEmpty()) {
-		cardNameContainsStartZone = true;
-		cardName = temp.first;
-	}
-	QString fromStr = temp.second;
-	QString cardStr;
-	if (cardNameContainsStartZone)
-		cardStr = cardName;
-	else if (cardName.isEmpty())
-		cardStr = tr("a card");
-	else
-		cardStr = cardLink(cardName);
-	
-	if (ownerChange && (attributes.startZone->getPlayer() == attributes.player)) {
-		appendHtml(tr("%1 gives %2 control over %3.").arg(sanitizeHtml(attributes.player->getName())).arg(sanitizeHtml(attributes.targetZone->getPlayer()->getName())).arg(cardStr));
-		return;
-	}
-	
-	QString finalStr;
-	if (targetName == "table") {
-		soundEngine->playCard();
-		if (moveCardTapped.value(attributes.card))
-			finalStr = tr("%1 puts %2 into play tapped%3.");
-		else
-			finalStr = tr("%1 puts %2 into play%3.");
-	} else if (targetName == "grave")
-		finalStr = tr("%1 puts %2%3 into graveyard.");
-	else if (targetName == "rfg")
-		finalStr = tr("%1 exiles %2%3.");
-	else if (targetName == "hand")
-		finalStr = tr("%1 moves %2%3 to hand.");
-	else if (targetName == "deck") {
-		if (attributes.newX == -1)
-			finalStr = isFemale(attributes.targetZone->getPlayer()) ? tr("%1 puts %2%3 into her library.") : tr("%1 puts %2%3 into his library.");
-		else if (attributes.newX == attributes.targetZone->getCards().size() - 1)
-			finalStr = isFemale(attributes.targetZone->getPlayer()) ? tr("%1 puts %2%3 on bottom of her library.") : tr("%1 puts %2%3 on bottom of his library.");
-		else if (attributes.newX == 0)
-			finalStr = isFemale(attributes.targetZone->getPlayer()) ? tr("%1 puts %2%3 on top of her library.") : tr("%1 puts %2%3 on top of his library.");
-		else
-			finalStr = isFemale(attributes.targetZone->getPlayer()) ? tr("%1 puts %2%3 into her library at position %4.") : tr("%1 puts %2%3 into his library at position %4.");
-	} else if (targetName == "sb")
-		finalStr = tr("%1 moves %2%3 to sideboard.");
-	else if (targetName == "stack") {
-		soundEngine->playCard();
-		finalStr = tr("%1 plays %2%3.");
-	}
-	
-	appendHtml(finalStr.arg(sanitizeHtml(attributes.player->getName())).arg(cardStr).arg(fromStr).arg(attributes.newX));
+    bool ownerChange = attributes.startZone->getPlayer() != attributes.targetZone->getPlayer();
+    QString startName = attributes.startZone->getName();
+    QString targetName = attributes.targetZone->getName();
+    if (((startName == "table") && (targetName == "table") && (attributes.startZone == attributes.targetZone)) || ((startName == "hand") && (targetName == "hand")))
+        return;
+    QString cardName = attributes.cardName;
+    QPair<QString, QString> temp = getFromStr(attributes.startZone, cardName, attributes.oldX, ownerChange);
+    bool cardNameContainsStartZone = false;
+    if (!temp.first.isEmpty()) {
+        cardNameContainsStartZone = true;
+        cardName = temp.first;
+    }
+    QString fromStr = temp.second;
+    QString cardStr;
+    if (cardNameContainsStartZone)
+        cardStr = cardName;
+    else if (cardName.isEmpty())
+        cardStr = tr("a card");
+    else
+        cardStr = cardLink(cardName);
+    
+    if (ownerChange && (attributes.startZone->getPlayer() == attributes.player)) {
+        appendHtml(tr("%1 gives %2 control over %3.").arg(sanitizeHtml(attributes.player->getName())).arg(sanitizeHtml(attributes.targetZone->getPlayer()->getName())).arg(cardStr));
+        return;
+    }
+    
+    QString finalStr;
+    if (targetName == "table") {
+        soundEngine->playCard();
+        if (moveCardTapped.value(attributes.card))
+            finalStr = tr("%1 puts %2 into play tapped%3.");
+        else
+            finalStr = tr("%1 puts %2 into play%3.");
+    } else if (targetName == "grave")
+        finalStr = tr("%1 puts %2%3 into graveyard.");
+    else if (targetName == "rfg")
+        finalStr = tr("%1 exiles %2%3.");
+    else if (targetName == "hand")
+        finalStr = tr("%1 moves %2%3 to hand.");
+    else if (targetName == "deck") {
+        if (attributes.newX == -1)
+            finalStr = isFemale(attributes.targetZone->getPlayer()) ? tr("%1 puts %2%3 into her library.") : tr("%1 puts %2%3 into his library.");
+        else if (attributes.newX == attributes.targetZone->getCards().size() - 1)
+            finalStr = isFemale(attributes.targetZone->getPlayer()) ? tr("%1 puts %2%3 on bottom of her library.") : tr("%1 puts %2%3 on bottom of his library.");
+        else if (attributes.newX == 0)
+            finalStr = isFemale(attributes.targetZone->getPlayer()) ? tr("%1 puts %2%3 on top of her library.") : tr("%1 puts %2%3 on top of his library.");
+        else
+            finalStr = isFemale(attributes.targetZone->getPlayer()) ? tr("%1 puts %2%3 into her library at position %4.") : tr("%1 puts %2%3 into his library at position %4.");
+    } else if (targetName == "sb")
+        finalStr = tr("%1 moves %2%3 to sideboard.");
+    else if (targetName == "stack") {
+        soundEngine->playCard();
+        finalStr = tr("%1 plays %2%3.");
+    }
+    
+    appendHtml(finalStr.arg(sanitizeHtml(attributes.player->getName())).arg(cardStr).arg(fromStr).arg(attributes.newX));
 }
 
 void MessageLogWidget::logMoveCard(Player *player, CardItem *card, CardZone *startZone, int oldX, CardZone *targetZone, int newX)
 {
-	LogMoveCard attributes = {player, card, card->getName(), startZone, oldX, targetZone, newX};
-	if (currentContext == MessageContext_MoveCard)
-		moveCardQueue.append(attributes);
-	else if (currentContext == MessageContext_Mulligan)
-		mulliganPlayer = player;
-	else
-		doMoveCard(attributes);
+    LogMoveCard attributes = {player, card, card->getName(), startZone, oldX, targetZone, newX};
+    if (currentContext == MessageContext_MoveCard)
+        moveCardQueue.append(attributes);
+    else if (currentContext == MessageContext_Mulligan)
+        mulliganPlayer = player;
+    else
+        doMoveCard(attributes);
 }
 
 void MessageLogWidget::logMulligan(Player *player, int number)
 {
-	if (!player)
-		return;
+    if (!player)
+        return;
 
-	if (number > -1) {
-		if (isFemale(player))
-			appendHtml(tr("%1 takes a mulligan to %n.", "female", number).arg(sanitizeHtml(player->getName())));
-		else
-			appendHtml(tr("%1 takes a mulligan to %n.", "male", number).arg(sanitizeHtml(player->getName())));
-	} else
-		appendHtml((isFemale(player) ? tr("%1 draws her initial hand.") : tr("%1 draws his initial hand.")).arg(sanitizeHtml(player->getName())));
+    if (number > -1) {
+        if (isFemale(player))
+            appendHtml(tr("%1 takes a mulligan to %n.", "female", number).arg(sanitizeHtml(player->getName())));
+        else
+            appendHtml(tr("%1 takes a mulligan to %n.", "male", number).arg(sanitizeHtml(player->getName())));
+    } else
+        appendHtml((isFemale(player) ? tr("%1 draws her initial hand.") : tr("%1 draws his initial hand.")).arg(sanitizeHtml(player->getName())));
 }
 
 void MessageLogWidget::logFlipCard(Player *player, QString cardName, bool faceDown)
 {
-	if (faceDown) {
-		if (isFemale(player))
-			appendHtml(tr("%1 flips %2 face-down.", "female").arg(sanitizeHtml(player->getName())).arg(cardName));
-		else
-			appendHtml(tr("%1 flips %2 face-down.", "male").arg(sanitizeHtml(player->getName())).arg(cardName));
-	} else {
-		if (isFemale(player))
-			appendHtml(tr("%1 flips %2 face-up.", "female").arg(sanitizeHtml(player->getName())).arg(cardName));
-		else
-			appendHtml(tr("%1 flips %2 face-up.", "male").arg(sanitizeHtml(player->getName())).arg(cardName));
-	}
+    if (faceDown) {
+        if (isFemale(player))
+            appendHtml(tr("%1 flips %2 face-down.", "female").arg(sanitizeHtml(player->getName())).arg(cardName));
+        else
+            appendHtml(tr("%1 flips %2 face-down.", "male").arg(sanitizeHtml(player->getName())).arg(cardName));
+    } else {
+        if (isFemale(player))
+            appendHtml(tr("%1 flips %2 face-up.", "female").arg(sanitizeHtml(player->getName())).arg(cardName));
+        else
+            appendHtml(tr("%1 flips %2 face-up.", "male").arg(sanitizeHtml(player->getName())).arg(cardName));
+    }
 }
 
 void MessageLogWidget::logDestroyCard(Player *player, QString cardName)
 {
-	if (isFemale(player))
-		appendHtml(tr("%1 destroys %2.", "female").arg(sanitizeHtml(player->getName())).arg(cardLink(cardName)));
-	else
-		appendHtml(tr("%1 destroys %2.", "male").arg(sanitizeHtml(player->getName())).arg(cardLink(cardName)));
+    if (isFemale(player))
+        appendHtml(tr("%1 destroys %2.", "female").arg(sanitizeHtml(player->getName())).arg(cardLink(cardName)));
+    else
+        appendHtml(tr("%1 destroys %2.", "male").arg(sanitizeHtml(player->getName())).arg(cardLink(cardName)));
 }
 
 void MessageLogWidget::logAttachCard(Player *player, QString cardName, Player *targetPlayer, QString targetCardName)
 {
-	QString str;
-	if (isFemale(player)) {
-		if (isFemale(targetPlayer))
-			str = tr("%1 attaches %2 to %3's %4.", "p1 female, p2 female");
-		else
-			str = tr("%1 attaches %2 to %3's %4.", "p1 female, p2 male");
-	} else {
-		if (isFemale(targetPlayer))
-			str = tr("%1 attaches %2 to %3's %4.", "p1 male, p2 female");
-		else
-			str = tr("%1 attaches %2 to %3's %4.", "p1 male, p2 male");
-	}
-	
-	appendHtml(str.arg(sanitizeHtml(player->getName())).arg(cardLink(cardName)).arg(sanitizeHtml(targetPlayer->getName())).arg(cardLink(targetCardName)));
+    QString str;
+    if (isFemale(player)) {
+        if (isFemale(targetPlayer))
+            str = tr("%1 attaches %2 to %3's %4.", "p1 female, p2 female");
+        else
+            str = tr("%1 attaches %2 to %3's %4.", "p1 female, p2 male");
+    } else {
+        if (isFemale(targetPlayer))
+            str = tr("%1 attaches %2 to %3's %4.", "p1 male, p2 female");
+        else
+            str = tr("%1 attaches %2 to %3's %4.", "p1 male, p2 male");
+    }
+    
+    appendHtml(str.arg(sanitizeHtml(player->getName())).arg(cardLink(cardName)).arg(sanitizeHtml(targetPlayer->getName())).arg(cardLink(targetCardName)));
 }
 
 void MessageLogWidget::logUnattachCard(Player *player, QString cardName)
 {
-	if (isFemale(player))
-		appendHtml(tr("%1 unattaches %2.", "female").arg(sanitizeHtml(player->getName())).arg(cardLink(cardName)));
-	else
-		appendHtml(tr("%1 unattaches %2.", "male").arg(sanitizeHtml(player->getName())).arg(cardLink(cardName)));
+    if (isFemale(player))
+        appendHtml(tr("%1 unattaches %2.", "female").arg(sanitizeHtml(player->getName())).arg(cardLink(cardName)));
+    else
+        appendHtml(tr("%1 unattaches %2.", "male").arg(sanitizeHtml(player->getName())).arg(cardLink(cardName)));
 }
 
 void MessageLogWidget::logCreateToken(Player *player, QString cardName, QString pt)
 {
-	if (isFemale(player))
-		appendHtml(tr("%1 creates token: %2%3.", "female").arg(sanitizeHtml(player->getName())).arg(cardLink(cardName)).arg(pt.isEmpty() ? QString() : QString(" (%1)").arg(sanitizeHtml(pt))));
-	else
-		appendHtml(tr("%1 creates token: %2%3.", "male").arg(sanitizeHtml(player->getName())).arg(cardLink(cardName)).arg(pt.isEmpty() ? QString() : QString(" (%1)").arg(sanitizeHtml(pt))));
+    if (isFemale(player))
+        appendHtml(tr("%1 creates token: %2%3.", "female").arg(sanitizeHtml(player->getName())).arg(cardLink(cardName)).arg(pt.isEmpty() ? QString() : QString(" (%1)").arg(sanitizeHtml(pt))));
+    else
+        appendHtml(tr("%1 creates token: %2%3.", "male").arg(sanitizeHtml(player->getName())).arg(cardLink(cardName)).arg(pt.isEmpty() ? QString() : QString(" (%1)").arg(sanitizeHtml(pt))));
 }
 
 void MessageLogWidget::logCreateArrow(Player *player, Player *startPlayer, QString startCard, Player *targetPlayer, QString targetCard, bool playerTarget)
 {
-	startCard = cardLink(startCard);
-	targetCard = cardLink(targetCard);
-	QString str;
-	if (playerTarget) {
-		if ((player == startPlayer) && (player == targetPlayer)) {
-			if (isFemale(player))
-				str = tr("%1 points from her %2 to herself.", "female");
-			else
-				str = tr("%1 points from his %2 to himself.", "male");
-			appendHtml(str.arg(sanitizeHtml(player->getName())).arg(startCard));
-		} else if (player == startPlayer) {
-			if (isFemale(player)) {
-				if (isFemale(targetPlayer))
-					str = tr("%1 points from her %2 to %3.", "p1 female, p2 female");
-				else
-					str = tr("%1 points from her %2 to %3.", "p1 female, p2 male");
-			} else {
-				if (isFemale(targetPlayer))
-					str = tr("%1 points from his %2 to %3.", "p1 male, p2 female");
-				else
-					str = tr("%1 points from his %2 to %3.", "p1 male, p2 male");
-			}
-			appendHtml(str.arg(sanitizeHtml(player->getName())).arg(startCard).arg(sanitizeHtml(targetPlayer->getName())));
-		} else if (player == targetPlayer) {
-			if (isFemale(player)) {
-				if (isFemale(startPlayer))
-					str = tr("%1 points from %2's %3 to herself.", "card owner female, target female");
-				else
-					str = tr("%1 points from %2's %3 to herself.", "card owner male, target female");
-			} else {
-				if (isFemale(startPlayer))
-					str = tr("%1 points from %2's %3 to himself.", "card owner female, target male");
-				else
-					str = tr("%1 points from %2's %3 to himself.", "card owner male, target male");
-			}
-			appendHtml(str.arg(sanitizeHtml(player->getName())).arg(sanitizeHtml(startPlayer->getName())).arg(startCard));
-		} else {
-			if (isFemale(player)) {
-				if (isFemale(startPlayer)) {
-					if (isFemale(targetPlayer))
-						str = tr("%1 points from %2's %3 to %4.", "p1 female, p2 female, p3 female");
-					else
-						str = tr("%1 points from %2's %3 to %4.", "p1 female, p2 female, p3 male");
-				} else {
-					if (isFemale(targetPlayer))
-						str = tr("%1 points from %2's %3 to %4.", "p1 female, p2 male, p3 female");
-					else
-						str = tr("%1 points from %2's %3 to %4.", "p1 female, p2 male, p3 male");
-				}
-			} else {
-				if (isFemale(startPlayer)) {
-					if (isFemale(targetPlayer))
-						str = tr("%1 points from %2's %3 to %4.", "p1 male, p2 female, p3 female");
-					else
-						str = tr("%1 points from %2's %3 to %4.", "p1 male, p2 female, p3 male");
-				} else {
-					if (isFemale(targetPlayer))
-						str = tr("%1 points from %2's %3 to %4.", "p1 male, p2 male, p3 female");
-					else
-						str = tr("%1 points from %2's %3 to %4.", "p1 male, p2 male, p3 male");
-				}
-			}
-			appendHtml(str.arg(sanitizeHtml(player->getName())).arg(sanitizeHtml(startPlayer->getName())).arg(startCard).arg(sanitizeHtml(targetPlayer->getName())));
-		}
-	} else {
-		if ((player == startPlayer) && (player == targetPlayer)) {
-			if (isFemale(player))
-				str = tr("%1 points from her %2 to her %3.", "female");
-			else
-				str = tr("%1 points from his %2 to his %3.", "male");
-			appendHtml(str.arg(sanitizeHtml(player->getName())).arg(startCard).arg(targetCard));
-		} else if (player == startPlayer) {
-			if (isFemale(player)) {
-				if (isFemale(targetPlayer))
-					str = tr("%1 points from her %2 to %3's %4.", "p1 female, p2 female");
-				else
-					str = tr("%1 points from her %2 to %3's %4.", "p1 female, p2 male");
-			} else {
-				if (isFemale(targetPlayer))
-					str = tr("%1 points from his %2 to %3's %4.", "p1 male, p2 female");
-				else
-					str = tr("%1 points from his %2 to %3's %4.", "p1 male, p2 male");
-			}
-			appendHtml(str.arg(sanitizeHtml(player->getName())).arg(startCard).arg(sanitizeHtml(targetPlayer->getName())).arg(targetCard));
-		} else if (player == targetPlayer) {
-			if (isFemale(player)) {
-				if (isFemale(startPlayer))
-					str = tr("%1 points from %2's %3 to her own %4.", "card owner female, target female");
-				else
-					str = tr("%1 points from %2's %3 to her own %4.", "card owner male, target female");
-			} else {
-				if (isFemale(startPlayer))
-					str = tr("%1 points from %2's %3 to his own %4.", "card owner female, target male");
-				else
-					str = tr("%1 points from %2's %3 to his own %4.", "card owner male, target male");
-			}
-			appendHtml(str.arg(sanitizeHtml(player->getName())).arg(sanitizeHtml(startPlayer->getName())).arg(startCard).arg(targetCard));
-		} else {
-			if (isFemale(player)) {
-				if (isFemale(startPlayer)) {
-					if (isFemale(targetPlayer))
-						str = tr("%1 points from %2's %3 to %4's %5.", "p1 female, p2 female, p3 female");
-					else
-						str = tr("%1 points from %2's %3 to %4's %5.", "p1 female, p2 female, p3 male");
-				} else {
-					if (isFemale(targetPlayer))
-						str = tr("%1 points from %2's %3 to %4's %5.", "p1 female, p2 male, p3 female");
-					else
-						str = tr("%1 points from %2's %3 to %4's %5.", "p1 female, p2 male, p3 male");
-				}
-			} else {
-				if (isFemale(startPlayer)) {
-					if (isFemale(targetPlayer))
-						str = tr("%1 points from %2's %3 to %4's %5.", "p1 male, p2 female, p3 female");
-					else
-						str = tr("%1 points from %2's %3 to %4's %5.", "p1 male, p2 female, p3 male");
-				} else {
-					if (isFemale(targetPlayer))
-						str = tr("%1 points from %2's %3 to %4's %5.", "p1 male, p2 male, p3 female");
-					else
-						str = tr("%1 points from %2's %3 to %4's %5.", "p1 male, p2 male, p3 male");
-				}
-			}
-			appendHtml(str.arg(sanitizeHtml(player->getName())).arg(sanitizeHtml(startPlayer->getName())).arg(startCard).arg(sanitizeHtml(targetPlayer->getName())).arg(targetCard));
-		}
-	}
+    startCard = cardLink(startCard);
+    targetCard = cardLink(targetCard);
+    QString str;
+    if (playerTarget) {
+        if ((player == startPlayer) && (player == targetPlayer)) {
+            if (isFemale(player))
+                str = tr("%1 points from her %2 to herself.", "female");
+            else
+                str = tr("%1 points from his %2 to himself.", "male");
+            appendHtml(str.arg(sanitizeHtml(player->getName())).arg(startCard));
+        } else if (player == startPlayer) {
+            if (isFemale(player)) {
+                if (isFemale(targetPlayer))
+                    str = tr("%1 points from her %2 to %3.", "p1 female, p2 female");
+                else
+                    str = tr("%1 points from her %2 to %3.", "p1 female, p2 male");
+            } else {
+                if (isFemale(targetPlayer))
+                    str = tr("%1 points from his %2 to %3.", "p1 male, p2 female");
+                else
+                    str = tr("%1 points from his %2 to %3.", "p1 male, p2 male");
+            }
+            appendHtml(str.arg(sanitizeHtml(player->getName())).arg(startCard).arg(sanitizeHtml(targetPlayer->getName())));
+        } else if (player == targetPlayer) {
+            if (isFemale(player)) {
+                if (isFemale(startPlayer))
+                    str = tr("%1 points from %2's %3 to herself.", "card owner female, target female");
+                else
+                    str = tr("%1 points from %2's %3 to herself.", "card owner male, target female");
+            } else {
+                if (isFemale(startPlayer))
+                    str = tr("%1 points from %2's %3 to himself.", "card owner female, target male");
+                else
+                    str = tr("%1 points from %2's %3 to himself.", "card owner male, target male");
+            }
+            appendHtml(str.arg(sanitizeHtml(player->getName())).arg(sanitizeHtml(startPlayer->getName())).arg(startCard));
+        } else {
+            if (isFemale(player)) {
+                if (isFemale(startPlayer)) {
+                    if (isFemale(targetPlayer))
+                        str = tr("%1 points from %2's %3 to %4.", "p1 female, p2 female, p3 female");
+                    else
+                        str = tr("%1 points from %2's %3 to %4.", "p1 female, p2 female, p3 male");
+                } else {
+                    if (isFemale(targetPlayer))
+                        str = tr("%1 points from %2's %3 to %4.", "p1 female, p2 male, p3 female");
+                    else
+                        str = tr("%1 points from %2's %3 to %4.", "p1 female, p2 male, p3 male");
+                }
+            } else {
+                if (isFemale(startPlayer)) {
+                    if (isFemale(targetPlayer))
+                        str = tr("%1 points from %2's %3 to %4.", "p1 male, p2 female, p3 female");
+                    else
+                        str = tr("%1 points from %2's %3 to %4.", "p1 male, p2 female, p3 male");
+                } else {
+                    if (isFemale(targetPlayer))
+                        str = tr("%1 points from %2's %3 to %4.", "p1 male, p2 male, p3 female");
+                    else
+                        str = tr("%1 points from %2's %3 to %4.", "p1 male, p2 male, p3 male");
+                }
+            }
+            appendHtml(str.arg(sanitizeHtml(player->getName())).arg(sanitizeHtml(startPlayer->getName())).arg(startCard).arg(sanitizeHtml(targetPlayer->getName())));
+        }
+    } else {
+        if ((player == startPlayer) && (player == targetPlayer)) {
+            if (isFemale(player))
+                str = tr("%1 points from her %2 to her %3.", "female");
+            else
+                str = tr("%1 points from his %2 to his %3.", "male");
+            appendHtml(str.arg(sanitizeHtml(player->getName())).arg(startCard).arg(targetCard));
+        } else if (player == startPlayer) {
+            if (isFemale(player)) {
+                if (isFemale(targetPlayer))
+                    str = tr("%1 points from her %2 to %3's %4.", "p1 female, p2 female");
+                else
+                    str = tr("%1 points from her %2 to %3's %4.", "p1 female, p2 male");
+            } else {
+                if (isFemale(targetPlayer))
+                    str = tr("%1 points from his %2 to %3's %4.", "p1 male, p2 female");
+                else
+                    str = tr("%1 points from his %2 to %3's %4.", "p1 male, p2 male");
+            }
+            appendHtml(str.arg(sanitizeHtml(player->getName())).arg(startCard).arg(sanitizeHtml(targetPlayer->getName())).arg(targetCard));
+        } else if (player == targetPlayer) {
+            if (isFemale(player)) {
+                if (isFemale(startPlayer))
+                    str = tr("%1 points from %2's %3 to her own %4.", "card owner female, target female");
+                else
+                    str = tr("%1 points from %2's %3 to her own %4.", "card owner male, target female");
+            } else {
+                if (isFemale(startPlayer))
+                    str = tr("%1 points from %2's %3 to his own %4.", "card owner female, target male");
+                else
+                    str = tr("%1 points from %2's %3 to his own %4.", "card owner male, target male");
+            }
+            appendHtml(str.arg(sanitizeHtml(player->getName())).arg(sanitizeHtml(startPlayer->getName())).arg(startCard).arg(targetCard));
+        } else {
+            if (isFemale(player)) {
+                if (isFemale(startPlayer)) {
+                    if (isFemale(targetPlayer))
+                        str = tr("%1 points from %2's %3 to %4's %5.", "p1 female, p2 female, p3 female");
+                    else
+                        str = tr("%1 points from %2's %3 to %4's %5.", "p1 female, p2 female, p3 male");
+                } else {
+                    if (isFemale(targetPlayer))
+                        str = tr("%1 points from %2's %3 to %4's %5.", "p1 female, p2 male, p3 female");
+                    else
+                        str = tr("%1 points from %2's %3 to %4's %5.", "p1 female, p2 male, p3 male");
+                }
+            } else {
+                if (isFemale(startPlayer)) {
+                    if (isFemale(targetPlayer))
+                        str = tr("%1 points from %2's %3 to %4's %5.", "p1 male, p2 female, p3 female");
+                    else
+                        str = tr("%1 points from %2's %3 to %4's %5.", "p1 male, p2 female, p3 male");
+                } else {
+                    if (isFemale(targetPlayer))
+                        str = tr("%1 points from %2's %3 to %4's %5.", "p1 male, p2 male, p3 female");
+                    else
+                        str = tr("%1 points from %2's %3 to %4's %5.", "p1 male, p2 male, p3 male");
+                }
+            }
+            appendHtml(str.arg(sanitizeHtml(player->getName())).arg(sanitizeHtml(startPlayer->getName())).arg(startCard).arg(sanitizeHtml(targetPlayer->getName())).arg(targetCard));
+        }
+    }
 }
 
 void MessageLogWidget::logSetCardCounter(Player *player, QString cardName, int counterId, int value, int oldValue)
 {
-	QString finalStr, colorStr;
-	
-	int delta = abs(oldValue - value);
-	if (value > oldValue) {
-		if (isFemale(player))
-			finalStr = tr("%1 places %n %2 counter(s) on %3 (now %4).", "female", delta);
-		else
-			finalStr = tr("%1 places %n %2 counter(s) on %3 (now %4).", "male", delta);
-	} else {
-		if (isFemale(player))
-			finalStr = tr("%1 removes %n %2 counter(s) from %3 (now %4).", "female", delta);
-		else
-			finalStr = tr("%1 removes %n %2 counter(s) from %3 (now %4).", "male", delta);
-	}
-	
-	switch (counterId) {
-		case 0: colorStr = tr("red", "", delta); break;
-		case 1: colorStr = tr("yellow", "", delta); break;
-		case 2: colorStr = tr("green", "", delta); break;
-		default: ;
-	}
-	
-	appendHtml(finalStr.arg(sanitizeHtml(player->getName())).arg(colorStr).arg(cardLink(cardName)).arg(value));
+    QString finalStr, colorStr;
+    
+    int delta = abs(oldValue - value);
+    if (value > oldValue) {
+        if (isFemale(player))
+            finalStr = tr("%1 places %n %2 counter(s) on %3 (now %4).", "female", delta);
+        else
+            finalStr = tr("%1 places %n %2 counter(s) on %3 (now %4).", "male", delta);
+    } else {
+        if (isFemale(player))
+            finalStr = tr("%1 removes %n %2 counter(s) from %3 (now %4).", "female", delta);
+        else
+            finalStr = tr("%1 removes %n %2 counter(s) from %3 (now %4).", "male", delta);
+    }
+    
+    switch (counterId) {
+        case 0: colorStr = tr("red", "", delta); break;
+        case 1: colorStr = tr("yellow", "", delta); break;
+        case 2: colorStr = tr("green", "", delta); break;
+        default: ;
+    }
+    
+    appendHtml(finalStr.arg(sanitizeHtml(player->getName())).arg(colorStr).arg(cardLink(cardName)).arg(value));
 }
 
 void MessageLogWidget::logSetTapped(Player *player, CardItem *card, bool tapped)
 {
-	if (tapped)
-		soundEngine->tap();
-	else
-		soundEngine->untap();
-	
-	if (currentContext == MessageContext_MoveCard)
-		moveCardTapped.insert(card, tapped);
-	else {
-		QString str;
-		if (!card) {
-			if (isFemale(player)) {
-				if (tapped)
-					str = tr("%1 taps her permanents.", "female");
-				else
-					str = tr("%1 untaps her permanents.", "female");
-			} else {
-				if (tapped)
-					str = tr("%1 taps his permanents.", "male");
-				else
-					str = tr("%1 untaps his permanents.", "male");
-			}
-			appendHtml(str.arg(sanitizeHtml(player->getName())));
-		} else {
-			if (isFemale(player)) {
-				if (tapped)
-					str = tr("%1 taps %2.", "female");
-				else
-					str = tr("%1 untaps %2.", "female");
-			} else {
-				if (tapped)
-					str = tr("%1 taps %2.", "male");
-				else
-					str = tr("%1 untaps %2.", "male");
-			}
-			appendHtml(str.arg(sanitizeHtml(player->getName())).arg(cardLink(card->getName())));
-		}
-	}
+    if (tapped)
+        soundEngine->tap();
+    else
+        soundEngine->untap();
+    
+    if (currentContext == MessageContext_MoveCard)
+        moveCardTapped.insert(card, tapped);
+    else {
+        QString str;
+        if (!card) {
+            if (isFemale(player)) {
+                if (tapped)
+                    str = tr("%1 taps her permanents.", "female");
+                else
+                    str = tr("%1 untaps her permanents.", "female");
+            } else {
+                if (tapped)
+                    str = tr("%1 taps his permanents.", "male");
+                else
+                    str = tr("%1 untaps his permanents.", "male");
+            }
+            appendHtml(str.arg(sanitizeHtml(player->getName())));
+        } else {
+            if (isFemale(player)) {
+                if (tapped)
+                    str = tr("%1 taps %2.", "female");
+                else
+                    str = tr("%1 untaps %2.", "female");
+            } else {
+                if (tapped)
+                    str = tr("%1 taps %2.", "male");
+                else
+                    str = tr("%1 untaps %2.", "male");
+            }
+            appendHtml(str.arg(sanitizeHtml(player->getName())).arg(cardLink(card->getName())));
+        }
+    }
 }
 
 void MessageLogWidget::logSetCounter(Player *player, QString counterName, int value, int oldValue)
 {
-	QString str;
-	if (isFemale(player))
-		str = tr("%1 sets counter %2 to %3 (%4%5).", "female");
-	else
-		str = tr("%1 sets counter %2 to %3 (%4%5).", "male");
-	appendHtml(str.arg(sanitizeHtml(player->getName())).arg(QString("<font color=\"blue\">%1</font>").arg(sanitizeHtml(counterName))).arg(QString("<font color=\"blue\">%1</font>").arg(value)).arg(value > oldValue ? "+" : "").arg(value - oldValue));
+    QString str;
+    if (isFemale(player))
+        str = tr("%1 sets counter %2 to %3 (%4%5).", "female");
+    else
+        str = tr("%1 sets counter %2 to %3 (%4%5).", "male");
+    appendHtml(str.arg(sanitizeHtml(player->getName())).arg(QString("<font color=\"blue\">%1</font>").arg(sanitizeHtml(counterName))).arg(QString("<font color=\"blue\">%1</font>").arg(value)).arg(value > oldValue ? "+" : "").arg(value - oldValue));
 }
 
 void MessageLogWidget::logSetDoesntUntap(Player *player, CardItem *card, bool doesntUntap)
 {
-	QString str;
-	if (doesntUntap) {
-		if (isFemale(player))
-			str = tr("%1 sets %2 to not untap normally.", "female");
-		else
-			str = tr("%1 sets %2 to not untap normally.", "male");
-	} else {
-		if (isFemale(player))
-			str = tr("%1 sets %2 to untap normally.", "female");
-		else
-			str = tr("%1 sets %2 to untap normally.", "male");
-	}
-	appendHtml(str.arg(sanitizeHtml(player->getName())).arg(cardLink(card->getName())));
+    QString str;
+    if (doesntUntap) {
+        if (isFemale(player))
+            str = tr("%1 sets %2 to not untap normally.", "female");
+        else
+            str = tr("%1 sets %2 to not untap normally.", "male");
+    } else {
+        if (isFemale(player))
+            str = tr("%1 sets %2 to untap normally.", "female");
+        else
+            str = tr("%1 sets %2 to untap normally.", "male");
+    }
+    appendHtml(str.arg(sanitizeHtml(player->getName())).arg(cardLink(card->getName())));
 }
 
 void MessageLogWidget::logSetPT(Player *player, CardItem *card, QString newPT)
 {
-	if (currentContext == MessageContext_MoveCard)
-		moveCardPT.insert(card, newPT);
-	else {
-		QString str;
-		if (isFemale(player))
-			str = tr("%1 sets PT of %2 to %3.", "female");
-		else
-			str = tr("%1 sets PT of %2 to %3.", "male");
-		appendHtml(str.arg(sanitizeHtml(player->getName())).arg(cardLink(card->getName())).arg(QString("<font color=\"blue\">%1</font>").arg(sanitizeHtml(newPT))));
-	}
+    if (currentContext == MessageContext_MoveCard)
+        moveCardPT.insert(card, newPT);
+    else {
+        QString str;
+        if (isFemale(player))
+            str = tr("%1 sets PT of %2 to %3.", "female");
+        else
+            str = tr("%1 sets PT of %2 to %3.", "male");
+        appendHtml(str.arg(sanitizeHtml(player->getName())).arg(cardLink(card->getName())).arg(QString("<font color=\"blue\">%1</font>").arg(sanitizeHtml(newPT))));
+    }
 }
 
 void MessageLogWidget::logSetAnnotation(Player *player, CardItem *card, QString newAnnotation)
 {
-	QString str;
-	if (isFemale(player))
-		str = tr("%1 sets annotation of %2 to %3.", "female");
-	else
-		str = tr("%1 sets annotation of %2 to %3.", "male");
-	appendHtml(str.arg(sanitizeHtml(player->getName())).arg(cardLink(card->getName())).arg(QString("&quot;<font color=\"blue\">%1</font>&quot;").arg(sanitizeHtml(newAnnotation))));
+    QString str;
+    if (isFemale(player))
+        str = tr("%1 sets annotation of %2 to %3.", "female");
+    else
+        str = tr("%1 sets annotation of %2 to %3.", "male");
+    appendHtml(str.arg(sanitizeHtml(player->getName())).arg(cardLink(card->getName())).arg(QString("&quot;<font color=\"blue\">%1</font>&quot;").arg(sanitizeHtml(newAnnotation))));
 }
 
 void MessageLogWidget::logDumpZone(Player *player, CardZone *zone, int numberCards)
 {
-	if (numberCards == -1)
-		appendHtml((isFemale(player)
-			? tr("%1 is looking at %2.", "female")
-			: tr("%1 is looking at %2.", "male")
-		).arg(sanitizeHtml(player->getName()))
-		 .arg(zone->getTranslatedName(zone->getPlayer() == player, CaseLookAtZone)));
-	else
-		appendHtml((isFemale(player)
-			? tr("%1 is looking at the top %n card(s) %2.", "female", numberCards)
-			: tr("%1 is looking at the top %n card(s) %2.", "male", numberCards)
-		).arg(sanitizeHtml(player->getName()))
-		 .arg(zone->getTranslatedName(zone->getPlayer() == player, CaseTopCardsOfZone)));
+    if (numberCards == -1)
+        appendHtml((isFemale(player)
+            ? tr("%1 is looking at %2.", "female")
+            : tr("%1 is looking at %2.", "male")
+        ).arg(sanitizeHtml(player->getName()))
+         .arg(zone->getTranslatedName(zone->getPlayer() == player, CaseLookAtZone)));
+    else
+        appendHtml((isFemale(player)
+            ? tr("%1 is looking at the top %n card(s) %2.", "female", numberCards)
+            : tr("%1 is looking at the top %n card(s) %2.", "male", numberCards)
+        ).arg(sanitizeHtml(player->getName()))
+         .arg(zone->getTranslatedName(zone->getPlayer() == player, CaseTopCardsOfZone)));
 }
 
 void MessageLogWidget::logStopDumpZone(Player *player, CardZone *zone)
 {
-	appendHtml((isFemale(player)
-		? tr("%1 stops looking at %2.", "female")
-		: tr("%1 stops looking at %2.", "male")
-	).arg(sanitizeHtml(player->getName()))
-	 .arg(zone->getTranslatedName(zone->getPlayer() == player, CaseLookAtZone)));
+    appendHtml((isFemale(player)
+        ? tr("%1 stops looking at %2.", "female")
+        : tr("%1 stops looking at %2.", "male")
+    ).arg(sanitizeHtml(player->getName()))
+     .arg(zone->getTranslatedName(zone->getPlayer() == player, CaseLookAtZone)));
 }
 
 void MessageLogWidget::logRevealCards(Player *player, CardZone *zone, int cardId, QString cardName, Player *otherPlayer, bool faceDown)
 {
-	QPair<QString, QString> temp = getFromStr(zone, cardName, cardId, false);
-	bool cardNameContainsStartZone = false;
-	if (!temp.first.isEmpty()) {
-		cardNameContainsStartZone = true;
-		cardName = temp.first;
-	}
-	QString fromStr = temp.second;
-
-	QString cardStr;
-	if (cardNameContainsStartZone)
-		cardStr = cardName;
-	else if (cardName.isEmpty())
-		cardStr = tr("a card");
-	else
-		cardStr = cardLink(cardName);
-
-	QString str;
-	if (cardId == -1) {
-		if (otherPlayer) {
-			if (isFemale(player)) {
-				if (isFemale(otherPlayer))
-					str = tr("%1 reveals %2 to %3.", "p1 female, p2 female");
-				else
-					str = tr("%1 reveals %2 to %3.", "p1 female, p2 male");
-			} else {
-				if (isFemale(otherPlayer))
-					str = tr("%1 reveals %2 to %3.", "p1 male, p2 female");
-				else
-					str = tr("%1 reveals %2 to %3.", "p1 male, p2 male");
-			}
-			appendHtml(str.arg(sanitizeHtml(player->getName())).arg(zone->getTranslatedName(true, CaseRevealZone)).arg(sanitizeHtml(otherPlayer->getName())));
-		} else {
-			appendHtml((isFemale(player)
-				? tr("%1 reveals %2.", "female")
-				: tr("%1 reveals %2.", "male")
-			).arg(sanitizeHtml(player->getName()))
-			 .arg(zone->getTranslatedName(true, CaseRevealZone)));
-		}
-	} else if (cardId == -2) {
-		if (otherPlayer) {
-			if (isFemale(player)) {
-				if (isFemale(otherPlayer))
-					str = tr("%1 randomly reveals %2%3 to %4.", "p1 female, p2 female");
-				else
-					str = tr("%1 randomly reveals %2%3 to %4.", "p1 female, p2 male");
-			} else {
-				if (isFemale(otherPlayer))
-					str = tr("%1 randomly reveals %2%3 to %4.", "p1 male, p2 female");
-				else
-					str = tr("%1 randomly reveals %2%3 to %4.", "p1 male, p2 male");
-			}
-			appendHtml(str.arg(sanitizeHtml(player->getName())).arg(cardStr).arg(fromStr).arg(sanitizeHtml(otherPlayer->getName())));
-		} else {
-			if (isFemale(player))
-				appendHtml(tr("%1 randomly reveals %2%3.", "female").arg(sanitizeHtml(player->getName())).arg(cardStr).arg(fromStr));
-			else
-				appendHtml(tr("%1 randomly reveals %2%3.", "male").arg(sanitizeHtml(player->getName())).arg(cardStr).arg(fromStr));
-		}
-	} else {
-		if (faceDown && (player == otherPlayer)) {
-			if (cardName.isEmpty()) {
-				if (isFemale(player))
-					str = tr("%1 peeks at face down card #%2.", "female");
-				else
-					str = tr("%1 peeks at face down card #%2.", "male");
-				appendHtml(str.arg(sanitizeHtml(player->getName())).arg(cardId));
-			} else {
-				if (isFemale(player))
-					str = tr("%1 peeks at face down card #%2: %3.", "female");
-				else
-					str = tr("%1 peeks at face down card #%2: %3.", "male");
-				appendHtml(str.arg(sanitizeHtml(player->getName())).arg(cardId).arg(cardStr));
-			}
-		} else if (otherPlayer) {
-			if (isFemale(player)) {
-				if (isFemale(otherPlayer))
-					str = tr("%1 reveals %2%3 to %4.", "p1 female, p2 female");
-				else
-					str = tr("%1 reveals %2%3 to %4.", "p1 female, p2 male");
-			} else {
-				if (isFemale(otherPlayer))
-					str = tr("%1 reveals %2%3 to %4.", "p1 male, p2 female");
-				else
-					str = tr("%1 reveals %2%3 to %4.", "p1 male, p2 male");
-			}
-			appendHtml(str.arg(sanitizeHtml(player->getName())).arg(cardStr).arg(fromStr).arg(sanitizeHtml(otherPlayer->getName())));
-		} else {
-			if (isFemale(player))
-				appendHtml(tr("%1 reveals %2%3.", "female").arg(sanitizeHtml(player->getName())).arg(cardStr).arg(fromStr));
-			else
-				appendHtml(tr("%1 reveals %2%3.", "male").arg(sanitizeHtml(player->getName())).arg(cardStr).arg(fromStr));
-		}
-	}
+    QPair<QString, QString> temp = getFromStr(zone, cardName, cardId, false);
+    bool cardNameContainsStartZone = false;
+    if (!temp.first.isEmpty()) {
+        cardNameContainsStartZone = true;
+        cardName = temp.first;
+    }
+    QString fromStr = temp.second;
+
+    QString cardStr;
+    if (cardNameContainsStartZone)
+        cardStr = cardName;
+    else if (cardName.isEmpty())
+        cardStr = tr("a card");
+    else
+        cardStr = cardLink(cardName);
+
+    QString str;
+    if (cardId == -1) {
+        if (otherPlayer) {
+            if (isFemale(player)) {
+                if (isFemale(otherPlayer))
+                    str = tr("%1 reveals %2 to %3.", "p1 female, p2 female");
+                else
+                    str = tr("%1 reveals %2 to %3.", "p1 female, p2 male");
+            } else {
+                if (isFemale(otherPlayer))
+                    str = tr("%1 reveals %2 to %3.", "p1 male, p2 female");
+                else
+                    str = tr("%1 reveals %2 to %3.", "p1 male, p2 male");
+            }
+            appendHtml(str.arg(sanitizeHtml(player->getName())).arg(zone->getTranslatedName(true, CaseRevealZone)).arg(sanitizeHtml(otherPlayer->getName())));
+        } else {
+            appendHtml((isFemale(player)
+                ? tr("%1 reveals %2.", "female")
+                : tr("%1 reveals %2.", "male")
+            ).arg(sanitizeHtml(player->getName()))
+             .arg(zone->getTranslatedName(true, CaseRevealZone)));
+        }
+    } else if (cardId == -2) {
+        if (otherPlayer) {
+            if (isFemale(player)) {
+                if (isFemale(otherPlayer))
+                    str = tr("%1 randomly reveals %2%3 to %4.", "p1 female, p2 female");
+                else
+                    str = tr("%1 randomly reveals %2%3 to %4.", "p1 female, p2 male");
+            } else {
+                if (isFemale(otherPlayer))
+                    str = tr("%1 randomly reveals %2%3 to %4.", "p1 male, p2 female");
+                else
+                    str = tr("%1 randomly reveals %2%3 to %4.", "p1 male, p2 male");
+            }
+            appendHtml(str.arg(sanitizeHtml(player->getName())).arg(cardStr).arg(fromStr).arg(sanitizeHtml(otherPlayer->getName())));
+        } else {
+            if (isFemale(player))
+                appendHtml(tr("%1 randomly reveals %2%3.", "female").arg(sanitizeHtml(player->getName())).arg(cardStr).arg(fromStr));
+            else
+                appendHtml(tr("%1 randomly reveals %2%3.", "male").arg(sanitizeHtml(player->getName())).arg(cardStr).arg(fromStr));
+        }
+    } else {
+        if (faceDown && (player == otherPlayer)) {
+            if (cardName.isEmpty()) {
+                if (isFemale(player))
+                    str = tr("%1 peeks at face down card #%2.", "female");
+                else
+                    str = tr("%1 peeks at face down card #%2.", "male");
+                appendHtml(str.arg(sanitizeHtml(player->getName())).arg(cardId));
+            } else {
+                if (isFemale(player))
+                    str = tr("%1 peeks at face down card #%2: %3.", "female");
+                else
+                    str = tr("%1 peeks at face down card #%2: %3.", "male");
+                appendHtml(str.arg(sanitizeHtml(player->getName())).arg(cardId).arg(cardStr));
+            }
+        } else if (otherPlayer) {
+            if (isFemale(player)) {
+                if (isFemale(otherPlayer))
+                    str = tr("%1 reveals %2%3 to %4.", "p1 female, p2 female");
+                else
+                    str = tr("%1 reveals %2%3 to %4.", "p1 female, p2 male");
+            } else {
+                if (isFemale(otherPlayer))
+                    str = tr("%1 reveals %2%3 to %4.", "p1 male, p2 female");
+                else
+                    str = tr("%1 reveals %2%3 to %4.", "p1 male, p2 male");
+            }
+            appendHtml(str.arg(sanitizeHtml(player->getName())).arg(cardStr).arg(fromStr).arg(sanitizeHtml(otherPlayer->getName())));
+        } else {
+            if (isFemale(player))
+                appendHtml(tr("%1 reveals %2%3.", "female").arg(sanitizeHtml(player->getName())).arg(cardStr).arg(fromStr));
+            else
+                appendHtml(tr("%1 reveals %2%3.", "male").arg(sanitizeHtml(player->getName())).arg(cardStr).arg(fromStr));
+        }
+    }
 }
 
 void MessageLogWidget::logAlwaysRevealTopCard(Player *player, CardZone *zone, bool reveal)
 {
-	appendHtml((reveal
-		? tr("%1 is now keeping the top card %2 revealed.")
-		: tr("%1 is not revealing the top card %2 any longer.")
-		).arg(sanitizeHtml(player->getName()))
-		 .arg(zone->getTranslatedName(true, CaseTopCardsOfZone))
-	);
+    appendHtml((reveal
+        ? tr("%1 is now keeping the top card %2 revealed.")
+        : tr("%1 is not revealing the top card %2 any longer.")
+        ).arg(sanitizeHtml(player->getName()))
+         .arg(zone->getTranslatedName(true, CaseTopCardsOfZone))
+    );
 }
 
 void MessageLogWidget::logSetActivePlayer(Player *player)
 {
-	soundEngine->notification();
-	
-	QString str;
-	if (isFemale(player))
-		str = tr("It is now %1's turn.", "female");
-	else
-		str = tr("It is now %1's turn.", "male");
-	appendHtml("<br><font color=\"green\"><b>" + str.arg(player->getName()) + "</b></font><br>");
+    soundEngine->notification();
+    
+    QString str;
+    if (isFemale(player))
+        str = tr("It is now %1's turn.", "female");
+    else
+        str = tr("It is now %1's turn.", "male");
+    appendHtml("<br><font color=\"green\"><b>" + str.arg(player->getName()) + "</b></font><br>");
 }
 
 void MessageLogWidget::logSetActivePhase(int phase)
 {
-	soundEngine->notification();
-	QString phaseName;
-	switch (phase) {
-		case 0: phaseName = tr("untap step"); break;
-		case 1: phaseName = tr("upkeep step"); break;
-		case 2: phaseName = tr("draw step"); break;
-		case 3: phaseName = tr("first main phase"); break;
-		case 4: phaseName = tr("beginning of combat step"); break;
-		case 5: phaseName = tr("declare attackers step"); break;
-		case 6: phaseName = tr("declare blockers step"); break;
-		case 7: phaseName = tr("combat damage step"); break;
-		case 8: phaseName = tr("end of combat step"); break;
-		case 9: phaseName = tr("second main phase"); break;
-		case 10: phaseName = tr("ending phase"); break;
-	}
-	appendHtml("<font color=\"green\"><b>" + tr("It is now the %1.").arg(phaseName) + "</b></font>");
+    soundEngine->notification();
+    QString phaseName;
+    switch (phase) {
+        case 0: phaseName = tr("untap step"); break;
+        case 1: phaseName = tr("upkeep step"); break;
+        case 2: phaseName = tr("draw step"); break;
+        case 3: phaseName = tr("first main phase"); break;
+        case 4: phaseName = tr("beginning of combat step"); break;
+        case 5: phaseName = tr("declare attackers step"); break;
+        case 6: phaseName = tr("declare blockers step"); break;
+        case 7: phaseName = tr("combat damage step"); break;
+        case 8: phaseName = tr("end of combat step"); break;
+        case 9: phaseName = tr("second main phase"); break;
+        case 10: phaseName = tr("ending phase"); break;
+    }
+    appendHtml("<font color=\"green\"><b>" + tr("It is now the %1.").arg(phaseName) + "</b></font>");
 }
 
 void MessageLogWidget::containerProcessingStarted(const GameEventContext &_context)
 {
-	if (_context.HasExtension(Context_MoveCard::ext))
-		currentContext = MessageContext_MoveCard;
-	else if (_context.HasExtension(Context_Mulligan::ext)) {
-		const Context_Mulligan &contextMulligan = _context.GetExtension(Context_Mulligan::ext);
-		currentContext = MessageContext_Mulligan;
-		mulliganPlayer = 0;
-		mulliganNumber = contextMulligan.number();
-	}
+    if (_context.HasExtension(Context_MoveCard::ext))
+        currentContext = MessageContext_MoveCard;
+    else if (_context.HasExtension(Context_Mulligan::ext)) {
+        const Context_Mulligan &contextMulligan = _context.GetExtension(Context_Mulligan::ext);
+        currentContext = MessageContext_Mulligan;
+        mulliganPlayer = 0;
+        mulliganNumber = contextMulligan.number();
+    }
 }
 
 void MessageLogWidget::containerProcessingDone()
 {
-	if (currentContext == MessageContext_MoveCard) {
-		for (int i = 0; i < moveCardQueue.size(); ++i)
-			doMoveCard(moveCardQueue[i]);
-		moveCardQueue.clear();
-		moveCardPT.clear();
-		moveCardTapped.clear();
-	} else if (currentContext == MessageContext_Mulligan) {
-		logMulligan(mulliganPlayer, mulliganNumber);
-		mulliganPlayer = 0;
-		mulliganNumber = 0;
-	}
-	
-	currentContext = MessageContext_None;
+    if (currentContext == MessageContext_MoveCard) {
+        for (int i = 0; i < moveCardQueue.size(); ++i)
+            doMoveCard(moveCardQueue[i]);
+        moveCardQueue.clear();
+        moveCardPT.clear();
+        moveCardTapped.clear();
+    } else if (currentContext == MessageContext_Mulligan) {
+        logMulligan(mulliganPlayer, mulliganNumber);
+        mulliganPlayer = 0;
+        mulliganNumber = 0;
+    }
+    
+    currentContext = MessageContext_None;
 }
 
 void MessageLogWidget::connectToPlayer(Player *player)
 {
-	connect(player, SIGNAL(logSay(Player *, QString)), this, SLOT(logSay(Player *, QString)));
-	connect(player, SIGNAL(logShuffle(Player *, CardZone *)), this, SLOT(logShuffle(Player *, CardZone *)));
-	connect(player, SIGNAL(logRollDie(Player *, int, int)), this, SLOT(logRollDie(Player *, int, int)));
-	connect(player, SIGNAL(logCreateArrow(Player *, Player *, QString, Player *, QString, bool)), this, SLOT(logCreateArrow(Player *, Player *, QString, Player *, QString, bool)));
-	connect(player, SIGNAL(logCreateToken(Player *, QString, QString)), this, SLOT(logCreateToken(Player *, QString, QString)));
-	connect(player, SIGNAL(logSetCounter(Player *, QString, int, int)), this, SLOT(logSetCounter(Player *, QString, int, int)));
-	connect(player, SIGNAL(logSetCardCounter(Player *, QString, int, int, int)), this, SLOT(logSetCardCounter(Player *, QString, int, int, int)));
-	connect(player, SIGNAL(logSetTapped(Player *, CardItem *, bool)), this, SLOT(logSetTapped(Player *, CardItem *, bool)));
-	connect(player, SIGNAL(logSetDoesntUntap(Player *, CardItem *, bool)), this, SLOT(logSetDoesntUntap(Player *, CardItem *, bool)));
-	connect(player, SIGNAL(logSetPT(Player *, CardItem *, QString)), this, SLOT(logSetPT(Player *, CardItem *, QString)));
-	connect(player, SIGNAL(logSetAnnotation(Player *, CardItem *, QString)), this, SLOT(logSetAnnotation(Player *, CardItem *, QString)));
-	connect(player, SIGNAL(logMoveCard(Player *, CardItem *, CardZone *, int, CardZone *, int)), this, SLOT(logMoveCard(Player *, CardItem *, CardZone *, int, CardZone *, int)));
-	connect(player, SIGNAL(logFlipCard(Player *, QString, bool)), this, SLOT(logFlipCard(Player *, QString, bool)));
-	connect(player, SIGNAL(logDestroyCard(Player *, QString)), this, SLOT(logDestroyCard(Player *, QString)));
-	connect(player, SIGNAL(logAttachCard(Player *, QString, Player *, QString)), this, SLOT(logAttachCard(Player *, QString, Player *, QString)));
-	connect(player, SIGNAL(logUnattachCard(Player *, QString)), this, SLOT(logUnattachCard(Player *, QString)));
-	connect(player, SIGNAL(logDumpZone(Player *, CardZone *, int)), this, SLOT(logDumpZone(Player *, CardZone *, int)));
-	connect(player, SIGNAL(logStopDumpZone(Player *, CardZone *)), this, SLOT(logStopDumpZone(Player *, CardZone *)));
-	connect(player, SIGNAL(logDrawCards(Player *, int)), this, SLOT(logDrawCards(Player *, int)));
-	connect(player, SIGNAL(logUndoDraw(Player *, QString)), this, SLOT(logUndoDraw(Player *, QString)));
-	connect(player, SIGNAL(logRevealCards(Player *, CardZone *, int, QString, Player *, bool)), this, SLOT(logRevealCards(Player *, CardZone *, int, QString, Player *, bool)));
-	connect(player, SIGNAL(logAlwaysRevealTopCard(Player *, CardZone *, bool)), this, SLOT(logAlwaysRevealTopCard(Player *, CardZone *, bool)));
+    connect(player, SIGNAL(logSay(Player *, QString)), this, SLOT(logSay(Player *, QString)));
+    connect(player, SIGNAL(logShuffle(Player *, CardZone *)), this, SLOT(logShuffle(Player *, CardZone *)));
+    connect(player, SIGNAL(logRollDie(Player *, int, int)), this, SLOT(logRollDie(Player *, int, int)));
+    connect(player, SIGNAL(logCreateArrow(Player *, Player *, QString, Player *, QString, bool)), this, SLOT(logCreateArrow(Player *, Player *, QString, Player *, QString, bool)));
+    connect(player, SIGNAL(logCreateToken(Player *, QString, QString)), this, SLOT(logCreateToken(Player *, QString, QString)));
+    connect(player, SIGNAL(logSetCounter(Player *, QString, int, int)), this, SLOT(logSetCounter(Player *, QString, int, int)));
+    connect(player, SIGNAL(logSetCardCounter(Player *, QString, int, int, int)), this, SLOT(logSetCardCounter(Player *, QString, int, int, int)));
+    connect(player, SIGNAL(logSetTapped(Player *, CardItem *, bool)), this, SLOT(logSetTapped(Player *, CardItem *, bool)));
+    connect(player, SIGNAL(logSetDoesntUntap(Player *, CardItem *, bool)), this, SLOT(logSetDoesntUntap(Player *, CardItem *, bool)));
+    connect(player, SIGNAL(logSetPT(Player *, CardItem *, QString)), this, SLOT(logSetPT(Player *, CardItem *, QString)));
+    connect(player, SIGNAL(logSetAnnotation(Player *, CardItem *, QString)), this, SLOT(logSetAnnotation(Player *, CardItem *, QString)));
+    connect(player, SIGNAL(logMoveCard(Player *, CardItem *, CardZone *, int, CardZone *, int)), this, SLOT(logMoveCard(Player *, CardItem *, CardZone *, int, CardZone *, int)));
+    connect(player, SIGNAL(logFlipCard(Player *, QString, bool)), this, SLOT(logFlipCard(Player *, QString, bool)));
+    connect(player, SIGNAL(logDestroyCard(Player *, QString)), this, SLOT(logDestroyCard(Player *, QString)));
+    connect(player, SIGNAL(logAttachCard(Player *, QString, Player *, QString)), this, SLOT(logAttachCard(Player *, QString, Player *, QString)));
+    connect(player, SIGNAL(logUnattachCard(Player *, QString)), this, SLOT(logUnattachCard(Player *, QString)));
+    connect(player, SIGNAL(logDumpZone(Player *, CardZone *, int)), this, SLOT(logDumpZone(Player *, CardZone *, int)));
+    connect(player, SIGNAL(logStopDumpZone(Player *, CardZone *)), this, SLOT(logStopDumpZone(Player *, CardZone *)));
+    connect(player, SIGNAL(logDrawCards(Player *, int)), this, SLOT(logDrawCards(Player *, int)));
+    connect(player, SIGNAL(logUndoDraw(Player *, QString)), this, SLOT(logUndoDraw(Player *, QString)));
+    connect(player, SIGNAL(logRevealCards(Player *, CardZone *, int, QString, Player *, bool)), this, SLOT(logRevealCards(Player *, CardZone *, int, QString, Player *, bool)));
+    connect(player, SIGNAL(logAlwaysRevealTopCard(Player *, CardZone *, bool)), this, SLOT(logAlwaysRevealTopCard(Player *, CardZone *, bool)));
 }
 
 MessageLogWidget::MessageLogWidget(const TabSupervisor *_tabSupervisor, TabGame *_game, QWidget *parent)
-	: ChatView(_tabSupervisor, _game, false, parent)
+    : ChatView(_tabSupervisor, _game, false, parent)
 {
 }

cockatrice/src/messagelogwidget.h

@@ -12,81 +12,81 @@ class GameEventContext;
 class CardItem;
 
 struct LogMoveCard {
-	Player *player;
-	CardItem *card;
-	QString cardName;
-	CardZone *startZone;
-	int oldX;
-	CardZone *targetZone;
-	int newX;
+    Player *player;
+    CardItem *card;
+    QString cardName;
+    CardZone *startZone;
+    int oldX;
+    CardZone *targetZone;
+    int newX;
 };
 
 class MessageLogWidget : public ChatView {
-	Q_OBJECT
+    Q_OBJECT
 private:
-	enum MessageContext { MessageContext_None, MessageContext_MoveCard, MessageContext_Mulligan };
-	
-	QString sanitizeHtml(QString dirty) const;
-	QString cardLink(const QString &cardName) const;
-	bool isFemale(Player *player) const;
-	bool userIsFemale() const;
-	QPair<QString, QString> getFromStr(CardZone *zone, QString cardName, int position, bool ownerChange) const;
-	MessageContext currentContext;
-	
-	QList<LogMoveCard> moveCardQueue;
-	QMap<CardItem *, QString> moveCardPT;
-	QMap<CardItem *, bool> moveCardTapped;
-	
-	Player *mulliganPlayer;
-	int mulliganNumber;
+    enum MessageContext { MessageContext_None, MessageContext_MoveCard, MessageContext_Mulligan };
+    
+    QString sanitizeHtml(QString dirty) const;
+    QString cardLink(const QString &cardName) const;
+    bool isFemale(Player *player) const;
+    bool userIsFemale() const;
+    QPair<QString, QString> getFromStr(CardZone *zone, QString cardName, int position, bool ownerChange) const;
+    MessageContext currentContext;
+    
+    QList<LogMoveCard> moveCardQueue;
+    QMap<CardItem *, QString> moveCardPT;
+    QMap<CardItem *, bool> moveCardTapped;
+    
+    Player *mulliganPlayer;
+    int mulliganNumber;
 public slots:
-	void logGameJoined(int gameId);
-	void logReplayStarted(int gameId);
-	void logJoin(Player *player);
-	void logLeave(Player *player);
-	void logGameClosed();
-	void logKicked();
-	void logJoinSpectator(QString name);
-	void logLeaveSpectator(QString name);
-	void logDeckSelect(Player *player, QString deckHash);
-	void logReadyStart(Player *player);
-	void logNotReadyStart(Player *player);
-	void logSetSideboardLock(Player *player, bool locked);
-	void logConcede(Player *player);
-	void logGameStart();
-	void logConnectionStateChanged(Player *player, bool connectionState);
-	void logSay(Player *player, QString message);
-	void logSpectatorSay(QString spectatorName, UserLevelFlags spectatorUserLevel, QString message);
-	void logShuffle(Player *player, CardZone *zone);
-	void logRollDie(Player *player, int sides, int roll);
-	void logDrawCards(Player *player, int number);
-	void logUndoDraw(Player *player, QString cardName);
-	void doMoveCard(LogMoveCard &attributes);
-	void logMoveCard(Player *player, CardItem *card, CardZone *startZone, int oldX, CardZone *targetZone, int newX);
-	void logMulligan(Player *player, int number);
-	void logFlipCard(Player *player, QString cardName, bool faceDown);
-	void logDestroyCard(Player *player, QString cardName);
-	void logAttachCard(Player *player, QString cardName, Player *targetPlayer, QString targetCardName);
-	void logUnattachCard(Player *player, QString cardName);
-	void logCreateToken(Player *player, QString cardName, QString pt);
-	void logCreateArrow(Player *player, Player *startPlayer, QString startCard, Player *targetPlayer, QString targetCard, bool playerTarget);
-	void logSetCardCounter(Player *player, QString cardName, int counterId, int value, int oldValue);
-	void logSetTapped(Player *player, CardItem *card, bool tapped);
-	void logSetCounter(Player *player, QString counterName, int value, int oldValue);
-	void logSetDoesntUntap(Player *player, CardItem *card, bool doesntUntap);
-	void logSetPT(Player *player, CardItem *card, QString newPT);
-	void logSetAnnotation(Player *player, CardItem *card, QString newAnnotation);
-	void logDumpZone(Player *player, CardZone *zone, int numberCards);
-	void logStopDumpZone(Player *player, CardZone *zone);
-	void logRevealCards(Player *player, CardZone *zone, int cardId, QString cardName, Player *otherPlayer, bool faceDown);
-	void logAlwaysRevealTopCard(Player *player, CardZone *zone, bool reveal);
-	void logSetActivePlayer(Player *player);
-	void logSetActivePhase(int phase);
-	void containerProcessingStarted(const GameEventContext &context);
-	void containerProcessingDone();
+    void logGameJoined(int gameId);
+    void logReplayStarted(int gameId);
+    void logJoin(Player *player);
+    void logLeave(Player *player);
+    void logGameClosed();
+    void logKicked();
+    void logJoinSpectator(QString name);
+    void logLeaveSpectator(QString name);
+    void logDeckSelect(Player *player, QString deckHash);
+    void logReadyStart(Player *player);
+    void logNotReadyStart(Player *player);
+    void logSetSideboardLock(Player *player, bool locked);
+    void logConcede(Player *player);
+    void logGameStart();
+    void logConnectionStateChanged(Player *player, bool connectionState);
+    void logSay(Player *player, QString message);
+    void logSpectatorSay(QString spectatorName, UserLevelFlags spectatorUserLevel, QString message);
+    void logShuffle(Player *player, CardZone *zone);
+    void logRollDie(Player *player, int sides, int roll);
+    void logDrawCards(Player *player, int number);
+    void logUndoDraw(Player *player, QString cardName);
+    void doMoveCard(LogMoveCard &attributes);
+    void logMoveCard(Player *player, CardItem *card, CardZone *startZone, int oldX, CardZone *targetZone, int newX);
+    void logMulligan(Player *player, int number);
+    void logFlipCard(Player *player, QString cardName, bool faceDown);
+    void logDestroyCard(Player *player, QString cardName);
+    void logAttachCard(Player *player, QString cardName, Player *targetPlayer, QString targetCardName);
+    void logUnattachCard(Player *player, QString cardName);
+    void logCreateToken(Player *player, QString cardName, QString pt);
+    void logCreateArrow(Player *player, Player *startPlayer, QString startCard, Player *targetPlayer, QString targetCard, bool playerTarget);
+    void logSetCardCounter(Player *player, QString cardName, int counterId, int value, int oldValue);
+    void logSetTapped(Player *player, CardItem *card, bool tapped);
+    void logSetCounter(Player *player, QString counterName, int value, int oldValue);
+    void logSetDoesntUntap(Player *player, CardItem *card, bool doesntUntap);
+    void logSetPT(Player *player, CardItem *card, QString newPT);
+    void logSetAnnotation(Player *player, CardItem *card, QString newAnnotation);
+    void logDumpZone(Player *player, CardZone *zone, int numberCards);
+    void logStopDumpZone(Player *player, CardZone *zone);
+    void logRevealCards(Player *player, CardZone *zone, int cardId, QString cardName, Player *otherPlayer, bool faceDown);
+    void logAlwaysRevealTopCard(Player *player, CardZone *zone, bool reveal);
+    void logSetActivePlayer(Player *player);
+    void logSetActivePhase(int phase);
+    void containerProcessingStarted(const GameEventContext &context);
+    void containerProcessingDone();
 public:
-	void connectToPlayer(Player *player);
-	MessageLogWidget(const TabSupervisor *_tabSupervisor, TabGame *_game, QWidget *parent = 0);
+    void connectToPlayer(Player *player);
+    MessageLogWidget(const TabSupervisor *_tabSupervisor, TabGame *_game, QWidget *parent = 0);
 };
 
 #endif

cockatrice/src/pending_command.h

@@ -6,26 +6,26 @@
 #include <QVariant>
 
 class PendingCommand : public QObject {
-	Q_OBJECT
+    Q_OBJECT
 signals:
-	void finished(const Response &response, const CommandContainer &commandContainer, const QVariant &extraData);
-	void finished(Response::ResponseCode respCode);
+    void finished(const Response &response, const CommandContainer &commandContainer, const QVariant &extraData);
+    void finished(Response::ResponseCode respCode);
 private:
-	CommandContainer commandContainer;
-	QVariant extraData;
-	int ticks;
+    CommandContainer commandContainer;
+    QVariant extraData;
+    int ticks;
 public:
-	PendingCommand(const CommandContainer &_commandContainer, QVariant _extraData = QVariant())
-		: commandContainer(_commandContainer), extraData(_extraData), ticks(0) { }
-	CommandContainer &getCommandContainer() { return commandContainer; }
-	void setExtraData(const QVariant &_extraData) { extraData = _extraData; }
-	QVariant getExtraData() const { return extraData; }
-	void processResponse(const Response &response)
-	{
-		emit finished(response, commandContainer, extraData);
-		emit finished(response.response_code());
-	}
-	int tick() { return ++ticks; }
+    PendingCommand(const CommandContainer &_commandContainer, QVariant _extraData = QVariant())
+        : commandContainer(_commandContainer), extraData(_extraData), ticks(0) { }
+    CommandContainer &getCommandContainer() { return commandContainer; }
+    void setExtraData(const QVariant &_extraData) { extraData = _extraData; }
+    QVariant getExtraData() const { return extraData; }
+    void processResponse(const Response &response)
+    {
+        emit finished(response, commandContainer, extraData);
+        emit finished(response.response_code());
+    }
+    int tick() { return ++ticks; }
 };
 
 #endif 

cockatrice/src/phasestoolbar.cpp

@@ -13,239 +13,239 @@
 #include "pb/command_draw_cards.pb.h"
 
 PhaseButton::PhaseButton(const QString &_name, QGraphicsItem *parent, QAction *_doubleClickAction, bool _highlightable)
-	: QObject(), QGraphicsItem(parent), name(_name), active(false), highlightable(_highlightable), activeAnimationCounter(0), doubleClickAction(_doubleClickAction), width(50)
+    : QObject(), QGraphicsItem(parent), name(_name), active(false), highlightable(_highlightable), activeAnimationCounter(0), doubleClickAction(_doubleClickAction), width(50)
 {
-	if (highlightable) {
-		activeAnimationTimer = new QTimer(this);
-		connect(activeAnimationTimer, SIGNAL(timeout()), this, SLOT(updateAnimation()));
-		activeAnimationTimer->setSingleShot(false);
-	} else
-		activeAnimationCounter = 9.0;
-	
-	setCacheMode(DeviceCoordinateCache);
+    if (highlightable) {
+        activeAnimationTimer = new QTimer(this);
+        connect(activeAnimationTimer, SIGNAL(timeout()), this, SLOT(updateAnimation()));
+        activeAnimationTimer->setSingleShot(false);
+    } else
+        activeAnimationCounter = 9.0;
+    
+    setCacheMode(DeviceCoordinateCache);
 }
 
 QRectF PhaseButton::boundingRect() const
 {
-	return QRectF(0, 0, width, width);
+    return QRectF(0, 0, width, width);
 }
 
 void PhaseButton::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/)
 {
-	QRectF iconRect = boundingRect().adjusted(3, 3, -3, -3);
-	QRectF translatedIconRect = painter->combinedTransform().mapRect(iconRect);
-	qreal scaleFactor = translatedIconRect.width() / iconRect.width();
-	QPixmap iconPixmap = PhasePixmapGenerator::generatePixmap(round(translatedIconRect.height()), name);
-	
-	painter->setBrush(QColor(220 * (activeAnimationCounter / 10.0), 220 * (activeAnimationCounter / 10.0), 220 * (activeAnimationCounter / 10.0)));
-	painter->setPen(Qt::gray);
-	painter->drawRect(0, 0, width - 1, width - 1);
-	painter->save();
-	painter->resetTransform();
-	painter->drawPixmap(iconPixmap.rect().translated(round(3 * scaleFactor), round(3 * scaleFactor)), iconPixmap, iconPixmap.rect());
-	painter->restore();
-	
-	painter->setBrush(QColor(0, 0, 0, 255 * ((10 - activeAnimationCounter) / 15.0)));
-	painter->setPen(Qt::gray);
-	painter->drawRect(0, 0, width - 1, width - 1);
+    QRectF iconRect = boundingRect().adjusted(3, 3, -3, -3);
+    QRectF translatedIconRect = painter->combinedTransform().mapRect(iconRect);
+    qreal scaleFactor = translatedIconRect.width() / iconRect.width();
+    QPixmap iconPixmap = PhasePixmapGenerator::generatePixmap(round(translatedIconRect.height()), name);
+    
+    painter->setBrush(QColor(220 * (activeAnimationCounter / 10.0), 220 * (activeAnimationCounter / 10.0), 220 * (activeAnimationCounter / 10.0)));
+    painter->setPen(Qt::gray);
+    painter->drawRect(0, 0, width - 1, width - 1);
+    painter->save();
+    painter->resetTransform();
+    painter->drawPixmap(iconPixmap.rect().translated(round(3 * scaleFactor), round(3 * scaleFactor)), iconPixmap, iconPixmap.rect());
+    painter->restore();
+    
+    painter->setBrush(QColor(0, 0, 0, 255 * ((10 - activeAnimationCounter) / 15.0)));
+    painter->setPen(Qt::gray);
+    painter->drawRect(0, 0, width - 1, width - 1);
 }
 
 void PhaseButton::setWidth(double _width)
 {
-	prepareGeometryChange();
-	width = _width;
+    prepareGeometryChange();
+    width = _width;
 }
 
 void PhaseButton::setActive(bool _active)
 {
-	if ((active == _active) || !highlightable)
-		return;
-	
-	active = _active;
-	activeAnimationTimer->start(50);
+    if ((active == _active) || !highlightable)
+        return;
+    
+    active = _active;
+    activeAnimationTimer->start(50);
 }
 
 void PhaseButton::updateAnimation()
 {
-	if (!highlightable)
-		return;
-	
-	if (active) {
-		if (++activeAnimationCounter >= 10)
-			activeAnimationTimer->stop();
-	} else {
-		if (--activeAnimationCounter <= 0)
-			activeAnimationTimer->stop();
-	}
-	update();
+    if (!highlightable)
+        return;
+    
+    if (active) {
+        if (++activeAnimationCounter >= 10)
+            activeAnimationTimer->stop();
+    } else {
+        if (--activeAnimationCounter <= 0)
+            activeAnimationTimer->stop();
+    }
+    update();
 }
 
 void PhaseButton::mousePressEvent(QGraphicsSceneMouseEvent * /*event*/)
 {
-	emit clicked();
+    emit clicked();
 }
 
 void PhaseButton::mouseDoubleClickEvent(QGraphicsSceneMouseEvent */*event*/)
 {
-	triggerDoubleClickAction();
+    triggerDoubleClickAction();
 }
 
 void PhaseButton::triggerDoubleClickAction()
 {
-	if (doubleClickAction)
-		doubleClickAction->trigger();
+    if (doubleClickAction)
+        doubleClickAction->trigger();
 }
 
 PhasesToolbar::PhasesToolbar(QGraphicsItem *parent)
-	: QGraphicsItem(parent), width(100), height(100)
-{
-	QAction *aUntapAll = new QAction(this);
-	connect(aUntapAll, SIGNAL(triggered()), this, SLOT(actUntapAll()));
-	QAction *aDrawCard = new QAction(this);
-	connect(aDrawCard, SIGNAL(triggered()), this, SLOT(actDrawCard()));
-	
-	PhaseButton *untapButton = new PhaseButton("untap", this, aUntapAll);
-	PhaseButton *upkeepButton = new PhaseButton("upkeep", this);
-	PhaseButton *drawButton = new PhaseButton("draw", this, aDrawCard);
-	PhaseButton *main1Button = new PhaseButton("main1", this);
-	PhaseButton *combatStartButton = new PhaseButton("combat_start", this);
-	PhaseButton *combatAttackersButton = new PhaseButton("combat_attackers", this);
-	PhaseButton *combatBlockersButton = new PhaseButton("combat_blockers", this);
-	PhaseButton *combatDamageButton = new PhaseButton("combat_damage", this);
-	PhaseButton *combatEndButton = new PhaseButton("combat_end", this);
-	PhaseButton *main2Button = new PhaseButton("main2", this);
-	PhaseButton *cleanupButton = new PhaseButton("cleanup", this);
-	
-	buttonList << untapButton << upkeepButton << drawButton << main1Button << combatStartButton
-		<< combatAttackersButton << combatBlockersButton << combatDamageButton << combatEndButton
-		<< main2Button << cleanupButton;
-	
-	for (int i = 0; i < buttonList.size(); ++i)
-		connect(buttonList[i], SIGNAL(clicked()), this, SLOT(phaseButtonClicked()));
-	
-	nextTurnButton = new PhaseButton("nextturn", this, 0, false);
-	connect(nextTurnButton, SIGNAL(clicked()), this, SLOT(actNextTurn()));
-	
-	rearrangeButtons();
-	
-	retranslateUi();
+    : QGraphicsItem(parent), width(100), height(100)
+{
+    QAction *aUntapAll = new QAction(this);
+    connect(aUntapAll, SIGNAL(triggered()), this, SLOT(actUntapAll()));
+    QAction *aDrawCard = new QAction(this);
+    connect(aDrawCard, SIGNAL(triggered()), this, SLOT(actDrawCard()));
+    
+    PhaseButton *untapButton = new PhaseButton("untap", this, aUntapAll);
+    PhaseButton *upkeepButton = new PhaseButton("upkeep", this);
+    PhaseButton *drawButton = new PhaseButton("draw", this, aDrawCard);
+    PhaseButton *main1Button = new PhaseButton("main1", this);
+    PhaseButton *combatStartButton = new PhaseButton("combat_start", this);
+    PhaseButton *combatAttackersButton = new PhaseButton("combat_attackers", this);
+    PhaseButton *combatBlockersButton = new PhaseButton("combat_blockers", this);
+    PhaseButton *combatDamageButton = new PhaseButton("combat_damage", this);
+    PhaseButton *combatEndButton = new PhaseButton("combat_end", this);
+    PhaseButton *main2Button = new PhaseButton("main2", this);
+    PhaseButton *cleanupButton = new PhaseButton("cleanup", this);
+    
+    buttonList << untapButton << upkeepButton << drawButton << main1Button << combatStartButton
+        << combatAttackersButton << combatBlockersButton << combatDamageButton << combatEndButton
+        << main2Button << cleanupButton;
+    
+    for (int i = 0; i < buttonList.size(); ++i)
+        connect(buttonList[i], SIGNAL(clicked()), this, SLOT(phaseButtonClicked()));
+    
+    nextTurnButton = new PhaseButton("nextturn", this, 0, false);
+    connect(nextTurnButton, SIGNAL(clicked()), this, SLOT(actNextTurn()));
+    
+    rearrangeButtons();
+    
+    retranslateUi();
 }
 
 QRectF PhasesToolbar::boundingRect() const
 {
-	return QRectF(0, 0, width, height);
+    return QRectF(0, 0, width, height);
 }
 
 void PhasesToolbar::retranslateUi()
 {
-	for (int i = 0; i < buttonList.size(); ++i)
-		buttonList[i]->setToolTip(getLongPhaseName(i));
+    for (int i = 0; i < buttonList.size(); ++i)
+        buttonList[i]->setToolTip(getLongPhaseName(i));
 }
 
 QString PhasesToolbar::getLongPhaseName(int phase) const
 {
-	switch (phase) {
-		case 0: return tr("Untap step");
-		case 1: return tr("Upkeep step");
-		case 2: return tr("Draw step");
-		case 3: return tr("First main phase");
-		case 4: return tr("Beginning of combat step");
-		case 5: return tr("Declare attackers step");
-		case 6: return tr("Declare blockers step");
-		case 7: return tr("Combat damage step");
-		case 8: return tr("End of combat step");
-		case 9: return tr("Second main phase");
-		case 10: return tr("End of turn step");
-		default: return QString();
-	}
+    switch (phase) {
+        case 0: return tr("Untap step");
+        case 1: return tr("Upkeep step");
+        case 2: return tr("Draw step");
+        case 3: return tr("First main phase");
+        case 4: return tr("Beginning of combat step");
+        case 5: return tr("Declare attackers step");
+        case 6: return tr("Declare blockers step");
+        case 7: return tr("Combat damage step");
+        case 8: return tr("End of combat step");
+        case 9: return tr("Second main phase");
+        case 10: return tr("End of turn step");
+        default: return QString();
+    }
 }
 
 void PhasesToolbar::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/)
 {
-	painter->fillRect(boundingRect(), QColor(50, 50, 50));
+    painter->fillRect(boundingRect(), QColor(50, 50, 50));
 }
 
 const double PhasesToolbar::marginSize = 3;
 
 void PhasesToolbar::rearrangeButtons()
 {
-	for (int i = 0; i < buttonList.size(); ++i)
-		buttonList[i]->setWidth(symbolSize);
-	nextTurnButton->setWidth(symbolSize);
-	
-	double y = marginSize;
-	buttonList[0]->setPos(marginSize, y);
-	buttonList[1]->setPos(marginSize, y += symbolSize);
-	buttonList[2]->setPos(marginSize, y += symbolSize);
-	y += ySpacing;
-	buttonList[3]->setPos(marginSize, y += symbolSize);
-	y += ySpacing;
-	buttonList[4]->setPos(marginSize, y += symbolSize);
-	buttonList[5]->setPos(marginSize, y += symbolSize);
-	buttonList[6]->setPos(marginSize, y += symbolSize);
-	buttonList[7]->setPos(marginSize, y += symbolSize);
-	buttonList[8]->setPos(marginSize, y += symbolSize);
-	y += ySpacing;
-	buttonList[9]->setPos(marginSize, y += symbolSize);
-	y += ySpacing;
-	buttonList[10]->setPos(marginSize, y += symbolSize);
-	y += ySpacing;
-	y += ySpacing;
-	nextTurnButton->setPos(marginSize, y += symbolSize);
+    for (int i = 0; i < buttonList.size(); ++i)
+        buttonList[i]->setWidth(symbolSize);
+    nextTurnButton->setWidth(symbolSize);
+    
+    double y = marginSize;
+    buttonList[0]->setPos(marginSize, y);
+    buttonList[1]->setPos(marginSize, y += symbolSize);
+    buttonList[2]->setPos(marginSize, y += symbolSize);
+    y += ySpacing;
+    buttonList[3]->setPos(marginSize, y += symbolSize);
+    y += ySpacing;
+    buttonList[4]->setPos(marginSize, y += symbolSize);
+    buttonList[5]->setPos(marginSize, y += symbolSize);
+    buttonList[6]->setPos(marginSize, y += symbolSize);
+    buttonList[7]->setPos(marginSize, y += symbolSize);
+    buttonList[8]->setPos(marginSize, y += symbolSize);
+    y += ySpacing;
+    buttonList[9]->setPos(marginSize, y += symbolSize);
+    y += ySpacing;
+    buttonList[10]->setPos(marginSize, y += symbolSize);
+    y += ySpacing;
+    y += ySpacing;
+    nextTurnButton->setPos(marginSize, y += symbolSize);
 }
 
 void PhasesToolbar::setHeight(double _height)
 {
-	prepareGeometryChange();
-	
-	height = _height;
-	ySpacing = (height - 2 * marginSize) / (buttonCount * 5 + spaceCount);
-	symbolSize = ySpacing * 5;
-	width = symbolSize + 2 * marginSize;
-	
-	rearrangeButtons();
+    prepareGeometryChange();
+    
+    height = _height;
+    ySpacing = (height - 2 * marginSize) / (buttonCount * 5 + spaceCount);
+    symbolSize = ySpacing * 5;
+    width = symbolSize + 2 * marginSize;
+    
+    rearrangeButtons();
 }
 
 void PhasesToolbar::setActivePhase(int phase)
 {
-	if (phase >= buttonList.size())
-		return;
-	
-	for (int i = 0; i < buttonList.size(); ++i)
-		buttonList[i]->setActive(i == phase);
+    if (phase >= buttonList.size())
+        return;
+    
+    for (int i = 0; i < buttonList.size(); ++i)
+        buttonList[i]->setActive(i == phase);
 }
 
 void PhasesToolbar::phaseButtonClicked()
 {
-	PhaseButton *button = qobject_cast<PhaseButton *>(sender());
-	if (button->getActive())
-		button->triggerDoubleClickAction();
-	
-	Command_SetActivePhase cmd;
-	cmd.set_phase(buttonList.indexOf(button));
-	
-	emit sendGameCommand(cmd, -1);
+    PhaseButton *button = qobject_cast<PhaseButton *>(sender());
+    if (button->getActive())
+        button->triggerDoubleClickAction();
+    
+    Command_SetActivePhase cmd;
+    cmd.set_phase(buttonList.indexOf(button));
+    
+    emit sendGameCommand(cmd, -1);
 }
 
 void PhasesToolbar::actNextTurn()
 {
-	emit sendGameCommand(Command_NextTurn(), -1);
+    emit sendGameCommand(Command_NextTurn(), -1);
 }
 
 void PhasesToolbar::actUntapAll()
 {
-	Command_SetCardAttr cmd;
-	cmd.set_zone("table");
-	cmd.set_attribute(AttrTapped);
-	cmd.set_attr_value("0");
-	
-	emit sendGameCommand(cmd, -1);
+    Command_SetCardAttr cmd;
+    cmd.set_zone("table");
+    cmd.set_attribute(AttrTapped);
+    cmd.set_attr_value("0");
+    
+    emit sendGameCommand(cmd, -1);
 }
 
 void PhasesToolbar::actDrawCard()
 {
-	Command_DrawCards cmd;
-	cmd.set_number(1);
-	
-	emit sendGameCommand(cmd, -1);
+    Command_DrawCards cmd;
+    cmd.set_number(1);
+    
+    emit sendGameCommand(cmd, -1);
 }

cockatrice/src/phasestoolbar.h

@@ -10,62 +10,62 @@ class Player;
 class GameCommand;
 
 class PhaseButton : public QObject, public QGraphicsItem {
-	Q_OBJECT
+    Q_OBJECT
 private:
-	QString name;
-	bool active, highlightable;
-	int activeAnimationCounter;
-	QTimer *activeAnimationTimer;
-	QAction *doubleClickAction;
-	double width;
-	
-	void updatePixmap(QPixmap &pixmap);
+    QString name;
+    bool active, highlightable;
+    int activeAnimationCounter;
+    QTimer *activeAnimationTimer;
+    QAction *doubleClickAction;
+    double width;
+    
+    void updatePixmap(QPixmap &pixmap);
 private slots:
-	void updateAnimation();
+    void updateAnimation();
 public:
-	PhaseButton(const QString &_name, QGraphicsItem *parent = 0, QAction *_doubleClickAction = 0, bool _highlightable = true);
-	QRectF boundingRect() const;
-	void setWidth(double _width);
-	void setActive(bool _active);
-	bool getActive() const { return active; }
-	void triggerDoubleClickAction();
+    PhaseButton(const QString &_name, QGraphicsItem *parent = 0, QAction *_doubleClickAction = 0, bool _highlightable = true);
+    QRectF boundingRect() const;
+    void setWidth(double _width);
+    void setActive(bool _active);
+    bool getActive() const { return active; }
+    void triggerDoubleClickAction();
 signals:
-	void clicked();
+    void clicked();
 protected:
-	void paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/);
-	void mousePressEvent(QGraphicsSceneMouseEvent *event);
-	void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/);
+    void mousePressEvent(QGraphicsSceneMouseEvent *event);
+    void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
 };
 
 class PhasesToolbar : public QObject, public QGraphicsItem {
-	Q_OBJECT
+    Q_OBJECT
 private:
-	QList<PhaseButton *> buttonList;
-	PhaseButton *nextTurnButton;
-	double width, height, ySpacing, symbolSize;
-	static const int buttonCount = 12;
-	static const int spaceCount = 6;
-	static const double marginSize;
-	void rearrangeButtons();
+    QList<PhaseButton *> buttonList;
+    PhaseButton *nextTurnButton;
+    double width, height, ySpacing, symbolSize;
+    static const int buttonCount = 12;
+    static const int spaceCount = 6;
+    static const double marginSize;
+    void rearrangeButtons();
 public:
-	PhasesToolbar(QGraphicsItem *parent = 0);
-	QRectF boundingRect() const;
-	void retranslateUi();
-	void setHeight(double _height);
-	double getWidth() const { return width; }
-	int phaseCount() const { return buttonList.size(); }
-	QString getLongPhaseName(int phase) const;
+    PhasesToolbar(QGraphicsItem *parent = 0);
+    QRectF boundingRect() const;
+    void retranslateUi();
+    void setHeight(double _height);
+    double getWidth() const { return width; }
+    int phaseCount() const { return buttonList.size(); }
+    QString getLongPhaseName(int phase) const;
 public slots:
-	void setActivePhase(int phase);
+    void setActivePhase(int phase);
 private slots:
-	void phaseButtonClicked();
-	void actNextTurn();
-	void actUntapAll();
-	void actDrawCard();
+    void phaseButtonClicked();
+    void actNextTurn();
+    void actUntapAll();
+    void actDrawCard();
 signals:
-	void sendGameCommand(const ::google::protobuf::Message &command, int playerId);
+    void sendGameCommand(const ::google::protobuf::Message &command, int playerId);
 protected:
-	void paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/);
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/);
 };
 
 #endif