From 3c7d1922c534b52c1428b7ca84458660fd56f0a6 Mon Sep 17 00:00:00 2001
From: RickyRister <ricky.rister.wang@gmail.com>
Date: Thu, 6 Feb 2025 22:02:23 -0800
Subject: [PATCH] refactor

---
 ...ual_deck_storage_folder_display_widget.cpp | 60 +++++++++----------
 ...isual_deck_storage_folder_display_widget.h |  2 -
 2 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp
index 1ac62b784..833707b5e 100644
--- a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp
+++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp
@@ -63,10 +63,24 @@ void VisualDeckStorageFolderDisplayWidget::refreshUi()
     header->setText(bannerText);
 }
 
+static QStringList getAllFiles(const QString &filePath)
+{
+    QStringList allFiles;
+
+    // QDirIterator with QDir::Files ensures only files are listed (no directories)
+    QDirIterator it(filePath, QDir::Files);
+
+    while (it.hasNext()) {
+        allFiles << it.next(); // Add each file path to the list
+    }
+
+    return allFiles;
+}
+
 void VisualDeckStorageFolderDisplayWidget::createWidgetsForFiles()
 {
     QList<DeckPreviewWidget *> allDecks;
-    for (const QString &file : getAllFiles()) {
+    for (const QString &file : getAllFiles(filePath)) {
         auto *display = new DeckPreviewWidget(flowWidget, visualDeckStorageWidget, file);
 
         connect(display, &DeckPreviewWidget::deckPreviewClicked, visualDeckStorageWidget,
@@ -121,9 +135,23 @@ bool VisualDeckStorageFolderDisplayWidget::checkVisibility()
     return atLeastOneWidgetVisible;
 }
 
+static QStringList getAllSubFolders(const QString &filePath)
+{
+    QStringList allFolders;
+
+    // QDirIterator with QDir::Files ensures only files are listed (no directories)
+    QDirIterator it(filePath, QDir::Dirs | QDir::NoDotAndDotDot);
+
+    while (it.hasNext()) {
+        allFolders << it.next(); // Add each file path to the list
+    }
+
+    return allFolders;
+}
+
 void VisualDeckStorageFolderDisplayWidget::createWidgetsForFolders()
 {
-    for (const QString &dir : getAllSubFolders()) {
+    for (const QString &dir : getAllSubFolders(filePath)) {
         auto *display = new VisualDeckStorageFolderDisplayWidget(this, visualDeckStorageWidget, dir, true);
         containerLayout->addWidget(display);
     }
@@ -148,32 +176,4 @@ QStringList VisualDeckStorageFolderDisplayWidget::gatherAllTagsFromFlowWidget()
     allTags.removeDuplicates();
 
     return allTags;
-}
-
-QStringList VisualDeckStorageFolderDisplayWidget::getAllFiles() const
-{
-    QStringList allFiles;
-
-    // QDirIterator with QDir::Files ensures only files are listed (no directories)
-    QDirIterator it(filePath, QDir::Files);
-
-    while (it.hasNext()) {
-        allFiles << it.next(); // Add each file path to the list
-    }
-
-    return allFiles;
-}
-
-QStringList VisualDeckStorageFolderDisplayWidget::getAllSubFolders() const
-{
-    QStringList allFolders;
-
-    // QDirIterator with QDir::Files ensures only files are listed (no directories)
-    QDirIterator it(filePath, QDir::Dirs | QDir::NoDotAndDotDot);
-
-    while (it.hasNext()) {
-        allFolders << it.next(); // Add each file path to the list
-    }
-
-    return allFolders;
 }
\ No newline at end of file
diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.h b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.h
index 7e1279e6b..fa590a5a5 100644
--- a/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.h
+++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.h
@@ -20,8 +20,6 @@ public:
     void createWidgetsForFiles();
     void createWidgetsForFolders();
     QStringList gatherAllTagsFromFlowWidget() const;
-    [[nodiscard]] QStringList getAllFiles() const;
-    [[nodiscard]] QStringList getAllSubFolders() const;
     FlowWidget *getFlowWidget() const
     {
         return flowWidget;