From 6c5a8f34eaf5fe6af0d885cb162b5ebf193030f8 Mon Sep 17 00:00:00 2001
From: Alexander Tkachev
Date: Mon, 6 Jun 2016 10:25:49 +0600
Subject: CLOUD: Add SaveLoadCloudSyncProgress enum

It's common for Save/Load dialogs and SavesSyncRequest.
---
 backends/cloud/savessyncrequest.cpp | 10 +++-------
 gui/saveload-dialog.cpp             | 12 +-----------
 gui/saveload-dialog.h               |  5 +++++
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/backends/cloud/savessyncrequest.cpp b/backends/cloud/savessyncrequest.cpp
index d983a0fcae..f07d1d000f 100644
--- a/backends/cloud/savessyncrequest.cpp
+++ b/backends/cloud/savessyncrequest.cpp
@@ -27,16 +27,12 @@
 #include "common/json.h"
 #include "common/savefile.h"
 #include "common/system.h"
+#include "gui/saveload-dialog.h"
 
 namespace Cloud {
 
 const char *SavesSyncRequest::TIMESTAMPS_FILENAME = "timestamps";
 
-enum {
-	kSavesSyncProgressCmd = 'SSPR',
-	kSavesSyncEndedCmd = 'SSEN'
-};
-
 SavesSyncRequest::SavesSyncRequest(Storage *storage, Storage::BoolCallback callback, Networking::ErrorCallback ecb):
 	Request(nullptr, ecb), CommandSender(nullptr), _storage(storage), _boolCallback(callback),
 	_workingRequest(nullptr), _ignoreCallback(false) {
@@ -209,7 +205,7 @@ void SavesSyncRequest::directoryCreatedErrorCallback(Networking::ErrorResponse e
 void SavesSyncRequest::downloadNextFile() {
 	if (_filesToDownload.empty()) {
 		_currentDownloadingFile = StorageFile("", 0, 0, false); //so getFilesToDownload() would return an empty array
-		sendCommand(kSavesSyncEndedCmd, 0);
+		sendCommand(GUI::kSavesSyncEndedCmd, 0);
 		uploadNextFile();
 		return;
 	}
@@ -217,7 +213,7 @@ void SavesSyncRequest::downloadNextFile() {
 	_currentDownloadingFile = _filesToDownload.back();
 	_filesToDownload.pop_back();
 
-	sendCommand(kSavesSyncProgressCmd, (int)(getDownloadingProgress() * 100));
+	sendCommand(GUI::kSavesSyncProgressCmd, (int)(getDownloadingProgress() * 100));
 
 	///////
 	debug("downloading %s (%d %%)", _currentDownloadingFile.name().c_str(), (int)(getProgress() * 100));
diff --git a/gui/saveload-dialog.cpp b/gui/saveload-dialog.cpp
index 2f10182006..2646194b4b 100644
--- a/gui/saveload-dialog.cpp
+++ b/gui/saveload-dialog.cpp
@@ -40,9 +40,6 @@
 namespace GUI {
 
 enum {
-	kSavesSyncProgressCmd = 'SSPR',
-	kSavesSyncEndedCmd = 'SSEN',
-
 	kCancelSyncCmd = 'PDCS',
 	kBackgroundSyncCmd = 'PDBS'
 };
@@ -198,15 +195,8 @@ void SaveLoadChooserDialog::handleCommand(CommandSender *sender, uint32 cmd, uin
 #endif // !DISABLE_SAVELOADCHOOSER_GRID
 
 	if (cmd == kSavesSyncProgressCmd || cmd == kSavesSyncEndedCmd) {
-		Cloud::SavesSyncRequest *request = (Cloud::SavesSyncRequest *)sender;
-
 		//this dialog only gets these commands if the progress dialog was shown and user clicked "run in background"
-		switch (cmd) {
-		case kSavesSyncProgressCmd:
-		case kSavesSyncEndedCmd:
-			updateSaveList();
-			break;
-		}
+		return updateSaveList();
 	}
 
 	return Dialog::handleCommand(sender, cmd, data);
diff --git a/gui/saveload-dialog.h b/gui/saveload-dialog.h
index a767fb8a23..435bfc7a5d 100644
--- a/gui/saveload-dialog.h
+++ b/gui/saveload-dialog.h
@@ -30,6 +30,11 @@
 
 namespace GUI {
 
+enum SaveLoadCloudSyncProgress {
+	kSavesSyncProgressCmd = 'SSPR',
+	kSavesSyncEndedCmd = 'SSEN'
+};
+
 class SaveLoadCloudSyncProgressDialog : public Dialog { //protected?
 	StaticTextWidget *_label;
 	bool _close;
-- 
cgit v1.2.3