- HANDLE hContact => HCONTACT

- GCF_* prefix was added to chat constants to avoid name conflicts

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

1 files changed, 19 insertions, 19 deletions

diff --git a/protocols/Omegle/src/proto.h b/protocols/Omegle/src/proto.h
index dc774a56b3..507faea578 100644
--- a/protocols/Omegle/src/proto.h
+++ b/protocols/Omegle/src/proto.h
@@ -49,18 +49,18 @@ public:
 

 	virtual	int      __cdecl Authorize( HANDLE hDbEvent );

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

-	virtual	int      __cdecl AuthRecv( HANDLE hContact, PROTORECVEVENT* );

-	virtual	int      __cdecl AuthRequest( HANDLE hContact, const PROTOCHAR* szMessage );

+	virtual	int      __cdecl AuthRecv( HCONTACT hContact, PROTORECVEVENT* );

+	virtual	int      __cdecl AuthRequest( HCONTACT hContact, const PROTOCHAR* szMessage );

 

 	virtual	HANDLE   __cdecl ChangeInfo( int iInfoType, void* pInfoData );

 

-	virtual	HANDLE   __cdecl FileAllow( HANDLE hContact, HANDLE hTransfer, const PROTOCHAR* szPath );

-	virtual	int      __cdecl FileCancel( HANDLE hContact, HANDLE hTransfer );

-	virtual	int      __cdecl FileDeny( HANDLE hContact, HANDLE hTransfer, const PROTOCHAR* szReason );

+	virtual	HANDLE   __cdecl FileAllow( HCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szPath );

+	virtual	int      __cdecl FileCancel( HCONTACT hContact, HANDLE hTransfer );

+	virtual	int      __cdecl FileDeny( HCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szReason );

 	virtual	int      __cdecl FileResume( HANDLE hTransfer, int* action, const PROTOCHAR** szFilename );

 

-	virtual	DWORD_PTR __cdecl GetCaps( int type, HANDLE hContact = NULL );

-	virtual	int       __cdecl GetInfo( HANDLE hContact, int infoType );

+	virtual	DWORD_PTR __cdecl GetCaps( int type, HCONTACT hContact = NULL );

+	virtual	int       __cdecl GetInfo( HCONTACT hContact, int infoType );

 

 	virtual	HANDLE    __cdecl SearchBasic( const PROTOCHAR* id );

 	virtual	HANDLE    __cdecl SearchByEmail( const PROTOCHAR* email );

@@ -68,24 +68,24 @@ public:
 	virtual	HWND      __cdecl SearchAdvanced( HWND owner );

 	virtual	HWND      __cdecl CreateExtendedSearchUI( HWND owner );

 

-	virtual	int       __cdecl RecvContacts( HANDLE hContact, PROTORECVEVENT* );

-	virtual	int       __cdecl RecvFile( HANDLE hContact, PROTOFILEEVENT* );

-	virtual	int       __cdecl RecvMsg( HANDLE hContact, PROTORECVEVENT* );

-	virtual	int       __cdecl RecvUrl( HANDLE hContact, PROTORECVEVENT* );

+	virtual	int       __cdecl RecvContacts( HCONTACT hContact, PROTORECVEVENT* );

+	virtual	int       __cdecl RecvFile( HCONTACT hContact, PROTOFILEEVENT* );

+	virtual	int       __cdecl RecvMsg( HCONTACT hContact, PROTORECVEVENT* );

+	virtual	int       __cdecl RecvUrl( HCONTACT hContact, PROTORECVEVENT* );

 

-	virtual	int       __cdecl SendContacts( HANDLE hContact, int flags, int nContacts, HANDLE* hContactsList );

-	virtual	HANDLE    __cdecl SendFile( HANDLE hContact, const PROTOCHAR* szDescription, PROTOCHAR** ppszFiles );

-	virtual	int       __cdecl SendMsg( HANDLE hContact, int flags, const char* msg );

-	virtual	int       __cdecl SendUrl( HANDLE hContact, int flags, const char* url );

+	virtual	int       __cdecl SendContacts( HCONTACT hContact, int flags, int nContacts, HCONTACT *hContactsList );

+	virtual	HANDLE    __cdecl SendFile( HCONTACT hContact, const PROTOCHAR* szDescription, PROTOCHAR** ppszFiles );

+	virtual	int       __cdecl SendMsg( HCONTACT hContact, int flags, const char* msg );

+	virtual	int       __cdecl SendUrl( HCONTACT hContact, int flags, const char* url );

 

-	virtual	int       __cdecl SetApparentMode( HANDLE hContact, int mode );

+	virtual	int       __cdecl SetApparentMode( HCONTACT hContact, int mode );

 	virtual	int       __cdecl SetStatus( int iNewStatus );

 

-	virtual	HANDLE    __cdecl GetAwayMsg( HANDLE hContact );

-	virtual	int       __cdecl RecvAwayMsg( HANDLE hContact, int mode, PROTORECVEVENT* evt );

+	virtual	HANDLE    __cdecl GetAwayMsg( HCONTACT hContact );

+	virtual	int       __cdecl RecvAwayMsg( HCONTACT hContact, int mode, PROTORECVEVENT* evt );

 	virtual	int       __cdecl SetAwayMsg( int iStatus, const PROTOCHAR* msg );

 

-	virtual	int       __cdecl UserIsTyping( HANDLE hContact, int type );

+	virtual	int       __cdecl UserIsTyping( HCONTACT hContact, int type );

 

 	virtual	int       __cdecl OnEvent( PROTOEVENTTYPE iEventType, WPARAM wParam, LPARAM lParam );