Use std::unique_ptr for owning pointers

[libs/net.git] / source / http / client.h

diff --git a/source/http/client.h b/source/http/client.h
index d617ffed6c06e023daff3fe0e2ca2c20ef2e1c1c..d79389a71d09bce9761243a56f255d019a2ddf97 100644 (file)
--- 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>
@@ -10,12 +11,6 @@
 namespace Msp {
 namespace Http {
 
-class client_busy: public std::logic_error
-{
-public:
-       client_busy(): std::logic_error(std::string()) { }
-};
-
 class Request;
 class Response;
 
@@ -36,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 *);
@@ -60,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 &);