[Format] Fix include order in tab_deck_storage.h

cockatrice/src/interface/deck_sync/deck_sync_manager.cpp

@@ -42,6 +42,11 @@ DeckSyncManager::DeckSyncManager(QObject *parent) : QObject(parent)
 {
 }
 
+DeckSyncManager::DeckSyncManager(AbstractClient *_client, ColorIdentityProvider provider, QObject *parent)
+    : QObject(parent), client(_client), colorIdentityProvider(std::move(provider))
+{
+}
+
 void DeckSyncManager::setClient(AbstractClient *_client)
 {
     client = _client;
@@ -145,11 +150,12 @@ void DeckSyncManager::collectServerFiles(const ServerInfo_DeckStorage_Folder &fo
         } else if (item.has_file()) {
             const QString path = prefix.isEmpty() ? name : prefix + "/" + name;
             const ServerInfo_DeckStorage_File &file = item.file();
-            ServerFile entry;
-            entry.id = item.id();
-            entry.guid = QString::fromStdString(file.guid());
-            entry.hash = QString::fromStdString(file.hash());
-            entry.lastModifiedSecs = file.has_last_modified() ? static_cast<qint64>(file.last_modified()) : 0;
+            ServerFile entry{
+                .id = item.id(),
+                .guid = QString::fromStdString(file.guid()),
+                .hash = QString::fromStdString(file.hash()),
+                .lastModifiedSecs = file.has_last_modified() ? static_cast<qint64>(file.last_modified()) : 0,
+            };
             files.insert(path, entry);
         }
     }

cockatrice/src/interface/deck_sync/deck_sync_manager.h

@@ -44,7 +44,17 @@ public:
     /** @brief Computes the color identity string uploaded alongside a deck. May be empty. */
     using ColorIdentityProvider = std::function<QString(const DeckList &)>;
 
+    /** @brief Outcome counts for a finished sync run; mirrors syncFinished() parameters. */
+    struct SyncSummary
+    {
+        int uploaded = 0;
+        int downloaded = 0;
+        int unchanged = 0;
+        int skipped = 0;
+    };
+
     explicit DeckSyncManager(QObject *parent = nullptr);
+    DeckSyncManager(AbstractClient *client, ColorIdentityProvider provider, QObject *parent = nullptr);
 
     void setClient(AbstractClient *_client);
     void setProfile(const DeckSyncProfile &_profile);

cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp

@@ -255,10 +255,8 @@ TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor,
     rightToolBar->addAction(aNewFolder);
     rightToolBar->addAction(aDeleteRemoteDeck);
 
-    syncManager = new DeckSyncManager(this);
-    syncManager->setClient(client);
-    syncManager->setColorIdentityProvider(
-        [](const DeckList &deck) { return getDeckColorIdentity(deck, CardDatabaseManager::query()); });
+    syncManager = new DeckSyncManager(
+        client, [](const DeckList &deck) { return getDeckColorIdentity(deck, CardDatabaseManager::query()); }, this);
     connect(syncManager, &DeckSyncManager::statusMessage, this, &TabDeckStorage::onSyncStatusMessage);
     connect(syncManager, &DeckSyncManager::syncFinished, this, &TabDeckStorage::onSyncFinished);
     if (currentUserInfo != nullptr) {

cockatrice/src/interface/widgets/tabs/tab_deck_storage.h

@@ -8,6 +8,7 @@
 #ifndef TAB_DECK_STORAGE_H
 #define TAB_DECK_STORAGE_H
 
+#include "../deck_sync/deck_sync_manager.h"
 #include "../interface/widgets/server/remote/remote_decklist_tree_widget.h"
 #include "tab.h"
 
@@ -29,7 +30,6 @@ class QLabel;
 class CommandContainer;
 class Response;
 class ShareBarWidget;
-class DeckSyncManager;
 class QAction;
 class QModelIndex;
 class TabSupervisor;
@@ -64,13 +64,7 @@ private:
         Finished,
         Failed
     };
-    struct SyncSummary
-    {
-        int uploaded = 0;
-        int downloaded = 0;
-        int unchanged = 0;
-        int skipped = 0;
-    };
+    using SyncSummary = DeckSyncManager::SyncSummary;
     SyncStatusType syncStatusType = SyncStatusType::Idle;
     QString syncStatusDetail;
     SyncSummary lastSyncSummary;