From ddba4ede6b451d0cfcd0d32b5180fbd0689966bf Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 10 Feb 2014 08:04:30 +0000 Subject: - 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 --- plugins/MetaContacts/src/metacontacts.h | 34 ++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'plugins/MetaContacts/src/metacontacts.h') diff --git a/plugins/MetaContacts/src/metacontacts.h b/plugins/MetaContacts/src/metacontacts.h index a7fb25823c..637db357d5 100644 --- a/plugins/MetaContacts/src/metacontacts.h +++ b/plugins/MetaContacts/src/metacontacts.h @@ -63,7 +63,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // I can't think of a way around this - mental block -INT_PTR TranslateMenuFunc(HANDLE hContact, int i); +INT_PTR TranslateMenuFunc(HCONTACT hContact, int i); extern HGENMENU hMenuContact[MAX_CONTACTS]; extern HINSTANCE hInstance; @@ -78,7 +78,7 @@ extern int mcStatus; INT_PTR Meta_Convert(WPARAM wParam,LPARAM lParam); INT_PTR Meta_AddTo(WPARAM wParam,LPARAM lParam); INT_PTR Meta_Edit(WPARAM wParam,LPARAM lParam); -void Meta_RemoveContactNumber(HANDLE hMeta, int number); +void Meta_RemoveContactNumber(HCONTACT hMeta, int number); INT_PTR Meta_Delete(WPARAM wParam,LPARAM lParam); INT_PTR Meta_Default(WPARAM wParam,LPARAM lParam); INT_PTR Meta_ForceDefault(WPARAM wParam,LPARAM lParam); @@ -87,32 +87,32 @@ INT_PTR Meta_IsEnabled(); int Meta_EqualDBV(DBVARIANT *dbv, DBVARIANT *id); int Meta_ModifyMenu(WPARAM wParam,LPARAM lParam); -BOOL Meta_Assign(HANDLE src, HANDLE dest, BOOL set_as_default); -HANDLE Meta_GetHandle(const char *protocol, DBVARIANT *id); +BOOL Meta_Assign(HCONTACT src, HCONTACT dest, BOOL set_as_default); +HCONTACT Meta_GetHandle(const char *protocol, DBVARIANT *id); int Meta_SetNick(char *proto); -HANDLE Meta_GetMostOnline(HANDLE hMeta); -HANDLE Meta_GetMostOnlineSupporting(HANDLE hMeta, int pflagnum, unsigned long capability); +HCONTACT Meta_GetMostOnline(HCONTACT hMeta); +HCONTACT Meta_GetMostOnlineSupporting(HCONTACT hMeta, int pflagnum, unsigned long capability); int Meta_HideLinkedContacts(void); int Meta_SetHandles(void); int Meta_UnhideLinkedContacts(void); -int Meta_GetContactNumber(HANDLE hContact); -HANDLE Meta_GetContactHandle(HANDLE hMeta, int contact_number); -void Meta_RestoreGroup(HANDLE hContact); -void Meta_SetGroup(HANDLE hContact); +int Meta_GetContactNumber(HCONTACT hContact); +HCONTACT Meta_GetContactHandle(HCONTACT hMeta, int contact_number); +void Meta_RestoreGroup(HCONTACT hContact); +void Meta_SetGroup(HCONTACT hContact); int Meta_HideMetaContacts(int hide); int Meta_SuppressStatus(int suppress); -int Meta_CopyContactNick(HANDLE hMeta, HANDLE hContact); -void Meta_CopyData(HANDLE hMeta); +int Meta_CopyContactNick(HCONTACT hMeta, HCONTACT hContact); +void Meta_CopyData(HCONTACT hMeta); int Meta_SetAllNicks(); int Meta_IsHiddenGroup(const char *group_name); -int Meta_SwapContacts(HANDLE hMeta, DWORD contact_number1, DWORD contact_number2); +int Meta_SwapContacts(HCONTACT hMeta, DWORD contact_number1, DWORD contact_number2); // function to copy history from one contact to another - courtesy JdGordon with mods (thx) -void copyHistory(HANDLE hContactFrom,HANDLE hContactTo); +void copyHistory(HCONTACT hContactFrom, HCONTACT hContactTo); // inverse //void Meta_RemoveHistory(HANDLE hContactRemoveFrom, HANDLE hContactSource); -void Meta_FixStatus(HANDLE hMeta); +void Meta_FixStatus(HCONTACT hMeta); -char *Meta_GetUniqueIdentifier(HANDLE hContact, DWORD *pused); +char *Meta_GetUniqueIdentifier(HCONTACT hContact, DWORD *pused); INT_PTR Meta_GetCaps(WPARAM wParam,LPARAM lParam); INT_PTR Meta_GetName(WPARAM wParam,LPARAM lParam); @@ -187,7 +187,7 @@ INT_PTR MetaAPI_RemoveFromMeta(WPARAM wParam, LPARAM lParam); INT_PTR MetaAPI_DisableHiddenGroup(WPARAM wParam, LPARAM lParam); // extended db get/write setting functions, that handle unicode -INT_PTR Mydb_get(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv); +INT_PTR Mydb_get(HCONTACT hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv); // IcoLib support void InitIcons(void); -- cgit v1.2.3