From 42363c34bd921487ec2d6bab9651af63ef2c7f15 Mon Sep 17 00:00:00 2001 From: RickyRister Date: Thu, 2 Jan 2025 02:16:27 -0800 Subject: [PATCH] refactor deck loading to new method --- cockatrice/src/client/tabs/tab_game.cpp | 10 +++++++--- cockatrice/src/client/tabs/tab_game.h | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/cockatrice/src/client/tabs/tab_game.cpp b/cockatrice/src/client/tabs/tab_game.cpp index 5e5c9e6cf..156bd6071 100644 --- a/cockatrice/src/client/tabs/tab_game.cpp +++ b/cockatrice/src/client/tabs/tab_game.cpp @@ -294,12 +294,16 @@ void DeckViewContainer::loadLocalDeck() if (!dialog.exec()) return; - QString fileName = dialog.selectedFiles().at(0); - DeckLoader::FileFormat fmt = DeckLoader::getFormatFromName(fileName); + loadDeckFromFile(dialog.selectedFiles().at(0)); +} + +void DeckViewContainer::loadDeckFromFile(const QString &filePath) +{ + DeckLoader::FileFormat fmt = DeckLoader::getFormatFromName(filePath); QString deckString; DeckLoader deck; - bool error = !deck.loadFromFile(fileName, fmt); + bool error = !deck.loadFromFile(filePath, fmt); if (!error) { deckString = deck.writeToString_Native(); error = deckString.length() > MAX_FILE_LENGTH; diff --git a/cockatrice/src/client/tabs/tab_game.h b/cockatrice/src/client/tabs/tab_game.h index 0cabc697c..8ca3c0568 100644 --- a/cockatrice/src/client/tabs/tab_game.h +++ b/cockatrice/src/client/tabs/tab_game.h @@ -112,6 +112,7 @@ public: void setReadyStart(bool ready); void setSideboardLocked(bool locked); void setDeck(const DeckLoader &deck); + void loadDeckFromFile(const QString &filePath); }; class TabGame : public Tab