merge from branch

git-svn-id: http://svn.miranda-ng.org/main/trunk@12029 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 1 insertions, 5 deletions

diff --git a/protocols/WhatsApp/src/WASocketConnection.h b/protocols/WhatsApp/src/WASocketConnection.h
index 1f0034471b..e6dcc472a6 100644
--- a/protocols/WhatsApp/src/WASocketConnection.h
+++ b/protocols/WhatsApp/src/WASocketConnection.h
@@ -1,12 +1,8 @@
 #if !defined(WASOCKETCONNECTION_H)

 #define WASOCKETCONNECTION_H

 

-#include "common.h"

 #include "WhatsAPI++/ISocketConnection.h"

-#include <iostream>

 #include "WhatsAPI++/WAException.h"

-#include "WhatsAPI++/WALogin.h"

-#include <windows.h>

 

 class WASocketConnection : public ISocketConnection

 {

@@ -21,7 +17,7 @@ private:
 	HANDLE hConn;

 

 public:

-	WASocketConnection(const std::string& dir, int port) throw (WAException);

+	WASocketConnection(const std::string &dir, int port) throw (WAException);

 	virtual ~WASocketConnection();

 

 	void write(int i);