From 1727d33fb3a5ebf08edc7c2f423c610c2dba4872 Mon Sep 17 00:00:00 2001 From: RickyRister Date: Tue, 18 Mar 2025 18:26:35 -0700 Subject: [PATCH] rename the other const --- cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp | 2 +- cockatrice/src/deck/deck_loader.cpp | 4 ++-- cockatrice/src/deck/deck_loader.h | 6 +++++- cockatrice/src/dialogs/dlg_load_deck.cpp | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp index 92e63230b..734ed1298 100644 --- a/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp +++ b/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp @@ -355,7 +355,7 @@ bool AbstractTabDeckEditor::actSaveDeckAs() dialog.setDirectory(SettingsCache::instance().getDeckPath()); dialog.setAcceptMode(QFileDialog::AcceptSave); dialog.setDefaultSuffix("cod"); - dialog.setNameFilters(DeckLoader::fileNameFilters); + dialog.setNameFilters(DeckLoader::FILE_NAME_FILTERS); dialog.selectFile(getDeckList()->getName().trimmed()); if (!dialog.exec()) return false; diff --git a/cockatrice/src/deck/deck_loader.cpp b/cockatrice/src/deck/deck_loader.cpp index f76e04445..16132c571 100644 --- a/cockatrice/src/deck/deck_loader.cpp +++ b/cockatrice/src/deck/deck_loader.cpp @@ -18,8 +18,8 @@ const QStringList DeckLoader::ACCEPTED_FILE_EXTENSIONS = {"*.cod", "*.dec", "*.dek", "*.txt", "*.mwDeck"}; -const QStringList DeckLoader::fileNameFilters = {tr("Common deck formats (%1)").arg(ACCEPTED_FILE_EXTENSIONS.join(" ")), - tr("All files (*.*)")}; +const QStringList DeckLoader::FILE_NAME_FILTERS = { + tr("Common deck formats (%1)").arg(ACCEPTED_FILE_EXTENSIONS.join(" ")), tr("All files (*.*)")}; DeckLoader::DeckLoader() : DeckList(), lastFileName(QString()), lastFileFormat(CockatriceFormat), lastRemoteDeckId(-1) { diff --git a/cockatrice/src/deck/deck_loader.h b/cockatrice/src/deck/deck_loader.h index fea0e7942..c62fd45c9 100644 --- a/cockatrice/src/deck/deck_loader.h +++ b/cockatrice/src/deck/deck_loader.h @@ -25,7 +25,11 @@ public: * Supported file extensions for decklist files */ static const QStringList ACCEPTED_FILE_EXTENSIONS; - static const QStringList fileNameFilters; + + /** + * For use with `QFileDialog::setNameFilters` + */ + static const QStringList FILE_NAME_FILTERS; private: QString lastFileName; diff --git a/cockatrice/src/dialogs/dlg_load_deck.cpp b/cockatrice/src/dialogs/dlg_load_deck.cpp index 0fabdaaa3..91252a768 100644 --- a/cockatrice/src/dialogs/dlg_load_deck.cpp +++ b/cockatrice/src/dialogs/dlg_load_deck.cpp @@ -11,7 +11,7 @@ DlgLoadDeck::DlgLoadDeck(QWidget *parent) : QFileDialog(parent, tr("Load Deck")) } setDirectory(startingDir); - setNameFilters(DeckLoader::fileNameFilters); + setNameFilters(DeckLoader::FILE_NAME_FILTERS); connect(this, &DlgLoadDeck::accepted, this, &DlgLoadDeck::actAccepted); }