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/Clist_nicer/src/Include/clc.h | 56 ++++++++++++++++---------------- plugins/Clist_nicer/src/Include/clist.h | 4 +-- plugins/Clist_nicer/src/Include/config.h | 22 ++++++------- 3 files changed, 41 insertions(+), 41 deletions(-) (limited to 'plugins/Clist_nicer/src/Include') diff --git a/plugins/Clist_nicer/src/Include/clc.h b/plugins/Clist_nicer/src/Include/clc.h index 08a89895c9..afb5a7ece5 100644 --- a/plugins/Clist_nicer/src/Include/clc.h +++ b/plugins/Clist_nicer/src/Include/clc.h @@ -103,32 +103,32 @@ typedef struct _OrderTreeData struct TExtraCache { - HANDLE hContact; - HANDLE hTimeZone; - BYTE valid; - TCHAR *statusMsg; - BYTE bStatusMsgValid; - DWORD dwCFlags; - DWORD dwDFlags; // display flags for caching only + HCONTACT hContact; + HANDLE hTimeZone; + BYTE valid; + TCHAR *statusMsg; + BYTE bStatusMsgValid; + DWORD dwCFlags; + DWORD dwDFlags; // display flags for caching only StatusItems_t *status_item, *proto_status_item; - DWORD dwLastMsgTime; - DWORD msgFrequency; - BOOL isChatRoom; + DWORD dwLastMsgTime; + DWORD msgFrequency; + BOOL isChatRoom; }; struct ClcContact : public ClcContactBase { - BOOL bIsMeta; - BYTE xStatus; - int xStatusIcon; - HANDLE hSubContact; - char *metaProto; - DWORD codePage; - WORD wStatus; - int avatarLeft, extraIconRightBegin; - int isRtl; - DWORD cFlags; - BYTE bSecondLine; + BOOL bIsMeta; + BYTE xStatus; + int xStatusIcon; + HCONTACT hSubContact; + char *metaProto; + DWORD codePage; + WORD wStatus; + int avatarLeft, extraIconRightBegin; + int isRtl; + DWORD cFlags; + BYTE bSecondLine; avatarCacheEntry *ace; TExtraCache* pExtra; @@ -233,7 +233,7 @@ struct TCluiData { HMENU hMenuNotify; int iLastEventAdded; int wNextMenuID; - HANDLE hUpdateContact; + HCONTACT hUpdateContact; DWORD sortTimer; TCHAR *szNoEvents; BOOL forceResize; @@ -329,7 +329,7 @@ struct IconDesc { }; struct NotifyMenuItemExData { - HANDLE hContact; + HCONTACT hContact; int iIcon; // icon index in the image list HICON hIcon; // corresponding icon handle HANDLE hDbEvent; @@ -357,7 +357,7 @@ HANDLE ContactToItemHandle(ClcContact *contact, DWORD *nmFlags); //clcitems.c void RebuildEntireList(HWND hwnd, struct ClcData *dat); -DWORD INTSORT_GetLastMsgTime(HANDLE hContact); +DWORD INTSORT_GetLastMsgTime(HCONTACT hContact); //clcmsgs.c LRESULT ProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPARAM wParam, LPARAM lParam); @@ -409,10 +409,10 @@ void ConfigureEventArea(HWND hwnd); void ClearIcons(int mode); void SkinDrawBg(HWND hwnd, HDC hdc); int GetBasicFontID(ClcContact * contact); -extern int __fastcall CLVM_GetContactHiddenStatus(HANDLE hContact, char *szStatus, struct ClcData *dat); +extern int __fastcall CLVM_GetContactHiddenStatus(HCONTACT hContact, char *szStatus, struct ClcData *dat); void CreateViewModeFrame(); -int GetExtraCache(HANDLE hContact, char *szProto); -void ReloadExtraInfo(HANDLE hContact); +int GetExtraCache(HCONTACT hContact, char *szProto); +void ReloadExtraInfo(HCONTACT hContact); void LoadAvatarForContact(ClcContact *p); void ApplyViewMode(const char *name); @@ -425,7 +425,7 @@ void __inline PaintItem(HDC hdcMem, ClcGroup *group, ClcContact *contact, int in void Reload3dBevelColors(); void ReloadThemedOptions(); void SetButtonToSkinned(); -void RTL_DetectAndSet(ClcContact *contact, HANDLE hContact); +void RTL_DetectAndSet(ClcContact *contact, HCONTACT hContact); void RTL_DetectGroupName(ClcContact *group); void CLN_LoadAllIcons(BOOL mode); void ReloadSkinItemsToCache(); diff --git a/plugins/Clist_nicer/src/Include/clist.h b/plugins/Clist_nicer/src/Include/clist.h index b60b0db108..51c769d031 100644 --- a/plugins/Clist_nicer/src/Include/clist.h +++ b/plugins/Clist_nicer/src/Include/clist.h @@ -23,8 +23,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ void LoadContactTree(void); -int IconFromStatusMode(const char *szProto, int status, HANDLE hContact, HICON *phIcon); -HTREEITEM GetTreeItemByHContact(HANDLE hContact); +int IconFromStatusMode(const char *szProto, int status, HCONTACT hContact, HICON *phIcon); +HTREEITEM GetTreeItemByHContact(HCONTACT hContact); void SortContacts(void); #define CLUIINTM_REDRAW (WM_USER+100) diff --git a/plugins/Clist_nicer/src/Include/config.h b/plugins/Clist_nicer/src/Include/config.h index 2052232339..e40a92d36c 100644 --- a/plugins/Clist_nicer/src/Include/config.h +++ b/plugins/Clist_nicer/src/Include/config.h @@ -52,34 +52,34 @@ class cfg public: static void init(); - static DWORD getDword(const HANDLE hContact, const char *szModule, const char *szSetting, DWORD uDefault); + static DWORD getDword(const HCONTACT hContact, const char *szModule, const char *szSetting, DWORD uDefault); static DWORD getDword(const char *szModule, const char *szSetting, DWORD uDefault); static DWORD getDword(const char *szSetting, DWORD uDefault); - static WORD getWord(const HANDLE hContact, const char *szModule, const char *szSetting, WORD uDefault); + static WORD getWord(const HCONTACT hContact, const char *szModule, const char *szSetting, WORD uDefault); static WORD getWord(const char *szModule, const char *szSetting, WORD uDefault); static WORD getWord(const char *szSetting, WORD uDefault); - static int getByte(const HANDLE hContact, const char *szModule, const char *szSetting, int uDefault); + static int getByte(const HCONTACT hContact, const char *szModule, const char *szSetting, int uDefault); static int getByte(const char *szModule, const char *szSetting, int uDefault); static int getByte(const char *szSetting, int uDefault); - static INT_PTR getTString(const HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv); - static INT_PTR getString(const HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv); + static INT_PTR getTString(const HCONTACT hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv); + static INT_PTR getString(const HCONTACT hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv); - static INT_PTR writeDword(const HANDLE hContact, const char *szModule, const char *szSetting, DWORD value); + static INT_PTR writeDword(const HCONTACT hContact, const char *szModule, const char *szSetting, DWORD value); static INT_PTR writeDword(const char *szModule, const char *szSetting, DWORD value); - static INT_PTR writeWord(const HANDLE hContact, const char *szModule, const char *szSetting, WORD value); + static INT_PTR writeWord(const HCONTACT hContact, const char *szModule, const char *szSetting, WORD value); static INT_PTR writeWord(const char *szModule, const char *szSetting, WORD value); - static INT_PTR writeByte(const HANDLE hContact, const char *szModule, const char *szSetting, BYTE value); + static INT_PTR writeByte(const HCONTACT hContact, const char *szModule, const char *szSetting, BYTE value); static INT_PTR writeByte(const char *szModule, const char *szSetting, BYTE value); - static INT_PTR writeTString(const HANDLE hContact, const char *szModule, const char *szSetting, const TCHAR *st); - static INT_PTR writeString(const HANDLE hContact, const char *szModule, const char *szSetting, const char *st); + static INT_PTR writeTString(const HCONTACT hContact, const char *szModule, const char *szSetting, const TCHAR *st); + static INT_PTR writeString(const HCONTACT hContact, const char *szModule, const char *szSetting, const char *st); - static TExtraCache* getCache(const HANDLE hContact, const char *szProto); + static TExtraCache* getCache(const HCONTACT hContact, const char *szProto); public: static TCluiData dat; -- cgit v1.2.3