From 371db973914f270432e914922b735e01279c5db8 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 12 Feb 2014 14:12:44 +0000
Subject: another bunch of useless conversions died

git-svn-id: http://svn.miranda-ng.org/main/trunk@8109 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/MirandaG15/src/CAppletManager.cpp | 12 ++++++------
 plugins/MirandaG15/src/CChatScreen.cpp    |  2 +-
 plugins/MirandaG15/src/CContactList.cpp   | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'plugins/MirandaG15/src')

diff --git a/plugins/MirandaG15/src/CAppletManager.cpp b/plugins/MirandaG15/src/CAppletManager.cpp
index b8cebd541e..483c31652a 100644
--- a/plugins/MirandaG15/src/CAppletManager.cpp
+++ b/plugins/MirandaG15/src/CAppletManager.cpp
@@ -464,7 +464,7 @@ bool CAppletManager::ActivateChatScreen(MCONTACT hContact)
 tstring CAppletManager::GetContactDisplayname(MCONTACT hContact,bool bShortened)
 {
 	if(!bShortened || !CConfig::GetBoolSetting(NOTIFY_NICKCUTOFF))
-		return (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR);
+		return (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR);
 	
 	tstring strNick = GetContactDisplayname(hContact,false);
 	if(strNick.length() > (tstring::size_type)CConfig::GetIntSetting(NOTIFY_NICKCUTOFF_OFFSET))
@@ -791,7 +791,7 @@ bool CAppletManager::IsSubContact(MCONTACT hContact)
 		return false;
 	bool bIsSubcontact = db_get_b(hContact,"MetaContacts","IsSubcontact",0);
 	return bIsSubcontact;
-	// HANDLE hMetaContact = (HANDLE)CallService(MS_MC_GETMETACONTACT, (WPARAM)hContact, NULL);
+	// HANDLE hMetaContact = (HANDLE)CallService(MS_MC_GETMETACONTACT, hContact, NULL);
 	// return hMetaContact != NULL;
 }
 
@@ -815,7 +815,7 @@ void CAppletManager::SendTypingNotification(MCONTACT hContact,bool bEnable)
     if (!db_get_b(hContact, "SRMsg", "SupportTyping", db_get_b(NULL, "SRMsg", "DefaultTyping", 1)))
         return;
 
-	char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
+	char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, hContact, 0);
     if (!szProto)
         return;
 
@@ -849,7 +849,7 @@ HANDLE CAppletManager::SendMessageToContact(MCONTACT hContact,tstring strMessage
 	pJob->dwTimestamp = GetTickCount();
 	pJob->hContact = hContact;
 
-	char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
+	char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, hContact, 0);
 	tstring strProto = toTstring(szProto);
 
 	CIRCConnection *pIRCCon = CAppletManager::GetInstance()->GetIRCConnection(strProto);
@@ -945,7 +945,7 @@ bool CAppletManager::IsMessageWindowOpen(MCONTACT hContact)
 void CAppletManager::MarkMessageAsRead(MCONTACT hContact,HANDLE hEvent)
 {
 	db_event_markRead(hContact, hEvent);
-	CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hContact, (LPARAM)hEvent);
+	CallService(MS_CLIST_REMOVEEVENT, hContact, (LPARAM)hEvent);
 }
 
 //************************************************************************
@@ -1216,7 +1216,7 @@ void CAppletManager::DeleteIRCHistory(MCONTACT hContact)
 //************************************************************************
 CIRCHistory *CAppletManager::CreateIRCHistory(MCONTACT hContact,tstring strChannel)
 {
-	char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
+	char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, hContact, 0);
 	if(!szProto)
 		return NULL;
 
