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/NoHistory/src/dllmain.cpp | 20 ++++++++++----------
 plugins/NoHistory/src/options.cpp |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'plugins/NoHistory/src')

diff --git a/plugins/NoHistory/src/dllmain.cpp b/plugins/NoHistory/src/dllmain.cpp
index 49c30e0f5a..f9404d1a3c 100644
--- a/plugins/NoHistory/src/dllmain.cpp
+++ b/plugins/NoHistory/src/dllmain.cpp
@@ -4,7 +4,7 @@ HINSTANCE hInst;
 int hLangpack = 0;
 
 // add icon to srmm status icons
-static void SrmmMenu_UpdateIcon(HCONTACT hContact);
+static void SrmmMenu_UpdateIcon(MCONTACT hContact);
 static int SrmmMenu_ProcessEvent(WPARAM wParam, LPARAM lParam);
 static int SrmmMenu_ProcessIconClick(WPARAM wParam, LPARAM lParam);
 
@@ -20,7 +20,7 @@ CRITICAL_SECTION list_cs;
 
 // a list of db events - we'll check them for the 'read' flag periodically and delete them whwen marked as read
 struct EventListNode {
-	HCONTACT hContact;
+	MCONTACT hContact;
 	HANDLE hDBEvent;
 	EventListNode *next;
 };
@@ -54,7 +54,7 @@ extern "C" __declspec (dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirand
 	return &pluginInfo;
 }
 
-void RemoveReadEvents(HCONTACT hContact = 0)
+void RemoveReadEvents(MCONTACT hContact = 0)
 {
 	DBEVENTINFO info = { sizeof(info) };
 	bool remove;
@@ -97,7 +97,7 @@ void RemoveReadEvents(HCONTACT hContact = 0)
 	LeaveCriticalSection(&list_cs);	
 }
 
-void RemoveAllEvents(HCONTACT hContact)
+void RemoveAllEvents(MCONTACT hContact)
 {
 	HANDLE hDBEvent = db_event_first(hContact);
 	while(hDBEvent) {
@@ -114,7 +114,7 @@ void CALLBACK TimerProc(HWND hWnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime)
 
 int OnDatabaseEventAdd(WPARAM wParam, LPARAM lParam)
 {
-	HCONTACT hContact = (HCONTACT)wParam;
+	MCONTACT hContact = (MCONTACT)wParam;
 	HANDLE hDBEvent = (HANDLE)lParam;
 	
 	// history not disabled for this contact
@@ -141,7 +141,7 @@ int OnDatabaseEventAdd(WPARAM wParam, LPARAM lParam)
 INT_PTR ServiceClear(WPARAM wParam, LPARAM lParam)
 {
 	if (MessageBox(0, TranslateT("This operation will PERMANENTLY REMOVE all history for this contact.\nAre you sure you want to do this?"), TranslateT("Clear History"), MB_YESNO | MB_ICONWARNING) == IDYES) {
-		HCONTACT hContact = (HCONTACT)wParam;
+		MCONTACT hContact = (MCONTACT)wParam;
 		RemoveAllEvents(hContact);
 	}
 	
@@ -150,7 +150,7 @@ INT_PTR ServiceClear(WPARAM wParam, LPARAM lParam)
 
 int PrebuildContactMenu(WPARAM wParam, LPARAM lParam)
 {
-	HCONTACT hContact = (HCONTACT)wParam;
+	MCONTACT hContact = (MCONTACT)wParam;
 	
 	bool remove = db_get_b(hContact, MODULE, DBSETTING_REMOVE, 0) != 0;
 	char *proto = GetContactProto(hContact);
@@ -172,7 +172,7 @@ int PrebuildContactMenu(WPARAM wParam, LPARAM lParam)
 
 INT_PTR ServiceToggle(WPARAM wParam, LPARAM lParam)
 {
-	HCONTACT hContact = (HCONTACT)wParam;
+	MCONTACT hContact = (MCONTACT)wParam;
 
 	int remove = db_get_b(hContact, MODULE, DBSETTING_REMOVE, 0) != 0;
 	remove = !remove;
@@ -192,7 +192,7 @@ INT_PTR ServiceToggle(WPARAM wParam, LPARAM lParam)
 int WindowEvent(WPARAM wParam, LPARAM lParam)
 {
 	MessageWindowEventData *mwd = (MessageWindowEventData *)lParam;
-	HCONTACT hContact = mwd->hContact;
+	MCONTACT hContact = mwd->hContact;
 
 	switch(mwd->uType) {
 	case MSG_WINDOW_EVT_CLOSE:
@@ -218,7 +218,7 @@ int WindowEvent(WPARAM wParam, LPARAM lParam)
 										  
 int IconPressed(WPARAM wParam, LPARAM lParam)
 {
-	HCONTACT hContact = (HCONTACT)wParam;
+	MCONTACT hContact = (MCONTACT)wParam;
 	StatusIconClickData *sicd = (StatusIconClickData *)lParam;
 	if (sicd->cbSize < (int)sizeof(StatusIconClickData))
 		return 0;
diff --git a/plugins/NoHistory/src/options.cpp b/plugins/NoHistory/src/options.cpp
index 14fa6d0d10..a963e796a0 100644
--- a/plugins/NoHistory/src/options.cpp
+++ b/plugins/NoHistory/src/options.cpp
@@ -84,7 +84,7 @@ static void ResetListOptions(HWND hwndList)
 
 static void SetAllContactIcons(HWND hwndList)
 {
-	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 *proto = GetContactProto(hContact);
 		bool chat_room = (proto && db_get_b(hContact, proto, "ChatRoom", 0) != 0);
 
@@ -198,7 +198,7 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 		case 0:
 			switch (((LPNMHDR)lParam)->code) {
 			case PSN_APPLY:
-				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 *proto = GetContactProto(hContact);
 					bool chat_room = (proto && db_get_b(hContact, proto, "ChatRoom", 0) != 0);
 
-- 
cgit v1.2.3