diff --git a/cockatrice/src/client/tabs/tab_supervisor.cpp b/cockatrice/src/client/tabs/tab_supervisor.cpp index 28d56deab..aaa5dff8f 100644 --- a/cockatrice/src/client/tabs/tab_supervisor.cpp +++ b/cockatrice/src/client/tabs/tab_supervisor.cpp @@ -210,9 +210,6 @@ void TabSupervisor::retranslateUi() QListIterator deckEditorIterator(deckEditorTabs); while (deckEditorIterator.hasNext()) tabs.append(deckEditorIterator.next()); - QListIterator visualDeckEditorIterator(visualDeckEditorTabs); - while (visualDeckEditorIterator.hasNext()) - tabs.append(visualDeckEditorIterator.next()); QMapIterator messageIterator(messageTabs); while (messageIterator.hasNext()) tabs.append(messageIterator.next().value()); @@ -820,10 +817,10 @@ TabDeckEditorVisual *TabSupervisor::addVisualDeckEditorTab(const DeckLoader *dec auto *tab = new TabDeckEditorVisual(this); if (deckToOpen) tab->setDeck(new DeckLoader(*deckToOpen)); - connect(tab, &AbstractTabDeckEditor::deckEditorClosing, this, &TabSupervisor::visualDeckEditorClosed); + connect(tab, &AbstractTabDeckEditor::deckEditorClosing, this, &TabSupervisor::deckEditorClosed); connect(tab, &AbstractTabDeckEditor::openDeckEditor, this, &TabSupervisor::addVisualDeckEditorTab); myAddTab(tab); - visualDeckEditorTabs.append(tab); + deckEditorTabs.append(tab); setCurrentWidget(tab); return tab; } @@ -849,15 +846,6 @@ void TabSupervisor::deckEditorClosed(AbstractTabDeckEditor *tab) removeTab(indexOf(tab)); } -void TabSupervisor::visualDeckEditorClosed(AbstractTabDeckEditor *tab) -{ - if (tab == currentWidget()) - emit setMenu(); - - visualDeckEditorTabs.removeOne(tab); - removeTab(indexOf(tab)); -} - void TabSupervisor::tabUserEvent(bool globalEvent) { Tab *tab = static_cast(sender()); diff --git a/cockatrice/src/client/tabs/tab_supervisor.h b/cockatrice/src/client/tabs/tab_supervisor.h index 869fdd609..b37e605bb 100644 --- a/cockatrice/src/client/tabs/tab_supervisor.h +++ b/cockatrice/src/client/tabs/tab_supervisor.h @@ -91,7 +91,6 @@ private: QList replayTabs; QMap messageTabs; QList deckEditorTabs; - QList visualDeckEditorTabs; bool isLocalGame; QAction *aTabDeckEditor, *aTabVisualDeckEditor, *aTabVisualDeckStorage, *aTabServer, *aTabAccount, *aTabDeckStorage, @@ -188,7 +187,6 @@ private slots: void processUserJoined(const ServerInfo_User &userInfo); void talkLeft(TabMessage *tab); void deckEditorClosed(AbstractTabDeckEditor *tab); - void visualDeckEditorClosed(AbstractTabDeckEditor *tab); void tabUserEvent(bool globalEvent); void updateTabText(Tab *tab, const QString &newTabText); void processRoomEvent(const RoomEvent &event); diff --git a/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.cpp b/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.cpp index 1e8633531..ce2d63d48 100644 --- a/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.cpp +++ b/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.cpp @@ -68,7 +68,7 @@ void ManaBaseWidget::updateDisplay() manaColors.insert("C", QColor(150, 150, 150)); for (auto manaColor : manaBaseMap.keys()) { - QColor barColor = manaColors.contains(manaColor) ? manaColors[manaColor] : Qt::gray; + QColor barColor = manaColors.value(manaColor, Qt::gray); BarWidget *barWidget = new BarWidget(QString(manaColor), manaBaseMap[manaColor], highestEntry, barColor, this); barLayout->addWidget(barWidget); } diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp index 62c2efc4a..cc5506c0f 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp @@ -40,7 +40,7 @@ void VisualDatabaseDisplayFilterSaveLoadWidget::saveFilter() if (filename.isEmpty()) return; - QString filePath = saveDirectory + "/" + filename + ".json"; + QString filePath = saveDirectory + QDir::separator() + filename + ".json"; // Serialize the filter model to JSON QJsonArray filtersArray; diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp index 1ac5644a3..4255921c6 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp @@ -19,6 +19,7 @@ #include #include #include +#include VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent, AbstractTabDeckEditor *_deckEditor, @@ -136,15 +137,15 @@ void VisualDatabaseDisplayWidget::onClick(QMouseEvent *event, CardInfoPictureWit emit cardClickedDatabaseDisplay(event, instance); } -void VisualDatabaseDisplayWidget::onHover(CardInfoPtr hoveredCard) +void VisualDatabaseDisplayWidget::onHover(const CardInfoPtr &hoveredCard) { emit cardHoveredDatabaseDisplay(hoveredCard); } -void VisualDatabaseDisplayWidget::addCard(CardInfoPtr cardToAdd) +void VisualDatabaseDisplayWidget::addCard(const CardInfoPtr &cardToAdd) { cards->append(cardToAdd); - CardInfoPictureWithTextOverlayWidget *display = new CardInfoPictureWithTextOverlayWidget(flowWidget, false); + auto *display = new CardInfoPictureWithTextOverlayWidget(flowWidget, false); display->setScaleFactor(cardSizeWidget->getSlider()->value()); display->setCard(cardToAdd); flowWidget->addWidget(display); @@ -174,8 +175,7 @@ void VisualDatabaseDisplayWidget::populateCards() QModelIndex index = databaseDisplayModel->index(row, CardDatabaseModel::NameColumn); QVariant name = databaseDisplayModel->data(index, Qt::DisplayRole); qCDebug(VisualDatabaseDisplayLog) << name.toString(); - CardInfoPtr info = CardDatabaseManager::getInstance()->getCard(name.toString()); - if (info) { + if (CardInfoPtr info = CardDatabaseManager::getInstance()->getCard(name.toString())) { addCard(info); } else { qCDebug(VisualDatabaseDisplayLog) << "Card not found in database!"; @@ -184,7 +184,7 @@ void VisualDatabaseDisplayWidget::populateCards() currentPage++; } -void VisualDatabaseDisplayWidget::updateSearch(const QString &search) +void VisualDatabaseDisplayWidget::updateSearch(const QString &search) const { databaseDisplayModel->setStringFilter(search); QModelIndexList sel = databaseView->selectionModel()->selectedRows(); @@ -199,8 +199,7 @@ void VisualDatabaseDisplayWidget::searchModelChanged() flowWidget->clearLayout(); // Clear existing cards cards->clear(); // Clear the card list // Reset scrollbar position to the top after loading new cards - QScrollBar *scrollBar = flowWidget->scrollArea->verticalScrollBar(); - if (scrollBar) { + if (QScrollBar *scrollBar = flowWidget->scrollArea->verticalScrollBar()) { scrollBar->setValue(0); // Reset scrollbar to top } @@ -225,8 +224,7 @@ void VisualDatabaseDisplayWidget::loadNextPage() for (int row = start; row < end; ++row) { QModelIndex index = databaseDisplayModel->index(row, CardDatabaseModel::NameColumn); QVariant name = databaseDisplayModel->data(index, Qt::DisplayRole); - CardInfoPtr info = CardDatabaseManager::getInstance()->getCard(name.toString()); - if (info) { + if (CardInfoPtr info = CardDatabaseManager::getInstance()->getCard(name.toString())) { addCard(info); } else { qCDebug(VisualDatabaseDisplayLog) << "Card not found in database!"; @@ -250,18 +248,19 @@ void VisualDatabaseDisplayWidget::loadCurrentPage() } } -void VisualDatabaseDisplayWidget::modelDirty() +void VisualDatabaseDisplayWidget::modelDirty() const { debounceTimer->start(debounceTime); } -void VisualDatabaseDisplayWidget::sortCardList(const QStringList properties, Qt::SortOrder order = Qt::AscendingOrder) +void VisualDatabaseDisplayWidget::sortCardList(const QStringList &properties, + Qt::SortOrder order = Qt::AscendingOrder) const { CardInfoComparator comparator(properties, order); - std::sort(cards->begin(), cards->end(), comparator); + std::ranges::sort(*cards, comparator); } -void VisualDatabaseDisplayWidget::databaseDataChanged(QModelIndex topLeft, QModelIndex bottomRight) +void VisualDatabaseDisplayWidget::databaseDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) { (void)topLeft; (void)bottomRight; diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h index 4354cc4ad..033bb856e 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h +++ b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.h @@ -43,7 +43,7 @@ public: void populateCards(); void loadNextPage(); void loadCurrentPage(); - void sortCardList(QStringList properties, Qt::SortOrder order); + void sortCardList(const QStringList &properties, Qt::SortOrder order) const; void setDeckList(const DeckList &new_deck_list_model); QWidget *searchContainer; @@ -61,12 +61,12 @@ signals: protected slots: void onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance); - void onHover(CardInfoPtr hoveredCard); - void addCard(CardInfoPtr cardToAdd); - void databaseDataChanged(QModelIndex topLeft, QModelIndex bottomRight); + void onHover(const CardInfoPtr &hoveredCard); + void addCard(const CardInfoPtr &cardToAdd); + void databaseDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight); void wheelEvent(QWheelEvent *event) override; - void modelDirty(); - void updateSearch(const QString &search); + void modelDirty() const; + void updateSearch(const QString &search) const; private: SettingsButtonWidget *quickFilterWidget;