aboutsummaryrefslogtreecommitdiff
path: root/backends/cloud/dropbox/dropboxstorage.h
diff options
context:
space:
mode:
authorAlexander Tkachev2016-05-27 15:21:06 +0600
committerAlexander Tkachev2016-08-24 16:07:55 +0600
commit98150beb38f73b56c7bc76f95dcc1d72290e4ac7 (patch)
treec56f8d97d30fb15f41f07f402c80e83a13cc03fc /backends/cloud/dropbox/dropboxstorage.h
parent83b349a033d71e92e292d1f1da0578d557ec6411 (diff)
downloadscummvm-rg350-98150beb38f73b56c7bc76f95dcc1d72290e4ac7.tar.gz
scummvm-rg350-98150beb38f73b56c7bc76f95dcc1d72290e4ac7.tar.bz2
scummvm-rg350-98150beb38f73b56c7bc76f95dcc1d72290e4ac7.zip
CLOUD: Refactor ConnectionManager/Requests system
ConnectionManager now storages Request * (not generates ids for it), Requests have control on their RequestState, RequestIdPair is now called Response and storages Request * with some response together. All related classes are changed to use it in more clean and understandable way. Request, RequestState and Response are carefully commented/documented.
Diffstat (limited to 'backends/cloud/dropbox/dropboxstorage.h')
-rw-r--r--backends/cloud/dropbox/dropboxstorage.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/backends/cloud/dropbox/dropboxstorage.h b/backends/cloud/dropbox/dropboxstorage.h
index dd082b25f1..f95d0c9812 100644
--- a/backends/cloud/dropbox/dropboxstorage.h
+++ b/backends/cloud/dropbox/dropboxstorage.h
@@ -41,7 +41,7 @@ class DropboxStorage: public Cloud::Storage {
static void getAccessToken(Common::String code);
/** Constructs StorageInfo based on JSON response from cloud. */
- void infoInnerCallback(StorageInfoCallback outerCallback, Networking::RequestJsonPair json);
+ void infoInnerCallback(StorageInfoCallback outerCallback, Networking::JsonResponse json);
void printFiles(Common::Array<StorageFile> files);
@@ -65,34 +65,34 @@ public:
/** Public Cloud API comes down there. */
/** Returns Common::Array<StorageFile>. */
- virtual int32 listDirectory(Common::String path, FileArrayCallback callback, bool recursive = false);
+ virtual Networking::Request *listDirectory(Common::String path, FileArrayCallback callback, bool recursive = false);
/** Calls the callback when finished. */
- virtual int32 upload(Common::String path, Common::ReadStream *contents, BoolCallback callback) { return -1; } //TODO
+ virtual Networking::Request *upload(Common::String path, Common::ReadStream *contents, BoolCallback callback) { return nullptr; } //TODO
/** Returns pointer to Networking::NetworkReadStream. */
- virtual int32 streamFile(Common::String path, ReadStreamCallback callback);
+ virtual Networking::Request *streamFile(Common::String path, Networking::NetworkReadStreamCallback callback);
/** Calls the callback when finished. */
- virtual int32 download(Common::String remotePath, Common::String localPath, BoolCallback callback);
+ virtual Networking::Request *download(Common::String remotePath, Common::String localPath, BoolCallback callback);
/** Calls the callback when finished. */
- virtual int32 remove(Common::String path, BoolCallback callback) { return -1; } //TODO
+ virtual Networking::Request *remove(Common::String path, BoolCallback callback) { return nullptr; } //TODO
/** Calls the callback when finished. */
- virtual int32 syncSaves(BoolCallback callback);
+ virtual Networking::Request *syncSaves(BoolCallback callback);
/** Calls the callback when finished. */
- virtual int32 createDirectory(Common::String path, BoolCallback callback) { return -1; } //TODO
+ virtual Networking::Request *createDirectory(Common::String path, BoolCallback callback) { return nullptr; } //TODO
/** Calls the callback when finished. */
- virtual int32 touch(Common::String path, BoolCallback callback) { return -1; } //TODO
+ virtual Networking::Request *touch(Common::String path, BoolCallback callback) { return nullptr; } //TODO
/** Returns the StorageInfo struct. */
- virtual int32 info(StorageInfoCallback callback);
+ virtual Networking::Request *info(StorageInfoCallback callback);
/** This method is passed into info(). (Temporary) */
- void infoMethodCallback(RequestStorageInfoPair pair);
+ void infoMethodCallback(StorageInfoResponse pair);
/** Returns whether saves sync process is running. */
virtual bool isSyncing() { return false; } //TODO