jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-21 09:52:16 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reformat code so the linter will stop yelling at me.

Browse source
This commit is contained in:
Lukas Brübach 2024-11-15 15:45:54 +01:00
parent e70533a9bc
commit d6035cec56
5 changed files with 26 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cockatrice/src/client/tabs/tab_game.cpp
View file

@ -8,7 +8,6 @@
#include "../../dialogs/dlg_manage_sets.h"
#include "../../game/board/arrow_item.h"
#include "../../game/cards/card_database.h"
#include "../../client/ui/widgets/cards/card_info_frame_widget.h"
#include "../../game/cards/card_database_manager.h"
#include "../../game/cards/card_item.h"
#include "../../game/game_scene.h"

22
cockatrice/src/deck/deck_list_model.cpp
View file

@ -245,10 +245,10 @@ bool DeckListModel::setData(const QModelIndex &index, const QVariant &value, con
break;
case 2:
node->setCardSetCode(value.toString());
break;
break;
case 3:
node->setCardCollectorNumber(value.toString());
break;
break;
default:
return false;
}
@ -299,7 +299,8 @@ InnerDecklistNode *DeckListModel::createNodeIfNeeded(const QString &name, InnerD
return newNode;
}
DecklistModelCardNode *DeckListModel::findCardNode(const QString &cardName, const QString &zoneName, const QString &uuid) const
DecklistModelCardNode *
DeckListModel::findCardNode(const QString &cardName, const QString &zoneName, const QString &uuid) const
{
InnerDecklistNode *zoneNode, *typeNode;
CardInfoPtr info;
@ -341,12 +342,17 @@ QModelIndex DeckListModel::findCard(const QString &cardName, const QString &zone
QModelIndex DeckListModel::addPreferredPrintingCard(const QString &cardName, const QString &zoneName, bool abAddAnyway)
{
return addCard(cardName, CardDatabaseManager::getInstance()->getPreferredSetForCard(cardName), zoneName, abAddAnyway);
return addCard(cardName, CardDatabaseManager::getInstance()->getPreferredSetForCard(cardName), zoneName,
abAddAnyway);
}
QModelIndex DeckListModel::addCard(const QString &cardName, const CardInfoPerSet cardInfoSet, const QString &zoneName, bool abAddAnyway)
QModelIndex DeckListModel::addCard(const QString &cardName,
const CardInfoPerSet cardInfoSet,
const QString &zoneName,
bool abAddAnyway)
{
CardInfoPtr cardInfo = CardDatabaseManager::getInstance()->getCardByNameAndUUID(cardName, cardInfoSet.getProperty("uuid"));
CardInfoPtr cardInfo =
CardDatabaseManager::getInstance()->getCardByNameAndUUID(cardName, cardInfoSet.getProperty("uuid"));
if (cardInfo == nullptr) {
if (abAddAnyway) {
@ -369,8 +375,8 @@ QModelIndex DeckListModel::addCard(const QString &cardName, const CardInfoPerSet
auto *cardNode = dynamic_cast<DecklistModelCardNode *>(
cardTypeNode->findCardChildByNameAndUUID(cardName, cardInfoSet.getProperty("uuid")));
if (!cardNode) {
auto *decklistCard = deckList->addCard(
cardInfo->getName(), zoneName, cardInfoSet.getProperty("uuid"), cardInfoSet.getProperty("num"));
auto *decklistCard = deckList->addCard(cardInfo->getName(), zoneName, cardInfoSet.getProperty("uuid"),
cardInfoSet.getProperty("num"));
beginInsertRows(parentIndex, static_cast<int>(cardTypeNode->size()), static_cast<int>(cardTypeNode->size()));
cardNode = new DecklistModelCardNode(decklistCard, cardTypeNode);
endInsertRows();

5
cockatrice/src/deck/deck_list_model.h
View file

@ -1,8 +1,8 @@
#ifndef DECKLISTMODEL_H
#define DECKLISTMODEL_H
#include "decklist.h"
#include "../game/cards/card_database.h"
#include "decklist.h"
#include <QAbstractItemModel>
#include <QList>
@ -101,7 +101,8 @@ private:
Qt::SortOrder lastKnownOrder;
InnerDecklistNode *createNodeIfNeeded(const QString &name, InnerDecklistNode *parent);
QModelIndex nodeToIndex(AbstractDecklistNode *node) const;
DecklistModelCardNode *findCardNode(const QString &cardName, const QString &zoneName, const QString &uuid = "") const;
DecklistModelCardNode *
findCardNode(const QString &cardName, const QString &zoneName, const QString &uuid = "") const;
void emitRecursiveUpdates(const QModelIndex &index);
void sortHelper(InnerDecklistNode *node, Qt::SortOrder order);

8
cockatrice/src/deck/deck_view.cpp
View file

@ -68,7 +68,10 @@ void DeckViewCardDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
event->accept();
}
DeckViewCard::DeckViewCard(const QString &_name, const QString &_uuid, const QString &_originZone, QGraphicsItem *parent)
DeckViewCard::DeckViewCard(const QString &_name,
const QString &_uuid,
const QString &_originZone,
QGraphicsItem *parent)
: AbstractCardItem(_name, _uuid, 0, -1, parent), originZone(_originZone), dragItem(0)
{
setAcceptHoverEvents(true);
@ -354,7 +357,8 @@ void DeckViewScene::rebuildTree()
continue;
for (int k = 0; k < currentCard->getNumber(); ++k) {
DeckViewCard *newCard = new DeckViewCard(currentCard->getName(), currentCard->getCardUuid(), currentZone->getName(), container);
DeckViewCard *newCard = new DeckViewCard(currentCard->getName(), currentCard->getCardUuid(),
currentZone->getName(), container);
container->addCard(newCard);
emit newCardAdded(newCard);
}

6
common/server_card.cpp
View file

@ -28,9 +28,9 @@
#include <QVariant>
Server_Card::Server_Card(QString _name, QString _uuid, int _id, int _coord_x, int _coord_y, Server_CardZone *_zone)
: zone(_zone), id(_id), coord_x(_coord_x), coord_y(_coord_y), name(_name), uuid(_uuid), tapped(false), attacking(false),
facedown(false), color(), ptString(), annotation(), destroyOnZoneChange(false), doesntUntap(false), parentCard(0),
stashedCard(nullptr)
: zone(_zone), id(_id), coord_x(_coord_x), coord_y(_coord_y), name(_name), uuid(_uuid), tapped(false),
attacking(false), facedown(false), color(), ptString(), annotation(), destroyOnZoneChange(false),
doesntUntap(false), parentCard(0), stashedCard(nullptr)
{
}