From b246c17850687e7b15b644b761fbfe835ffc1c32 Mon Sep 17 00:00:00 2001
From: Alexander Tkachev
Date: Thu, 26 May 2016 19:22:27 +0600
Subject: CLOUD: Fix CurlJsonRequest to use JsonCallback

Type safety first.
---
 backends/networking/curl/curljsonrequest.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'backends/networking/curl/curljsonrequest.h')

diff --git a/backends/networking/curl/curljsonrequest.h b/backends/networking/curl/curljsonrequest.h
index 3d5dd7858b..75d4a6df81 100644
--- a/backends/networking/curl/curljsonrequest.h
+++ b/backends/networking/curl/curljsonrequest.h
@@ -25,19 +25,24 @@
 
 #include "backends/networking/curl/curlrequest.h"
 #include "common/memstream.h"
+#include "common/json.h"
 
 namespace Networking {
 
 class NetworkReadStream;
 
-class CurlJsonRequest: public CurlRequest {	
+typedef RequestIdPair<Common::JSONValue*> RequestJsonPair;
+typedef Common::BaseCallback<RequestJsonPair> *JsonCallback;
+
+class CurlJsonRequest: public CurlRequest {
+	JsonCallback _jsonCallback;
 	Common::MemoryWriteStreamDynamic _contentsStream;
 
 	/** Prepares raw bytes from _contentsStream to be parsed with Common::JSON::parse(). */
 	char *getPreparedContents();
 
 public:
-	CurlJsonRequest(DataCallback cb, const char *url); //TODO: use some Callback<JSON> already
+	CurlJsonRequest(JsonCallback cb, const char *url);
 	virtual ~CurlJsonRequest();
 
 	virtual void handle();
-- 
cgit v1.2.3