- 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, 30 insertions, 31 deletions

diff --git a/protocols/WhatsApp/src/proto.h b/protocols/WhatsApp/src/proto.h
index d8bdab70a6..80e954d71a 100644
--- a/protocols/WhatsApp/src/proto.h
+++ b/protocols/WhatsApp/src/proto.h
@@ -37,18 +37,18 @@ public:
 

    virtual	int      __cdecl Authorize( HANDLE hDbEvent );

    virtual	int      __cdecl AuthDeny( HANDLE hDbEvent, const PROTOCHAR* szReason )       { return 1; }

-   virtual	int      __cdecl AuthRecv( HANDLE hContact, PROTORECVEVENT* )                 { return 1; }

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

+   virtual	int      __cdecl AuthRecv(HCONTACT hContact, PROTORECVEVENT* )                 { return 1; }

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

 

    virtual	HANDLE   __cdecl ChangeInfo( int iInfoType, void* pInfoData ) { return NULL; }

 

-   virtual	HANDLE   __cdecl FileAllow( HANDLE hContact, HANDLE hTransfer, const PROTOCHAR* szPath )     { return NULL; }

-   virtual	int      __cdecl FileCancel( HANDLE hContact, HANDLE hTransfer )                             { return 1; }             

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

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

+   virtual	int      __cdecl FileCancel(HCONTACT hContact, HANDLE hTransfer )                             { return 1; }             

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

    virtual	int      __cdecl FileResume( HANDLE hTransfer, int* action, const PROTOCHAR** szFilename )   { return 1; }

 

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

-   virtual	int       __cdecl GetInfo( HANDLE hContact, int infoType )     { return 1; }

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

+   virtual	int       __cdecl GetInfo(HCONTACT hContact, int infoType )     { return 1; }

 

    virtual	HANDLE    __cdecl SearchBasic( const PROTOCHAR* id );

    virtual	HANDLE    __cdecl SearchByEmail( const PROTOCHAR* email )                                                      { return NULL; }

@@ -56,25 +56,25 @@ public:
 	virtual	HWND      __cdecl SearchAdvanced( HWND owner )                                                                 { return NULL; }

 	virtual	HWND      __cdecl CreateExtendedSearchUI( HWND owner )                                                         { return NULL; }

 

-	virtual	int       __cdecl RecvContacts( HANDLE hContact, PROTORECVEVENT* )   { return 1; }

-	virtual	int       __cdecl RecvFile( HANDLE hContact, PROTOFILEEVENT* )       { return 1; }

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

-	virtual	int       __cdecl RecvUrl( HANDLE hContact, PROTORECVEVENT* )        { return 1; }

+	virtual	int       __cdecl RecvContacts(HCONTACT hContact, PROTORECVEVENT* )   { return 1; }

+	virtual	int       __cdecl RecvFile(HCONTACT hContact, PROTOFILEEVENT* )       { return 1; }

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

+	virtual	int       __cdecl RecvUrl(HCONTACT hContact, PROTORECVEVENT* )        { return 1; }

 

-   virtual	int       __cdecl SendContacts( HANDLE hContact, int flags, int nContacts, HANDLE* hContactsList ) { return 1; }

-   virtual	HANDLE    __cdecl SendFile( HANDLE hContact, const PROTOCHAR* szDescription, PROTOCHAR** ppszFiles ) { return NULL; }

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

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

+	virtual	int       __cdecl SendContacts(HCONTACT hContact, int flags, int nContacts, HCONTACT *hContactsList) { return 1; }

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

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

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

 

-   virtual	int       __cdecl SetApparentMode( HANDLE hContact, int mode ) { return 1; }

+   virtual	int       __cdecl SetApparentMode(HCONTACT hContact, int mode ) { return 1; }

    virtual	int       __cdecl SetStatus( int iNewStatus );

 

-   virtual	HANDLE    __cdecl GetAwayMsg( HANDLE hContact )                                        { return NULL; }

-   virtual	int       __cdecl RecvAwayMsg( HANDLE hContact, int mode, PROTORECVEVENT* evt )        { return 1; }

-	virtual	int       __cdecl SendAwayMsg( HANDLE hContact, HANDLE hProcess, const char* msg )     { return 1; }

+   virtual	HANDLE    __cdecl GetAwayMsg(HCONTACT hContact )                                        { return NULL; }

+   virtual	int       __cdecl RecvAwayMsg(HCONTACT hContact, int mode, PROTORECVEVENT* evt )        { return 1; }

+	virtual	int       __cdecl SendAwayMsg(HCONTACT hContact, HANDLE hProcess, const char* msg )     { return 1; }

 	virtual	int       __cdecl SetAwayMsg( int iStatus, const PROTOCHAR* msg )                      { return 1; }

 

-	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 ) { return 1; }

 

@@ -120,18 +120,18 @@ public:
    void __cdecl SendCreateGroupWorker(void*);

 

    // Contacts handling

-   HANDLE AddToContactList(const std::string& jid, BYTE type = 0, bool dont_check = false,

+	HCONTACT AddToContactList(const std::string& jid, BYTE type = 0, bool dont_check = false,

                            const char *new_name = NULL, bool isChatRoom = false, bool isHidden = false);

-	bool     IsMyContact(HANDLE, bool include_chat = false);

-	HANDLE   ContactIDToHContact(const std::string&);

+	bool     IsMyContact(HCONTACT hContact, bool include_chat = false);

+	HCONTACT ContactIDToHContact(const std::string&);

    void     SetAllContactStatuses(int status, bool reset_client = false);

-   void     UpdateStatusMsg(HANDLE hContact);

-   string   GetContactDisplayName(HANDLE hContact);

+   void     UpdateStatusMsg(HCONTACT hContact);

+   string   GetContactDisplayName(HCONTACT hContact);

    string   GetContactDisplayName(const string& jid);

    void     InitContactMenus();

    void     HandleReceiveGroups(const std::vector<string>& groups, bool isOwned);

    

-   bool IsGroupChat(HANDLE hC, bool checkIsAdmin = false)

+	bool IsGroupChat(HCONTACT hC, bool checkIsAdmin = false)

    {

 		return getByte(hC, "SimpleChatRoom", 0) > (checkIsAdmin ? 1 : 0);

    }

@@ -165,9 +165,8 @@ public:
    string phoneNumber;

    string jid;

    string nick;

-   std::map<string, HANDLE> hContactByJid;

-   //std::map<HANDLE, std::vector<HANDLE>> membersByGroupContact;

-   map<HANDLE, map<HANDLE, bool>> isMemberByGroupContact;

+	std::map<string, HCONTACT> hContactByJid;

+	map<HCONTACT, map<HCONTACT, bool>> isMemberByGroupContact;

 

    // WhatsApp Events

    virtual void onMessageForMe(FMessage* paramFMessage, bool paramBoolean);

@@ -206,8 +205,8 @@ public:
 	virtual void onLeaveGroup(const std::string& paramString);

 

 	// Information providing

-   void NotifyEvent(TCHAR* title, TCHAR* info, HANDLE contact, DWORD flags, TCHAR* url=NULL);

-   void NotifyEvent(const string& title, const string& info, HANDLE contact, DWORD flags, TCHAR* url=NULL);

+	void NotifyEvent(TCHAR* title, TCHAR* info, HCONTACT contact, DWORD flags, TCHAR* url = NULL);

+	void NotifyEvent(const string& title, const string& info, HCONTACT contact, DWORD flags, TCHAR* url = NULL);

 

 

 };