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/YAPP/src/message_pump.h | 2 +-
 plugins/YAPP/src/options.cpp    | 2 +-
 plugins/YAPP/src/popwin.cpp     | 4 ++--
 plugins/YAPP/src/services.cpp   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'plugins/YAPP/src')

diff --git a/plugins/YAPP/src/message_pump.h b/plugins/YAPP/src/message_pump.h
index 6283a0f14b..a6fbb1c164 100644
--- a/plugins/YAPP/src/message_pump.h
+++ b/plugins/YAPP/src/message_pump.h
@@ -15,7 +15,7 @@ struct PopupData
 {
 	int cbSize;
 	int flags; // OR of PDF_* flags below
-	HCONTACT hContact;
+	MCONTACT hContact;
 	HICON hIcon;
 	union {
 		char *pszTitle;
diff --git a/plugins/YAPP/src/options.cpp b/plugins/YAPP/src/options.cpp
index 7b11771414..97180ba262 100644
--- a/plugins/YAPP/src/options.cpp
+++ b/plugins/YAPP/src/options.cpp
@@ -99,7 +99,7 @@ void ShowExamplePopups()
 	pd.ptzText = TranslateT("Thequickbrownfoxjumpedoverthelazydog.");
 	ShowPopup(pd);
 
-	for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
+	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
 		if (options.av_layout != PAV_NONE && ServiceExists(MS_AV_DRAWAVATAR)) {
 			AVATARCACHEENTRY *ace = (AVATARCACHEENTRY *)CallService(MS_AV_GETAVATARBITMAP, (WPARAM)hContact, 0);
 			if (ace && (ace->dwFlags & AVS_BITMAP_VALID)) {
diff --git a/plugins/YAPP/src/popwin.cpp b/plugins/YAPP/src/popwin.cpp
index 0ff42ee951..bf37ce97d9 100644
--- a/plugins/YAPP/src/popwin.cpp
+++ b/plugins/YAPP/src/popwin.cpp
@@ -566,7 +566,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
 
 	case PUM_GETCONTACT:
 		{
-			HCONTACT *phContact = (HCONTACT*)wParam;
+			MCONTACT *phContact = (MCONTACT*)wParam;
 			*phContact = pd->hContact;
 			if (lParam)
 				SetEvent((HANDLE)lParam);
@@ -695,7 +695,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
 			pd->colorBack = MNotifyGetDWord(pwd->hNotify, NFOPT_BACKCOLOR, colBg);
 			pd->colorText = MNotifyGetDWord(pwd->hNotify, NFOPT_TEXTCOLOR, colSecondLine);
 			pd->timeout = MNotifyGetDWord(pwd->hNotify, NFOPT_TIMEOUT, options.default_timeout);
-			pd->hContact = (HCONTACT)MNotifyGetDWord(pwd->hNotify, NFOPT_CONTACT, 0);
+			pd->hContact = (MCONTACT)MNotifyGetDWord(pwd->hNotify, NFOPT_CONTACT, 0);
 			pd->hIcon = (HICON)MNotifyGetDWord(pwd->hNotify, NFOPT_ICON, 0);
 
 			const wchar_t *swzName = MNotifyGetWString(pwd->hNotify, NFOPT_TITLEW, 0);
diff --git a/plugins/YAPP/src/services.cpp b/plugins/YAPP/src/services.cpp
index 808b184990..128e2ef84d 100644
--- a/plugins/YAPP/src/services.cpp
+++ b/plugins/YAPP/src/services.cpp
@@ -162,7 +162,7 @@ void ShowPopup(PopupData &pd_in)
 static INT_PTR GetContact(WPARAM wParam, LPARAM lParam)
 {
 	HWND hwndPop = (HWND)wParam;
-	HCONTACT hContact;
+	MCONTACT hContact;
 	if (GetCurrentThreadId() == message_pump_thread_id)
 		SendMessage(hwndPop, PUM_GETCONTACT, (WPARAM)&hContact, 0);
 	else {
-- 
cgit v1.2.3