From 68d3fd47bb9b75e65859d14199ffee01f16ac9a7 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 10 Feb 2014 20:47:51 +0000 Subject: HCONTACT is not needed anymore git-svn-id: http://svn.miranda-ng.org/main/trunk@8086 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/src/hdr/modern_awaymsg.h | 2 +- plugins/Clist_modern/src/hdr/modern_cache_funcs.h | 4 +-- plugins/Clist_modern/src/hdr/modern_clc.h | 12 +++---- plugins/Clist_modern/src/hdr/modern_clist.h | 6 ++-- .../Clist_modern/src/hdr/modern_commonheaders.h | 10 +++--- .../Clist_modern/src/hdr/modern_commonprototypes.h | 38 +++++++++++----------- plugins/Clist_modern/src/hdr/modern_gettextasync.h | 4 +-- .../Clist_modern/src/hdr/modern_global_structure.h | 2 +- .../Clist_modern/src/hdr/modern_skinned_profile.h | 8 ++--- 9 files changed, 43 insertions(+), 43 deletions(-) (limited to 'plugins/Clist_modern/src/hdr') diff --git a/plugins/Clist_modern/src/hdr/modern_awaymsg.h b/plugins/Clist_modern/src/hdr/modern_awaymsg.h index df40446f2c..702358721c 100644 --- a/plugins/Clist_modern/src/hdr/modern_awaymsg.h +++ b/plugins/Clist_modern/src/hdr/modern_awaymsg.h @@ -34,4 +34,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. void InitAwayMsgModule(); void UninitAwayMsgModule(); -void amRequestAwayMsg(HCONTACT hContact); +void amRequestAwayMsg(MCONTACT hContact); diff --git a/plugins/Clist_modern/src/hdr/modern_cache_funcs.h b/plugins/Clist_modern/src/hdr/modern_cache_funcs.h index 9b32eb6788..24dc9db73d 100644 --- a/plugins/Clist_modern/src/hdr/modern_cache_funcs.h +++ b/plugins/Clist_modern/src/hdr/modern_cache_funcs.h @@ -37,11 +37,11 @@ void Cache_GetFirstLineText(ClcData *dat, ClcContact *contact); void Cache_GetSecondLineText(struct SHORTDATA *dat, ClcCacheEntry *pdnce); void Cache_GetThirdLineText(struct SHORTDATA *dat, ClcCacheEntry *pdnce); void Cache_GetAvatar(ClcData *dat, ClcContact *contact); -void Cache_GetTimezone(ClcData *dat, HCONTACT hContact); +void Cache_GetTimezone(ClcData *dat, MCONTACT hContact); int Cache_GetLineText(ClcCacheEntry *pdnce, int type, LPTSTR text, int text_size, TCHAR *variable_text, BOOL xstatus_has_priority, BOOL show_status_if_no_away, BOOL show_listening_if_no_away, BOOL use_name_and_message_for_xstatus, BOOL pdnce_time_show_only_if_different); -void amRequestAwayMsg(HCONTACT hContact); +void amRequestAwayMsg(MCONTACT hContact); #endif // __CACHE_FUNCS_H__ diff --git a/plugins/Clist_modern/src/hdr/modern_clc.h b/plugins/Clist_modern/src/hdr/modern_clc.h index 2e8cfe1224..5cffd61852 100644 --- a/plugins/Clist_modern/src/hdr/modern_clc.h +++ b/plugins/Clist_modern/src/hdr/modern_clc.h @@ -396,7 +396,7 @@ void ClcOptionsChanged(void); //clcidents.c int cliGetRowsPriorTo(ClcGroup *group,ClcGroup *subgroup,int contactIndex); -int FindItem(HWND hwnd, ClcData *dat, HCONTACT hItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible, BOOL isIgnoreSubcontacts); +int FindItem(HWND hwnd, ClcData *dat, MCONTACT hItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible, BOOL isIgnoreSubcontacts); int cliGetRowByIndex(ClcData *dat,int testindex,ClcContact **contact,ClcGroup **subgroup); HANDLE ContactToHItem(ClcContact *contact); HANDLE ContactToItemHandle(ClcContact *contact,DWORD *nmFlags); @@ -407,8 +407,8 @@ ClcGroup *cli_AddGroup(HWND hwnd,ClcData *dat,const TCHAR *szName,DWORD flags,in void cli_FreeGroup(ClcGroup *group); int cli_AddInfoItemToGroup(ClcGroup *group,int flags,const TCHAR *pszText); void cliRebuildEntireList(HWND hwnd, ClcData *dat); -void cli_DeleteItemFromTree(HWND hwnd, HCONTACT hItem); -void cli_AddContactToTree(HWND hwnd,ClcData *dat,HCONTACT hContact,int updateTotalCount,int checkHideOffline); +void cli_DeleteItemFromTree(HWND hwnd, MCONTACT hItem); +void cli_AddContactToTree(HWND hwnd,ClcData *dat,MCONTACT hContact,int updateTotalCount,int checkHideOffline); void cli_SortCLC(HWND hwnd,ClcData *dat,int useInsertionSort); int GetNewSelection(ClcGroup *group,int selection, int direction); @@ -433,13 +433,13 @@ DWORD GetDefaultExStyle(void); void GetFontSetting(int i,LOGFONT *lf,COLORREF *colour,BYTE *effect, COLORREF *eColour1,COLORREF *eColour2); //clistsettings.c -TCHAR * GetContactDisplayNameW(HCONTACT hContact, int mode ); +TCHAR * GetContactDisplayNameW(MCONTACT hContact, int mode ); //groups.c TCHAR* GetGroupNameTS( int idx, DWORD* pdwFlags ); int RenameGroupT(WPARAM groupID, LPARAM newName); -int GetContactCachedStatus(HCONTACT hContact); -char *GetContactCachedProtocol(HCONTACT hContact); +int GetContactCachedStatus(MCONTACT hContact); +char *GetContactCachedProtocol(MCONTACT hContact); #endif /* _CLC_H_ */ diff --git a/plugins/Clist_modern/src/hdr/modern_clist.h b/plugins/Clist_modern/src/hdr/modern_clist.h index 1c6c5923e8..65cfaeb76e 100644 --- a/plugins/Clist_modern/src/hdr/modern_clist.h +++ b/plugins/Clist_modern/src/hdr/modern_clist.h @@ -28,9 +28,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define _CLIST_H_ void LoadContactTree(void); -HTREEITEM GetTreeItemByHContact(HCONTACT hContact); -void cli_ChangeContactIcon(HCONTACT hContact,int iIcon,int add); -int GetContactInfosForSort(HCONTACT hContact,char **Proto,TCHAR **Name,int *Status); +HTREEITEM GetTreeItemByHContact(MCONTACT hContact); +void cli_ChangeContactIcon(MCONTACT hContact,int iIcon,int add); +int GetContactInfosForSort(MCONTACT hContact,char **Proto,TCHAR **Name,int *Status); /////////////////////////////////////////////////////////////////////////////// diff --git a/plugins/Clist_modern/src/hdr/modern_commonheaders.h b/plugins/Clist_modern/src/hdr/modern_commonheaders.h index 636388c61a..320010f101 100644 --- a/plugins/Clist_modern/src/hdr/modern_commonheaders.h +++ b/plugins/Clist_modern/src/hdr/modern_commonheaders.h @@ -241,14 +241,14 @@ int AniAva_InitModule(); // HAVE TO BE AFTER GDI+ INITIALIZED int AniAva_UnloadModule(); int AniAva_UpdateOptions(); //reload options, //hot enable/disable engine -int AniAva_AddAvatar(HCONTACT hContact, TCHAR * szFilename, int width, int heigth); // adds avatars to be displayed -int AniAva_SetAvatarPos(HCONTACT hContact, RECT *rc, int overlayIdx, BYTE bAlpha); // update avatars pos -int AniAva_InvalidateAvatarPositions(HCONTACT hContact); // reset positions of avatars to be drawn (still be painted at same place) +int AniAva_AddAvatar(MCONTACT hContact, TCHAR * szFilename, int width, int heigth); // adds avatars to be displayed +int AniAva_SetAvatarPos(MCONTACT hContact, RECT *rc, int overlayIdx, BYTE bAlpha); // update avatars pos +int AniAva_InvalidateAvatarPositions(MCONTACT hContact); // reset positions of avatars to be drawn (still be painted at same place) int AniAva_RemoveInvalidatedAvatars(); // all avatars without validated position will be stop painted and probably removed -int AniAva_RemoveAvatar(HCONTACT hContact); // remove avatar +int AniAva_RemoveAvatar(MCONTACT hContact); // remove avatar int AniAva_RedrawAllAvatars(BOOL updateZOrder); // request to repaint all void AniAva_UpdateParent(); -int AniAva_RenderAvatar(HCONTACT hContact, HDC hdcMem, RECT *rc ); +int AniAva_RenderAvatar(MCONTACT hContact, HDC hdcMem, RECT *rc ); #define CCI_NAME 1 #define CCI_GROUP (1<<1) diff --git a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h index 838686b5d7..e6998c3a95 100644 --- a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h +++ b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h @@ -207,21 +207,21 @@ INT_PTR CALLBACK DlgSkinEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM INT_PTR CALLBACK DlgTmplEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); //RowTemplate.c BOOL FindMenuHanleByGlobalID(HMENU hMenu, int globalID, struct _MenuItemHandles * dat); //GenMenu.c BOOL MatchMask(char *name, char *mask); //mod_skin_selector.c -char* GetContactCachedProtocol(HCONTACT hContact); //clistsettings.c +char* GetContactCachedProtocol(MCONTACT hContact); //clistsettings.c char* GetParamN(char *string, char *buf, int buflen, BYTE paramN, char Delim, BOOL SkipSpaces); //mod_skin_selector.c WCHAR* GetParamN(WCHAR *string, WCHAR *buf, int buflen, BYTE paramN, WCHAR Delim, BOOL SkipSpaces); -DWORD CompareContacts2_getLMTime(HCONTACT u); //contact.c +DWORD CompareContacts2_getLMTime(MCONTACT u); //contact.c DWORD mod_CalcHash(const char * a); //mod_skin_selector.c -HICON cliGetIconFromStatusMode(HCONTACT hContact, const char *szProto,int status); //clistmod.c +HICON cliGetIconFromStatusMode(MCONTACT hContact, const char *szProto,int status); //clistmod.c HICON GetMainStatusOverlay(int STATUS); //clc.c -int __fastcall CLVM_GetContactHiddenStatus(HCONTACT hContact, char *szStatus, ClcData *dat); //clcitems.c +int __fastcall CLVM_GetContactHiddenStatus(MCONTACT hContact, char *szStatus, ClcData *dat); //clcitems.c int BgStatusBarChange(WPARAM wParam,LPARAM lParam); //clcopts.c -int ClcDoProtoAck(HCONTACT wParam, ACKDATA *ack); //clc.c +int ClcDoProtoAck(MCONTACT wParam, ACKDATA *ack); //clc.c int ModernSkinButtonDeleteAll(); //modernbutton.c -int GetContactCachedStatus(HCONTACT hContact); //clistsettings.c +int GetContactCachedStatus(MCONTACT hContact); //clistsettings.c int GetContactIconC(ClcCacheEntry *cacheEntry); //clistmod.c int GetContactIndex(ClcGroup *group,ClcContact *contact); //clcidents.c -int GetStatusForContact(HCONTACT hContact,char *szProto); //clistsettings.c +int GetStatusForContact(MCONTACT hContact,char *szProto); //clistsettings.c int InitCustomMenus(void); //clistmenus.c int InitFramesMenus(void); //framesmenus.c int LoadMoveToGroup(); //movetogroup.c @@ -247,7 +247,7 @@ void Docking_GetMonitorRectFromWindow(HWND hWnd,RECT *rc); void DrawAvatarImageWithGDIp(HDC hDestDC,int x, int y, DWORD width, DWORD height, HBITMAP hbmp, int x1, int y1, DWORD width1, DWORD height1,DWORD flag,BYTE alpha); //gdiplus.cpp void FreeRowCell(); //RowHeight void InitGdiPlus(); //gdiplus.cpp -void InvalidateDNCEbyPointer(HCONTACT hContact,ClcCacheEntry *pdnce,int SettingType); //clistsettings.c +void InvalidateDNCEbyPointer(MCONTACT hContact,ClcCacheEntry *pdnce,int SettingType); //clistsettings.c void ShutdownGdiPlus(); //gdiplus.cpp void UninitCustomMenus(); //clistmenus.c void UnloadAvatarOverlayIcon(); //clc.c @@ -255,7 +255,7 @@ void UnLoadContactListModule(); / void UpdateAllAvatars(ClcData *dat); //cache_func.c //cluiframes.c -void gtaRenewText(HCONTACT hContact); +void gtaRenewText(MCONTACT hContact); int ExtraImage_ExtraIDToColumnNum(int extra); int LoadSkinButtonModule(); @@ -281,15 +281,15 @@ int cli_AddInfoItemToGroup(ClcGroup *group,int flags,const TCHAR *pszText); int cliGetGroupContentsCount(ClcGroup *group, int visibleOnly); int cliFindRowByText(HWND hwnd, ClcData *dat, const TCHAR *text, int prefixOk); int cliGetRowsPriorTo(ClcGroup *group,ClcGroup *subgroup,int contactIndex); -int cli_IconFromStatusMode(const char *szProto,int nStatus, HCONTACT hContact); -int cli_GetContactIcon(HCONTACT hContact); -int cli_RemoveEvent(HCONTACT hContact, HANDLE hDbEvent); -void cli_AddContactToTree(HWND hwnd,ClcData *dat,HCONTACT hContact,int updateTotalCount,int checkHideOffline); -void cli_DeleteItemFromTree(HWND hwnd, HCONTACT hItem); +int cli_IconFromStatusMode(const char *szProto,int nStatus, MCONTACT hContact); +int cli_GetContactIcon(MCONTACT hContact); +int cli_RemoveEvent(MCONTACT hContact, HANDLE hDbEvent); +void cli_AddContactToTree(HWND hwnd,ClcData *dat,MCONTACT hContact,int updateTotalCount,int checkHideOffline); +void cli_DeleteItemFromTree(HWND hwnd, MCONTACT hItem); void cli_FreeContact( ClcContact* ); void cli_FreeGroup( ClcGroup* ); char* cli_GetGroupCountsText(ClcData *dat, ClcContact *contact); -void cli_ChangeContactIcon(HCONTACT hContact,int iIcon,int add); +void cli_ChangeContactIcon(MCONTACT hContact,int iIcon,int add); LRESULT cli_ProcessExternalMessages(HWND hwnd,ClcData *dat,UINT msg,WPARAM wParam,LPARAM lParam); struct CListEvent* cliCreateEvent( void ); struct CListEvent* cli_AddEvent(CLISTEVENT *cle); @@ -302,7 +302,7 @@ int cliTrayCalcChanged(const char *szChangedProto, int averageMode, int netP int cliTrayIconPauseAutoHide(WPARAM wParam,LPARAM lParam); void cliCluiProtocolStatusChanged(int status,const char * proto); HMENU cliBuildGroupPopupMenu(ClcGroup *group); -void cliInvalidateDisplayNameCacheEntry(HCONTACT hContact); +void cliInvalidateDisplayNameCacheEntry(MCONTACT hContact); void cliCheckCacheItem(ClcCacheEntry *pdnce); void cli_SaveStateAndRebuildList(HWND hwnd, ClcData *dat); void CLUI_cli_LoadCluiGlobalOpts(void); @@ -310,8 +310,8 @@ INT_PTR cli_TrayIconProcessMessage(WPARAM wParam,LPARAM lParam); BOOL CLUI__cliInvalidateRect(HWND hWnd, CONST RECT* lpRect,BOOL bErase ); ClcContact* cliCreateClcContact( void ); -ClcCacheEntry* cliCreateCacheItem(HCONTACT hContact); -ClcCacheEntry* cliGetCacheEntry(HCONTACT hContact); +ClcCacheEntry* cliCreateCacheItem(MCONTACT hContact); +ClcCacheEntry* cliGetCacheEntry(MCONTACT hContact); #define WM_DWMCOMPOSITIONCHANGED 0x031E @@ -332,7 +332,7 @@ extern tPaintCallbackProc CLCPaint_PaintCallbackProc(HWND hWnd, HDC hDC, RECT *r /* SkinEngine.c */ -BYTE SkinDBGetContactSettingByte(HCONTACT hContact, const char* szSection, const char*szKey, BYTE bDefault); +BYTE SkinDBGetContactSettingByte(MCONTACT hContact, const char* szSection, const char*szKey, BYTE bDefault); extern OVERLAYICONINFO g_pAvatarOverlayIcons[ID_STATUS_OUTTOLUNCH - ID_STATUS_OFFLINE + 1]; extern OVERLAYICONINFO g_pStatusOverlayIcons[ID_STATUS_OUTTOLUNCH - ID_STATUS_OFFLINE + 1]; diff --git a/plugins/Clist_modern/src/hdr/modern_gettextasync.h b/plugins/Clist_modern/src/hdr/modern_gettextasync.h index 4e8c7c6ed5..386b721b19 100644 --- a/plugins/Clist_modern/src/hdr/modern_gettextasync.h +++ b/plugins/Clist_modern/src/hdr/modern_gettextasync.h @@ -1,5 +1,5 @@ #pragma once void InitCacheAsync(); void UninitCacheAsync(); -void gtaRenewText(HCONTACT hContact); -int gtaAddRequest(ClcData *dat,ClcContact *contact,HCONTACT hContact); +void gtaRenewText(MCONTACT hContact); +int gtaAddRequest(ClcData *dat,ClcContact *contact,MCONTACT hContact); diff --git a/plugins/Clist_modern/src/hdr/modern_global_structure.h b/plugins/Clist_modern/src/hdr/modern_global_structure.h index 7be8dd2ff8..10b238cbfa 100644 --- a/plugins/Clist_modern/src/hdr/modern_global_structure.h +++ b/plugins/Clist_modern/src/hdr/modern_global_structure.h @@ -18,7 +18,7 @@ typedef struct tagCLUIDATA DWORD dwFlags; TCHAR *szNoEvents; int hIconNotify; - HCONTACT hUpdateContact; + MCONTACT hUpdateContact; /* Contact List View Mode */ TCHAR groupFilter[2048]; diff --git a/plugins/Clist_modern/src/hdr/modern_skinned_profile.h b/plugins/Clist_modern/src/hdr/modern_skinned_profile.h index 0eebf53cba..20d662aee7 100644 --- a/plugins/Clist_modern/src/hdr/modern_skinned_profile.h +++ b/plugins/Clist_modern/src/hdr/modern_skinned_profile.h @@ -233,10 +233,10 @@ public: HRESULT Init(); HRESULT Clear(); - static BYTE SpiGetSkinByte (HCONTACT hContact, const char * szSection, const char * szKey, const BYTE defValue ); - static WORD SpiGetSkinWord (HCONTACT hContact, const char * szSection, const char * szKey, const WORD defValue ); - static DWORD SpiGetSkinDword(HCONTACT hContact, const char * szSection, const char * szKey, const DWORD defValue ); - static BOOL SpiCheckSkinned(HCONTACT hContact, const char * szSection, const char * szKey ); + static BYTE SpiGetSkinByte (MCONTACT hContact, const char * szSection, const char * szKey, const BYTE defValue ); + static WORD SpiGetSkinWord (MCONTACT hContact, const char * szSection, const char * szKey, const WORD defValue ); + static DWORD SpiGetSkinDword(MCONTACT hContact, const char * szSection, const char * szKey, const DWORD defValue ); + static BOOL SpiCheckSkinned(MCONTACT hContact, const char * szSection, const char * szKey ); }; -- cgit v1.2.3