From b3bf5322117d03c003011839ea1e7897c48183fa Mon Sep 17 00:00:00 2001
From: Alexander Tkachev
Date: Wed, 1 Jun 2016 16:22:42 +0600
Subject: CLOUD: Make CloudManager singleton

It's needed to ::destroy() it in main().
---
 common/cloudmanager.h | 77 ---------------------------------------------------
 common/system.h       | 22 ---------------
 2 files changed, 99 deletions(-)
 delete mode 100644 common/cloudmanager.h

(limited to 'common')

diff --git a/common/cloudmanager.h b/common/cloudmanager.h
deleted file mode 100644
index 936f0e0108..0000000000
--- a/common/cloudmanager.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
-*
-* ScummVM is the legal property of its developers, whose names
-* are too numerous to list here. Please refer to the COPYRIGHT
-* file distributed with this source distribution.
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*
-*/
-
-#ifndef COMMON_CLOUDMANAGER_H
-#define COMMON_CLOUDMANAGER_H
-
-#include "backends/cloud/storage.h"
-
-namespace Common {
-
-class CloudManager {
-public:
-	CloudManager() {}
-	virtual ~CloudManager() {}
-
-	/**
-	 * Loads all information from configs and creates current Storage instance.
-	 *
-	 * @note It's called once on startup in scummvm_main().
-	 */
-	virtual void init() = 0;
-
-	/**
-	 * Saves all information into configuration file.
-	 */
-	virtual void save() = 0;
-
-	/**
-	 * Adds new Storage into list.	
-	 *
-	 * @param	storage Cloud::Storage to add.
-	 * @param	makeCurrent whether added storage should be the new current storage.
-	 * @param	saveConfig whether save() should be called to update configuration file.
-	 */
-	virtual void addStorage(Cloud::Storage *storage, bool makeCurrent = true, bool saveConfig = true) = 0;
-
-	/**
-	 * Returns active Storage, which could be used to interact
-	 *  with cloud storage.
-	 *
-	 * @return	active Cloud::Storage or null, if there is no active Storage.
-	 */
-	virtual Cloud::Storage *getCurrentStorage() = 0;
-
-	/**
-	 * Starts saves syncing process in currently active storage if there is any.
-	 */
-	virtual void syncSaves(Cloud::Storage::BoolCallback callback = nullptr, Networking::ErrorCallback errorCallback = nullptr) = 0;
-
-	/**
-	 * Starts feature testing (the one I'm working on currently). (Temporary)
-	 */
-	virtual void testFeature() = 0;
-};
-
-} // End of namespace Common
-
-#endif
diff --git a/common/system.h b/common/system.h
index 815fa9d19d..6d185d3075 100644
--- a/common/system.h
+++ b/common/system.h
@@ -56,7 +56,6 @@ class HardwareInputSet;
 class Keymap;
 class KeymapperDefaultBindings;
 #endif
-class CloudManager;
 }
 
 class AudioCDManager;
@@ -179,15 +178,6 @@ protected:
 	Common::UpdateManager *_updateManager;
 #endif
 
-#if defined(USE_CLOUD)
-	/**
-	* No default value is provided for _cloudThread by OSystem.
-	*
-	* @note _cloudThread is deleted by the OSystem destructor.
-	*/
-	Common::CloudManager *_cloudManager;
-#endif
-
 	/**
 	 * No default value is provided for _fsFactory by OSystem.
 	 *
@@ -1126,18 +1116,6 @@ public:
 	}
 #endif
 
-#if defined(USE_CLOUD)
-	/**
-	* Returns the CloudManager, used to sync save games and
-	* upload/download files from user's cloud storage.
-	*
-	* @return the CloudManager for the current architecture
-	*/
-	virtual Common::CloudManager *getCloudManager() {
-		return _cloudManager;
-	}
-#endif
-
 	/**
 	 * Returns the FilesystemFactory object, depending on the current architecture.
 	 *
-- 
cgit v1.2.3