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/TabSRMM/src/chat/chat.h       | 6 +++---
 plugins/TabSRMM/src/chat/manager.cpp  | 2 +-
 plugins/TabSRMM/src/chat/services.cpp | 2 +-
 plugins/TabSRMM/src/chat/tools.cpp    | 2 +-
 plugins/TabSRMM/src/chat/window.cpp   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'plugins/TabSRMM/src/chat')

diff --git a/plugins/TabSRMM/src/chat/chat.h b/plugins/TabSRMM/src/chat/chat.h
index 1e1e8caa16..3ea4cdc8b4 100644
--- a/plugins/TabSRMM/src/chat/chat.h
+++ b/plugins/TabSRMM/src/chat/chat.h
@@ -103,7 +103,7 @@ struct TMUCSettings : public GlobalLogSettingsBase
 
 struct FLASH_PARAMS
 {
-	HCONTACT hContact;
+	MCONTACT hContact;
 	const char* sound;
 	int   iEvent;
 	HICON hNotifyIcon;
@@ -151,7 +151,7 @@ HWND CreateNewRoom(TContainerData *pContainer, SESSION_INFO *si, BOOL bActivateT
 
 // manager.c
 SESSION_INFO* SM_FindSessionByHWND(HWND h);
-SESSION_INFO* SM_FindSessionByHCONTACT(HCONTACT h);
+SESSION_INFO* SM_FindSessionByHCONTACT(MCONTACT h);
 SESSION_INFO* SM_FindSessionAutoComplete(const char* pszModule, SESSION_INFO* currSession, SESSION_INFO* prevSession, const TCHAR* pszOriginal, const TCHAR* pszCurrent);
 
 void SM_RemoveContainer(TContainerData *pContainer);
@@ -173,7 +173,7 @@ void          DestroyGCMenu(HMENU *hMenu, int iIndex);
 void          Chat_SetFilters(SESSION_INFO *si);
 void TSAPI    DoFlashAndSoundWorker(FLASH_PARAMS* p);
 BOOL          DoPopup(SESSION_INFO *si, GCEVENT* gce);
-int           ShowPopup(HCONTACT hContact, SESSION_INFO *si, HICON hIcon, char* pszProtoName, TCHAR* pszRoomName, COLORREF crBkg, const TCHAR* fmt, ...);
+int           ShowPopup(MCONTACT hContact, SESSION_INFO *si, HICON hIcon, char* pszProtoName, TCHAR* pszRoomName, COLORREF crBkg, const TCHAR* fmt, ...);
 BOOL          LogToFile(SESSION_INFO *si, GCEVENT *gce);
 
 // message.c
diff --git a/plugins/TabSRMM/src/chat/manager.cpp b/plugins/TabSRMM/src/chat/manager.cpp
index 9aff83efd0..500e5f394d 100644
--- a/plugins/TabSRMM/src/chat/manager.cpp
+++ b/plugins/TabSRMM/src/chat/manager.cpp
@@ -93,7 +93,7 @@ SESSION_INFO* SM_FindSessionByHWND(HWND hWnd)
 	return NULL;
 }
 
-SESSION_INFO* SM_FindSessionByHCONTACT(HCONTACT h)
+SESSION_INFO* SM_FindSessionByHCONTACT(MCONTACT h)
 {
 	for (SESSION_INFO *si = pci->wndList; si; si = si->next)
 		if (si->hContact == h)
diff --git a/plugins/TabSRMM/src/chat/services.cpp b/plugins/TabSRMM/src/chat/services.cpp
index 5f44fa352c..70f6a16088 100644
--- a/plugins/TabSRMM/src/chat/services.cpp
+++ b/plugins/TabSRMM/src/chat/services.cpp
@@ -35,7 +35,7 @@
 
 HWND CreateNewRoom(TContainerData *pContainer, SESSION_INFO *si, BOOL bActivateTab, BOOL bPopupContainer, BOOL bWantPopup)
 {
-	HCONTACT hContact = si->hContact;
+	MCONTACT hContact = si->hContact;
 	if (M.FindWindow(hContact) != 0)
 		return 0;
 
diff --git a/plugins/TabSRMM/src/chat/tools.cpp b/plugins/TabSRMM/src/chat/tools.cpp
index e082f985a0..beaed8af21 100644
--- a/plugins/TabSRMM/src/chat/tools.cpp
+++ b/plugins/TabSRMM/src/chat/tools.cpp
@@ -102,7 +102,7 @@ BOOL DoTrayIcon(SESSION_INFO *si, GCEVENT *gce)
 	return TRUE;
 }
 
-int ShowPopup(HCONTACT hContact, SESSION_INFO *si, HICON hIcon, char* pszProtoName, TCHAR* pszRoomName, COLORREF crBkg, const TCHAR* fmt, ...)
+int ShowPopup(MCONTACT hContact, SESSION_INFO *si, HICON hIcon, char* pszProtoName, TCHAR* pszRoomName, COLORREF crBkg, const TCHAR* fmt, ...)
 {
 	POPUPDATAT pd = { 0 };
 	va_list marker;
diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp
index 3c940648d4..3c8e9420f2 100644
--- a/plugins/TabSRMM/src/chat/window.cpp
+++ b/plugins/TabSRMM/src/chat/window.cpp
@@ -3332,7 +3332,7 @@ LABEL_SHOWWINDOW:
 
 	case DM_QUERYHCONTACT:
 		if (lParam)
-			*(HCONTACT*)lParam = dat->hContact;
+			*(MCONTACT*)lParam = dat->hContact;
 		return 0;
 
 	case GC_CLOSEWINDOW:
-- 
cgit v1.2.3