From bbac3e0de1625d3ed264b42a3378e2bddc75e1be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Fri, 13 Jun 2025 04:34:12 +0200 Subject: [PATCH] Lint. --- .../card_group_display_widget.cpp | 6 +++--- .../card_group_display_widget.h | 10 +++++----- .../flat_card_group_display_widget.h | 8 ++++---- .../ui/widgets/cards/deck_card_zone_display_widget.cpp | 6 +++--- .../ui/widgets/cards/deck_card_zone_display_widget.h | 2 +- .../visual_deck_editor/visual_deck_editor_widget.cpp | 9 ++++++--- .../visual_deck_editor/visual_deck_editor_widget.h | 2 +- common/decklist.h | 3 ++- 8 files changed, 25 insertions(+), 21 deletions(-) diff --git a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp b/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp index 5f156cd49..173050e27 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp +++ b/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp @@ -16,9 +16,9 @@ CardGroupDisplayWidget::CardGroupDisplayWidget(QWidget *parent, QStringList _activeSortCriteria, int bannerOpacity, CardSizeWidget *_cardSizeWidget) - : QWidget(parent), deckListModel(_deckListModel), trackedIndex(_trackedIndex), zoneName(_zoneName), cardGroupCategory(_cardGroupCategory), - activeGroupCriteria(_activeGroupCriteria), activeSortCriteria(_activeSortCriteria), - cardSizeWidget(_cardSizeWidget) + : QWidget(parent), deckListModel(_deckListModel), trackedIndex(_trackedIndex), zoneName(_zoneName), + cardGroupCategory(_cardGroupCategory), activeGroupCriteria(_activeGroupCriteria), + activeSortCriteria(_activeSortCriteria), cardSizeWidget(_cardSizeWidget) { layout = new QVBoxLayout(this); setLayout(layout); diff --git a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.h b/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.h index 17aff072e..e24b2b254 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.h +++ b/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/card_group_display_widget.h @@ -28,7 +28,7 @@ public: DeckListModel *deckListModel; QPersistentModelIndex trackedIndex; - QHash indexToWidgetMap; + QHash indexToWidgetMap; QString zoneName; QString cardGroupCategory; QString activeGroupCriteria; @@ -38,7 +38,7 @@ public: public slots: void onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card); void onHover(CardInfoPtr card); - virtual QWidget* constructWidgetForIndex(int rowIndex); + virtual QWidget *constructWidgetForIndex(int rowIndex); virtual void updateCardDisplays(); virtual void onCardAddition(const QModelIndex &parent, int first, int last); virtual void onCardRemoval(const QModelIndex &parent, int first, int last); @@ -53,12 +53,12 @@ protected: QVBoxLayout *layout; BannerWidget *banner; - virtual QWidget* getLayoutParent() + virtual QWidget *getLayoutParent() { return this; } - virtual void addToLayout(QWidget* toAdd) + virtual void addToLayout(QWidget *toAdd) { layout->addWidget(toAdd); } @@ -68,7 +68,7 @@ protected: layout->insertWidget(insertAt, toInsert); } - virtual void removeFromLayout(QWidget* toRemove) + virtual void removeFromLayout(QWidget *toRemove) { layout->removeWidget(toRemove); } diff --git a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.h b/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.h index f9737bbd2..fd2c01ebb 100644 --- a/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.h +++ b/cockatrice/src/client/ui/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.h @@ -20,7 +20,7 @@ public: CardSizeWidget *cardSizeWidget); public slots: - QWidget* constructWidgetForIndex(int row) override; + QWidget *constructWidgetForIndex(int row) override; void resizeEvent(QResizeEvent *event) override; void onCardAddition(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: FlowWidget *flowWidget; - QWidget* getLayoutParent() override + QWidget *getLayoutParent() override { return flowWidget; } - void addToLayout(QWidget* toAdd) override + void addToLayout(QWidget *toAdd) override { flowWidget->addWidget(toAdd); } @@ -43,7 +43,7 @@ private: flowWidget->insertWidgetAtIndex(toInsert, insertAt); } - void removeFromLayout(QWidget* toRemove) override + void removeFromLayout(QWidget *toRemove) override { flowWidget->removeWidget(toRemove); } diff --git a/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp b/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp index b54de5304..7d250c370 100644 --- a/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp +++ b/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp @@ -17,9 +17,9 @@ DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent, int bannerOpacity, int subBannerOpacity, CardSizeWidget *_cardSizeWidget) - : QWidget(parent), deckListModel(_deckListModel), trackedIndex(_trackedIndex), zoneName(_zoneName), activeGroupCriteria(_activeGroupCriteria), - activeSortCriteria(_activeSortCriteria), displayType(_displayType), bannerOpacity(bannerOpacity), - subBannerOpacity(subBannerOpacity), cardSizeWidget(_cardSizeWidget) + : QWidget(parent), deckListModel(_deckListModel), trackedIndex(_trackedIndex), zoneName(_zoneName), + activeGroupCriteria(_activeGroupCriteria), activeSortCriteria(_activeSortCriteria), displayType(_displayType), + bannerOpacity(bannerOpacity), subBannerOpacity(subBannerOpacity), cardSizeWidget(_cardSizeWidget) { layout = new QVBoxLayout(this); setLayout(layout); diff --git a/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.h b/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.h index 7da726023..8a21ec3d3 100644 --- a/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.h +++ b/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.h @@ -65,7 +65,7 @@ private: QWidget *cardGroupContainer; QVBoxLayout *cardGroupLayout; OverlapWidget *overlapWidget; - QHash indexToWidgetMap; + QHash indexToWidgetMap; }; #endif // DECK_CARD_ZONE_DISPLAY_WIDGET_H diff --git a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp index 9c8ba2deb..d58baacad 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp @@ -221,10 +221,12 @@ void VisualDeckEditorWidget::onCardAddition(const QModelIndex &parent, int first } 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); 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, &VisualDeckEditorWidget::cleanupInvalidZones); connect(this, &VisualDeckEditorWidget::activeSortCriteriaChanged, zoneDisplayWidget, @@ -265,7 +267,8 @@ void VisualDeckEditorWidget::constructZoneWidgetsFromDeckListModel() } 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); connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardHovered, this, &VisualDeckEditorWidget::onHover); connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardClicked, this, &VisualDeckEditorWidget::onCardClick); diff --git a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.h b/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.h index d62b2ca42..6f43d624c 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.h +++ b/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.h @@ -86,7 +86,7 @@ private: QVBoxLayout *zoneContainerLayout; // OverlapControlWidget *overlapControlWidget; QWidget *container; - QHash indexToWidgetMap; + QHash indexToWidgetMap; }; #endif // VISUAL_DECK_EDITOR_H diff --git a/common/decklist.h b/common/decklist.h index 28007df77..1db3b3991 100644 --- a/common/decklist.h +++ b/common/decklist.h @@ -153,7 +153,8 @@ public: class AbstractDecklistCardNode : public AbstractDecklistNode { 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;