From 68d3fd47bb9b75e65859d14199ffee01f16ac9a7 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 10 Feb 2014 20:47:51 +0000
Subject: HCONTACT is not needed anymore

git-svn-id: http://svn.miranda-ng.org/main/trunk@8086 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/VKontakte/src/vk_proto.cpp | 48 ++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

(limited to 'protocols/VKontakte/src/vk_proto.cpp')

diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp
index 3e52d04e5f..f1697284c2 100644
--- a/protocols/VKontakte/src/vk_proto.cpp
+++ b/protocols/VKontakte/src/vk_proto.cpp
@@ -103,7 +103,7 @@ int CVkProto::OnPreShutdown(WPARAM wParam, LPARAM lParam)
 
 //////////////////////////////////////////////////////////////////////////////
 
-DWORD_PTR CVkProto::GetCaps(int type, HCONTACT hContact)
+DWORD_PTR CVkProto::GetCaps(int type, MCONTACT hContact)
 {
 	switch(type) {
 	case PFLAGNUM_1:
@@ -135,7 +135,7 @@ DWORD_PTR CVkProto::GetCaps(int type, HCONTACT hContact)
 
 //////////////////////////////////////////////////////////////////////////////
 
-int CVkProto::RecvMsg(HCONTACT hContact, PROTORECVEVENT *pre)
+int CVkProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT *pre)
 { 
 	Proto_RecvMessage(hContact, pre);
 	return 0;
@@ -145,11 +145,11 @@ int CVkProto::RecvMsg(HCONTACT hContact, PROTORECVEVENT *pre)
 
 struct TFakeAckParams
 {
-	__inline TFakeAckParams(HCONTACT _hContact, int _msgid) :
+	__inline TFakeAckParams(MCONTACT _hContact, int _msgid) :
 		hContact(_hContact), msgid(_msgid)
 		{}
 
-	HCONTACT hContact;
+	MCONTACT hContact;
 	int msgid;
 };
 
@@ -161,7 +161,7 @@ void CVkProto::SendMsgAck(void *param)
 	delete ack;
 }
 
-int CVkProto::SendMsg(HCONTACT hContact, int flags, const char *msg)
+int CVkProto::SendMsg(MCONTACT hContact, int flags, const char *msg)
 { 
 	LONG userID = getDword(hContact, "ID", -1);
 	if (userID == -1)
@@ -202,7 +202,7 @@ void CVkProto::OnSendMessage(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pReq)
 	}
 
 	if (m_bServerDelivery)
-		ProtoBroadcastAck((HCONTACT)pReq->pData, ACKTYPE_MESSAGE, iResult, pReq->pUserInfo, 0);
+		ProtoBroadcastAck((MCONTACT)pReq->pData, ACKTYPE_MESSAGE, iResult, pReq->pUserInfo, 0);
 	pReq->pData = NULL;
 }
 
@@ -273,12 +273,12 @@ HANDLE CVkProto::SearchByName(const PROTOCHAR* nick, const PROTOCHAR* firstName,
 	return 0;
 }
 
-HCONTACT CVkProto::AddToList(int flags, PROTOSEARCHRESULT* psr)
+MCONTACT CVkProto::AddToList(int flags, PROTOSEARCHRESULT* psr)
 {
 	return NULL;
 }
 
-int CVkProto::AuthRequest(HCONTACT hContact,const PROTOCHAR *message)
+int CVkProto::AuthRequest(MCONTACT hContact,const PROTOCHAR *message)
 {
 	return 0;
 }
@@ -295,17 +295,17 @@ int CVkProto::AuthDeny(HANDLE hDbEvent, const PROTOCHAR *reason)
 	return 1;
 }
 
-int CVkProto::UserIsTyping(HCONTACT hContact, int type)
+int CVkProto::UserIsTyping(MCONTACT hContact, int type)
 { 
 	return 0;
 }
 
