merge from branch

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

1 files changed, 2 insertions, 2 deletions

diff --git a/protocols/WhatsApp/src/WhatsAPI++/WALogin.h b/protocols/WhatsApp/src/WhatsAPI++/WALogin.h
index 30c5937810..0d4d30af5b 100644
--- a/protocols/WhatsApp/src/WhatsAPI++/WALogin.h
+++ b/protocols/WhatsApp/src/WhatsAPI++/WALogin.h
@@ -35,7 +35,7 @@ public:
 

 	void init(unsigned char *_key, unsigned char *_keyMac);

 

-	static void keyFromPasswordAndNonce(const std::string& pass, const std::vector<unsigned char>& nonce, unsigned char *out);

+	static void keyFromPasswordAndNonce(const std::string &pass, const std::vector<unsigned char>& nonce, unsigned char *out);

 	void decodeMessage(unsigned char* buffer, int macOffset, int offset, const int length);

 	void encodeMessage(unsigned char* buffer, int macOffset, int offset, const int length);

 };

@@ -58,7 +58,7 @@ public:
 	int         m_iAccountKind;

 	std::string m_szPassword;

 

-	WALogin(WAConnection* connection, const std::string& password);

+	WALogin(WAConnection* connection, const std::string &password);

 	~WALogin();

 

 	std::vector<unsigned char> login(const std::vector<unsigned char> &blob);