jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-14 22:42:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Lint.

Browse source
This commit is contained in:
Lukas Brübach 2025-06-13 04:34:12 +02:00
parent 96457802eb
commit bbac3e0de1
8 changed files with 25 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp
View file

@ -16,9 +16,9 @@ CardGroupDisplayWidget::CardGroupDisplayWidget(QWidget *parent,
QStringList _activeSortCriteria, QStringList _activeSortCriteria,
int bannerOpacity, int bannerOpacity,
CardSizeWidget *_cardSizeWidget) CardSizeWidget *_cardSizeWidget)
: QWidget(parent), deckListModel(_deckListModel), trackedIndex(_trackedIndex), zoneName(_zoneName), cardGroupCategory(_cardGroupCategory), : QWidget(parent), deckListModel(_deckListModel), trackedIndex(_trackedIndex), zoneName(_zoneName),
activeGroupCriteria(_activeGroupCriteria), activeSortCriteria(_activeSortCriteria), cardGroupCategory(_cardGroupCategory), activeGroupCriteria(_activeGroupCriteria),
cardSizeWidget(_cardSizeWidget) activeSortCriteria(_activeSortCriteria), cardSizeWidget(_cardSizeWidget)
{ {
layout = new QVBoxLayout(this); layout = new QVBoxLayout(this);
setLayout(layout); setLayout(layout);

10
cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.h
View file

@ -28,7 +28,7 @@ public:
DeckListModel *deckListModel; DeckListModel *deckListModel;
QPersistentModelIndex trackedIndex; QPersistentModelIndex trackedIndex;
QHash<QPersistentModelIndex, QWidget*> indexToWidgetMap; QHash<QPersistentModelIndex, QWidget *> indexToWidgetMap;
QString zoneName; QString zoneName;
QString cardGroupCategory; QString cardGroupCategory;
QString activeGroupCriteria; QString activeGroupCriteria;
@ -38,7 +38,7 @@ public:
public slots: public slots:
void onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card); void onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card);
void onHover(CardInfoPtr card); void onHover(CardInfoPtr card);
virtual QWidget* constructWidgetForIndex(int rowIndex); virtual QWidget *constructWidgetForIndex(int rowIndex);
virtual void updateCardDisplays(); virtual void updateCardDisplays();
virtual void onCardAddition(const QModelIndex &parent, int first, int last); virtual void onCardAddition(const QModelIndex &parent, int first, int last);
virtual void onCardRemoval(const QModelIndex &parent, int first, int last); virtual void onCardRemoval(const QModelIndex &parent, int first, int last);
@ -53,12 +53,12 @@ protected:
QVBoxLayout *layout; QVBoxLayout *layout;
BannerWidget *banner; BannerWidget *banner;
virtual QWidget* getLayoutParent() virtual QWidget *getLayoutParent()
{ {
return this; return this;
} }
virtual void addToLayout(QWidget* toAdd) virtual void addToLayout(QWidget *toAdd)
{ {
layout->addWidget(toAdd); layout->addWidget(toAdd);
} }
@ -68,7 +68,7 @@ protected:
layout->insertWidget(insertAt, toInsert); layout->insertWidget(insertAt, toInsert);
} }
virtual void removeFromLayout(QWidget* toRemove) virtual void removeFromLayout(QWidget *toRemove)
{ {
layout->removeWidget(toRemove); layout->removeWidget(toRemove);
} }

8
cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.h
View file

@ -20,7 +20,7 @@ public:
CardSizeWidget *cardSizeWidget); CardSizeWidget *cardSizeWidget);
public slots: public slots:
QWidget* constructWidgetForIndex(int row) override; QWidget *constructWidgetForIndex(int row) override;
void resizeEvent(QResizeEvent *event) override; void resizeEvent(QResizeEvent *event) override;
void onCardAddition(const QModelIndex &parent, int first, int last) override; void onCardAddition(const QModelIndex &parent, int first, int last) override;
void onCardRemoval(const QModelIndex &parent, int first, int last) override; void onCardRemoval(const QModelIndex &parent, int first, int last) override;
@ -28,12 +28,12 @@ public slots:
private: private:
FlowWidget *flowWidget; FlowWidget *flowWidget;
QWidget* getLayoutParent() override QWidget *getLayoutParent() override
{ {
return flowWidget; return flowWidget;
} }
void addToLayout(QWidget* toAdd) override void addToLayout(QWidget *toAdd) override
{ {
flowWidget->addWidget(toAdd); flowWidget->addWidget(toAdd);
} }
@ -43,7 +43,7 @@ private:
flowWidget->insertWidgetAtIndex(toInsert, insertAt); flowWidget->insertWidgetAtIndex(toInsert, insertAt);
} }
void removeFromLayout(QWidget* toRemove) override void removeFromLayout(QWidget *toRemove) override
{ {
flowWidget->removeWidget(toRemove); flowWidget->removeWidget(toRemove);
} }

6
cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp
View file

