MNonCopyable - the common class to avoid declaring fake private constructors

1 files changed, 3 insertions, 9 deletions

diff --git a/protocols/SkypeWeb/src/http_request.h b/protocols/SkypeWeb/src/http_request.h
index 65bafa00fd..7b67fe44c6 100644
--- a/protocols/SkypeWeb/src/http_request.h
+++ b/protocols/SkypeWeb/src/http_request.h
@@ -58,17 +58,15 @@ struct FORMAT_VALUE : public VALUE
 	}

 };

 

-class HttpRequest : public NETLIBHTTPREQUEST, public MZeroedObject

+class HttpRequest : public NETLIBHTTPREQUEST, public MZeroedObject, private MNonCopyable

 {

-	HttpRequest& operator=(const HttpRequest&); // to prevent copying;

-

 	va_list formatArgs;

 	CMStringA url;

 

 protected:

 	enum HttpRequestUrlFormat { FORMAT };

 

-	class HttpRequestUrl

+	class HttpRequestUrl : private MNonCopyable

 	{

 		friend HttpRequest;

 

@@ -87,8 +85,6 @@ protected:
 			request.szUrl = request.url.GetBuffer();

 		}

 

-		HttpRequestUrl& operator=(const HttpRequestUrl&); // to prevent copying;

-

 	public:

 		HttpRequestUrl &operator<<(const VALUE &param)

 		{

@@ -120,10 +116,8 @@ protected:
 		}

 	};

 

-	class HttpRequestHeaders

+	class HttpRequestHeaders : private MNonCopyable

 	{

-		HttpRequestHeaders& operator=(const HttpRequestHeaders&); // to prevent copying;

-

 		HttpRequest &request;

 

 		void Add(LPCSTR szName)