VKontakte: types fix

3 files changed, 12 insertions, 12 deletions

diff --git a/protocols/VKontakte/src/vk_chats.cpp b/protocols/VKontakte/src/vk_chats.cpp
index 2cbed48bf6..377c7c076f 100644
--- a/protocols/VKontakte/src/vk_chats.cpp
+++ b/protocols/VKontakte/src/vk_chats.cpp
@@ -142,7 +142,7 @@ void CVkProto::OnReceiveChatInfo(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pRe
 			if (!jnUser)

 				break;

 

-			int uid = jnUser["id"].as_int();

+			LONG uid = jnUser["id"].as_int();

 			bool bIsGroup = jnUser["type"].as_mstring() == L"group";

 			if (bIsGroup)

 				uid *= -1;

@@ -392,7 +392,7 @@ void CVkProto::AppendChatMessage(int id, const JSONNode &jnMsg, const JSONNode &
 	}

 }

 

-void CVkProto::AppendChatMessage(CVkChatInfo *cc, int uid, int msgTime, LPCWSTR pwszBody, bool bIsHistory, bool bIsAction)

+void CVkProto::AppendChatMessage(CVkChatInfo *cc, LONG uid, int msgTime, LPCWSTR pwszBody, bool bIsHistory, bool bIsAction)

 {

 	debugLogA("CVkProto::AppendChatMessage2");

 	MCONTACT hContact = FindUser(uid);

@@ -545,7 +545,7 @@ void CVkProto::LogMenuHook(CVkChatInfo *cc, GCHOOK *gch)
 		{

 			CVkInviteChatForm dlg(this);

 			if (dlg.DoModal() && dlg.m_hContact != 0) {

-				int uid = getDword(dlg.m_hContact, "ID", VK_INVALID_USER);

+				LONG uid = getDword(dlg.m_hContact, "ID", VK_INVALID_USER);

 				if (uid != VK_INVALID_USER)

 					Push(new AsyncHttpRequest(this, REQUEST_GET, "/method/messages.addChatUser.json", true, &CVkProto::OnReceiveSmth)

 						<< INT_PARAM("user_id", uid)

@@ -626,7 +626,7 @@ void CVkProto::LeaveChat(int chat_id, bool close_window, bool delete_chat)
 	m_chats.remove(cc);

 }

 

-void CVkProto::KickFromChat(int chat_id, int user_id, const JSONNode &jnMsg, const JSONNode &jnFUsers)

+void CVkProto::KickFromChat(int chat_id, LONG user_id, const JSONNode &jnMsg, const JSONNode &jnFUsers)

 {

 	debugLogA("CVkProto::KickFromChat (%d)", user_id);

 

@@ -811,7 +811,7 @@ void CVkProto::ChatContactTypingThread(void *p)
 		return;

 

 	int iChatId = param->m_ChatId;

-	int iUserId = param->m_UserId;

+	LONG iUserId = param->m_UserId;

 

 	debugLogA("CVkProto::ChatContactTypingThread %d %d", iChatId, iUserId);

 

@@ -847,7 +847,7 @@ void CVkProto::ChatContactTypingThread(void *p)
 	StopChatContactTyping(iChatId, iUserId);

 }

 

-void CVkProto::StopChatContactTyping(int iChatId, int iUserId)

+void CVkProto::StopChatContactTyping(int iChatId, LONG iUserId)

 {

 	debugLogA("CVkProto::StopChatContactTyping %d %d", iChatId, iUserId);

 	MCONTACT hChatContact = FindChat(iChatId);

diff --git a/protocols/VKontakte/src/vk_proto.h b/protocols/VKontakte/src/vk_proto.h
index e50e42a2b6..984dc46808 100644
--- a/protocols/VKontakte/src/vk_proto.h
+++ b/protocols/VKontakte/src/vk_proto.h
@@ -384,12 +384,12 @@ private:
 	void ReloadAvatarInfo(MCONTACT hContact);

 	void __cdecl SendMsgAck(void *param);

 	void __cdecl ChatContactTypingThread(void *p);

-	void StopChatContactTyping(int iChatId, int iUserId);

+	void StopChatContactTyping(int iChatId, LONG iUserId);

 	void OnCreateNewChat(NETLIBHTTPREQUEST*, AsyncHttpRequest*);

 	CVkChatInfo* AppendChat(int id, const JSONNode &jnNode);

 	void SetChatTitle(CVkChatInfo *cc, LPCWSTR wszTopic);

 	void AppendChatMessage(int id, const JSONNode &jnMsg, const JSONNode &jnFUsers, bool bIsHistory);

-	void AppendChatMessage(CVkChatInfo *cc, int uid, int msgTime, LPCWSTR pwszBody, bool bIsHistory, bool bIsAction = false);

+	void AppendChatMessage(CVkChatInfo *cc, LONG uid, int msgTime, LPCWSTR pwszBody, bool bIsHistory, bool bIsAction = false);

 	void RetrieveChatInfo(CVkChatInfo*);

 	void OnReceiveChatInfo(NETLIBHTTPREQUEST*, AsyncHttpRequest*);

 	void OnSendChatMsg(NETLIBHTTPREQUEST*, AsyncHttpRequest*);

@@ -397,7 +397,7 @@ private:
 	void OnChatDestroy(NETLIBHTTPREQUEST*, AsyncHttpRequest*);

 	int __cdecl OnChatEvent(WPARAM, LPARAM);

 	int __cdecl OnGcMenuHook(WPARAM, LPARAM);

-	void KickFromChat(int chat_id, int user_id, const JSONNode &jnMsg, const JSONNode &jnFUsers);

+	void KickFromChat(int chat_id, LONG user_id, const JSONNode &jnMsg, const JSONNode &jnFUsers);

 	void LeaveChat(int chat_id, bool close_window = true, bool delete_chat = false);

 	INT_PTR __cdecl OnLeaveChat(WPARAM, LPARAM);

 	INT_PTR __cdecl OnJoinChat(WPARAM, LPARAM);

diff --git a/protocols/VKontakte/src/vk_struct.h b/protocols/VKontakte/src/vk_struct.h
index ee6b699b56..89077432dd 100644
--- a/protocols/VKontakte/src/vk_struct.h
+++ b/protocols/VKontakte/src/vk_struct.h
@@ -103,13 +103,13 @@ struct CVkChatMessage : public MZeroedObject
 

 struct CVkChatUser : public MZeroedObject

 {

-	CVkChatUser(int _id) :

+	CVkChatUser(LONG _id) :

 		m_uid(_id),

 		m_bDel(false),

 		m_bUnknown(false)

 	{}

 

-	int m_uid;

+	LONG m_uid;

 	bool m_bDel, m_bUnknown;

 	ptrW m_wszNick;

 };

@@ -204,7 +204,7 @@ struct CVKChatContactTypingParam {
 	{}

 

 	int m_ChatId;

-	int m_UserId;

+	LONG m_UserId;

 };

 

 struct CVKInteres {