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
---
 plugins/YahooGroups/src/utils.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'plugins/YahooGroups/src/utils.cpp')

diff --git a/plugins/YahooGroups/src/utils.cpp b/plugins/YahooGroups/src/utils.cpp
index 93b84691c8..d938abbab3 100644
--- a/plugins/YahooGroups/src/utils.cpp
+++ b/plugins/YahooGroups/src/utils.cpp
@@ -132,7 +132,7 @@ void HexToBin(char *inData, ULONG &size, LPBYTE &outData)
 	i = size;
 }
 
-int GetStringFromDatabase(HCONTACT hContact, char *szModule, char *szSettingName, char *szError, char *szResult, int size)
+int GetStringFromDatabase(MCONTACT hContact, char *szModule, char *szSettingName, char *szError, char *szResult, int size)
 {
 	DBVARIANT dbv = {0};
 	int res = 1;
@@ -163,7 +163,7 @@ int GetStringFromDatabase(HCONTACT hContact, char *szModule, char *szSettingName
 	return res;
 }
 
-int GetStringFromDatabase(HCONTACT hContact, char *szModule, char *szSettingName, WCHAR *szError, WCHAR *szResult, int count)
+int GetStringFromDatabase(MCONTACT hContact, char *szModule, char *szSettingName, WCHAR *szError, WCHAR *szResult, int count)
 {
 	DBVARIANT dbv = {0};
 	int res = 1;
@@ -204,7 +204,7 @@ int GetStringFromDatabase(char *szSettingName, WCHAR *szError, WCHAR *szResult,
 	return GetStringFromDatabase(NULL, ModuleName, szSettingName, szError, szResult, count);
 }
 
-TCHAR *GetContactName(HCONTACT hContact, char *szProto)
+TCHAR *GetContactName(MCONTACT hContact, char *szProto)
 {
 	CONTACTINFO ctInfo;
 	char proto[200];
@@ -240,12 +240,12 @@ TCHAR *GetContactName(HCONTACT hContact, char *szProto)
 	return buffer;
 }
 
-void GetContactProtocol(HCONTACT hContact, char *szProto, int size)
+void GetContactProtocol(MCONTACT hContact, char *szProto, int size)
 {
 	GetStringFromDatabase(hContact, "Protocol", "p", NULL, szProto, size);
 }
 
-TCHAR *GetContactID(HCONTACT hContact)
+TCHAR *GetContactID(MCONTACT hContact)
 {
 	char protocol[256];
 	GetContactProtocol(hContact, protocol, sizeof(protocol));
@@ -253,7 +253,7 @@ TCHAR *GetContactID(HCONTACT hContact)
 	return GetContactID(hContact, protocol);
 }
 
-TCHAR *GetContactID(HCONTACT hContact, char *szProto)
+TCHAR *GetContactID(MCONTACT hContact, char *szProto)
 {
 	CONTACTINFO ctInfo;
 
@@ -314,7 +314,7 @@ TCHAR *GetContactID(HCONTACT hContact, char *szProto)
 		}
 }
 
-HCONTACT GetContactFromID(TCHAR *szID, char *szProto)
+MCONTACT GetContactFromID(TCHAR *szID, char *szProto)
 {
 	TCHAR *szHandle;
 	TCHAR dispName[1024];
@@ -322,7 +322,7 @@ HCONTACT GetContactFromID(TCHAR *szID, char *szProto)
 	TCHAR *tmp;
 
 	int found = 0;
-	for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
+	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
 		GetContactProtocol(hContact, cProtocol, sizeof(cProtocol));
 		szHandle = GetContactID(hContact, cProtocol);
 		
@@ -343,7 +343,7 @@ HCONTACT GetContactFromID(TCHAR *szID, char *szProto)
 #pragma warning (default: 4312)
 
 #pragma warning (disable: 4312)
-HCONTACT GetContactFromID(TCHAR *szID, wchar_t *szProto)
+MCONTACT GetContactFromID(TCHAR *szID, wchar_t *szProto)
 {
 	char protocol[1024];
 	WideCharToMultiByte(CP_ACP, 0, szProto, -1, protocol, sizeof(protocol), NULL, NULL);
-- 
cgit v1.2.3