HCONTACT is not needed anymore

git-svn-id: http://svn.miranda-ng.org/main/trunk@8086 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 16 insertions, 16 deletions

diff --git a/plugins/Nudge/src/headers.h b/plugins/Nudge/src/headers.h
index a481e613b4..919d8fdb22 100644
--- a/plugins/Nudge/src/headers.h
+++ b/plugins/Nudge/src/headers.h
@@ -66,22 +66,22 @@ int Preview();
 /*

 *

 ****************************/

-HCONTACT Nudge_GethContact(HCONTACT);

+MCONTACT Nudge_GethContact(MCONTACT);

 

 /*

 *

 ****************************/

-void Nudge_ShowPopup(CNudgeElement, HCONTACT, TCHAR *);

+void Nudge_ShowPopup(CNudgeElement, MCONTACT, TCHAR *);

 

 /*

 *

 ****************************/

-void Nudge_ShowStatus(CNudgeElement, HCONTACT, DWORD timestamp);

+void Nudge_ShowStatus(CNudgeElement, MCONTACT, DWORD timestamp);

 

 /*

 *

 ****************************/

-void Nudge_SentStatus(CNudgeElement, HCONTACT);

+void Nudge_SentStatus(CNudgeElement, MCONTACT);

 

 /*

 *

diff --git a/plugins/Nudge/src/main.cpp b/plugins/Nudge/src/main.cpp
index 2dffab3d52..3a0f14438f 100644
--- a/plugins/Nudge/src/main.cpp
+++ b/plugins/Nudge/src/main.cpp
@@ -41,7 +41,7 @@ INT_PTR NudgeShowMenu(WPARAM wParam,LPARAM lParam)
 

 INT_PTR NudgeSend(WPARAM wParam, LPARAM lParam)

 {

-	HCONTACT hContact = (HCONTACT)wParam;

+	MCONTACT hContact = (MCONTACT)wParam;

 	char *protoName = GetContactProto(hContact);

 	int diff = time(NULL) - db_get_dw(hContact, "Nudge", "LastSent", time(NULL) - 30);

 	if (diff < GlobalNudge.sendTimeSec) {

@@ -81,7 +81,7 @@ void OpenContactList()
 

 int NudgeReceived(WPARAM wParam, LPARAM lParam)

 {

-	HCONTACT hContact = (HCONTACT)wParam;

+	MCONTACT hContact = (MCONTACT)wParam;

 	char *protoName = GetContactProto(hContact);

 

 	DWORD currentTimestamp = time(NULL);

@@ -253,7 +253,7 @@ static int TabsrmmButtonInit(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-void HideNudgeButton(HCONTACT hContact)

+void HideNudgeButton(MCONTACT hContact)

 {

 	char *szProto = GetContactProto(hContact);

 	if (!ProtoServiceExists(szProto, PS_SEND_NUDGE)) {

@@ -379,7 +379,7 @@ void LoadPopupClass()
 

 int Preview()

 {

-	HCONTACT hContact = db_find_first();

+	MCONTACT hContact = db_find_first();

 	if (GlobalNudge.useByProtocol) {

 		for (NudgeElementList *n = NudgeList; n != NULL; n = n->next) {

 			if (n->item.enabled) {

@@ -415,7 +415,7 @@ int Preview()
 	return 0;

 }

 

-void Nudge_ShowPopup(CNudgeElement n, HCONTACT hContact, TCHAR * Message)

+void Nudge_ShowPopup(CNudgeElement n, MCONTACT hContact, TCHAR * Message)

 {

 	hContact = Nudge_GethContact(hContact);

 	TCHAR * lpzContactName = (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR);

@@ -449,7 +449,7 @@ void Nudge_ShowPopup(CNudgeElement n, HCONTACT hContact, TCHAR * Message)
 	else MessageBox(NULL, Message, lpzContactName, 0);

 }

 

-void Nudge_SentStatus(CNudgeElement n, HCONTACT hContact)

+void Nudge_SentStatus(CNudgeElement n, MCONTACT hContact)

 {

 	char *buff = mir_utf8encodeT(n.senText);

 

@@ -463,7 +463,7 @@ void Nudge_SentStatus(CNudgeElement n, HCONTACT hContact)
 

 	INT_PTR res = CallService(MS_MC_GETMETACONTACT, (WPARAM)hContact, 0); //try to retrieve the metacontact if some

 	if (res != CALLSERVICE_NOTFOUND) {

-		HCONTACT hMetaContact = (HCONTACT)res;

+		MCONTACT hMetaContact = (MCONTACT)res;

 		if (hMetaContact != NULL) // metacontact

 			db_event_add(hMetaContact, &dbei);

 	}

@@ -472,7 +472,7 @@ void Nudge_SentStatus(CNudgeElement n, HCONTACT hContact)
 	mir_free(buff);

 }

 

-void Nudge_ShowStatus(CNudgeElement n, HCONTACT hContact, DWORD timestamp)

+void Nudge_ShowStatus(CNudgeElement n, MCONTACT hContact, DWORD timestamp)

 {

 	char *buff = mir_utf8encodeT(n.recText);

 

@@ -486,7 +486,7 @@ void Nudge_ShowStatus(CNudgeElement n, HCONTACT hContact, DWORD timestamp)
 

 	INT_PTR res = CallService(MS_MC_GETMETACONTACT, (WPARAM)hContact, 0); //try to retrieve the metacontact if some

 	if (res != CALLSERVICE_NOTFOUND) {

-		HCONTACT hMetaContact = (HCONTACT)res;

+		MCONTACT hMetaContact = (MCONTACT)res;

 		if (hMetaContact != NULL) { //metacontact

 			db_event_add(hMetaContact, &dbei);

 			dbei.flags |= DBEF_READ;

@@ -497,11 +497,11 @@ void Nudge_ShowStatus(CNudgeElement n, HCONTACT hContact, DWORD timestamp)
 	mir_free(buff);

 }

 

-HCONTACT Nudge_GethContact(HCONTACT hContact)

+MCONTACT Nudge_GethContact(MCONTACT hContact)

 {

 	INT_PTR res = CallService(MS_MC_GETMETACONTACT, (WPARAM)hContact, 0);

 	if (res != CALLSERVICE_NOTFOUND) {

-		HCONTACT hMetaContact = (HCONTACT)res;

+		MCONTACT hMetaContact = (MCONTACT)res;

 		if (hMetaContact != NULL)

 			return hMetaContact;

 	}

diff --git a/plugins/Nudge/src/shake.cpp b/plugins/Nudge/src/shake.cpp
index f42d028aba..3f6ff396bc 100644
--- a/plugins/Nudge/src/shake.cpp
+++ b/plugins/Nudge/src/shake.cpp
@@ -50,7 +50,7 @@ INT_PTR ShakeChat(WPARAM wParam, LPARAM lParam)
 	MessageWindowInputData mwid;

 

 	mwd.cbSize = sizeof(MessageWindowData);

-	mwd.hContact = Nudge_GethContact((HCONTACT)wParam);

+	mwd.hContact = Nudge_GethContact((MCONTACT)wParam);

 	mwd.uFlags = MSG_WINDOW_UFLAG_MSG_BOTH;

 

 	mwid.cbSize = sizeof(MessageWindowInputData);