From d66d0b108b918800fa54f099d74deed774b4fa1b Mon Sep 17 00:00:00 2001 From: ZeldaZach Date: Wed, 18 Dec 2024 21:16:43 -0500 Subject: [PATCH] Cleanup Lints --- .../widgets/general/display/dynamic_font_size_label.cpp | 2 +- .../ui/widgets/general/display/dynamic_font_size_label.h | 2 +- .../ui/widgets/printing_selector/card_amount_widget.cpp | 4 ++-- .../ui/widgets/printing_selector/card_amount_widget.h | 2 +- .../printing_selector_card_display_widget.cpp | 7 ++++--- .../printing_selector_card_display_widget.h | 2 +- .../printing_selector_card_overlay_widget.cpp | 4 ++-- .../printing_selector_card_sorting_widget.cpp | 8 ++++---- .../printing_selector_card_sorting_widget.h | 7 ++++--- 9 files changed, 20 insertions(+), 18 deletions(-) diff --git a/cockatrice/src/client/ui/widgets/general/display/dynamic_font_size_label.cpp b/cockatrice/src/client/ui/widgets/general/display/dynamic_font_size_label.cpp index 12da08b2d..ed4db1fd3 100644 --- a/cockatrice/src/client/ui/widgets/general/display/dynamic_font_size_label.cpp +++ b/cockatrice/src/client/ui/widgets/general/display/dynamic_font_size_label.cpp @@ -30,7 +30,7 @@ void DynamicFontSizeLabel::paintEvent(QPaintEvent *event) // LOG(true, "Paint delay" << ((float)timer.nsecsElapsed())/1000000.0 << " mS"); } -float DynamicFontSizeLabel::getWidgetMaximumFontSize(QWidget *widget, const QString& text) +float DynamicFontSizeLabel::getWidgetMaximumFontSize(QWidget *widget, const QString &text) { QFont font = widget->font(); const QRect widgetRect = widget->contentsRect(); diff --git a/cockatrice/src/client/ui/widgets/general/display/dynamic_font_size_label.h b/cockatrice/src/client/ui/widgets/general/display/dynamic_font_size_label.h index 0e7d7ab9d..2f66227e9 100644 --- a/cockatrice/src/client/ui/widgets/general/display/dynamic_font_size_label.h +++ b/cockatrice/src/client/ui/widgets/general/display/dynamic_font_size_label.h @@ -15,7 +15,7 @@ public: { } - static float getWidgetMaximumFontSize(QWidget *widget, const QString& text); + static float getWidgetMaximumFontSize(QWidget *widget, const QString &text); /* This method overwrite stylesheet */ void setTextColor(QColor color); diff --git a/cockatrice/src/client/ui/widgets/printing_selector/card_amount_widget.cpp b/cockatrice/src/client/ui/widgets/printing_selector/card_amount_widget.cpp index 4315e37d1..5f5ca3c5b 100644 --- a/cockatrice/src/client/ui/widgets/printing_selector/card_amount_widget.cpp +++ b/cockatrice/src/client/ui/widgets/printing_selector/card_amount_widget.cpp @@ -21,7 +21,7 @@ CardAmountWidget::CardAmountWidget(QWidget *parent, QSlider *cardSizeSlider, CardInfoPtr &rootCard, CardInfoPerSet &setInfoForCard, - const QString& zoneName) + const QString &zoneName) : QWidget(parent), deckEditor(deckEditor), deckModel(deckModel), deckView(deckView), cardSizeSlider(cardSizeSlider), rootCard(rootCard), setInfoForCard(setInfoForCard), zoneName(zoneName), hovered(false) { @@ -234,7 +234,7 @@ void CardAmountWidget::offsetCountAtIndex(const QModelIndex &idx, int offset) void CardAmountWidget::decrementCardHelper(const QString &zone) { QModelIndex idx = deckModel->findCard(rootCard->getName(), zone, setInfoForCard.getProperty("uuid"), - setInfoForCard.getProperty("num")); + setInfoForCard.getProperty("num")); offsetCountAtIndex(idx, -1); } diff --git a/cockatrice/src/client/ui/widgets/printing_selector/card_amount_widget.h b/cockatrice/src/client/ui/widgets/printing_selector/card_amount_widget.h index 737aa0dc9..3d4e5c4b8 100644 --- a/cockatrice/src/client/ui/widgets/printing_selector/card_amount_widget.h +++ b/cockatrice/src/client/ui/widgets/printing_selector/card_amount_widget.h @@ -26,7 +26,7 @@ public: QSlider *cardSizeSlider, CardInfoPtr &rootCard, CardInfoPerSet &setInfoForCard, - const QString& zoneName); + const QString &zoneName); int countCardsInZone(const QString &deckZone); public slots: diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_display_widget.cpp b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_display_widget.cpp index 7dc58ac24..176cc793f 100644 --- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_display_widget.cpp +++ b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_display_widget.cpp @@ -33,10 +33,11 @@ PrintingSelectorCardDisplayWidget::PrintingSelectorCardDisplayWidget(QWidget *pa QTreeView *_deckView, QSlider *_cardSizeSlider, CardInfoPtr _rootCard, - const CardInfoPerSet& _setInfoForCard, + const CardInfoPerSet &_setInfoForCard, QString &_currentZone) - : QWidget(parent), deckEditor(_deckEditor), deckModel(_deckModel), deckView(_deckView), cardSizeSlider(_cardSizeSlider), - rootCard(std::move(_rootCard)), setInfoForCard(_setInfoForCard), currentZone(_currentZone) + : QWidget(parent), deckEditor(_deckEditor), deckModel(_deckModel), deckView(_deckView), + cardSizeSlider(_cardSizeSlider), rootCard(std::move(_rootCard)), setInfoForCard(_setInfoForCard), + currentZone(_currentZone) { layout = new QVBoxLayout(this); setLayout(layout); diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_display_widget.h b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_display_widget.h index de7e7b01d..f8b351c84 100644 --- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_display_widget.h +++ b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_display_widget.h @@ -29,7 +29,7 @@ public: QTreeView *_deckView, QSlider *_cardSizeSlider, CardInfoPtr _rootCard, - const CardInfoPerSet& _setInfoForCard, + const CardInfoPerSet &_setInfoForCard, QString &_currentZone); public slots: diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp index e8d6e5b68..b996a6aff 100644 --- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp +++ b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp @@ -30,8 +30,8 @@ PrintingSelectorCardOverlayWidget::PrintingSelectorCardOverlayWidget(QWidget *pa QSlider *_cardSizeSlider, CardInfoPtr _rootCard, const CardInfoPerSet &_setInfoForCard) - : QWidget(parent), deckEditor(_deckEditor), deckModel(_deckModel), deckView(_deckView), cardSizeSlider(_cardSizeSlider), rootCard(std::move(_rootCard)), - setInfoForCard(_setInfoForCard) + : QWidget(parent), deckEditor(_deckEditor), deckModel(_deckModel), deckView(_deckView), + cardSizeSlider(_cardSizeSlider), rootCard(std::move(_rootCard)), setInfoForCard(_setInfoForCard) { // Set up the main layout auto *mainLayout = new QVBoxLayout(this); diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp index 08e0c9127..aac777332 100644 --- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp +++ b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp @@ -7,8 +7,8 @@ const QString PrintingSelectorCardSortingWidget::SORT_OPTIONS_ALPHABETICAL = tr( const QString PrintingSelectorCardSortingWidget::SORT_OPTIONS_PREFERENCE = tr("Preference"); const QString PrintingSelectorCardSortingWidget::SORT_OPTIONS_RELEASE_DATE = tr("Release Date"); -const QStringList PrintingSelectorCardSortingWidget::SORT_OPTIONS = { - SORT_OPTIONS_ALPHABETICAL, SORT_OPTIONS_PREFERENCE, SORT_OPTIONS_RELEASE_DATE}; +const QStringList PrintingSelectorCardSortingWidget::SORT_OPTIONS = {SORT_OPTIONS_ALPHABETICAL, SORT_OPTIONS_PREFERENCE, + SORT_OPTIONS_RELEASE_DATE}; /** * @brief A widget for sorting and filtering card sets in the Printing Selector. @@ -128,7 +128,7 @@ QList PrintingSelectorCardSortingWidget::sortSets(CardInfoPerSet * @return A filtered list of card sets. */ QList PrintingSelectorCardSortingWidget::filterSets(const QList &sets, - const QString& searchText) + const QString &searchText) { if (searchText.isEmpty()) { return sets; @@ -160,7 +160,7 @@ QList PrintingSelectorCardSortingWidget::filterSets(const QList< * @return A list of card sets with the printings contained in the deck prepended. */ QList PrintingSelectorCardSortingWidget::prependPrintingsInDeck(const QList &sets, - const CardInfoPtr& selectedCard, + const CardInfoPtr &selectedCard, DeckListModel *deckModel) { if (!selectedCard) { diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.h b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.h index 40d8665e2..6c9efa4e6 100644 --- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.h +++ b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.h @@ -13,9 +13,10 @@ class PrintingSelectorCardSortingWidget : public QWidget public: explicit PrintingSelectorCardSortingWidget(PrintingSelector *parent); QList sortSets(CardInfoPerSetMap cardInfoPerSets); - static QList filterSets(const QList &sets, const QString& searchText) ; - static QList - prependPrintingsInDeck(const QList &sets, const CardInfoPtr& selectedCard, DeckListModel *deckModel); + static QList filterSets(const QList &sets, const QString &searchText); + static QList prependPrintingsInDeck(const QList &sets, + const CardInfoPtr &selectedCard, + DeckListModel *deckModel); public slots: void updateSortOrder();