-HCONTACT CVkProto::AddToListByEvent(int flags,int iContact,HANDLE hDbEvent)
+MCONTACT CVkProto::AddToListByEvent(int flags,int iContact,HANDLE hDbEvent)
 {
 	return NULL;
 }
 
-int CVkProto::AuthRecv(HCONTACT hContact,PROTORECVEVENT *)
+int CVkProto::AuthRecv(MCONTACT hContact,PROTORECVEVENT *)
 {
 	return 1;
 }
@@ -316,17 +316,17 @@ HANDLE CVkProto::ChangeInfo(int type,void *info_data)
 	return NULL;
 }
 
-HANDLE CVkProto::FileAllow(HCONTACT hContact,HANDLE hTransfer,const PROTOCHAR *path)
+HANDLE CVkProto::FileAllow(MCONTACT hContact,HANDLE hTransfer,const PROTOCHAR *path)
 {
 	return NULL;
 }
 
-int CVkProto::FileCancel(HCONTACT hContact,HANDLE hTransfer)
+int CVkProto::FileCancel(MCONTACT hContact,HANDLE hTransfer)
 {
 	return 1;
 }
 
-int CVkProto::FileDeny(HCONTACT hContact,HANDLE hTransfer,const PROTOCHAR *reason)
+int CVkProto::FileDeny(MCONTACT hContact,HANDLE hTransfer,const PROTOCHAR *reason)
 {
 	return 1;
 }
@@ -336,7 +336,7 @@ int CVkProto::FileResume(HANDLE hTransfer,int *action,const PROTOCHAR **filename
 	return 1;
 }
 
-int CVkProto::GetInfo(HCONTACT hContact, int infoType)
+int CVkProto::GetInfo(MCONTACT hContact, int infoType)
 {
 	// TODO: Most probably some ProtoAck should be here instead
 	return 1;
@@ -352,47 +352,47 @@ HWND CVkProto::CreateExtendedSearchUI(HWND owner)
 	return NULL;
 }
 
-int CVkProto::RecvContacts(HCONTACT hContact,PROTORECVEVENT *)
+int CVkProto::RecvContacts(MCONTACT hContact,PROTORECVEVENT *)
 {
 	return 1;
 }
 
-int CVkProto::RecvFile(HCONTACT hContact,PROTORECVFILET *)
+int CVkProto::RecvFile(MCONTACT hContact,PROTORECVFILET *)
 {
 	return 1;
 }
 
-int CVkProto::RecvUrl(HCONTACT hContact,PROTORECVEVENT *)
+int CVkProto::RecvUrl(MCONTACT hContact,PROTORECVEVENT *)
 {
 	return 1;
 }
 
-int CVkProto::SendContacts(HCONTACT hContact, int flags, int nContacts, HCONTACT *hContactsList)
+int CVkProto::SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList)
 {
 	return 1;
 }
 
-HANDLE CVkProto::SendFile(HCONTACT hContact,const PROTOCHAR *desc, PROTOCHAR **files)
+HANDLE CVkProto::SendFile(MCONTACT hContact,const PROTOCHAR *desc, PROTOCHAR **files)
 {
 	return NULL;
 }
 
-int CVkProto::SendUrl(HCONTACT hContact,int flags,const char *url)
+int CVkProto::SendUrl(MCONTACT hContact,int flags,const char *url)
 {
 	return 1;
 }
 
-int CVkProto::SetApparentMode(HCONTACT hContact,int mode)
+int CVkProto::SetApparentMode(MCONTACT hContact,int mode)
 {
 	return 1;
 }
 
-int CVkProto::RecvAwayMsg(HCONTACT hContact,int mode,PROTORECVEVENT *evt)
+int CVkProto::RecvAwayMsg(MCONTACT hContact,int mode,PROTORECVEVENT *evt)
 {
 	return 1;
 }
 
-HANDLE CVkProto::GetAwayMsg(HCONTACT hContact)
+HANDLE CVkProto::GetAwayMsg(MCONTACT hContact)
 {
 	return 0; // Status messages are disabled
 }
-- 
cgit v1.2.3