From 401b34d22c7dff6cd0a8c6953623bcb1529fb856 Mon Sep 17 00:00:00 2001 From: Buce Date: Tue, 18 Feb 2014 20:05:22 -0600 Subject: [PATCH] Clean up DecklistModel::addCard() Split common functionality out of the if-else block. --- cockatrice/src/decklistmodel.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/cockatrice/src/decklistmodel.cpp b/cockatrice/src/decklistmodel.cpp index 758e540b..829a1e5a 100644 --- a/cockatrice/src/decklistmodel.cpp +++ b/cockatrice/src/decklistmodel.cpp @@ -244,24 +244,20 @@ QModelIndex DeckListModel::addCard(const QString &cardName, const QString &zoneN QString cardType = info->getMainCardType(); InnerDecklistNode *cardTypeNode = createNodeIfNeeded(cardType, zoneNode); + QModelIndex parentIndex = nodeToIndex(cardTypeNode); DecklistModelCardNode *cardNode = dynamic_cast(cardTypeNode->findChild(cardName)); if (!cardNode) { DecklistCardNode *decklistCard = deckList->addCard(cardName, zoneName); - QModelIndex parentIndex = nodeToIndex(cardTypeNode); beginInsertRows(parentIndex, cardTypeNode->size(), cardTypeNode->size()); cardNode = new DecklistModelCardNode(decklistCard, cardTypeNode); endInsertRows(); - sort(lastKnownColumn, lastKnownOrder); - emitRecursiveUpdates(parentIndex); - return nodeToIndex(cardNode); } else { cardNode->setNumber(cardNode->getNumber() + 1); - QModelIndex parentIndex = nodeToIndex(cardTypeNode); - sort(lastKnownColumn, lastKnownOrder); - emitRecursiveUpdates(parentIndex); deckList->updateDeckHash(); - return nodeToIndex(cardNode); } + sort(lastKnownColumn, lastKnownOrder); + emitRecursiveUpdates(parentIndex); + return nodeToIndex(cardNode); } QModelIndex DeckListModel::nodeToIndex(AbstractDecklistNode *node) const