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/WhenWasIt/src/utils.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/plugins/WhenWasIt/src/utils.cpp b/plugins/WhenWasIt/src/utils.cpp
index f09f9ffdca..ec04582ed2 100644
--- a/plugins/WhenWasIt/src/utils.cpp
+++ b/plugins/WhenWasIt/src/utils.cpp
@@ -118,7 +118,7 @@ void HexToBin(char *inData, ULONG &size, LPBYTE &outData)
 	i = size;
 }
 
-int GetStringFromDatabase(HCONTACT hContact, char *szModule, char *szSettingName, char *szError, char *szResult, size_t size)
+int GetStringFromDatabase(MCONTACT hContact, char *szModule, char *szSettingName, char *szError, char *szResult, size_t size)
 {
 	DBVARIANT dbv = {0};
 	int res = 1;
@@ -156,7 +156,7 @@ int GetStringFromDatabase(char *szSettingName, char *szError, char *szResult, si
 
 
 #pragma warning (disable: 4312) 
-TCHAR *GetContactName(HCONTACT hContact, char *szProto)
+TCHAR *GetContactName(MCONTACT hContact, char *szProto)
 {
 	CONTACTINFO ctInfo = { sizeof(ctInfo) };
 	ctInfo.szProto = (szProto) ? szProto : GetContactProto(hContact);
@@ -176,12 +176,12 @@ TCHAR *GetContactName(HCONTACT hContact, char *szProto)
 	return buffer;
 }
 
-TCHAR *GetContactID(HCONTACT hContact)
+TCHAR *GetContactID(MCONTACT hContact)
 {
 	return GetContactID(hContact, GetContactProto(hContact));
 }
 
-TCHAR *GetContactID(HCONTACT hContact, char *szProto)
+TCHAR *GetContactID(MCONTACT hContact, char *szProto)
 {
 	CONTACTINFO ctInfo = { sizeof(ctInfo) };
 	ctInfo.szProto = szProto;
@@ -217,9 +217,9 @@ TCHAR *GetContactID(HCONTACT hContact, char *szProto)
 	return (!ret) ? buffer : NULL;
 }
 
-HCONTACT GetContactFromID(TCHAR *szID, char *szProto)
+MCONTACT GetContactFromID(TCHAR *szID, char *szProto)
 {
-	for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
+	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
 		char *m_szProto = GetContactProto(hContact);
 		TCHAR *szHandle = GetContactID(hContact, szProto);
 		if (szHandle) {
@@ -232,7 +232,7 @@ HCONTACT GetContactFromID(TCHAR *szID, char *szProto)
 	return NULL;
 }
 
-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