- 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, 32 insertions, 32 deletions

diff --git a/protocols/FacebookRM/src/proto.h b/protocols/FacebookRM/src/proto.h
index 3d056a92c4..9b5b550253 100644
--- a/protocols/FacebookRM/src/proto.h
+++ b/protocols/FacebookRM/src/proto.h
@@ -54,11 +54,11 @@ public:
 

 	__forceinline INT_PTR getStringUtf(const char *name, DBVARIANT *result) {

 		return db_get_utf(NULL, m_szModuleName, name, result); }

-	__forceinline INT_PTR getStringUtf(HANDLE hContact, const char *name, DBVARIANT *result) {

+	__forceinline INT_PTR getStringUtf(HCONTACT hContact, const char *name, DBVARIANT *result) {

 		return db_get_utf(hContact, m_szModuleName, name, result); }

 

 	__forceinline void setStringUtf(const char *name, const char* value) { db_set_utf(NULL, m_szModuleName, name, value); }

-	__forceinline void setStringUtf(HANDLE hContact, const char *name, const char* value) { db_set_utf(hContact, m_szModuleName, name, value); }

+	__forceinline void setStringUtf(HCONTACT hContact, const char *name, const char* value) { db_set_utf(hContact, m_szModuleName, name, value); }

 

 	//PROTO_INTERFACE

 

@@ -67,18 +67,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);

@@ -86,24 +86,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);

 

@@ -185,13 +185,13 @@ public:
 	void __cdecl SendPokeWorker(void*);

 

 	// Contacts handling

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

-	HANDLE  ContactIDToHContact(std::string);

-	HANDLE  ChatIDToHContact(std::tstring);

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

+	HCONTACT ContactIDToHContact(std::string);

+	HCONTACT ChatIDToHContact(std::tstring);

 	std::string ThreadIDToContactID(std::string thread_id);

-	HANDLE  AddToContactList(facebook_user*, ContactType type, bool dont_check = false);

-	void    SetAllContactStatuses(int status);

-	HANDLE  HContactFromAuthEvent(HANDLE hEvent);

+	HCONTACT AddToContactList(facebook_user*, ContactType type, bool dont_check = false);

+	void     SetAllContactStatuses(int status);

+	HCONTACT HContactFromAuthEvent(HANDLE hEvent);

 

 	// Chats handling

  	void AddChat(const TCHAR *id, const TCHAR *name);

@@ -209,11 +209,11 @@ public:
 	// Helpers

 	std::tstring GetAvatarFolder();

 	bool GetDbAvatarInfo(PROTO_AVATAR_INFORMATIONT &ai, std::string *url);

-	void CheckAvatarChange(HANDLE hContact, std::string image_url);

+	void CheckAvatarChange(HCONTACT hContact, std::string image_url);

 	void ToggleStatusMenuItems(BOOL bEnable);

-	void ParseSmileys(std::string message, HANDLE hContact);

+	void ParseSmileys(std::string message, HCONTACT hContact);

 	void OpenUrl(std::string url);

-	void SaveName(HANDLE hContact, const facebook_user *fbu);

+	void SaveName(HCONTACT hContact, const facebook_user *fbu);

 

 	// Handles, Locks

 	HGENMENU m_hMenuRoot, m_hMenuServicesRoot, m_hStatusMind;

@@ -227,10 +227,10 @@ public:
 

 	std::string last_status_msg_;

 	HANDLE	hSmileysFolder_;

-	std::vector<HANDLE> avatar_queue;

+	std::vector<HCONTACT> avatar_queue;

 

 	static void CALLBACK APC_callback(ULONG_PTR p);

 

 	// Information providing

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

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

 };