mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-09 09:33:57 -07:00
don't store constructor args in fields if they're just passed
This commit is contained in:
parent
3b9db1febc
commit
6624cd8457
7 changed files with 25 additions and 41 deletions
|
|
@ -23,8 +23,7 @@ AllZonesCardAmountWidget::AllZonesCardAmountWidget(QWidget *parent,
|
||||||
QTreeView *deckView,
|
QTreeView *deckView,
|
||||||
QSlider *cardSizeSlider,
|
QSlider *cardSizeSlider,
|
||||||
const ExactCard &rootCard)
|
const ExactCard &rootCard)
|
||||||
: QWidget(parent), deckEditor(deckEditor), deckModel(deckModel), deckView(deckView), cardSizeSlider(cardSizeSlider),
|
: QWidget(parent), cardSizeSlider(cardSizeSlider)
|
||||||
rootCard(rootCard)
|
|
||||||
{
|
{
|
||||||
layout = new QVBoxLayout(this);
|
layout = new QVBoxLayout(this);
|
||||||
layout->setAlignment(Qt::AlignHCenter);
|
layout->setAlignment(Qt::AlignHCenter);
|
||||||
|
|
|
||||||
|
|
@ -36,11 +36,7 @@ public slots:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QVBoxLayout *layout;
|
QVBoxLayout *layout;
|
||||||
AbstractTabDeckEditor *deckEditor;
|
|
||||||
DeckListModel *deckModel;
|
|
||||||
QTreeView *deckView;
|
|
||||||
QSlider *cardSizeSlider;
|
QSlider *cardSizeSlider;
|
||||||
ExactCard rootCard;
|
|
||||||
QLabel *zoneLabelMainboard;
|
QLabel *zoneLabelMainboard;
|
||||||
CardAmountWidget *buttonBoxMainboard;
|
CardAmountWidget *buttonBoxMainboard;
|
||||||
QLabel *zoneLabelSideboard;
|
QLabel *zoneLabelSideboard;
|
||||||
|
|
|
||||||
|
|
@ -17,20 +17,19 @@
|
||||||
* display.
|
* display.
|
||||||
*
|
*
|
||||||
* @param parent The parent widget for this display.
|
* @param parent The parent widget for this display.
|
||||||
* @param _deckEditor The TabDeckEditor instance for deck management.
|
* @param deckEditor The TabDeckEditor instance for deck management.
|
||||||
* @param _deckModel The DeckListModel instance providing deck data.
|
* @param deckModel The DeckListModel instance providing deck data.
|
||||||
* @param _deckView The QTreeView instance displaying the deck.
|
* @param deckView The QTreeView instance displaying the deck.
|
||||||
* @param _cardSizeSlider The slider controlling the size of the displayed card.
|
* @param cardSizeSlider The slider controlling the size of the displayed card.
|
||||||
* @param _rootCard The root card object, representing the card to be displayed.
|
* @param rootCard The root card object, representing the card to be displayed.
|
||||||
*/
|
*/
|
||||||
PrintingSelectorCardDisplayWidget::PrintingSelectorCardDisplayWidget(QWidget *parent,
|
PrintingSelectorCardDisplayWidget::PrintingSelectorCardDisplayWidget(QWidget *parent,
|
||||||
AbstractTabDeckEditor *_deckEditor,
|
AbstractTabDeckEditor *deckEditor,
|
||||||
DeckListModel *_deckModel,
|
DeckListModel *deckModel,
|
||||||
QTreeView *_deckView,
|
QTreeView *deckView,
|
||||||
QSlider *_cardSizeSlider,
|
QSlider *cardSizeSlider,
|
||||||
const ExactCard &_rootCard)
|
const ExactCard &rootCard)
|
||||||
: QWidget(parent), deckEditor(_deckEditor), deckModel(_deckModel), deckView(_deckView),
|
: QWidget(parent)
|
||||||
cardSizeSlider(_cardSizeSlider), rootCard(_rootCard)
|
|
||||||
{
|
{
|
||||||
layout = new QVBoxLayout(this);
|
layout = new QVBoxLayout(this);
|
||||||
setLayout(layout);
|
setLayout(layout);
|
||||||
|
|
|
||||||
|
|
@ -20,11 +20,11 @@ class PrintingSelectorCardDisplayWidget : public QWidget
|
||||||
|
|
||||||
public:
|
public:
|
||||||
PrintingSelectorCardDisplayWidget(QWidget *parent,
|
PrintingSelectorCardDisplayWidget(QWidget *parent,
|
||||||
AbstractTabDeckEditor *_deckEditor,
|
AbstractTabDeckEditor *deckEditor,
|
||||||
DeckListModel *_deckModel,
|
DeckListModel *deckModel,
|
||||||
QTreeView *_deckView,
|
QTreeView *deckView,
|
||||||
QSlider *_cardSizeSlider,
|
QSlider *cardSizeSlider,
|
||||||
const ExactCard &_rootCard);
|
const ExactCard &rootCard);
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void clampSetNameToPicture();
|
void clampSetNameToPicture();
|
||||||
|
|
@ -35,11 +35,6 @@ signals:
|
||||||
private:
|
private:
|
||||||
QVBoxLayout *layout;
|
QVBoxLayout *layout;
|
||||||
SetNameAndCollectorsNumberDisplayWidget *setNameAndCollectorsNumberDisplayWidget;
|
SetNameAndCollectorsNumberDisplayWidget *setNameAndCollectorsNumberDisplayWidget;
|
||||||
AbstractTabDeckEditor *deckEditor;
|
|
||||||
DeckListModel *deckModel;
|
|
||||||
QTreeView *deckView;
|
|
||||||
QSlider *cardSizeSlider;
|
|
||||||
ExactCard rootCard;
|
|
||||||
PrintingSelectorCardOverlayWidget *overlayWidget;
|
PrintingSelectorCardOverlayWidget *overlayWidget;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,19 +22,18 @@
|
||||||
*
|
*
|
||||||
* @param parent The parent widget for this overlay.
|
* @param parent The parent widget for this overlay.
|
||||||
* @param _deckEditor The TabDeckEditor instance for deck management.
|
* @param _deckEditor The TabDeckEditor instance for deck management.
|
||||||
* @param _deckModel The DeckListModel instance providing deck data.
|
* @param deckModel The DeckListModel instance providing deck data.
|
||||||
* @param _deckView The QTreeView instance displaying the deck.
|
* @param deckView The QTreeView instance displaying the deck.
|
||||||
* @param _cardSizeSlider The slider controlling the size of the card.
|
* @param cardSizeSlider The slider controlling the size of the card.
|
||||||
* @param _rootCard The root card object that contains information about the card.
|
* @param _rootCard The root card object that contains information about the card.
|
||||||
*/
|
*/
|
||||||
PrintingSelectorCardOverlayWidget::PrintingSelectorCardOverlayWidget(QWidget *parent,
|
PrintingSelectorCardOverlayWidget::PrintingSelectorCardOverlayWidget(QWidget *parent,
|
||||||
AbstractTabDeckEditor *_deckEditor,
|
AbstractTabDeckEditor *_deckEditor,
|
||||||
DeckListModel *_deckModel,
|
DeckListModel *deckModel,
|
||||||
QTreeView *_deckView,
|
QTreeView *deckView,
|
||||||
QSlider *_cardSizeSlider,
|
QSlider *cardSizeSlider,
|
||||||
const ExactCard &_rootCard)
|
const ExactCard &_rootCard)
|
||||||
: QWidget(parent), deckEditor(_deckEditor), deckModel(_deckModel), deckView(_deckView),
|
: QWidget(parent), deckEditor(_deckEditor), rootCard(_rootCard)
|
||||||
cardSizeSlider(_cardSizeSlider), rootCard(_rootCard)
|
|
||||||
{
|
{
|
||||||
// Set up the main layout
|
// Set up the main layout
|
||||||
auto *mainLayout = new QVBoxLayout(this);
|
auto *mainLayout = new QVBoxLayout(this);
|
||||||
|
|
|
||||||
|
|
@ -48,9 +48,6 @@ private:
|
||||||
AllZonesCardAmountWidget *allZonesCardAmountWidget;
|
AllZonesCardAmountWidget *allZonesCardAmountWidget;
|
||||||
QLabel *pinBadge = nullptr;
|
QLabel *pinBadge = nullptr;
|
||||||
AbstractTabDeckEditor *deckEditor;
|
AbstractTabDeckEditor *deckEditor;
|
||||||
DeckListModel *deckModel;
|
|
||||||
QTreeView *deckView;
|
|
||||||
QSlider *cardSizeSlider;
|
|
||||||
ExactCard rootCard;
|
ExactCard rootCard;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ SetNameAndCollectorsNumberDisplayWidget::SetNameAndCollectorsNumberDisplayWidget
|
||||||
const QString &_setName,
|
const QString &_setName,
|
||||||
const QString &_collectorsNumber,
|
const QString &_collectorsNumber,
|
||||||
QSlider *_cardSizeSlider)
|
QSlider *_cardSizeSlider)
|
||||||
: QWidget(parent)
|
: QWidget(parent), cardSizeSlider(_cardSizeSlider)
|
||||||
{
|
{
|
||||||
// Set up the layout for the widget
|
// Set up the layout for the widget
|
||||||
layout = new QVBoxLayout(this);
|
layout = new QVBoxLayout(this);
|
||||||
|
|
@ -35,7 +35,6 @@ SetNameAndCollectorsNumberDisplayWidget::SetNameAndCollectorsNumberDisplayWidget
|
||||||
collectorsNumber->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
|
collectorsNumber->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
|
||||||
|
|
||||||
// Store the card size slider and connect its signal to the font size adjustment slot
|
// Store the card size slider and connect its signal to the font size adjustment slot
|
||||||
cardSizeSlider = _cardSizeSlider;
|
|
||||||
connect(cardSizeSlider, &QSlider::valueChanged, this, &SetNameAndCollectorsNumberDisplayWidget::adjustFontSize);
|
connect(cardSizeSlider, &QSlider::valueChanged, this, &SetNameAndCollectorsNumberDisplayWidget::adjustFontSize);
|
||||||
|
|
||||||
// Add labels to the layout
|
// Add labels to the layout
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue