"we don't need these variables" (c) Pink Floyd

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

7 files changed, 23 insertions, 45 deletions

diff --git a/protocols/JabberG/src/jabber_adhoc.cpp b/protocols/JabberG/src/jabber_adhoc.cpp
index 052f2d9692..0c745d950c 100644
--- a/protocols/JabberG/src/jabber_adhoc.cpp
+++ b/protocols/JabberG/src/jabber_adhoc.cpp
@@ -508,14 +508,13 @@ static INT_PTR CALLBACK JabberAdHoc_CommandDlgProc(HWND hwndDlg, UINT msg, WPARA
 	return FALSE;

 }

 

-int __cdecl CJabberProto::ContactMenuRunCommands(WPARAM wParam, LPARAM lParam)

+int __cdecl CJabberProto::ContactMenuRunCommands(WPARAM hContact, LPARAM lParam)

 {

-	MCONTACT hContact = wParam;

 	int res = -1;

 

 	if ((hContact != NULL || lParam != 0) && m_bJabberOnline) {

 		ptrT szJid(getTStringA(hContact, "jid"));

-		if (wParam && szJid != NULL) {

+		if (hContact && szJid != NULL) {

 			JABBER_LIST_ITEM *item = NULL;

 			int selected = 0;

 			TCHAR jid[JABBER_MAX_JID_LEN];

diff --git a/protocols/JabberG/src/jabber_events.cpp b/protocols/JabberG/src/jabber_events.cpp
index 594224512b..86bb7689f0 100644
--- a/protocols/JabberG/src/jabber_events.cpp
+++ b/protocols/JabberG/src/jabber_events.cpp
@@ -31,12 +31,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 /////////////////////////////////////////////////////////////////////////////////////////

 // OnContactDeleted - processes a contact deletion

 

-int CJabberProto::OnContactDeleted(WPARAM wParam, LPARAM)

+int CJabberProto::OnContactDeleted(WPARAM hContact, LPARAM)

 {

 	if (!m_bJabberOnline)	// should never happen

 		return 0;

 

-	MCONTACT hContact = wParam;

 	ptrT jid(getTStringA(hContact, isChatRoom(hContact) ? "ChatRoomID" : "jid"));

 	if (jid == NULL)

 		return 0;

@@ -157,9 +156,8 @@ void __cdecl CJabberProto::OnAddContactForever(DBCONTACTWRITESETTING *cws, MCONT
 	db_unset(hContact, "CList", "Hidden");

 }

 

-int __cdecl CJabberProto::OnDbSettingChanged(WPARAM wParam, LPARAM lParam)

+int __cdecl CJabberProto::OnDbSettingChanged(WPARAM hContact, LPARAM lParam)

 {

-	MCONTACT hContact = wParam;

 	if (hContact == NULL || !m_bJabberOnline)

 		return 0;

 

diff --git a/protocols/JabberG/src/jabber_groupchat.cpp b/protocols/JabberG/src/jabber_groupchat.cpp
index 0e8d20f019..7c58fd7c30 100644
--- a/protocols/JabberG/src/jabber_groupchat.cpp
+++ b/protocols/JabberG/src/jabber_groupchat.cpp
@@ -183,9 +183,8 @@ INT_PTR __cdecl CJabberProto::OnMenuHandleJoinGroupchat(WPARAM, LPARAM)
 	return 0;

 }

 

-INT_PTR __cdecl CJabberProto::OnJoinChat(WPARAM wParam, LPARAM)

+INT_PTR __cdecl CJabberProto::OnJoinChat(WPARAM hContact, LPARAM)

 {

-	MCONTACT hContact = wParam;

 	ptrT jid( getTStringA(hContact, "ChatRoomID"));

 	if (jid == NULL)

 		return 0;

@@ -208,9 +207,8 @@ INT_PTR __cdecl CJabberProto::OnJoinChat(WPARAM wParam, LPARAM)
 	return 0;

 }

 

-INT_PTR __cdecl CJabberProto::OnLeaveChat(WPARAM wParam, LPARAM)

+INT_PTR __cdecl CJabberProto::OnLeaveChat(WPARAM hContact, LPARAM)

 {

-	MCONTACT hContact = wParam;

 	ptrT jid(getTStringA(hContact, "ChatRoomID"));

 	if (jid != NULL) {

 		if (getWord(hContact, "Status", 0) != ID_STATUS_OFFLINE) {

diff --git a/protocols/JabberG/src/jabber_icolib.cpp b/protocols/JabberG/src/jabber_icolib.cpp
index b535cb0d47..c57c42dc90 100644
--- a/protocols/JabberG/src/jabber_icolib.cpp
+++ b/protocols/JabberG/src/jabber_icolib.cpp
@@ -391,9 +391,8 @@ int CJabberProto::OnReloadIcons(WPARAM, LPARAM)
 // if imagelist require advanced painting status overlay(like xStatus)

 // index should be shifted to HIWORD, LOWORD should be 0

 

-INT_PTR __cdecl CJabberProto::JGetAdvancedStatusIcon(WPARAM wParam, LPARAM)

+INT_PTR __cdecl CJabberProto::JGetAdvancedStatusIcon(WPARAM hContact, LPARAM)

 {

-	MCONTACT hContact = wParam;

 	if (!hContact)

 		return -1;

 

diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp
index 066a03f2a1..f1d507f208 100644
--- a/protocols/JabberG/src/jabber_menu.cpp
+++ b/protocols/JabberG/src/jabber_menu.cpp
@@ -345,9 +345,8 @@ void g_MenuUninit(void)
 /////////////////////////////////////////////////////////////////////////////////////////

 // contact menu services

 

-int CJabberProto::OnPrebuildContactMenu(WPARAM wParam, LPARAM)

+int CJabberProto::OnPrebuildContactMenu(WPARAM hContact, LPARAM)

 {

-	MCONTACT hContact = wParam;

 	if (hContact == NULL)

 		return 0;

 

@@ -477,9 +476,8 @@ int CJabberProto::OnPrebuildContactMenu(WPARAM wParam, LPARAM)
 	return 0;

 }

 

-INT_PTR __cdecl CJabberProto::OnMenuConvertChatContact(WPARAM wParam, LPARAM)

+INT_PTR __cdecl CJabberProto::OnMenuConvertChatContact(WPARAM hContact, LPARAM)

 {

-	MCONTACT hContact = wParam;

 	BYTE bIsChatRoom = isChatRoom(hContact);

 	const char *szSetting = (bIsChatRoom) ? "ChatRoomID" : "jid";

 

@@ -492,9 +490,8 @@ INT_PTR __cdecl CJabberProto::OnMenuConvertChatContact(WPARAM wParam, LPARAM)
 	return 0;

 }

 

-INT_PTR __cdecl CJabberProto::OnMenuRosterAdd(WPARAM wParam, LPARAM)

+INT_PTR __cdecl CJabberProto::OnMenuRosterAdd(WPARAM hContact, LPARAM)

 {

-	MCONTACT hContact = wParam;

 	if (!hContact)

 		return 0; // we do not add ourself to the roster. (buggy situation - should not happen)

 

@@ -522,9 +519,8 @@ INT_PTR __cdecl CJabberProto::OnMenuRosterAdd(WPARAM wParam, LPARAM)
 	return 0;

 }

 

-INT_PTR __cdecl CJabberProto::OnMenuHandleRequestAuth(WPARAM wParam, LPARAM)

+INT_PTR __cdecl CJabberProto::OnMenuHandleRequestAuth(WPARAM hContact, LPARAM)

 {

-	MCONTACT hContact = wParam;

 	if (hContact != NULL && m_bJabberOnline) {

 		ptrT jid(getTStringA(hContact, "jid"));

 		if (jid != NULL)

@@ -533,9 +529,8 @@ INT_PTR __cdecl CJabberProto::OnMenuHandleRequestAuth(WPARAM wParam, LPARAM)
 	return 0;

 }

 

-INT_PTR __cdecl CJabberProto::OnMenuHandleGrantAuth(WPARAM wParam, LPARAM)

+INT_PTR __cdecl CJabberProto::OnMenuHandleGrantAuth(WPARAM hContact, LPARAM)

 {

-	MCONTACT hContact = wParam;

 	if (hContact != NULL && m_bJabberOnline) {

 		ptrT jid(getTStringA(hContact, "jid"));

 		if (jid != NULL)

@@ -544,9 +539,8 @@ INT_PTR __cdecl CJabberProto::OnMenuHandleGrantAuth(WPARAM wParam, LPARAM)
 	return 0;

 }

 

-INT_PTR __cdecl CJabberProto::OnMenuRevokeAuth(WPARAM wParam, LPARAM)

+INT_PTR __cdecl CJabberProto::OnMenuRevokeAuth(WPARAM hContact, LPARAM)

 {

-	MCONTACT hContact = wParam;

 	if (hContact != NULL && m_bJabberOnline) {

 		ptrT jid(getTStringA(hContact, "jid"));

 		if (jid != NULL)

@@ -555,9 +549,8 @@ INT_PTR __cdecl CJabberProto::OnMenuRevokeAuth(WPARAM wParam, LPARAM)
 	return 0;

 }

 

-INT_PTR __cdecl CJabberProto::OnMenuTransportLogin(WPARAM wParam, LPARAM)

+INT_PTR __cdecl CJabberProto::OnMenuTransportLogin(WPARAM hContact, LPARAM)

 {

-	MCONTACT hContact = wParam;

 	if (!getByte(hContact, "IsTransport", 0))

 		return 0;

 

@@ -571,9 +564,8 @@ INT_PTR __cdecl CJabberProto::OnMenuTransportLogin(WPARAM wParam, LPARAM)
 	return 0;

 }

 

-INT_PTR __cdecl CJabberProto::OnMenuTransportResolve(WPARAM wParam, LPARAM)

+INT_PTR __cdecl CJabberProto::OnMenuTransportResolve(WPARAM hContact, LPARAM)

 {

-	MCONTACT hContact = wParam;

 	if (!getByte(hContact, "IsTransport", 0))

 		return 0;

 

@@ -583,9 +575,8 @@ INT_PTR __cdecl CJabberProto::OnMenuTransportResolve(WPARAM wParam, LPARAM)
 	return 0;

 }

 

-INT_PTR __cdecl CJabberProto::OnMenuBookmarkAdd(WPARAM wParam, LPARAM)

+INT_PTR __cdecl CJabberProto::OnMenuBookmarkAdd(WPARAM hContact, LPARAM)

 {

-	MCONTACT hContact = wParam;

 	if (!hContact)

 		return 0; // we do not add ourself to the roster. (buggy situation - should not happen)

 

@@ -1037,13 +1028,12 @@ int CJabberProto::OnProcessSrmmEvent(WPARAM, LPARAM lParam)
 	return 0;

 }

 

-int CJabberProto::OnProcessSrmmIconClick(WPARAM wParam, LPARAM lParam)

+int CJabberProto::OnProcessSrmmIconClick(WPARAM hContact, LPARAM lParam)

 {

 	StatusIconClickData *sicd = (StatusIconClickData *)lParam;

 	if (lstrcmpA(sicd->szModule, m_szModuleName))

 		return 0;

 

-	MCONTACT hContact = wParam;

 	if (!hContact)

 		return 0;

 

@@ -1092,12 +1082,11 @@ int CJabberProto::OnProcessSrmmIconClick(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-INT_PTR __cdecl CJabberProto::OnMenuHandleResource(WPARAM wParam, LPARAM, LPARAM res)

+INT_PTR __cdecl CJabberProto::OnMenuHandleResource(WPARAM hContact, LPARAM, LPARAM res)

 {

-	if (!m_bJabberOnline || !wParam)

+	if (!m_bJabberOnline || !hContact)

 		return 0;

 

-	MCONTACT hContact = wParam;

 	ptrT tszJid(getTStringA(hContact, "jid"));

 	if (tszJid == NULL)

 		return 0;

@@ -1124,13 +1113,11 @@ INT_PTR __cdecl CJabberProto::OnMenuHandleResource(WPARAM wParam, LPARAM, LPARAM
 	return 0;

 }

 

-INT_PTR __cdecl CJabberProto::OnMenuHandleDirectPresence(WPARAM wParam, LPARAM lParam, LPARAM res)

+INT_PTR __cdecl CJabberProto::OnMenuHandleDirectPresence(WPARAM hContact, LPARAM lParam, LPARAM res)

 {

-	if (!m_bJabberOnline || !wParam)

+	if (!m_bJabberOnline || !hContact)

 		return 0;

 

-	MCONTACT hContact = wParam;

-

 	TCHAR *jid, text[1024];

 	ptrT tszJid(getTStringA(hContact, "jid"));

 	if (tszJid == NULL) {

diff --git a/protocols/JabberG/src/jabber_svc.cpp b/protocols/JabberG/src/jabber_svc.cpp
index 442cf5d0e4..59f9086632 100644
--- a/protocols/JabberG/src/jabber_svc.cpp
+++ b/protocols/JabberG/src/jabber_svc.cpp
@@ -533,12 +533,11 @@ INT_PTR __cdecl CJabberProto::JabberServiceParseXmppURI(WPARAM, LPARAM lParam)
 }

 

 // XEP-0224 support (Attention/Nudge)

-INT_PTR __cdecl CJabberProto::JabberSendNudge(WPARAM wParam, LPARAM)

+INT_PTR __cdecl CJabberProto::JabberSendNudge(WPARAM hContact, LPARAM)

 {

 	if (!m_bJabberOnline)

 		return 0;

 

-	MCONTACT hContact = wParam;

 	ptrT jid( getTStringA(hContact, "jid"));

 	if (jid == NULL)

 		return 0;

diff --git a/protocols/JabberG/src/jabber_xstatus.cpp b/protocols/JabberG/src/jabber_xstatus.cpp
index d5ac96a819..4d2bd7942e 100644
--- a/protocols/JabberG/src/jabber_xstatus.cpp
+++ b/protocols/JabberG/src/jabber_xstatus.cpp
@@ -1329,7 +1329,7 @@ void CJabberProto::XStatusInit()
 /////////////////////////////////////////////////////////////////////////////////////////

 // JabberSetXStatus - sets the extended status info (mood)

 

-INT_PTR __cdecl CJabberProto::OnGetXStatusEx(WPARAM wParam, LPARAM lParam)

+INT_PTR __cdecl CJabberProto::OnGetXStatusEx(WPARAM hContact, LPARAM lParam)

 {

 	if (!m_bPepSupported || !m_bJabberOnline)

 		return 1;

@@ -1342,8 +1342,6 @@ INT_PTR __cdecl CJabberProto::OnGetXStatusEx(WPARAM wParam, LPARAM lParam)
 	if (pepMood == NULL)

 		return 1;

 

-	MCONTACT hContact = wParam;

-

 	// fill status member

 	if (pData->flags & CSSF_MASK_STATUS)

 		*pData->status = pepMood->m_mode;