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

(limited to 'plugins/Variables/src/contact.cpp')

diff --git a/plugins/Variables/src/contact.cpp b/plugins/Variables/src/contact.cpp
index a655d799ae..0f0ad17159 100644
--- a/plugins/Variables/src/contact.cpp
+++ b/plugins/Variables/src/contact.cpp
@@ -75,7 +75,7 @@ static builtinCnfs[] =
 
 typedef struct {
 	TCHAR* tszContact;
-	HCONTACT hContact;
+	MCONTACT hContact;
 	DWORD flags;
 } CONTACTCE; /* contact cache entry */
 
@@ -104,7 +104,7 @@ BYTE getContactInfoType(TCHAR* type)
 /*
 	returns info about a contact as a string
 */
-TCHAR* getContactInfoT(BYTE type, HCONTACT hContact)
+TCHAR* getContactInfoT(BYTE type, MCONTACT hContact)
 {
 	/* returns dynamic allocated buffer with info, or NULL if failed */
 	TCHAR *res = NULL;
@@ -216,7 +216,7 @@ int getContactFromString(CONTACTSINFO *ci)
 		for (int i=0; i < cacheSize; i++) {
 			if ((!_tcscmp(cce[i].tszContact, tszContact)) && (ci->flags == cce[i].flags)) {
 				/* found in cache */
-				ci->hContacts = (HCONTACT*)mir_alloc(sizeof(HCONTACT));
+				ci->hContacts = (MCONTACT*)mir_alloc(sizeof(MCONTACT));
 				if (ci->hContacts == NULL)
 					return -1;
 
@@ -227,7 +227,7 @@ int getContactFromString(CONTACTSINFO *ci)
 	}
 
 	/* contact was not in cache, do a search */
-	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 *szProto = GetContactProto(hContact);
 		if (szProto == NULL)
 			continue;
@@ -325,7 +325,7 @@ int getContactFromString(CONTACTSINFO *ci)
 			}
 		}
 		if (bMatch) {
-			ci->hContacts = (HCONTACT*)mir_realloc(ci->hContacts, (count + 1)*sizeof(HCONTACT));
+			ci->hContacts = (MCONTACT*)mir_realloc(ci->hContacts, (count + 1)*sizeof(MCONTACT));
 			if (ci->hContacts == NULL)
 				return -1;
 
@@ -353,7 +353,7 @@ int getContactFromString(CONTACTSINFO *ci)
 static int contactSettingChanged(WPARAM wParam, LPARAM lParam)
 {
 	DBCONTACTWRITESETTING *dbw = (DBCONTACTWRITESETTING*)lParam;
-	HCONTACT hContact = (HCONTACT)wParam;
+	MCONTACT hContact = (MCONTACT)wParam;
 
 	mir_cslock lck(csContactCache);
 	for (int i=0; i < cacheSize; i++) {
@@ -407,7 +407,7 @@ int deinitContactModule()
 
 // returns a string in the form <PROTOID:UNIQUEID>, cannot be _HANDLE_!
 // result must be freed
-TCHAR* encodeContactToString(HCONTACT hContact)
+TCHAR* encodeContactToString(MCONTACT hContact)
 {
 	char *szProto = GetContactProto(hContact);
 	TCHAR *tszUniqueId = getContactInfoT(CNF_UNIQUEID, hContact);
@@ -423,9 +423,9 @@ TCHAR* encodeContactToString(HCONTACT hContact)
 
 // returns a contact from a string in the form <PROTOID:UNIQUEID>
 // returns INVALID_HANDLE_VALUE in case of an error.
-HCONTACT decodeContactFromString(TCHAR *tszContact)
+MCONTACT decodeContactFromString(TCHAR *tszContact)
 {
-	HCONTACT hContact = (HCONTACT)INVALID_HANDLE_VALUE;
+	MCONTACT hContact = INVALID_CONTACT_ID;
 	CONTACTSINFO ci = { sizeof(ci) };
 	ci.tszContact = tszContact;
 	ci.flags = CI_PROTOID|CI_TCHAR;
-- 
cgit v1.2.3