aboutsummaryrefslogtreecommitdiff
path: root/backends/networking/curl/curljsonrequest.cpp
diff options
context:
space:
mode:
authorAlexander Tkachev2016-05-21 21:30:25 +0600
committerAlexander Tkachev2016-08-24 16:07:55 +0600
commite1109c0c328aaf671e2b03b3b4e6de1ae9061754 (patch)
treedf4beeb28006b68c6d60953c164f53660f74b376 /backends/networking/curl/curljsonrequest.cpp
parentca456a7241fb4b46f9c76c86eeecc273ca31d8f6 (diff)
downloadscummvm-rg350-e1109c0c328aaf671e2b03b3b4e6de1ae9061754.tar.gz
scummvm-rg350-e1109c0c328aaf671e2b03b3b4e6de1ae9061754.tar.bz2
scummvm-rg350-e1109c0c328aaf671e2b03b3b4e6de1ae9061754.zip
CLOUD: Add CallbackBridge
This commit also adds GlobalFunctionCallback, because it was needed in order to replace plain C pointers to functions (which were used in Request) into our object-oriented BaseCallback pointers.
Diffstat (limited to 'backends/networking/curl/curljsonrequest.cpp')
-rw-r--r--backends/networking/curl/curljsonrequest.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/backends/networking/curl/curljsonrequest.cpp b/backends/networking/curl/curljsonrequest.cpp
index fe6e218269..c3064681ef 100644
--- a/backends/networking/curl/curljsonrequest.cpp
+++ b/backends/networking/curl/curljsonrequest.cpp
@@ -31,7 +31,7 @@
namespace Networking {
-CurlJsonRequest::CurlJsonRequest(SimpleCallback cb, const char *url) : Request(cb), _stream(0), _headersList(0), _contentsStream(DisposeAfterUse::YES) {
+CurlJsonRequest::CurlJsonRequest(Common::BaseCallback* cb, const char *url) : Request(cb), _stream(0), _headersList(0), _contentsStream(DisposeAfterUse::YES) {
_url = url;
}
@@ -75,7 +75,7 @@ bool CurlJsonRequest::handle() {
if (_callback) {
char *contents = getPreparedContents();
Common::JSONValue *json = Common::JSON::parse(contents);
- _callback(this, json); //potential memory leak, free it in your callbacks!
+ (*_callback)(json); //potential memory leak, free it in your callbacks!
}
return true;
}