From ea723620aeb12e121357fba649d0d30420e05828 Mon Sep 17 00:00:00 2001 From: ZeldaZach Date: Tue, 11 Feb 2025 20:52:35 -0500 Subject: [PATCH] Minor cleanup --- .../deck_preview_tag_addition_widget.cpp | 15 ++++++++------- .../deck_preview_tag_addition_widget.h | 6 ++---- .../deck_preview/deck_preview_widget.cpp | 8 ++++---- .../visual_deck_storage_widget.cpp | 2 +- .../visual_deck_storage_widget.h | 2 +- 5 files changed, 16 insertions(+), 17 deletions(-) diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp index 32313117c..aacd48115 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp @@ -9,11 +9,12 @@ #include #include #include +#include DeckPreviewTagAdditionWidget::DeckPreviewTagAdditionWidget(QWidget *_parent, DeckPreviewDeckTagsDisplayWidget *_tagsDisplayWidget, - const QString &_tagName) - : QWidget(_parent), tagsDisplayWidget(_tagsDisplayWidget), tagName_(_tagName) + QString _tagName) + : QWidget(_parent), tagsDisplayWidget(_tagsDisplayWidget), tagName_(std::move(_tagName)) { // Create layout auto *layout = new QHBoxLayout(this); @@ -32,7 +33,7 @@ QSize DeckPreviewTagAdditionWidget::sizeHint() const int width = textWidth + 50; // Add extra padding int height = fm.height() + 10; // Height based on font size + padding - return QSize(width, height); + return {width, height}; } static QStringList getAllFiles(const QString &filePath, bool recursive) @@ -59,7 +60,7 @@ void DeckPreviewTagAdditionWidget::mousePressEvent(QMouseEvent *event) QWidget::mousePressEvent(event); if (qobject_cast(tagsDisplayWidget->parentWidget())) { - DeckPreviewWidget *deckPreviewWidget = qobject_cast(tagsDisplayWidget->parentWidget()); + auto *deckPreviewWidget = qobject_cast(tagsDisplayWidget->parentWidget()); QStringList knownTags = deckPreviewWidget->visualDeckStorageWidget->tagFilterWidget->getAllKnownTags(); QStringList activeTags = tagsDisplayWidget->deckList->getTags(); @@ -118,11 +119,11 @@ void DeckPreviewTagAdditionWidget::mousePressEvent(QMouseEvent *event) currentParent = currentParent->parentWidget(); } if (qobject_cast(currentParent)) { - TabDeckEditor *deckEditor = qobject_cast(currentParent); + auto *deckEditor = qobject_cast(currentParent); QStringList knownTags; QStringList allFiles = getAllFiles(SettingsCache::instance().getDeckPath(), true); - DeckLoader *loader = new DeckLoader(); - for (QString file : allFiles) { + auto *loader = new DeckLoader(); + for (const QString& file : allFiles) { loader->loadFromFile(file, DeckLoader::getFormatFromName(file), false); QStringList tags = loader->getTags(); knownTags.append(tags); diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.h b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.h index bbd70383f..4d288c95a 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.h +++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.h @@ -14,8 +14,8 @@ class DeckPreviewTagAdditionWidget : public QWidget public: explicit DeckPreviewTagAdditionWidget(QWidget *_parent, DeckPreviewDeckTagsDisplayWidget *_tagsDisplayWidget, - const QString &_tagName); - QSize sizeHint() const override; + QString _tagName); + [[nodiscard]] QSize sizeHint() const override; signals: void tagClicked(); // Emitted when the tag is clicked @@ -28,8 +28,6 @@ protected: private: DeckPreviewDeckTagsDisplayWidget *tagsDisplayWidget; QString tagName_; - QLabel *tagLabel_; - QPushButton *closeButton_; }; #endif // DECK_PREVIEW_TAG_ADDITION_WIDGET_H diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp index 95557dfbe..589bb3b14 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp @@ -195,10 +195,10 @@ void DeckPreviewWidget::updateBannerCardComboBox() // Prepare the new items with deduplication QSet> bannerCardSet; InnerDecklistNode *listRoot = deckLoader->getRoot(); - for (int i = 0; i < listRoot->size(); i++) { - InnerDecklistNode *currentZone = dynamic_cast(listRoot->at(i)); - for (int j = 0; j < currentZone->size(); j++) { - DecklistCardNode *currentCard = dynamic_cast(currentZone->at(j)); + for (auto i : *listRoot) { + auto *currentZone = dynamic_cast(i); + for (auto j : *currentZone) { + auto *currentCard = dynamic_cast(j); if (!currentCard) continue; diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp index 324ce9458..ef65a40cf 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(parent), folderWidget(nullptr) { diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h index b6f11f54b..b2eee6ab4 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h +++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_widget.h @@ -14,7 +14,7 @@ #include #include -#include +#include class VisualDeckStorageSearchWidget; class VisualDeckStorageSortWidget;