MEVENT - the strict type for events, they are not HANDLE anymore

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

4 files changed, 10 insertions, 10 deletions

diff --git a/protocols/IcqOscarJ/src/icq_db.cpp b/protocols/IcqOscarJ/src/icq_db.cpp
index 4871d2d7b3..53e41ef407 100644
--- a/protocols/IcqOscarJ/src/icq_db.cpp
+++ b/protocols/IcqOscarJ/src/icq_db.cpp
@@ -189,7 +189,7 @@ int CIcqProto::IsICQContact(MCONTACT hContact)
 	return !strcmpnull(szProto, m_szModuleName);

 }

 

-HANDLE CIcqProto::AddEvent(MCONTACT hContact, WORD wType, DWORD dwTime, DWORD flags, size_t cbBlob, PBYTE pBlob)

+MEVENT CIcqProto::AddEvent(MCONTACT hContact, WORD wType, DWORD dwTime, DWORD flags, size_t cbBlob, PBYTE pBlob)

 {

 	DBEVENTINFO dbei = { sizeof(dbei) };

 	dbei.szModule = m_szModuleName;

diff --git a/protocols/IcqOscarJ/src/icq_proto.cpp b/protocols/IcqOscarJ/src/icq_proto.cpp
index 330ff5235f..825cdd8068 100644
--- a/protocols/IcqOscarJ/src/icq_proto.cpp
+++ b/protocols/IcqOscarJ/src/icq_proto.cpp
@@ -342,7 +342,7 @@ MCONTACT CIcqProto::AddToList(int flags, PROTOSEARCHRESULT *psr)
 	return AddToListByUID(szUid, flags);

 }

 

-MCONTACT __cdecl CIcqProto::AddToListByEvent(int flags, int iContact, HANDLE hDbEvent)

+MCONTACT __cdecl CIcqProto::AddToListByEvent(int flags, int iContact, MEVENT hDbEvent)

 {

 	DWORD uin = 0;

 	uid_str uid = { 0 };

@@ -405,7 +405,7 @@ MCONTACT __cdecl CIcqProto::AddToListByEvent(int flags, int iContact, HANDLE hDb
 ////////////////////////////////////////////////////////////////////////////////////////

 // PS_AuthAllow - processes the successful authorization

 

-int CIcqProto::Authorize(HANDLE hDbEvent)

+int CIcqProto::Authorize(MEVENT hDbEvent)

 {

 	if (icqOnline() && hDbEvent) {

 		MCONTACT hContact = HContactFromAuthEvent(hDbEvent);

@@ -431,7 +431,7 @@ int CIcqProto::Authorize(HANDLE hDbEvent)
 ////////////////////////////////////////////////////////////////////////////////////////

 // PS_AuthDeny - handles the unsuccessful authorization

 

-int CIcqProto::AuthDeny(HANDLE hDbEvent, const TCHAR* szReason)

+int CIcqProto::AuthDeny(MEVENT hDbEvent, const TCHAR* szReason)

 {

 	if (icqOnline() && hDbEvent) {

 		MCONTACT hContact = HContactFromAuthEvent(hDbEvent);

diff --git a/protocols/IcqOscarJ/src/icq_proto.h b/protocols/IcqOscarJ/src/icq_proto.h
index cd51336809..56db448000 100644
--- a/protocols/IcqOscarJ/src/icq_proto.h
+++ b/protocols/IcqOscarJ/src/icq_proto.h
@@ -55,10 +55,10 @@ struct CIcqProto : public PROTO<CIcqProto>
 	//====================================================================================

 

 	virtual	MCONTACT  __cdecl AddToList( int flags, PROTOSEARCHRESULT *psr);

-	virtual	MCONTACT  __cdecl AddToListByEvent( int flags, int iContact, HANDLE hDbEvent);

+	virtual	MCONTACT  __cdecl AddToListByEvent( int flags, int iContact, MEVENT hDbEvent);

 

-	virtual	int       __cdecl Authorize(HANDLE hDbEvent);

-	virtual	int       __cdecl AuthDeny(HANDLE hDbEvent, const TCHAR *szReason);

+	virtual	int       __cdecl Authorize(MEVENT hDbEvent);

+	virtual	int       __cdecl AuthDeny(MEVENT hDbEvent, const TCHAR *szReason);

 	virtual	int       __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*);

 	virtual	int       __cdecl AuthRequest(MCONTACT hContact, const TCHAR *szMessage);

 

@@ -412,7 +412,7 @@ struct CIcqProto : public PROTO<CIcqProto>
 	const char* detectUserClient(MCONTACT hContact, int nIsICQ, WORD wUserClass, DWORD dwOnlineSince, const char *szCurrentClient, WORD wVersion, DWORD dwFT1, DWORD dwFT2, DWORD dwFT3, DWORD dwDirectCookie, DWORD dwWebPort, BYTE *caps, size_t wLen, BYTE *bClientId, char *szClientBuf);

 

 	//----| icq_db.cpp |------------------------------------------------------------------

-	HANDLE AddEvent(MCONTACT hContact, WORD wType, DWORD dwTime, DWORD flags, size_t cbBlob, PBYTE pBlob);

+	MEVENT AddEvent(MCONTACT hContact, WORD wType, DWORD dwTime, DWORD flags, size_t cbBlob, PBYTE pBlob);

 	int    IsICQContact(MCONTACT hContact);

 

 	int    getSetting(MCONTACT hContact, const char *szSetting, DBVARIANT *dbv);

@@ -888,7 +888,7 @@ struct CIcqProto : public PROTO<CIcqProto>
 	MCONTACT HandleFromCacheByUid(DWORD dwUin, const char *szUid);

 	MCONTACT HContactFromUIN(DWORD dwUin, int *Added);

 	MCONTACT HContactFromUID(DWORD dwUin, const char *szUid, int *Added);

-	MCONTACT HContactFromAuthEvent(HANDLE hEvent);

+	MCONTACT HContactFromAuthEvent(MEVENT hEvent);

 

 	void   ResetSettingsOnListReload();

 	void   ResetSettingsOnConnect();

diff --git a/protocols/IcqOscarJ/src/utilities.cpp b/protocols/IcqOscarJ/src/utilities.cpp
index 3adf403033..8dc21e8c19 100644
--- a/protocols/IcqOscarJ/src/utilities.cpp
+++ b/protocols/IcqOscarJ/src/utilities.cpp
@@ -552,7 +552,7 @@ MCONTACT CIcqProto::HContactFromUID(DWORD dwUin, const char *szUid, int *Added)
 	return INVALID_CONTACT_ID;

 }

 

-MCONTACT CIcqProto::HContactFromAuthEvent(HANDLE hEvent)

+MCONTACT CIcqProto::HContactFromAuthEvent(MEVENT hEvent)

 {

 	DWORD body[3];