merge into trunk

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

1 files changed, 15 insertions, 15 deletions

diff --git a/protocols/WhatsApp/src/entities.h b/protocols/WhatsApp/src/entities.h
index 2be8cacd54..7cf037792e 100644
--- a/protocols/WhatsApp/src/entities.h
+++ b/protocols/WhatsApp/src/entities.h
@@ -3,9 +3,10 @@
 

 struct send_direct

 {

-	send_direct(MCONTACT hContact,const std::string &msg, HANDLE msgid, bool isChat = false)

-      : hContact(hContact), msg(msg), msgid(msgid)

-      {}

+	send_direct(MCONTACT hContact, const std::string &msg, HANDLE msgid, bool isChat = false) :

+		hContact(hContact), msg(msg), msgid(msgid)

+		{}

+

 	MCONTACT hContact;

 	std::string msg;

 	HANDLE msgid;

@@ -13,29 +14,28 @@ struct send_direct
 

 struct send_typing

 {

-	send_typing(MCONTACT hContact,const int status) : hContact(hContact), status(status) {}

+	send_typing(MCONTACT hContact, const int status) : hContact(hContact), status(status) {}

 	MCONTACT hContact;

 	int status;

 };

 

 struct input_box

 {

-   tstring text;

-   tstring title;

-   tstring defaultValue;

-   int limit;

-

-   void (__cdecl WhatsAppProto::*thread)(void*);

-   WhatsAppProto* proto;

-   void* userData;

+	tstring text;

+	tstring title;

+	tstring defaultValue;

+	int limit;

+

+	void(__cdecl WhatsAppProto::*thread)(void*);

+	WhatsAppProto *proto;

+	void *userData;

 };

 

 struct input_box_ret // has to be deleted by input-box handler

 {

-   void* userData; // has to be deleted by input-box handler

-   char* value; // mir_free() has to be called by input-box handler

+	void *userData; // has to be deleted by input-box handler

+	char *value; // mir_free() has to be called by input-box handler

 };

 

 

-

 #endif // ENTITIES_H
\ No newline at end of file