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/StopSpamPlus/src/events.cpp   | 6 +++---
 plugins/StopSpamPlus/src/headers.h    | 4 ++--
 plugins/StopSpamPlus/src/services.cpp | 6 +++---
 plugins/StopSpamPlus/src/utils.cpp    | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'plugins/StopSpamPlus')

diff --git a/plugins/StopSpamPlus/src/events.cpp b/plugins/StopSpamPlus/src/events.cpp
index 309fbdc612..03cc73334e 100644
--- a/plugins/StopSpamPlus/src/events.cpp
+++ b/plugins/StopSpamPlus/src/events.cpp
@@ -20,7 +20,7 @@ MIRANDA_HOOK_EVENT(ME_DB_EVENT_ADDED, wParam, lParam)
 
 	// event is an auth request
 	if (!(dbei.flags & DBEF_SENT) && !(dbei.flags & DBEF_READ) && dbei.eventType == EVENTTYPE_AUTHREQUEST) {
-		HCONTACT hcntct = DbGetAuthEventContact(&dbei);
+		MCONTACT hcntct = DbGetAuthEventContact(&dbei);
 
 		// if request is from unknown or not marked Answered contact
 		//and if I don't sent message to this contact
@@ -48,7 +48,7 @@ MIRANDA_HOOK_EVENT(ME_DB_EVENT_ADDED, wParam, lParam)
 
 MIRANDA_HOOK_EVENT(ME_DB_EVENT_FILTER_ADD, w, l)
 {
-	HCONTACT hContact = (HCONTACT)w;
+	MCONTACT hContact = (MCONTACT)w;
 	DBEVENTINFO *dbei = (DBEVENTINFO*)l;
 	if (dbei == NULL) //fix potential DEP crash
 		return 0;
@@ -188,7 +188,7 @@ MIRANDA_HOOK_EVENT(ME_OPT_INITIALISE, w, l)
 
 MIRANDA_HOOK_EVENT(ME_DB_CONTACT_SETTINGCHANGED, w, l)
 {
-	HCONTACT hContact = (HCONTACT)w;
+	MCONTACT hContact = (MCONTACT)w;
 	DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)l;
 
 	// if CList/NotOnList is being deleted then remove answeredSetting
diff --git a/plugins/StopSpamPlus/src/headers.h b/plugins/StopSpamPlus/src/headers.h
index 08f8965dab..1b2ac5b2e1 100644
--- a/plugins/StopSpamPlus/src/headers.h
+++ b/plugins/StopSpamPlus/src/headers.h
@@ -48,8 +48,8 @@ INT_PTR CALLBACK ProtoDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 void SetDlgItemString(HWND hwndDlg, UINT idItem, std::string const &str);
 void SetDlgItemString(HWND hwndDlg, UINT idItem, std::wstring const &str);
 tstring &GetDlgItemString(HWND hwnd, int id);
-bool IsExistMyMessage(HCONTACT hContact);
-tstring variables_parse(tstring const &tstrFormat, HCONTACT hContact);
+bool IsExistMyMessage(MCONTACT hContact);
+tstring variables_parse(tstring const &tstrFormat, MCONTACT hContact);
 tstring trim(tstring const &tstr, tstring const &trimChars = _T(" \f\n\r\t\v"));
 
 INT_PTR IsContactPassed(WPARAM wParam, LPARAM /*lParam*/);
diff --git a/plugins/StopSpamPlus/src/services.cpp b/plugins/StopSpamPlus/src/services.cpp
index 032b70c94c..578ff5f3b6 100644
--- a/plugins/StopSpamPlus/src/services.cpp
+++ b/plugins/StopSpamPlus/src/services.cpp
@@ -2,7 +2,7 @@
 
 INT_PTR IsContactPassed(WPARAM wParam, LPARAM /*lParam*/)
 {
-	HCONTACT hContact = (HCONTACT)wParam;
+	MCONTACT hContact = (MCONTACT)wParam;
 	std::string proto = GetContactProto(hContact);
 	
 	if ( !plSets->ProtoDisabled( proto.c_str()))
@@ -22,8 +22,8 @@ INT_PTR IsContactPassed(WPARAM wParam, LPARAM /*lParam*/)
 
 INT_PTR RemoveTempContacts(WPARAM wParam,LPARAM lParam)
 {
-	for (HCONTACT hContact = db_find_first(); hContact; ) {
-		HCONTACT hNext = db_find_next(hContact);
+	for (MCONTACT hContact = db_find_first(); hContact; ) {
+		MCONTACT hNext = db_find_next(hContact);
 		ptrT szGroup( db_get_tsa( hContact, "CList", "Group"));
 
 		if ( db_get_b(hContact, "CList", "NotOnList", 0) || db_get_b(hContact, "CList", "Hidden", 0 ) || (szGroup != NULL && (_tcsstr(szGroup, _T("Not In List")) || _tcsstr(szGroup, TranslateT("Not In List"))))) {
diff --git a/plugins/StopSpamPlus/src/utils.cpp b/plugins/StopSpamPlus/src/utils.cpp
index 17ef65e2bb..54bbdcea1e 100644
--- a/plugins/StopSpamPlus/src/utils.cpp
+++ b/plugins/StopSpamPlus/src/utils.cpp
@@ -12,7 +12,7 @@ tstring &GetDlgItemString(HWND hwnd, int id)
 	return s;
 }
 
-bool IsExistMyMessage(HCONTACT hContact)
+bool IsExistMyMessage(MCONTACT hContact)
 {
 	HANDLE hDbEvent = db_event_first(hContact);
 	while(hDbEvent){
@@ -41,7 +41,7 @@ void SetDlgItemString(HWND hwndDlg, UINT idItem, std::wstring const &str)
 	SetDlgItemTextW(hwndDlg, idItem, str.c_str());
 }
 
-tstring variables_parse(tstring const &tstrFormat, HCONTACT hContact){
+tstring variables_parse(tstring const &tstrFormat, MCONTACT hContact){
 	if (ServiceExists(MS_VARS_FORMATSTRING)) {
 		FORMATINFO fi;
 		tstring tstrResult;
-- 
cgit v1.2.3