X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fhttp%2Fclient.h;h=d79389a71d09bce9761243a56f255d019a2ddf97;hb=6057616e00a6792e219fab2ce958306e737faa67;hp=e0b9b64f097b62c563480e0f879b2985cb5523c2;hpb=5afa6e0e07b20ef58d262d69d96971df9a4be71f;p=libs%2Fnet.git

diff --git a/source/http/client.h b/source/http/client.h
index e0b9b64..d79389a 100644
--- a/source/http/client.h
+++ b/source/http/client.h
@@ -1,6 +1,7 @@
 #ifndef MSP_HTTP_CLIENT_H_
 #define MSP_HTTP_CLIENT_H_
 
+#include <memory>
 #include <string>
 #include <sigc++/signal.h>
 #include <msp/io/eventdispatcher.h>
@@ -30,20 +31,19 @@ private:
 		void resolve_failed(unsigned, const std::exception &);
 	};
 
-	Net::StreamSocket *sock;
-	IO::EventDispatcher *event_disp;
-	Net::Resolver *resolver;
-	ResolveListener *resolve_listener;
-	unsigned resolve_tag;
-	std::string user_agent;
-	Request *request;
-	Response *response;
+	std::unique_ptr<Net::StreamSocket> sock;
+	IO::EventDispatcher *event_disp = nullptr;
+	Net::Resolver *resolver = nullptr;
+	std::unique_ptr<ResolveListener> resolve_listener;
+	unsigned resolve_tag = 0;
+	std::string user_agent = "libmspnet/1.0";
+	std::unique_ptr<Request> request;
+	std::unique_ptr<Response> response;
 	std::string in_buf;
 
 	Client(const Client &);
 	Client &operator=(const Client &);
 public:
-	Client();
 	~Client();
 
 	void use_event_dispatcher(IO::EventDispatcher *);
@@ -54,8 +54,8 @@ public:
 	void tick();
 	void wait_response();
 	void abort();
-	const Request *get_request() const { return request; }
-	const Response *get_response() const { return response; }
+	const Request *get_request() const { return request.get(); }
+	const Response *get_response() const { return response.get(); }
 private:
 	void address_resolved(unsigned, const Net::SockAddr &);
 	void resolve_failed(unsigned, const std::exception &);