@ -17,9 +17,9 @@ DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent,
int bannerOpacity, int bannerOpacity,
int subBannerOpacity, int subBannerOpacity,
CardSizeWidget *_cardSizeWidget) CardSizeWidget *_cardSizeWidget)
: QWidget(parent), deckListModel(_deckListModel), trackedIndex(_trackedIndex), zoneName(_zoneName), activeGroupCriteria(_activeGroupCriteria), : QWidget(parent), deckListModel(_deckListModel), trackedIndex(_trackedIndex), zoneName(_zoneName),
activeSortCriteria(_activeSortCriteria), displayType(_displayType), bannerOpacity(bannerOpacity), activeGroupCriteria(_activeGroupCriteria), activeSortCriteria(_activeSortCriteria), displayType(_displayType),
subBannerOpacity(subBannerOpacity), cardSizeWidget(_cardSizeWidget) bannerOpacity(bannerOpacity), subBannerOpacity(subBannerOpacity), cardSizeWidget(_cardSizeWidget)
{ {
layout = new QVBoxLayout(this); layout = new QVBoxLayout(this);
setLayout(layout); setLayout(layout);

2
cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.h
View file

@ -65,7 +65,7 @@ private:
QWidget *cardGroupContainer; QWidget *cardGroupContainer;
QVBoxLayout *cardGroupLayout; QVBoxLayout *cardGroupLayout;
OverlapWidget *overlapWidget; OverlapWidget *overlapWidget;
QHash<QPersistentModelIndex, QWidget*> indexToWidgetMap; QHash<QPersistentModelIndex, QWidget *> indexToWidgetMap;
}; };
#endif // DECK_CARD_ZONE_DISPLAY_WIDGET_H #endif // DECK_CARD_ZONE_DISPLAY_WIDGET_H

9
cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
View file

@ -221,10 +221,12 @@ void VisualDeckEditorWidget::onCardAddition(const QModelIndex &parent, int first
} }
DeckCardZoneDisplayWidget *zoneDisplayWidget = new DeckCardZoneDisplayWidget( DeckCardZoneDisplayWidget *zoneDisplayWidget = new DeckCardZoneDisplayWidget(
zoneContainer, deckListModel, index, deckListModel->data(index.sibling(index.row(), 1), Qt::EditRole).toString(), activeGroupCriteria, zoneContainer, deckListModel, index,
deckListModel->data(index.sibling(index.row(), 1), Qt::EditRole).toString(), activeGroupCriteria,
activeSortCriteria, currentDisplayType, 20, 10, cardSizeWidget); activeSortCriteria, currentDisplayType, 20, 10, cardSizeWidget);
connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardHovered, this, &VisualDeckEditorWidget::onHover); connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardHovered, this, &VisualDeckEditorWidget::onHover);
connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardClicked, this, &VisualDeckEditorWidget::onCardClick); connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardClicked, this,
&VisualDeckEditorWidget::onCardClick);
connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::requestCleanup, this, connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::requestCleanup, this,
&VisualDeckEditorWidget::cleanupInvalidZones); &VisualDeckEditorWidget::cleanupInvalidZones);
connect(this, &VisualDeckEditorWidget::activeSortCriteriaChanged, zoneDisplayWidget, connect(this, &VisualDeckEditorWidget::activeSortCriteriaChanged, zoneDisplayWidget,
@ -265,7 +267,8 @@ void VisualDeckEditorWidget::constructZoneWidgetsFromDeckListModel()
} }
DeckCardZoneDisplayWidget *zoneDisplayWidget = new DeckCardZoneDisplayWidget( DeckCardZoneDisplayWidget *zoneDisplayWidget = new DeckCardZoneDisplayWidget(
zoneContainer, deckListModel, index, deckListModel->data(index.sibling(index.row(), 1), Qt::EditRole).toString(), activeGroupCriteria, zoneContainer, deckListModel, index,
deckListModel->data(index.sibling(index.row(), 1), Qt::EditRole).toString(), activeGroupCriteria,
activeSortCriteria, currentDisplayType, 20, 10, cardSizeWidget); activeSortCriteria, currentDisplayType, 20, 10, cardSizeWidget);
connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardHovered, this, &VisualDeckEditorWidget::onHover); connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardHovered, this, &VisualDeckEditorWidget::onHover);
connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardClicked, this, &VisualDeckEditorWidget::onCardClick); connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardClicked, this, &VisualDeckEditorWidget::onCardClick);

2
cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.h
View file

@ -86,7 +86,7 @@ private:
QVBoxLayout *zoneContainerLayout; QVBoxLayout *zoneContainerLayout;
// OverlapControlWidget *overlapControlWidget; // OverlapControlWidget *overlapControlWidget;
QWidget *container; QWidget *container;
QHash<QPersistentModelIndex, QWidget*> indexToWidgetMap; QHash<QPersistentModelIndex, QWidget *> indexToWidgetMap;
}; };
#endif // VISUAL_DECK_EDITOR_H #endif // VISUAL_DECK_EDITOR_H

3
common/decklist.h
View file

@ -153,7 +153,8 @@ public:
class AbstractDecklistCardNode : public AbstractDecklistNode class AbstractDecklistCardNode : public AbstractDecklistNode
{ {
public: public:
explicit AbstractDecklistCardNode(InnerDecklistNode *_parent = nullptr, int position = -1) : AbstractDecklistNode(_parent, position) explicit AbstractDecklistCardNode(InnerDecklistNode *_parent = nullptr, int position = -1)
: AbstractDecklistNode(_parent, position)
{ {
} }
virtual int getNumber() const = 0; virtual int getNumber() const = 0;