aboutsummaryrefslogtreecommitdiff
path: root/backends/cloud/dropbox
diff options
context:
space:
mode:
authorAlexander Tkachev2016-06-21 17:07:23 +0600
committerAlexander Tkachev2016-08-24 16:07:55 +0600
commitf3a392359be2f6d05bac107a5f7bd168c178e428 (patch)
treeeab864e98d1b75414f55053375fab076e1b23ecc /backends/cloud/dropbox
parentfa3ea83165d6c378348f61f8daec85f805626dbe (diff)
downloadscummvm-rg350-f3a392359be2f6d05bac107a5f7bd168c178e428.tar.gz
scummvm-rg350-f3a392359be2f6d05bac107a5f7bd168c178e428.tar.bz2
scummvm-rg350-f3a392359be2f6d05bac107a5f7bd168c178e428.zip
CLOUD: Fix finishSuccess() warning
Diffstat (limited to 'backends/cloud/dropbox')
-rw-r--r--backends/cloud/dropbox/dropboxcreatedirectoryrequest.cpp4
-rw-r--r--backends/cloud/dropbox/dropboxcreatedirectoryrequest.h2
-rw-r--r--backends/cloud/dropbox/dropboxlistdirectoryrequest.cpp4
-rw-r--r--backends/cloud/dropbox/dropboxlistdirectoryrequest.h2
-rw-r--r--backends/cloud/dropbox/dropboxuploadrequest.cpp6
-rw-r--r--backends/cloud/dropbox/dropboxuploadrequest.h2
6 files changed, 10 insertions, 10 deletions
diff --git a/backends/cloud/dropbox/dropboxcreatedirectoryrequest.cpp b/backends/cloud/dropbox/dropboxcreatedirectoryrequest.cpp
index 61cc9ddfcd..a52d41e896 100644
--- a/backends/cloud/dropbox/dropboxcreatedirectoryrequest.cpp
+++ b/backends/cloud/dropbox/dropboxcreatedirectoryrequest.cpp
@@ -82,7 +82,7 @@ void DropboxCreateDirectoryRequest::responseCallback(Networking::JsonResponse re
}
Common::JSONObject info = json->asObject();
- if (info.contains("id")) finishSuccess(true);
+ if (info.contains("id")) finishCreation(true);
else {
error.response = json->stringify(true);
finishError(error);
@@ -104,7 +104,7 @@ void DropboxCreateDirectoryRequest::restart() { start(); }
Common::String DropboxCreateDirectoryRequest::date() const { return _date; }
-void DropboxCreateDirectoryRequest::finishSuccess(bool success) {
+void DropboxCreateDirectoryRequest::finishCreation(bool success) {
Request::finishSuccess();
if (_boolCallback) (*_boolCallback)(Storage::BoolResponse(this, success));
}
diff --git a/backends/cloud/dropbox/dropboxcreatedirectoryrequest.h b/backends/cloud/dropbox/dropboxcreatedirectoryrequest.h
index e8599c7df9..4bdc6dbee6 100644
--- a/backends/cloud/dropbox/dropboxcreatedirectoryrequest.h
+++ b/backends/cloud/dropbox/dropboxcreatedirectoryrequest.h
@@ -41,7 +41,7 @@ class DropboxCreateDirectoryRequest: public Networking::Request {
void start();
void responseCallback(Networking::JsonResponse response);
void errorCallback(Networking::ErrorResponse error);
- void finishSuccess(bool success);
+ void finishCreation(bool success);
public:
DropboxCreateDirectoryRequest(Common::String token, Common::String path, Storage::BoolCallback cb, Networking::ErrorCallback ecb);
virtual ~DropboxCreateDirectoryRequest();
diff --git a/backends/cloud/dropbox/dropboxlistdirectoryrequest.cpp b/backends/cloud/dropbox/dropboxlistdirectoryrequest.cpp
index 933ea2bd8e..dcbca3131e 100644
--- a/backends/cloud/dropbox/dropboxlistdirectoryrequest.cpp
+++ b/backends/cloud/dropbox/dropboxlistdirectoryrequest.cpp
@@ -125,7 +125,7 @@ void DropboxListDirectoryRequest::responseCallback(Networking::JsonResponse resp
_workingRequest = ConnMan.addRequest(request);
} else {
- finishSuccess(_files);
+ finishListing(_files);
}
} else {
warning("null, not json");
@@ -149,7 +149,7 @@ void DropboxListDirectoryRequest::restart() { start(); }
Common::String DropboxListDirectoryRequest::date() const { return _date; }
-void DropboxListDirectoryRequest::finishSuccess(Common::Array<StorageFile> &files) {
+void DropboxListDirectoryRequest::finishListing(Common::Array<StorageFile> &files) {
Request::finishSuccess();
if (_listDirectoryCallback) (*_listDirectoryCallback)(Storage::ListDirectoryResponse(this, files));
}
diff --git a/backends/cloud/dropbox/dropboxlistdirectoryrequest.h b/backends/cloud/dropbox/dropboxlistdirectoryrequest.h
index 0d96edd1e6..62dde71f76 100644
--- a/backends/cloud/dropbox/dropboxlistdirectoryrequest.h
+++ b/backends/cloud/dropbox/dropboxlistdirectoryrequest.h
@@ -45,7 +45,7 @@ class DropboxListDirectoryRequest: public Networking::Request {
void start();
void responseCallback(Networking::JsonResponse response);
void errorCallback(Networking::ErrorResponse error);
- void finishSuccess(Common::Array<StorageFile> &files);
+ void finishListing(Common::Array<StorageFile> &files);
public:
DropboxListDirectoryRequest(Common::String token, Common::String path, Storage::ListDirectoryCallback cb, Networking::ErrorCallback ecb, bool recursive = false);
virtual ~DropboxListDirectoryRequest();
diff --git a/backends/cloud/dropbox/dropboxuploadrequest.cpp b/backends/cloud/dropbox/dropboxuploadrequest.cpp
index f1fb818d36..e530502413 100644
--- a/backends/cloud/dropbox/dropboxuploadrequest.cpp
+++ b/backends/cloud/dropbox/dropboxuploadrequest.cpp
@@ -148,7 +148,7 @@ void DropboxUploadRequest::partUploadedCallback(Networking::JsonResponse respons
Common::String path = object.getVal("path_lower")->asString();
uint32 size = object.getVal("size")->asIntegerNumber();
uint32 timestamp = ISO8601::convertToTimestamp(object.getVal("server_modified")->asString());
- finishSuccess(StorageFile(path, size, timestamp, false));
+ finishUpload(StorageFile(path, size, timestamp, false));
return;
}
@@ -163,7 +163,7 @@ void DropboxUploadRequest::partUploadedCallback(Networking::JsonResponse respons
if (!needsFinishRequest && (_contentsStream->eos() || _contentsStream->pos() >= _contentsStream->size() - 1)) {
warning("no file info to return");
- finishSuccess(StorageFile(_savePath, 0, 0, false));
+ finishUpload(StorageFile(_savePath, 0, 0, false));
} else {
uploadNextPart();
}
@@ -186,7 +186,7 @@ void DropboxUploadRequest::handle() {}
void DropboxUploadRequest::restart() { start(); }
-void DropboxUploadRequest::finishSuccess(StorageFile file) {
+void DropboxUploadRequest::finishUpload(StorageFile file) {
Request::finishSuccess();
if (_uploadCallback) (*_uploadCallback)(Storage::UploadResponse(this, file));
}
diff --git a/backends/cloud/dropbox/dropboxuploadrequest.h b/backends/cloud/dropbox/dropboxuploadrequest.h
index a85d7ef883..8d9a3e2650 100644
--- a/backends/cloud/dropbox/dropboxuploadrequest.h
+++ b/backends/cloud/dropbox/dropboxuploadrequest.h
@@ -44,7 +44,7 @@ class DropboxUploadRequest: public Networking::Request {
void uploadNextPart();
void partUploadedCallback(Networking::JsonResponse response);
void partUploadedErrorCallback(Networking::ErrorResponse error);
- void finishSuccess(StorageFile status);
+ void finishUpload(StorageFile status);
public:
DropboxUploadRequest(Common::String token, Common::String path, Common::SeekableReadStream *contents, Storage::UploadCallback callback, Networking::ErrorCallback ecb);