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

Cleanup Lints

Browse source
This commit is contained in:
ZeldaZach 2024-12-18 21:16:43 -05:00
parent 9dd2dd4929
commit d66d0b108b
No known key found for this signature in database
9 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/client/ui/widgets/general/display/dynamic_font_size_label.cpp
View file

@ -30,7 +30,7 @@ void DynamicFontSizeLabel::paintEvent(QPaintEvent *event)
// LOG(true, "Paint delay" << ((float)timer.nsecsElapsed())/1000000.0 << " mS"); // 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(); QFont font = widget->font();
const QRect widgetRect = widget->contentsRect(); const QRect widgetRect = widget->contentsRect();

2
cockatrice/src/client/ui/widgets/general/display/dynamic_font_size_label.h
View file

@ -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 */ /* This method overwrite stylesheet */
void setTextColor(QColor color); void setTextColor(QColor color);

2
cockatrice/src/client/ui/widgets/printing_selector/card_amount_widget.cpp
View file

@ -21,7 +21,7 @@ CardAmountWidget::CardAmountWidget(QWidget *parent,
QSlider *cardSizeSlider, QSlider *cardSizeSlider,
CardInfoPtr &rootCard, CardInfoPtr &rootCard,
CardInfoPerSet &setInfoForCard, CardInfoPerSet &setInfoForCard,
const QString& zoneName) const QString &zoneName)
: QWidget(parent), deckEditor(deckEditor), deckModel(deckModel), deckView(deckView), cardSizeSlider(cardSizeSlider), : QWidget(parent), deckEditor(deckEditor), deckModel(deckModel), deckView(deckView), cardSizeSlider(cardSizeSlider),
rootCard(rootCard), setInfoForCard(setInfoForCard), zoneName(zoneName), hovered(false) rootCard(rootCard), setInfoForCard(setInfoForCard), zoneName(zoneName), hovered(false)
{ {

2
cockatrice/src/client/ui/widgets/printing_selector/card_amount_widget.h
View file

@ -26,7 +26,7 @@ public:
QSlider *cardSizeSlider, QSlider *cardSizeSlider,
CardInfoPtr &rootCard, CardInfoPtr &rootCard,
CardInfoPerSet &setInfoForCard, CardInfoPerSet &setInfoForCard,
const QString& zoneName); const QString &zoneName);
int countCardsInZone(const QString &deckZone); int countCardsInZone(const QString &deckZone);
public slots: public slots:

7
cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_display_widget.cpp
View file

@ -33,10 +33,11 @@ PrintingSelectorCardDisplayWidget::PrintingSelectorCardDisplayWidget(QWidget *pa
QTreeView *_deckView, QTreeView *_deckView,
QSlider *_cardSizeSlider, QSlider *_cardSizeSlider,
CardInfoPtr _rootCard, CardInfoPtr _rootCard,
const CardInfoPerSet& _setInfoForCard, const CardInfoPerSet &_setInfoForCard,
QString &_currentZone) QString &_currentZone)
: QWidget(parent), deckEditor(_deckEditor), deckModel(_deckModel), deckView(_deckView), cardSizeSlider(_cardSizeSlider), : QWidget(parent), deckEditor(_deckEditor), deckModel(_deckModel), deckView(_deckView),
rootCard(std::move(_rootCard)), setInfoForCard(_setInfoForCard), currentZone(_currentZone) cardSizeSlider(_cardSizeSlider), rootCard(std::move(_rootCard)), setInfoForCard(_setInfoForCard),
currentZone(_currentZone)
{ {
layout = new QVBoxLayout(this); layout = new QVBoxLayout(this);
setLayout(layout); setLayout(layout);

2
cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_display_widget.h
View file

@ -29,7 +29,7 @@ public:
QTreeView *_deckView, QTreeView *_deckView,
QSlider *_cardSizeSlider, QSlider *_cardSizeSlider,
CardInfoPtr _rootCard, CardInfoPtr _rootCard,
const CardInfoPerSet& _setInfoForCard, const CardInfoPerSet &_setInfoForCard,
QString &_currentZone); QString &_currentZone);
public slots: public slots:

4
cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
View file

