diff options
| author | Alexander Tkachev | 2016-06-01 16:22:42 +0600 |
|---|---|---|
| committer | Alexander Tkachev | 2016-08-24 16:07:55 +0600 |
| commit | b3bf5322117d03c003011839ea1e7897c48183fa (patch) | |
| tree | 7991bd7d812bcc9dbd4dfd078a55b16f7ec8e0ba /backends/cloud/onedrive | |
| parent | 1f974a7a2a2073074391fbf090d2bf909006e773 (diff) | |
| download | scummvm-rg350-b3bf5322117d03c003011839ea1e7897c48183fa.tar.gz scummvm-rg350-b3bf5322117d03c003011839ea1e7897c48183fa.tar.bz2 scummvm-rg350-b3bf5322117d03c003011839ea1e7897c48183fa.zip | |
CLOUD: Make CloudManager singleton
It's needed to ::destroy() it in main().
Diffstat (limited to 'backends/cloud/onedrive')
| -rw-r--r-- | backends/cloud/onedrive/onedrivestorage.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/backends/cloud/onedrive/onedrivestorage.cpp b/backends/cloud/onedrive/onedrivestorage.cpp index 98f0ac5a4d..ca8a2346ad 100644 --- a/backends/cloud/onedrive/onedrivestorage.cpp +++ b/backends/cloud/onedrive/onedrivestorage.cpp @@ -22,6 +22,7 @@ #define FORBIDDEN_SYMBOL_ALLOW_ALL #include "backends/cloud/onedrive/onedrivestorage.h" +#include "backends/cloud/cloudmanager.h" #include "backends/cloud/onedrive/onedrivecreatedirectoryrequest.h" #include "backends/cloud/onedrive/onedrivetokenrefresher.h" #include "backends/cloud/onedrive/onedrivelistdirectoryrequest.h" @@ -29,11 +30,9 @@ #include "backends/networking/curl/connectionmanager.h" #include "backends/networking/curl/curljsonrequest.h" #include "backends/networking/curl/networkreadstream.h" -#include "common/cloudmanager.h" #include "common/config-manager.h" #include "common/debug.h" #include "common/json.h" -#include "common/system.h" #include <curl/curl.h> namespace Cloud { @@ -104,7 +103,7 @@ void OneDriveStorage::tokenRefreshed(BoolCallback callback, Networking::JsonResp _token = result.getVal("access_token")->asString(); _uid = result.getVal("user_id")->asString(); _refreshToken = result.getVal("refresh_token")->asString(); - g_system->getCloudManager()->save(); //ask CloudManager to save our new refreshToken + CloudMan.save(); //ask CloudManager to save our new refreshToken if (callback) (*callback)(BoolResponse(nullptr, true)); } delete json; @@ -116,10 +115,10 @@ void OneDriveStorage::codeFlowComplete(BoolResponse response) { return; } - g_system->getCloudManager()->addStorage(this); + CloudMan.addStorage(this); ConfMan.removeKey("onedrive_code", "cloud"); debug("Done! You can use OneDrive now! Look:"); - g_system->getCloudManager()->syncSaves(); + CloudMan.syncSaves(); } void OneDriveStorage::saveConfig(Common::String keyPrefix) { |