diff --git a/plugins/MirandaG15/src/CChatScreen.cpp b/plugins/MirandaG15/src/CChatScreen.cpp
index 4eef6df9b1..6fb7cd99e9 100644
--- a/plugins/MirandaG15/src/CChatScreen.cpp
+++ b/plugins/MirandaG15/src/CChatScreen.cpp
@@ -233,7 +233,7 @@ bool CChatScreen::SetContact(MCONTACT hContact)
 	}
 	
 	// Check if the contact is valid
-	char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
+	char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, hContact, 0);
 	m_strProto = toTstring(szProto);
 
 	CIRCConnection *pIRCCon = CAppletManager::GetInstance()->GetIRCConnection(m_strProto);
diff --git a/plugins/MirandaG15/src/CContactList.cpp b/plugins/MirandaG15/src/CContactList.cpp
index c22859cce5..046582e2e0 100644
--- a/plugins/MirandaG15/src/CContactList.cpp
+++ b/plugins/MirandaG15/src/CContactList.cpp
@@ -83,7 +83,7 @@ tstring CContactList::GetContactGroupPath(MCONTACT hContact)
 	tstring strGroup = _T("");
 	if(db_get_b(0, "MetaContacts", "Enabled", 1) && CAppletManager::IsSubContact(hContact))
 	{
-		MCONTACT hMetaContact = (MCONTACT)CallService(MS_MC_GETMETACONTACT, (WPARAM)hContact, NULL);
+		MCONTACT hMetaContact = (MCONTACT)CallService(MS_MC_GETMETACONTACT, hContact, NULL);
 		if(CConfig::GetBoolSetting(CLIST_USEGROUPS))
 			strGroup = CAppletManager::GetContactGroup(hMetaContact);
 
@@ -150,17 +150,17 @@ void CContactList::AddContact(MCONTACT hContact)
 		pGroup->sort(CContactList::CompareEntries);
 
 		// check that all subcontacts exist
-		int numContacts = CallService(MS_MC_GETNUMCONTACTS,(WPARAM)hContact,0);
+		int numContacts = CallService(MS_MC_GETNUMCONTACTS,hContact,0);
 		MCONTACT hSubContact = NULL;
 		for(int i=0;i<numContacts;i++) {
-			hSubContact = (MCONTACT)CallService(MS_MC_GETSUBCONTACT, (WPARAM)hContact, (LPARAM)i);
+			hSubContact = (MCONTACT)CallService(MS_MC_GETSUBCONTACT, hContact, (LPARAM)i);
 			RemoveContact(hSubContact);
 			AddContact(hSubContact);
 		}
 		return;
 	}
 	else if(CAppletManager::IsSubContact(hContact)) {
-		MCONTACT hMetaContact = (MCONTACT)CallService(MS_MC_GETMETACONTACT, (WPARAM)hContact, 0);
+		MCONTACT hMetaContact = (MCONTACT)CallService(MS_MC_GETMETACONTACT, hContact, 0);
 		// check that the metacontact exists
 		if(!FindContact(hMetaContact)) {
 			AddContact(hMetaContact);
@@ -279,9 +279,9 @@ void CContactList::RemoveContact(MCONTACT hContact) {
 		else {
 			pGroup->RemoveGroup(((CListContainer<CContactListEntry*,CContactListGroup*>*)pContactEntry)->GetGroupData());
 			// Reenumerate all subcontacts (maybe MetaContacts was disabled
-			int numContacts = CallService(MS_MC_GETNUMCONTACTS,(WPARAM)hContact,0);
+			int numContacts = CallService(MS_MC_GETNUMCONTACTS,hContact,0);
 			for(int i=0;i<numContacts;i++) {
-				MCONTACT hSubContact = (MCONTACT)CallService(MS_MC_GETSUBCONTACT,(WPARAM)hContact, (LPARAM)i);
+				MCONTACT hSubContact = (MCONTACT)CallService(MS_MC_GETSUBCONTACT,hContact, (LPARAM)i);
 				if(!FindContact(hSubContact))
 					AddContact(hSubContact);
 			}
-- 
cgit v1.2.3