summaryrefslogtreecommitdiff
path: root/protocols/Omegle
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2014-02-10 20:47:51 +0000
committerGeorge Hazan <george.hazan@gmail.com>2014-02-10 20:47:51 +0000
commit68d3fd47bb9b75e65859d14199ffee01f16ac9a7 (patch)
treefcc340ad7067561e57733b287f193a7dbed93dd4 /protocols/Omegle
parent7193759b046338c6f47ff2edb34743a1465791cd (diff)
HCONTACT is not needed anymore
git-svn-id: http://svn.miranda-ng.org/main/trunk@8086 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Omegle')
-rw-r--r--protocols/Omegle/src/chat.cpp4
-rw-r--r--protocols/Omegle/src/messages.cpp2
-rw-r--r--protocols/Omegle/src/proto.cpp4
-rw-r--r--protocols/Omegle/src/proto.h44
-rw-r--r--protocols/Omegle/src/stubs.cpp38
-rw-r--r--protocols/Omegle/src/theme.cpp2
6 files changed, 47 insertions, 47 deletions
diff --git a/protocols/Omegle/src/chat.cpp b/protocols/Omegle/src/chat.cpp
index f9d1c75b0a..a51eb4542f 100644
--- a/protocols/Omegle/src/chat.cpp
+++ b/protocols/Omegle/src/chat.cpp
@@ -361,12 +361,12 @@ void OmegleProto::ClearChat()
}
// TODO: Could this be done better?
-HCONTACT OmegleProto::GetChatHandle()
+MCONTACT OmegleProto::GetChatHandle()
{
/*if (facy.chatHandle_ != NULL)
return facy.chatHandle_;
- 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)) {
if (db_get_b(hContact, m_szModuleName, "ChatRoom", 0) > 0) {
ptrA id = db_get_sa(hContact, m_szModuleName, "ChatRoomId");
if (id != NULL && !strcmp(id, m_szModuleName))
diff --git a/protocols/Omegle/src/messages.cpp b/protocols/Omegle/src/messages.cpp
index e98fa84271..4ec6ef36fe 100644
--- a/protocols/Omegle/src/messages.cpp
+++ b/protocols/Omegle/src/messages.cpp
@@ -79,7 +79,7 @@ void OmegleProto::StopChatWorker(void*p)
StopChat();
}
-int OmegleProto::SendMsg(HCONTACT hContact, int flags, const char *msg)
+int OmegleProto::SendMsg(MCONTACT hContact, int flags, const char *msg)
{
// TODO: msg comes as Unicode (retyped wchar_t*), why should we convert it as ANSI to UTF-8? o_O
/* if ( flags & PREF_UNICODE )
diff --git a/protocols/Omegle/src/proto.cpp b/protocols/Omegle/src/proto.cpp
index ef213f5066..29612b1a75 100644
--- a/protocols/Omegle/src/proto.cpp
+++ b/protocols/Omegle/src/proto.cpp
@@ -82,7 +82,7 @@ OmegleProto::~OmegleProto( )
//////////////////////////////////////////////////////////////////////////////
-DWORD_PTR OmegleProto::GetCaps( int type, HCONTACT hContact )
+DWORD_PTR OmegleProto::GetCaps( int type, MCONTACT hContact )
{
switch(type) {
case PFLAGNUM_1:
@@ -210,7 +210,7 @@ int OmegleProto::OnPreShutdown(WPARAM wParam,LPARAM lParam)
int OmegleProto::OnContactDeleted(WPARAM wparam,LPARAM)
{
- //HCONTACT hContact = (HCONTACT)wparam;
+ //MCONTACT hContact = (MCONTACT)wparam;
OnLeaveChat(NULL, NULL);
return 0;
diff --git a/protocols/Omegle/src/proto.h b/protocols/Omegle/src/proto.h
index f274dc0174..7e8ce70cad 100644
--- a/protocols/Omegle/src/proto.h
+++ b/protocols/Omegle/src/proto.h
@@ -44,23 +44,23 @@ public:
}
// PROTO_INTERFACE
- virtual HCONTACT __cdecl AddToList( int flags, PROTOSEARCHRESULT* psr );
- virtual HCONTACT __cdecl AddToListByEvent( int flags, int iContact, HANDLE hDbEvent );
+ virtual MCONTACT __cdecl AddToList( int flags, PROTOSEARCHRESULT* psr );
+ virtual MCONTACT __cdecl AddToListByEvent( int flags, int iContact, HANDLE hDbEvent );
virtual int __cdecl Authorize( HANDLE hDbEvent );
virtual int __cdecl AuthDeny( HANDLE hDbEvent, const PROTOCHAR* szReason );
- virtual int __cdecl AuthRecv( HCONTACT hContact, PROTORECVEVENT* );
- virtual int __cdecl AuthRequest( HCONTACT hContact, const PROTOCHAR* szMessage );
+ virtual int __cdecl AuthRecv( MCONTACT hContact, PROTORECVEVENT* );
+ virtual int __cdecl AuthRequest( MCONTACT hContact, const PROTOCHAR* szMessage );
virtual HANDLE __cdecl ChangeInfo( int iInfoType, void* pInfoData );
- 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 HANDLE __cdecl FileAllow( MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szPath );
+ virtual int __cdecl FileCancel( MCONTACT hContact, HANDLE hTransfer );
+ virtual int __cdecl FileDeny( MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szReason );
virtual int __cdecl FileResume( HANDLE hTransfer, int* action, const PROTOCHAR** szFilename );
- virtual DWORD_PTR __cdecl GetCaps( int type, HCONTACT hContact = NULL );
- virtual int __cdecl GetInfo( HCONTACT hContact, int infoType );
+ virtual DWORD_PTR __cdecl GetCaps( int type, MCONTACT hContact = NULL );
+ virtual int __cdecl GetInfo( MCONTACT 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( 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 RecvContacts( MCONTACT hContact, PROTORECVEVENT* );
+ virtual int __cdecl RecvFile( MCONTACT hContact, PROTOFILEEVENT* );
+ virtual int __cdecl RecvMsg( MCONTACT hContact, PROTORECVEVENT* );
+ virtual int __cdecl RecvUrl( MCONTACT hContact, PROTORECVEVENT* );
- 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 SendContacts( MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList );
+ virtual HANDLE __cdecl SendFile( MCONTACT hContact, const PROTOCHAR* szDescription, PROTOCHAR** ppszFiles );
+ virtual int __cdecl SendMsg( MCONTACT hContact, int flags, const char* msg );
+ virtual int __cdecl SendUrl( MCONTACT hContact, int flags, const char* url );
- virtual int __cdecl SetApparentMode( HCONTACT hContact, int mode );
+ virtual int __cdecl SetApparentMode( MCONTACT hContact, int mode );
virtual int __cdecl SetStatus( int iNewStatus );
- virtual HANDLE __cdecl GetAwayMsg( HCONTACT hContact );
- virtual int __cdecl RecvAwayMsg( HCONTACT hContact, int mode, PROTORECVEVENT* evt );
+ virtual HANDLE __cdecl GetAwayMsg( MCONTACT hContact );
+ virtual int __cdecl RecvAwayMsg( MCONTACT hContact, int mode, PROTORECVEVENT* evt );
virtual int __cdecl SetAwayMsg( int iStatus, const PROTOCHAR* msg );
- virtual int __cdecl UserIsTyping( HCONTACT hContact, int type );
+ virtual int __cdecl UserIsTyping( MCONTACT hContact, int type );
virtual int __cdecl OnEvent( PROTOEVENTTYPE iEventType, WPARAM wParam, LPARAM lParam );
@@ -132,7 +132,7 @@ public:
void SetChatStatus(int);
void ClearChat();
void SetTopic(const TCHAR *topic = NULL);
- HCONTACT GetChatHandle();
+ MCONTACT GetChatHandle();
// Connection client
Omegle_client facy;
diff --git a/protocols/Omegle/src/stubs.cpp b/protocols/Omegle/src/stubs.cpp
index 1f8c085547..897ab43de3 100644
--- a/protocols/Omegle/src/stubs.cpp
+++ b/protocols/Omegle/src/stubs.cpp
@@ -22,12 +22,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "common.h"
-HCONTACT OmegleProto::AddToList(int flags, PROTOSEARCHRESULT* psr)
+MCONTACT OmegleProto::AddToList(int flags, PROTOSEARCHRESULT* psr)
{
return NULL;
};
-HCONTACT OmegleProto::AddToListByEvent(int flags,int iContact,HANDLE hDbEvent)
+MCONTACT OmegleProto::AddToListByEvent(int flags,int iContact,HANDLE hDbEvent)
{
return NULL;
};
@@ -42,12 +42,12 @@ int OmegleProto::AuthDeny(HANDLE hDbEvent,const PROTOCHAR *reason)
return 1;
}
-int OmegleProto::AuthRecv(HCONTACT hContact,PROTORECVEVENT *)
+int OmegleProto::AuthRecv(MCONTACT hContact,PROTORECVEVENT *)
{
return 1;
}
-int OmegleProto::AuthRequest(HCONTACT hContact,const PROTOCHAR *message)
+int OmegleProto::AuthRequest(MCONTACT hContact,const PROTOCHAR *message)
{
return 1;
}
@@ -57,17 +57,17 @@ HANDLE OmegleProto::ChangeInfo(int type,void *info_data)
return NULL;
}
-HANDLE OmegleProto::FileAllow(HCONTACT hContact,HANDLE hTransfer,const PROTOCHAR *path)
+HANDLE OmegleProto::FileAllow(MCONTACT hContact,HANDLE hTransfer,const PROTOCHAR *path)
{
return NULL;
}
-int OmegleProto::FileCancel(HCONTACT hContact,HANDLE hTransfer)
+int OmegleProto::FileCancel(MCONTACT hContact,HANDLE hTransfer)
{
return 1;
}
-int OmegleProto::FileDeny(HCONTACT hContact,HANDLE hTransfer,const PROTOCHAR *reason)
+int OmegleProto::FileDeny(MCONTACT hContact,HANDLE hTransfer,const PROTOCHAR *reason)
{
return 1;
}
@@ -77,7 +77,7 @@ int OmegleProto::FileResume(HANDLE hTransfer,int *action,const PROTOCHAR **filen
return 1;
}
-int OmegleProto::GetInfo( HCONTACT hContact, int infoType )
+int OmegleProto::GetInfo( MCONTACT hContact, int infoType )
{
return 1;
}
@@ -107,47 +107,47 @@ HWND OmegleProto::CreateExtendedSearchUI(HWND owner)
return NULL;
}
-int OmegleProto::RecvContacts(HCONTACT hContact,PROTORECVEVENT *)
+int OmegleProto::RecvContacts(MCONTACT hContact,PROTORECVEVENT *)
{
return 1;
}
-int OmegleProto::RecvFile(HCONTACT hContact,PROTORECVFILET *)
+int OmegleProto::RecvFile(MCONTACT hContact,PROTORECVFILET *)
{
return 1;
}
-int OmegleProto::RecvUrl(HCONTACT hContact,PROTORECVEVENT *)
+int OmegleProto::RecvUrl(MCONTACT hContact,PROTORECVEVENT *)
{
return 1;
}
-int OmegleProto::SendContacts(HCONTACT hContact,int flags,int nContacts,HCONTACT *hContactsList)
+int OmegleProto::SendContacts(MCONTACT hContact,int flags,int nContacts,MCONTACT *hContactsList)
{
return 1;
}
-HANDLE OmegleProto::SendFile(HCONTACT hContact,const PROTOCHAR *desc, PROTOCHAR **files)
+HANDLE OmegleProto::SendFile(MCONTACT hContact,const PROTOCHAR *desc, PROTOCHAR **files)
{
return NULL;
}
-int OmegleProto::SendUrl(HCONTACT hContact,int flags,const char *url)
+int OmegleProto::SendUrl(MCONTACT hContact,int flags,const char *url)
{
return 1;
}
-int OmegleProto::SetApparentMode(HCONTACT hContact,int mode)
+int OmegleProto::SetApparentMode(MCONTACT hContact,int mode)
{
return 1;
}
-int OmegleProto::RecvAwayMsg(HCONTACT hContact,int mode,PROTORECVEVENT *evt)
+int OmegleProto::RecvAwayMsg(MCONTACT hContact,int mode,PROTORECVEVENT *evt)
{
return 1;
}
-int OmegleProto::UserIsTyping(HCONTACT hContact, int type)
+int OmegleProto::UserIsTyping(MCONTACT hContact, int type)
{
return 1;
}
@@ -157,12 +157,12 @@ int OmegleProto::SetAwayMsg(int iStatus, const PROTOCHAR* msg)
return 1;
}
-HANDLE OmegleProto::GetAwayMsg( HCONTACT hContact )
+HANDLE OmegleProto::GetAwayMsg( MCONTACT hContact )
{
return NULL;
}
-int OmegleProto::RecvMsg(HCONTACT hContact, PROTORECVEVENT *pre)
+int OmegleProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT *pre)
{
return 1;
}
diff --git a/protocols/Omegle/src/theme.cpp b/protocols/Omegle/src/theme.cpp
index 78e1f9d135..c9b41d93ec 100644
--- a/protocols/Omegle/src/theme.cpp
+++ b/protocols/Omegle/src/theme.cpp
@@ -47,7 +47,7 @@ HANDLE GetIconHandle(const char* name)
}
// Helper functions
-static OmegleProto * GetInstanceByHContact(HCONTACT hContact)
+static OmegleProto * GetInstanceByHContact(MCONTACT hContact)
{
char *proto = GetContactProto(hContact);
if (!proto)