From 9ba3f21730143df53f6fa7b3ab1ca6138d7436e1 Mon Sep 17 00:00:00 2001
From: Mitchell Rosen <mitchellwrosen@gmail.com>
Date: Mon, 20 Feb 2017 02:48:12 -0500
Subject: [PATCH] Fix indentation (and Debug build) (#2418)

* Fix indentation (and Debug build)

* More indentation fixes
---
 cockatrice/src/arrowitem.cpp     | 103 +++++++++++++++++--------------
 cockatrice/src/decklistmodel.cpp |   6 +-
 2 files changed, 59 insertions(+), 50 deletions(-)

diff --git a/cockatrice/src/arrowitem.cpp b/cockatrice/src/arrowitem.cpp
index 059abbb3..a42206b8 100644
--- a/cockatrice/src/arrowitem.cpp
+++ b/cockatrice/src/arrowitem.cpp
@@ -130,18 +130,19 @@ void ArrowItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
     }
 
     QList<QGraphicsItem *> colliding = scene()->items(event->scenePos());
-    for (int i = 0; i < colliding.size(); ++i)
+    for (int i = 0; i < colliding.size(); ++i) {
         if (qgraphicsitem_cast<CardItem *>(colliding[i])) {
             event->ignore();
             return;
         }
+    }
 
-        event->accept();
-        if (event->button() == Qt::RightButton) {
-            Command_DeleteArrow cmd;
-            cmd.set_arrow_id(id);
-            player->sendGameCommand(cmd);
-        }
+    event->accept();
+    if (event->button() == Qt::RightButton) {
+        Command_DeleteArrow cmd;
+        cmd.set_arrow_id(id);
+        player->sendGameCommand(cmd);
+    }
 }
 
 ArrowDragItem::ArrowDragItem(Player *_owner, ArrowTarget *_startItem, const QColor &_color)
@@ -166,35 +167,39 @@ void ArrowDragItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
     QList<QGraphicsItem *> colliding = scene()->items(endPos);
     ArrowTarget *cursorItem = 0;
     qreal cursorItemZ = -1;
-    for (int i = colliding.size() - 1; i >= 0; i--)
-        if (qgraphicsitem_cast<PlayerTarget *>(colliding.at(i)) || qgraphicsitem_cast<CardItem *>(colliding.at(i)))
+    for (int i = colliding.size() - 1; i >= 0; i--) {
+        if (qgraphicsitem_cast<PlayerTarget *>(colliding.at(i)) || qgraphicsitem_cast<CardItem *>(colliding.at(i))) {
             if (colliding.at(i)->zValue() > cursorItemZ) {
                 cursorItem = static_cast<ArrowTarget *>(colliding.at(i));
                 cursorItemZ = cursorItem->zValue();
             }
-            if ((cursorItem != targetItem) && targetItem) {
-                targetItem->setBeingPointedAt(false);
-                targetItem->removeArrowTo(this);
-            }
-            if (!cursorItem) {
-                fullColor = false;
-                targetItem = 0;
-                updatePath(endPos);
-            } else {
-                if (cursorItem != targetItem) {
-                    fullColor = true;
-                    if (cursorItem != startItem) {
-                        cursorItem->setBeingPointedAt(true);
-                        cursorItem->addArrowTo(this);
-                    }
-                    targetItem = cursorItem;
-                }
-                updatePath();
-            }
-            update();
+        }
+    }
 
-            for (int i = 0; i < childArrows.size(); ++i)
-                childArrows[i]->mouseMoveEvent(event);
+    if ((cursorItem != targetItem) && targetItem) {
+        targetItem->setBeingPointedAt(false);
+        targetItem->removeArrowTo(this);
+    }
+    if (!cursorItem) {
+        fullColor = false;
+        targetItem = 0;
+        updatePath(endPos);
+    } else {
+        if (cursorItem != targetItem) {
+            fullColor = true;
+            if (cursorItem != startItem) {
+                cursorItem->setBeingPointedAt(true);
+                cursorItem->addArrowTo(this);
+            }
+            targetItem = cursorItem;
+        }
+        updatePath();
+    }
+    update();
+
+    for (int i = 0; i < childArrows.size(); ++i) {
+        childArrows[i]->mouseMoveEvent(event);
+    }
 }
 
 void ArrowDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
@@ -257,27 +262,31 @@ void ArrowAttachItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
     QList<QGraphicsItem *> colliding = scene()->items(endPos);
     ArrowTarget *cursorItem = 0;
     qreal cursorItemZ = -1;
-    for (int i = colliding.size() - 1; i >= 0; i--)
-        if (qgraphicsitem_cast<CardItem *>(colliding.at(i)))
+    for (int i = colliding.size() - 1; i >= 0; i--) {
+        if (qgraphicsitem_cast<CardItem *>(colliding.at(i))) {
             if (colliding.at(i)->zValue() > cursorItemZ) {
                 cursorItem = static_cast<ArrowTarget *>(colliding.at(i));
                 cursorItemZ = cursorItem->zValue();
             }
+        }
+    }
 
-            if ((cursorItem != targetItem) && targetItem)
-                targetItem->setBeingPointedAt(false);
-            if (!cursorItem) {
-                fullColor = false;
-                targetItem = 0;
-                updatePath(endPos);
-            } else {
-                fullColor = true;
-                if (cursorItem != startItem)
-                    cursorItem->setBeingPointedAt(true);
-                targetItem = cursorItem;
-                updatePath();
-            }
-            update();
+    if ((cursorItem != targetItem) && targetItem) {
+        targetItem->setBeingPointedAt(false);
+    }
+    if (!cursorItem) {
+        fullColor = false;
+        targetItem = 0;
+        updatePath(endPos);
+    } else {
+        fullColor = true;
+        if (cursorItem != startItem) {
+            cursorItem->setBeingPointedAt(true);
+        }
+        targetItem = cursorItem;
+        updatePath();
+    }
+    update();
 }
 
 void ArrowAttachItem::mouseReleaseEvent(QGraphicsSceneMouseEvent * /*event*/)
diff --git a/cockatrice/src/decklistmodel.cpp b/cockatrice/src/decklistmodel.cpp
index 380a3c26..38ea9f4e 100644
--- a/cockatrice/src/decklistmodel.cpp
+++ b/cockatrice/src/decklistmodel.cpp
@@ -79,7 +79,7 @@ QVariant DeckListModel::data(const QModelIndex &index, int role) const
 //    debugIndexInfo("data", index);
     if (!index.isValid())
         return QVariant();
-        if (index.column() >= columnCount())
+    if (index.column() >= columnCount())
         return QVariant();
 
     AbstractDecklistNode *temp = static_cast<AbstractDecklistNode *>(index.internalPointer());
@@ -136,7 +136,7 @@ QVariant DeckListModel::headerData(int section, Qt::Orientation orientation, int
 {
     if ((role != Qt::DisplayRole) || (orientation != Qt::Horizontal))
         return QVariant();
-        if (section >= columnCount())
+    if (section >= columnCount())
         return QVariant();
     switch (section) {
                 case 0: return tr("Number");
@@ -310,7 +310,7 @@ void DeckListModel::sortHelper(InnerDecklistNode *node, Qt::SortOrder order)
     // Sort children of node and save the information needed to
     // update the list of persistent indexes.
     QVector<QPair<int, int> > sortResult = node->sort(order);
-    
+
     QModelIndexList from, to;
     int columns = columnCount();
     for (int i = sortResult.size() - 1; i >= 0; --i) {