@ -30,8 +30,8 @@ PrintingSelectorCardOverlayWidget::PrintingSelectorCardOverlayWidget(QWidget *pa
QSlider *_cardSizeSlider, QSlider *_cardSizeSlider,
CardInfoPtr _rootCard, CardInfoPtr _rootCard,
const CardInfoPerSet &_setInfoForCard) const CardInfoPerSet &_setInfoForCard)
: QWidget(parent), deckEditor(_deckEditor), deckModel(_deckModel), deckView(_deckView), cardSizeSlider(_cardSizeSlider), rootCard(std::move(_rootCard)), : QWidget(parent), deckEditor(_deckEditor), deckModel(_deckModel), deckView(_deckView),
setInfoForCard(_setInfoForCard) cardSizeSlider(_cardSizeSlider), rootCard(std::move(_rootCard)), setInfoForCard(_setInfoForCard)
{ {
// Set up the main layout // Set up the main layout
auto *mainLayout = new QVBoxLayout(this); auto *mainLayout = new QVBoxLayout(this);

8
cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
View file

@ -7,8 +7,8 @@ const QString PrintingSelectorCardSortingWidget::SORT_OPTIONS_ALPHABETICAL = tr(
const QString PrintingSelectorCardSortingWidget::SORT_OPTIONS_PREFERENCE = tr("Preference"); const QString PrintingSelectorCardSortingWidget::SORT_OPTIONS_PREFERENCE = tr("Preference");
const QString PrintingSelectorCardSortingWidget::SORT_OPTIONS_RELEASE_DATE = tr("Release Date"); const QString PrintingSelectorCardSortingWidget::SORT_OPTIONS_RELEASE_DATE = tr("Release Date");
const QStringList PrintingSelectorCardSortingWidget::SORT_OPTIONS = { const QStringList PrintingSelectorCardSortingWidget::SORT_OPTIONS = {SORT_OPTIONS_ALPHABETICAL, SORT_OPTIONS_PREFERENCE,
SORT_OPTIONS_ALPHABETICAL, SORT_OPTIONS_PREFERENCE, SORT_OPTIONS_RELEASE_DATE}; SORT_OPTIONS_RELEASE_DATE};
/** /**
* @brief A widget for sorting and filtering card sets in the Printing Selector. * @brief A widget for sorting and filtering card sets in the Printing Selector.
@ -128,7 +128,7 @@ QList<CardInfoPerSet> PrintingSelectorCardSortingWidget::sortSets(CardInfoPerSet
* @return A filtered list of card sets. * @return A filtered list of card sets.
*/ */
QList<CardInfoPerSet> PrintingSelectorCardSortingWidget::filterSets(const QList<CardInfoPerSet> &sets, QList<CardInfoPerSet> PrintingSelectorCardSortingWidget::filterSets(const QList<CardInfoPerSet> &sets,
const QString& searchText) const QString &searchText)
{ {
if (searchText.isEmpty()) { if (searchText.isEmpty()) {
return sets; return sets;
@ -160,7 +160,7 @@ QList<CardInfoPerSet> PrintingSelectorCardSortingWidget::filterSets(const QList<
* @return A list of card sets with the printings contained in the deck prepended. * @return A list of card sets with the printings contained in the deck prepended.
*/ */
QList<CardInfoPerSet> PrintingSelectorCardSortingWidget::prependPrintingsInDeck(const QList<CardInfoPerSet> &sets, QList<CardInfoPerSet> PrintingSelectorCardSortingWidget::prependPrintingsInDeck(const QList<CardInfoPerSet> &sets,
const CardInfoPtr& selectedCard, const CardInfoPtr &selectedCard,
DeckListModel *deckModel) DeckListModel *deckModel)
{ {
if (!selectedCard) { if (!selectedCard) {

7
cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.h
View file

@ -13,9 +13,10 @@ class PrintingSelectorCardSortingWidget : public QWidget
public: public:
explicit PrintingSelectorCardSortingWidget(PrintingSelector *parent); explicit PrintingSelectorCardSortingWidget(PrintingSelector *parent);
QList<CardInfoPerSet> sortSets(CardInfoPerSetMap cardInfoPerSets); QList<CardInfoPerSet> sortSets(CardInfoPerSetMap cardInfoPerSets);
static QList<CardInfoPerSet> filterSets(const QList<CardInfoPerSet> &sets, const QString& searchText) ; static QList<CardInfoPerSet> filterSets(const QList<CardInfoPerSet> &sets, const QString &searchText);
static QList<CardInfoPerSet> static QList<CardInfoPerSet> prependPrintingsInDeck(const QList<CardInfoPerSet> &sets,
prependPrintingsInDeck(const QList<CardInfoPerSet> &sets, const CardInfoPtr& selectedCard, DeckListModel *deckModel); const CardInfoPtr &selectedCard,
DeckListModel *deckModel);
public slots: public slots:
void updateSortOrder(); void updateSortOrder();