From cdff820aeb7d935d18fb66027102f69ec96bf92c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 30 Oct 2012 20:08:15 +0000 Subject: minor clists' code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@2118 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp | 2 +- plugins/Clist_nicer/src/Include/clc.h | 12 ++++++------ plugins/Clist_nicer/src/clc.cpp | 8 ++++---- plugins/Clist_nicer/src/clcidents.cpp | 8 ++++---- plugins/Clist_nicer/src/clcitems.cpp | 20 ++++++++++---------- plugins/Clist_nicer/src/clcmsgs.cpp | 2 +- plugins/Clist_nicer/src/clcpaint.cpp | 4 ++-- plugins/Clist_nicer/src/clcutils.cpp | 8 ++++---- plugins/Clist_nicer/src/init.cpp | 18 +++++++++--------- plugins/Clist_nicer/src/rowheight_funcs.cpp | 2 +- plugins/Clist_nicer/src/statusfloater.cpp | 4 ++-- 11 files changed, 44 insertions(+), 44 deletions(-) (limited to 'plugins/Clist_nicer/src') diff --git a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp b/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp index a784e30883..99d93d30fd 100644 --- a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp +++ b/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp @@ -478,7 +478,7 @@ static INT_PTR RemoveSubGroupMenuItem(WPARAM wParam,LPARAM lParam) static int OnBuildSubGroupMenu(WPARAM wParam,LPARAM lParam) { - ClcGroup *group=(struct ClcGroup *)wParam; + ClcGroup *group=(ClcGroup *)wParam; if (group == 0) return 0; diff --git a/plugins/Clist_nicer/src/Include/clc.h b/plugins/Clist_nicer/src/Include/clc.h index a1bd91939f..3329cfa76a 100644 --- a/plugins/Clist_nicer/src/Include/clc.h +++ b/plugins/Clist_nicer/src/Include/clc.h @@ -54,7 +54,7 @@ #define TIMERID_SORT 15 #define TIMERID_REFRESH 18 #define TIMERID_PAINT 19 -struct ClcGroup; +ClcGroup; #define CONTACTF_ONLINE 1 #define CONTACTF_INVISTO 2 @@ -421,7 +421,7 @@ typedef struct { } protoMenu; //clcidents.c -int FindItem(HWND hwnd, struct ClcData *dat, HANDLE hItem, struct ClcContact **contact, struct ClcGroup **subgroup, int *isVisible); +int FindItem(HWND hwnd, struct ClcData *dat, HANDLE hItem, struct ClcContact **contact, ClcGroup **subgroup, int *isVisible); HANDLE ContactToItemHandle(struct ClcContact *contact, DWORD *nmFlags); //clcitems.c @@ -433,11 +433,11 @@ DWORD INTSORT_GetLastMsgTime(HANDLE hContact); LRESULT ProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPARAM wParam, LPARAM lParam); //clcutils.c -void SetGroupExpand(HWND hwnd, struct ClcData *dat, struct ClcGroup *group, int newState); +void SetGroupExpand(HWND hwnd, struct ClcData *dat, ClcGroup *group, int newState); void DoSelectionDefaultAction(HWND hwnd, struct ClcData *dat); int FindRowByText(HWND hwnd, struct ClcData *dat, const TCHAR *text, int prefixOk); void BeginRenameSelection(HWND hwnd, struct ClcData *dat); -int HitTest(HWND hwnd, struct ClcData *dat, int testx, int testy, struct ClcContact **contact, struct ClcGroup **group, DWORD *flags); +int HitTest(HWND hwnd, struct ClcData *dat, int testx, int testy, struct ClcContact **contact, ClcGroup **group, DWORD *flags); void ScrollTo(HWND hwnd, struct ClcData *dat, int desty, int noSmooth); void RecalcScrollBar(HWND hwnd, struct ClcData *dat); size_t MY_pathToRelative(const TCHAR *pSrc, TCHAR *pOut); @@ -452,7 +452,7 @@ size_t MY_pathToAbsolute(const TCHAR *pSrc, TCHAR *pOut); int GetDropTargetInformation(HWND hwnd, struct ClcData *dat, POINT pt); void LoadClcOptions(HWND hwnd, struct ClcData *dat); void RecalculateGroupCheckboxes(HWND hwnd, struct ClcData *dat); -void SetGroupChildCheckboxes(struct ClcGroup *group, int checked); +void SetGroupChildCheckboxes(ClcGroup *group, int checked); BYTE GetCachedStatusMsg(int iExtraCacheEntry, char *szProto); int __fastcall GetStatusOnlineness(int status); void GetExtendedInfo(struct ClcContact *contact, struct ClcData *dat); @@ -492,7 +492,7 @@ HWND ClcGetButtonWindow(int ctrlid); //clcpaint.c void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT *rcPaint); -void __inline PaintItem(HDC hdcMem, struct ClcGroup *group, struct ClcContact *contact, int indent, int y, struct ClcData *dat, int index, HWND hwnd, DWORD style, RECT *clRect, BOOL *bFirstNGdrawn, int groupCountsFontTopShift, int rowHeight); +void __inline PaintItem(HDC hdcMem, ClcGroup *group, struct ClcContact *contact, int indent, int y, struct ClcData *dat, int index, HWND hwnd, DWORD style, RECT *clRect, BOOL *bFirstNGdrawn, int groupCountsFontTopShift, int rowHeight); void Reload3dBevelColors(); void ReloadThemedOptions(); void SetButtonToSkinned(); diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp index 84ab25af3c..5c70df5d48 100644 --- a/plugins/Clist_nicer/src/clc.cpp +++ b/plugins/Clist_nicer/src/clc.cpp @@ -59,7 +59,7 @@ LONG g_cxsmIcon, g_cysmIcon; void SetDBButtonStates(HANDLE hContact); -HMENU BuildGroupPopupMenu(struct ClcGroup* group) +HMENU BuildGroupPopupMenu(ClcGroup* group) { return (HMENU)CallService(MS_CLIST_MENUBUILDSUBGROUP, (WPARAM)group, 0); } @@ -355,7 +355,7 @@ LBL_Def: case INTM_ICONCHANGED: { struct ClcContact *contact = NULL; - struct ClcGroup *group = NULL; + ClcGroup *group = NULL; int recalcScrollBar = 0, shouldShow; WORD status = ID_STATUS_OFFLINE; char *szProto; @@ -402,7 +402,7 @@ LBL_Def: } } if (hSelItem) { - struct ClcGroup *selgroup; + ClcGroup *selgroup; if (pcli->pfnFindItem(hwnd, dat, hSelItem, &selcontact, &selgroup, NULL)) dat->selection = pcli->pfnGetRowsPriorTo(&dat->list, selgroup, List_IndexOf((SortedList*) & selgroup->cl, selcontact)); else @@ -564,7 +564,7 @@ LBL_Def: case INTM_INVALIDATECONTACT: { struct ClcContact *contact = 0; - struct ClcGroup *group = 0; + ClcGroup *group = 0; int iItem; if (!FindItem(hwnd, dat, (HANDLE) wParam, &contact, &group, NULL)) diff --git a/plugins/Clist_nicer/src/clcidents.cpp b/plugins/Clist_nicer/src/clcidents.cpp index 277fbe32db..fdb7eac8df 100644 --- a/plugins/Clist_nicer/src/clcidents.cpp +++ b/plugins/Clist_nicer/src/clcidents.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /* the CLC uses 3 different ways to identify elements in its list, this file contains routines to convert between them. -1) struct ClcContact/struct ClcGroup pair. Only ever used within the duration +1) struct ClcContact/ClcGroup pair. Only ever used within the duration of a single operation, but used at some point in nearly everything 2) index integer. The 0-based number of the item from the top. Only visible items are counted (ie not closed groups). Used for saving selection and drag @@ -39,16 +39,16 @@ contains routines to convert between them. 2->1: GetRowByIndex() */ -int FindItem(HWND hwnd, struct ClcData *dat, HANDLE hItem, struct ClcContact **contact, struct ClcGroup **subgroup, int *isVisible) +int FindItem(HWND hwnd, struct ClcData *dat, HANDLE hItem, struct ClcContact **contact, ClcGroup **subgroup, int *isVisible) { int index = 0; int nowVisible = 1; - struct ClcGroup *group = &dat->list; + ClcGroup *group = &dat->list; group->scanIndex = 0; for (; ;) { if (group->scanIndex == group->cl.count) { - struct ClcGroup *tgroup; + ClcGroup *tgroup; group = group->parent; if (group == NULL) break; diff --git a/plugins/Clist_nicer/src/clcitems.cpp b/plugins/Clist_nicer/src/clcitems.cpp index 7bc8154533..8086fe7ebd 100644 --- a/plugins/Clist_nicer/src/clcitems.cpp +++ b/plugins/Clist_nicer/src/clcitems.cpp @@ -35,10 +35,10 @@ extern HANDLE hExtraImageListRebuilding, hExtraImageApplying; -extern int ( *saveAddContactToGroup )(struct ClcData *dat, struct ClcGroup *group, HANDLE hContact); -extern int ( *saveAddInfoItemToGroup )(struct ClcGroup *group, int flags, const TCHAR *pszText); -extern struct ClcGroup* ( *saveRemoveItemFromGroup )(HWND hwnd, struct ClcGroup *group, struct ClcContact *contact, int updateTotalCount); -extern struct ClcGroup* ( *saveAddGroup )(HWND hwnd, struct ClcData *dat, const TCHAR *szName, DWORD flags, int groupId, int calcTotalMembers); +extern int ( *saveAddContactToGroup )(struct ClcData *dat, ClcGroup *group, HANDLE hContact); +extern int ( *saveAddInfoItemToGroup )(ClcGroup *group, int flags, const TCHAR *pszText); +extern ClcGroup* ( *saveRemoveItemFromGroup )(HWND hwnd, ClcGroup *group, struct ClcContact *contact, int updateTotalCount); +extern ClcGroup* ( *saveAddGroup )(HWND hwnd, struct ClcData *dat, const TCHAR *szName, DWORD flags, int groupId, int calcTotalMembers); static void TZ_LoadTimeZone(HANDLE hContact, struct TExtraCache *c, const char *szProto); @@ -58,7 +58,7 @@ struct ClcContact* CreateClcContact( void ) return p; } -int AddInfoItemToGroup(struct ClcGroup *group, int flags, const TCHAR *pszText) +int AddInfoItemToGroup(ClcGroup *group, int flags, const TCHAR *pszText) { int i = saveAddInfoItemToGroup(group, flags, pszText); struct ClcContact* p = group->cl.items[i]; @@ -72,9 +72,9 @@ int AddInfoItemToGroup(struct ClcGroup *group, int flags, const TCHAR *pszText) return i; } -struct ClcGroup *AddGroup(HWND hwnd, struct ClcData *dat, const TCHAR *szName, DWORD flags, int groupId, int calcTotalMembers) +ClcGroup *AddGroup(HWND hwnd, struct ClcData *dat, const TCHAR *szName, DWORD flags, int groupId, int calcTotalMembers) { - struct ClcGroup *p = saveAddGroup( hwnd, dat, szName, flags, groupId, calcTotalMembers); + ClcGroup *p = saveAddGroup( hwnd, dat, szName, flags, groupId, calcTotalMembers); if ( p && p->parent ) @@ -83,7 +83,7 @@ struct ClcGroup *AddGroup(HWND hwnd, struct ClcData *dat, const TCHAR *szName, D return p; } -struct ClcGroup *RemoveItemFromGroup(HWND hwnd, struct ClcGroup *group, struct ClcContact *contact, int updateTotalCount) +ClcGroup *RemoveItemFromGroup(HWND hwnd, ClcGroup *group, struct ClcContact *contact, int updateTotalCount) { if (contact->extraCacheEntry >= 0 && contact->extraCacheEntry < cfg::nextCacheEntry) { if (cfg::eCache[contact->extraCacheEntry].floater && cfg::eCache[contact->extraCacheEntry].floater->hwnd) @@ -118,7 +118,7 @@ void LoadAvatarForContact(struct ClcContact *p) p->cFlags &= ~ECF_AVATAR; } -int AddContactToGroup(struct ClcData *dat, struct ClcGroup *group, HANDLE hContact) +int AddContactToGroup(struct ClcData *dat, ClcGroup *group, HANDLE hContact) { int i = saveAddContactToGroup( dat, group, hContact ); struct ClcContact* p = group->cl.items[i]; @@ -177,7 +177,7 @@ void RebuildEntireList(HWND hwnd, struct ClcData *dat) char *szProto; DWORD style = GetWindowLongPtr(hwnd, GWL_STYLE); HANDLE hContact; - struct ClcGroup *group; + ClcGroup *group; DBVARIANT dbv = {0}; RowHeight::Clear(dat); diff --git a/plugins/Clist_nicer/src/clcmsgs.cpp b/plugins/Clist_nicer/src/clcmsgs.cpp index c89174af44..195a8565c8 100644 --- a/plugins/Clist_nicer/src/clcmsgs.cpp +++ b/plugins/Clist_nicer/src/clcmsgs.cpp @@ -42,7 +42,7 @@ LRESULT ProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPARAM case CLM_SETSTICKY: { struct ClcContact *contact; - struct ClcGroup *group; + ClcGroup *group; if (wParam == 0 || !FindItem(hwnd, dat, (HANDLE) wParam, &contact, &group, NULL)) return 0; diff --git a/plugins/Clist_nicer/src/clcpaint.cpp b/plugins/Clist_nicer/src/clcpaint.cpp index 17e5cba9ed..99625c23f0 100644 --- a/plugins/Clist_nicer/src/clcpaint.cpp +++ b/plugins/Clist_nicer/src/clcpaint.cpp @@ -449,7 +449,7 @@ static BOOL mirror_rtl, mirror_always, mirror_rtltext; BYTE savedCORNER = -1; int g_padding_y = 0; -void __inline PaintItem(HDC hdcMem, struct ClcGroup *group, struct ClcContact *contact, int indent, int y, struct ClcData *dat, int index, HWND hwnd, DWORD style, RECT *clRect, BOOL *bFirstNGdrawn, int groupCountsFontTopShift, int rowHeight) +void __inline PaintItem(HDC hdcMem, ClcGroup *group, struct ClcContact *contact, int indent, int y, struct ClcData *dat, int index, HWND hwnd, DWORD style, RECT *clRect, BOOL *bFirstNGdrawn, int groupCountsFontTopShift, int rowHeight) { RECT rc; int iImage = -1; @@ -1372,7 +1372,7 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT *rcPaint) HDC hdcMem; RECT clRect; int y,indent,index,fontHeight; - struct ClcGroup *group; + ClcGroup *group; HBITMAP hBmpOsb, hOldBitmap; HFONT hOldFont; DWORD style = GetWindowLongPtr(hwnd, GWL_STYLE); diff --git a/plugins/Clist_nicer/src/clcutils.cpp b/plugins/Clist_nicer/src/clcutils.cpp index 5384867f5f..45e9cdb9db 100644 --- a/plugins/Clist_nicer/src/clcutils.cpp +++ b/plugins/Clist_nicer/src/clcutils.cpp @@ -188,10 +188,10 @@ int RTL_HitTest(HWND hwnd, struct ClcData *dat, int testx, int testy, struct Clc return -1; } -int HitTest(HWND hwnd, struct ClcData *dat, int testx, int testy, struct ClcContact **contact, struct ClcGroup **group, DWORD *flags) +int HitTest(HWND hwnd, struct ClcData *dat, int testx, int testy, struct ClcContact **contact, ClcGroup **group, DWORD *flags) { struct ClcContact *hitcontact; - struct ClcGroup *hitgroup; + ClcGroup *hitgroup; int hit, indent, width, i, cxSmIcon; int checkboxWidth; SIZE textSize; @@ -443,7 +443,7 @@ void RecalcScrollBar(HWND hwnd, struct ClcData *dat) //saveRecalcScrollBar(hwnd, dat); } -void SetGroupExpand(HWND hwnd,struct ClcData *dat,struct ClcGroup *group,int newState) +void SetGroupExpand(HWND hwnd,struct ClcData *dat,ClcGroup *group,int newState) { int contentCount; int groupy; @@ -516,7 +516,7 @@ static LRESULT CALLBACK RenameEditSubclassProc(HWND hwnd, UINT msg, WPARAM wPara void BeginRenameSelection(HWND hwnd, struct ClcData *dat) { struct ClcContact *contact; - struct ClcGroup *group; + ClcGroup *group; int indent, x, y, h; RECT clRect; diff --git a/plugins/Clist_nicer/src/init.cpp b/plugins/Clist_nicer/src/init.cpp index f4cb71debc..d6eee3bc0b 100644 --- a/plugins/Clist_nicer/src/init.cpp +++ b/plugins/Clist_nicer/src/init.cpp @@ -50,7 +50,7 @@ extern HIMAGELIST himlExtraImages; TIME_API tmi; -HMENU BuildGroupPopupMenu( struct ClcGroup* group ); +HMENU BuildGroupPopupMenu( ClcGroup* group ); struct ClcContact* CreateClcContact( void ); struct CListEvent* fnCreateEvent( void ); void ReloadThemedOptions(); @@ -66,20 +66,20 @@ int ClcShutdown(WPARAM wParam, LPARAM lParam); void ( *saveLoadClcOptions )(HWND hwnd,struct ClcData *dat); void LoadClcOptions(HWND hwnd,struct ClcData *dat); -int ( *saveAddContactToGroup )(struct ClcData *dat, struct ClcGroup *group, HANDLE hContact); -int AddContactToGroup(struct ClcData *dat, struct ClcGroup *group, HANDLE hContact); +int ( *saveAddContactToGroup )(struct ClcData *dat, ClcGroup *group, HANDLE hContact); +int AddContactToGroup(struct ClcData *dat, ClcGroup *group, HANDLE hContact); -struct ClcGroup* ( *saveRemoveItemFromGroup )(HWND hwnd, struct ClcGroup *group, struct ClcContact *contact, int updateTotalCount); -struct ClcGroup* RemoveItemFromGroup(HWND hwnd, struct ClcGroup *group, struct ClcContact *contact, int updateTotalCount); +ClcGroup* ( *saveRemoveItemFromGroup )(HWND hwnd, ClcGroup *group, struct ClcContact *contact, int updateTotalCount); +ClcGroup* RemoveItemFromGroup(HWND hwnd, ClcGroup *group, struct ClcContact *contact, int updateTotalCount); struct CListEvent* ( *saveAddEvent )(CLISTEVENT *cle); struct CListEvent* AddEvent(CLISTEVENT *cle); -int ( *saveAddInfoItemToGroup )(struct ClcGroup *group, int flags, const TCHAR *pszText); -int AddInfoItemToGroup(struct ClcGroup *group, int flags, const TCHAR *pszText); +int ( *saveAddInfoItemToGroup )(ClcGroup *group, int flags, const TCHAR *pszText); +int AddInfoItemToGroup(ClcGroup *group, int flags, const TCHAR *pszText); -struct ClcGroup* ( *saveAddGroup )(HWND hwnd, struct ClcData *dat, const TCHAR *szName, DWORD flags, int groupId, int calcTotalMembers); -struct ClcGroup* AddGroup(HWND hwnd, struct ClcData *dat, const TCHAR *szName, DWORD flags, int groupId, int calcTotalMembers); +ClcGroup* ( *saveAddGroup )(HWND hwnd, struct ClcData *dat, const TCHAR *szName, DWORD flags, int groupId, int calcTotalMembers); +ClcGroup* AddGroup(HWND hwnd, struct ClcData *dat, const TCHAR *szName, DWORD flags, int groupId, int calcTotalMembers); LRESULT ( CALLBACK *saveContactListWndProc )(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); LRESULT CALLBACK ContactListWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); diff --git a/plugins/Clist_nicer/src/rowheight_funcs.cpp b/plugins/Clist_nicer/src/rowheight_funcs.cpp index 3ef0bef92e..1f0bbdd6e7 100644 --- a/plugins/Clist_nicer/src/rowheight_funcs.cpp +++ b/plugins/Clist_nicer/src/rowheight_funcs.cpp @@ -143,7 +143,7 @@ void RowHeight::calcRowHeights(ClcData *dat, HWND hwnd) { int indent, subindex, line_num; struct ClcContact *Drawing; - struct ClcGroup *group; + ClcGroup *group; DWORD dwStyle = GetWindowLongPtr(hwnd, GWL_STYLE); // Draw lines diff --git a/plugins/Clist_nicer/src/statusfloater.cpp b/plugins/Clist_nicer/src/statusfloater.cpp index 392fe90d2a..3421c7b016 100644 --- a/plugins/Clist_nicer/src/statusfloater.cpp +++ b/plugins/Clist_nicer/src/statusfloater.cpp @@ -972,7 +972,7 @@ void FLT_Create(int iEntry) if (iEntry >= 0 && iEntry < cfg::nextCacheEntry) { struct ClcContact *contact = NULL; - struct ClcGroup *group = NULL; + ClcGroup *group = NULL; centry = &cfg::eCache[iEntry]; if (centry->floater == 0 && API::pfnUpdateLayeredWindow != NULL) { @@ -1018,7 +1018,7 @@ void FLT_Update(struct ClcData *dat, struct ClcContact *contact) HWND hwnd; HDC hdc; BOOL firstDrawn = TRUE; - struct ClcGroup *group = NULL; + ClcGroup *group = NULL; struct ClcContact *newContact = NULL; HRGN rgn; HBRUSH hbrBorder; -- cgit v1.2.3