HCONTACT is not needed anymore

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

1 files changed, 12 insertions, 12 deletions

diff --git a/protocols/JabberG/src/jabber_misc.cpp b/protocols/JabberG/src/jabber_misc.cpp
index 04af56aec0..e3b56f08b5 100644
--- a/protocols/JabberG/src/jabber_misc.cpp
+++ b/protocols/JabberG/src/jabber_misc.cpp
@@ -70,7 +70,7 @@ int JabberCompareJids(const TCHAR *jid1, const TCHAR *jid2)
 

 void CJabberProto::DBAddAuthRequest(const TCHAR *jid, const TCHAR *nick)

 {

-	HCONTACT hContact = DBCreateContact(jid, nick, TRUE, TRUE);

+	MCONTACT hContact = DBCreateContact(jid, nick, TRUE, TRUE);

 	delSetting(hContact, "Hidden");

 

 	char* szJid = mir_utf8encodeT(jid);

@@ -103,7 +103,7 @@ void CJabberProto::DBAddAuthRequest(const TCHAR *jid, const TCHAR *nick)
 ///////////////////////////////////////////////////////////////////////////////

 // JabberDBCreateContact()

 

-HCONTACT CJabberProto::DBCreateContact(const TCHAR *jid, const TCHAR *nick, BOOL temporary, BOOL stripResource)

+MCONTACT CJabberProto::DBCreateContact(const TCHAR *jid, const TCHAR *nick, BOOL temporary, BOOL stripResource)

 {

 	if (jid == NULL || jid[0]=='\0')

 		return NULL;

@@ -120,7 +120,7 @@ HCONTACT CJabberProto::DBCreateContact(const TCHAR *jid, const TCHAR *nick, BOOL
 

 	// We can't use JabberHContactFromJID() here because of the stripResource option

 	size_t len = _tcslen(s);

-	for (HCONTACT hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) {

+	for (MCONTACT hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) {

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

 		if (jid == NULL)

 			continue;

@@ -130,7 +130,7 @@ HCONTACT CJabberProto::DBCreateContact(const TCHAR *jid, const TCHAR *nick, BOOL
 			return hContact;

 	}

 

-	HCONTACT hNewContact = (HCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0);

+	MCONTACT hNewContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0);

 	CallService(MS_PROTO_ADDTOCONTACT, (WPARAM)hNewContact, (LPARAM)m_szModuleName);

 	setTString(hNewContact, "jid", s);

 	if (nick != NULL && *nick != '\0')

@@ -144,7 +144,7 @@ HCONTACT CJabberProto::DBCreateContact(const TCHAR *jid, const TCHAR *nick, BOOL
 	return hNewContact;

 }

 

-BOOL CJabberProto::AddDbPresenceEvent(HCONTACT hContact, BYTE btEventType)

+BOOL CJabberProto::AddDbPresenceEvent(MCONTACT hContact, BYTE btEventType)

 {

 	if (!hContact)

 		return FALSE;

@@ -179,7 +179,7 @@ BOOL CJabberProto::AddDbPresenceEvent(HCONTACT hContact, BYTE btEventType)
 ///////////////////////////////////////////////////////////////////////////////

 // JabberGetAvatarFileName() - gets a file name for the avatar image

 

-void CJabberProto::GetAvatarFileName(HCONTACT hContact, TCHAR* pszDest, size_t cbLen)

+void CJabberProto::GetAvatarFileName(MCONTACT hContact, TCHAR* pszDest, size_t cbLen)

 {

 	int tPathLen = mir_sntprintf(pszDest, cbLen, _T("%s\\%S"), VARST(_T("%miranda_avatarcache%")), m_szModuleName);

 

@@ -219,7 +219,7 @@ void CJabberProto::GetAvatarFileName(HCONTACT hContact, TCHAR* pszDest, size_t c
 void CJabberProto::ResolveTransportNicks(const TCHAR *jid)

 {

 	// Set all contacts to offline

-	HCONTACT hContact = m_ThreadInfo->resolveContact;

+	MCONTACT hContact = m_ThreadInfo->resolveContact;

 	if (hContact == NULL)

 		hContact = db_find_first(m_szModuleName);

 

@@ -320,7 +320,7 @@ static sttCapsNodeToName_Map[] =
 

 void CJabberProto::UpdateMirVer(JABBER_LIST_ITEM *item)

 {

-	HCONTACT hContact = HContactFromJID(item->jid);

+	MCONTACT hContact = HContactFromJID(item->jid);

 	if (!hContact)

 		return;

 

@@ -396,7 +396,7 @@ void CJabberProto::FormatMirVer(pResourceStatus &resource, CMString &res)
 }

 

 

-void CJabberProto::UpdateMirVer(HCONTACT hContact, pResourceStatus &resource)

+void CJabberProto::UpdateMirVer(MCONTACT hContact, pResourceStatus &resource)

 {

 	CMString tszMirVer;

 	FormatMirVer(resource, tszMirVer);

@@ -415,7 +415,7 @@ void CJabberProto::UpdateMirVer(HCONTACT hContact, pResourceStatus &resource)
 	setTString(hContact, DBSETTING_DISPLAY_UID, szFullJid);

 }

 

-void CJabberProto::UpdateSubscriptionInfo(HCONTACT hContact, JABBER_LIST_ITEM *item)

+void CJabberProto::UpdateSubscriptionInfo(MCONTACT hContact, JABBER_LIST_ITEM *item)

 {

 	switch (item->subscription) {

 	case SUB_TO:

@@ -445,7 +445,7 @@ void CJabberProto::UpdateSubscriptionInfo(HCONTACT hContact, JABBER_LIST_ITEM *i
 	}

 }

 

-void CJabberProto::SetContactOfflineStatus(HCONTACT hContact)

+void CJabberProto::SetContactOfflineStatus(MCONTACT hContact)

 {

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

 		setWord(hContact, "Status", ID_STATUS_OFFLINE);

@@ -482,7 +482,7 @@ void CJabberProto::InitPopups(void)
 	Skin_ReleaseIcon(ppc.hIcon);

 }

 

-void CJabberProto::MsgPopup(HCONTACT hContact, const TCHAR *szMsg, const TCHAR *szTitle)

+void CJabberProto::MsgPopup(MCONTACT hContact, const TCHAR *szMsg, const TCHAR *szTitle)

 {

 	if (ServiceExists(MS_POPUP_ADDPOPUPCLASS)) {

 		char name[256];