minor clists' code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@2118 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

6 files changed, 49 insertions, 49 deletions

diff --git a/plugins/Clist_modern/src/hdr/modern_cache_funcs.h b/plugins/Clist_modern/src/hdr/modern_cache_funcs.h
index ba2b59f2c3..af86a029d4 100644
--- a/plugins/Clist_modern/src/hdr/modern_cache_funcs.h
+++ b/plugins/Clist_modern/src/hdr/modern_cache_funcs.h
@@ -31,11 +31,11 @@ Created by Pescuma
 #include "modern_clc.h"

 #include "modern_commonprototypes.h"

 

-void Cache_GetText(struct ClcData *dat, struct ClcContact *contact, BOOL forceRenew);

-void Cache_GetFirstLineText(struct ClcData *dat, struct ClcContact *contact);

+void Cache_GetText(struct ClcData *dat, ClcContact *contact, BOOL forceRenew);

+void Cache_GetFirstLineText(struct ClcData *dat, ClcContact *contact);

 void Cache_GetSecondLineText(struct SHORTDATA *dat, PDNCE pdnce);

 void Cache_GetThirdLineText(struct SHORTDATA *dat, PDNCE pdnce);

-void Cache_GetAvatar(struct ClcData *dat, struct ClcContact *contact);

+void Cache_GetAvatar(struct ClcData *dat, ClcContact *contact);

 void Cache_GetTimezone(struct ClcData *dat, HANDLE hContact);

 int Cache_GetLineText(PDNCE 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,

diff --git a/plugins/Clist_modern/src/hdr/modern_clc.h b/plugins/Clist_modern/src/hdr/modern_clc.h
index e17ee3e03c..62d9473a60 100644
--- a/plugins/Clist_modern/src/hdr/modern_clc.h
+++ b/plugins/Clist_modern/src/hdr/modern_clc.h
@@ -128,7 +128,7 @@ void clcSetDelayTimer( UINT_PTR uIDEvent, HWND hwnd, int nDelay = -1);
 #define DROPTARGET_ONMETACONTACT  6

 #define DROPTARGET_ONSUBCONTACT  7

 

-struct ClcGroup;

+ClcGroup;

 

 #define CONTACTF_ONLINE    1

 #define CONTACTF_INVISTO   2

@@ -208,7 +208,7 @@ struct tContactItems
 

 struct ClcContact : public ClcContactBase

 {

-	struct ClcContact *subcontacts;

+	ClcContact *subcontacts;

 	BYTE SubAllocated;

 	BYTE SubExpanded;

 	BYTE isSubcontact;

@@ -403,22 +403,22 @@ typedef struct tagOVERLAYICONINFO
 void    ClcOptionsChanged(void);

 

 //clcidents.c

-int     cliGetRowsPriorTo(struct ClcGroup *group,struct ClcGroup *subgroup,int contactIndex);

-int     FindItem(HWND hwnd,struct ClcData *dat,HANDLE hItem,struct ClcContact **contact,struct ClcGroup **subgroup,int *isVisible, BOOL isIgnoreSubcontacts );

-int     cliGetRowByIndex(struct ClcData *dat,int testindex,struct ClcContact **contact,struct ClcGroup **subgroup);

-HANDLE  ContactToHItem(struct ClcContact *contact);

-HANDLE  ContactToItemHandle(struct ClcContact *contact,DWORD *nmFlags);

+int     cliGetRowsPriorTo(ClcGroup *group,ClcGroup *subgroup,int contactIndex);

+int     FindItem(HWND hwnd,struct ClcData *dat,HANDLE hItem,ClcContact **contact,ClcGroup **subgroup,int *isVisible, BOOL isIgnoreSubcontacts );

+int     cliGetRowByIndex(struct ClcData *dat,int testindex,ClcContact **contact,ClcGroup **subgroup);

+HANDLE  ContactToHItem(ClcContact *contact);

+HANDLE  ContactToItemHandle(ClcContact *contact,DWORD *nmFlags);

 void    ClearRowByIndexCache();

 

 //clcitems.c

-struct ClcGroup *cli_AddGroup(HWND hwnd,struct ClcData *dat,const TCHAR *szName,DWORD flags,int groupId,int calcTotalMembers);

-void    cli_FreeGroup(struct ClcGroup *group);

-int     cli_AddInfoItemToGroup(struct ClcGroup *group,int flags,const TCHAR *pszText);

+ClcGroup *cli_AddGroup(HWND hwnd,struct ClcData *dat,const TCHAR *szName,DWORD flags,int groupId,int calcTotalMembers);

+void    cli_FreeGroup(ClcGroup *group);

+int     cli_AddInfoItemToGroup(ClcGroup *group,int flags,const TCHAR *pszText);

 void    cliRebuildEntireList(HWND hwnd,struct ClcData *dat);

 void    cli_DeleteItemFromTree(HWND hwnd,HANDLE hItem);

 void    cli_AddContactToTree(HWND hwnd,struct ClcData *dat,HANDLE hContact,int updateTotalCount,int checkHideOffline);

 void    cli_SortCLC(HWND hwnd,struct ClcData *dat,int useInsertionSort);

-int     GetNewSelection(struct ClcGroup *group,int selection, int direction);

+int     GetNewSelection(ClcGroup *group,int selection, int direction);

 

 //clcmsgs.c

 LRESULT cli_ProcessExternalMessages(HWND hwnd,struct ClcData *dat,UINT msg,WPARAM wParam,LPARAM lParam);

@@ -426,7 +426,7 @@ LRESULT cli_ProcessExternalMessages(HWND hwnd,struct ClcData *dat,UINT msg,WPARA
 //clcutils.c

 void    cliRecalcScrollBar(HWND hwnd,struct ClcData *dat);

 void    cliBeginRenameSelection(HWND hwnd,struct ClcData *dat);

-int     cliHitTest(HWND hwnd,struct ClcData *dat,int testx,int testy,struct ClcContact **contact,struct ClcGroup **group,DWORD *flags);

+int     cliHitTest(HWND hwnd,struct ClcData *dat,int testx,int testy,ClcContact **contact,ClcGroup **group,DWORD *flags);

 void    cliScrollTo(HWND hwnd,struct ClcData *dat,int desty,int noSmooth);

 int     GetDropTargetInformation(HWND hwnd,struct ClcData *dat,POINT pt);

 void    LoadCLCOptions(HWND hwnd,struct ClcData *dat);

diff --git a/plugins/Clist_modern/src/hdr/modern_clcpaint.h b/plugins/Clist_modern/src/hdr/modern_clcpaint.h
index fdca01884f..73c275fe56 100644
--- a/plugins/Clist_modern/src/hdr/modern_clcpaint.h
+++ b/plugins/Clist_modern/src/hdr/modern_clcpaint.h
@@ -14,7 +14,7 @@ public:
 

 	 BOOL   IsForegroundWindow( HWND hWnd );

 	 HFONT  ChangeToFont( HDC hdc, struct ClcData *dat, int id, int *fontHeight );

-	 int    GetBasicFontID( struct ClcContact * contact );

+	 int    GetBasicFontID( ClcContact * contact );

 	 void   GetTextSize( SIZE *text_size, HDC hdcMem, RECT free_row_rc, TCHAR *szText, SortedList *plText, UINT uTextFormat, int smiley_height );

 	 void   AddParam( MODERNMASK * mpModernMask, DWORD dwParamHash, const char* szValue, DWORD dwValueHash ); 

 	 BOOL   CheckMiniMode( struct ClcData *dat, BOOL selected, BOOL hot );

@@ -101,33 +101,33 @@ private:
 	 void _SetHotTrackColour( HDC hdc, struct ClcData *dat );

 	 int  _GetStatusOnlineness( int status );

 	 int  _GetGeneralisedStatus();

-	 int  _GetRealStatus( struct ClcContact * pContact, int nStatus );

+	 int  _GetRealStatus( ClcContact * pContact, int nStatus );

 	 RECT _GetRectangle( struct ClcData *dat, RECT *row_rc, RECT *free_row_rc, int *left_pos, int *right_pos, BOOL left, int real_width, int width, int height, int horizontal_space );

 	 void _DrawTextSmiley( HDC hdcMem, RECT * free_rc, SIZE * text_size, TCHAR *szText, int start, int len, SortedList *plText, UINT uTextFormat, BOOL ResizeSizeSmiley );

 	 void _AddParameter( MODERNMASK * mpModernMask, MASKPARAM * lpParam );

 	 void _AddParamShort( MODERNMASK * mpModernMask, DWORD dwParamIndex, DWORD dwValueIndex );

 	 void _FillParam( MASKPARAM * lpParam, DWORD dwParamHash, const char* szValue, DWORD dwValueHash );

-	 MODERNMASK * _GetCLCContactRowBackModernMask( struct ClcGroup * group, struct ClcContact * Drawing, int indent, int index, BOOL selected, BOOL hottrack, struct ClcData * dat );

+	 MODERNMASK * _GetCLCContactRowBackModernMask( ClcGroup * group, ClcContact * Drawing, int indent, int index, BOOL selected, BOOL hottrack, struct ClcData * dat );

 	 void _RTLRect( RECT *rect, int width, int offset );

-	 void _PaintRowItemsEx( HWND hwnd, HDC hdcMem, struct ClcData *dat, struct ClcContact *Drawing, RECT row_rc, RECT free_row_rc, int left_pos, int right_pos, int selected, int hottrack, RECT *rcPaint );

-	 void _DrawStatusIcon( struct ClcContact * Drawing, struct ClcData *dat, int iImage, HDC hdcMem, int x, int y, int cx, int cy, DWORD colorbg, DWORD colorfg, int mode );

+	 void _PaintRowItemsEx( HWND hwnd, HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, RECT row_rc, RECT free_row_rc, int left_pos, int right_pos, int selected, int hottrack, RECT *rcPaint );

+	 void _DrawStatusIcon( ClcContact * Drawing, struct ClcData *dat, int iImage, HDC hdcMem, int x, int y, int cx, int cy, DWORD colorbg, DWORD colorfg, int mode );

 	 BOOL _DrawNonEnginedBackground( HWND hwnd, HDC hdcMem, RECT * rcPaint, RECT clRect, struct ClcData * dat );

 	 void _PaintClc( HWND hwnd, struct ClcData *dat, HDC hdc, RECT *rcPaint );

-	 void _StoreItemPos( struct ClcContact *contact, int ItemType, RECT * rc );

-	 void _CalcItemsPos( HWND hwnd, HDC hdcMem, struct ClcData *dat, struct ClcContact *Drawing, RECT *in_row_rc, RECT *in_free_row_rc, int left_pos, int right_pos, int selected, int hottrack );

+	 void _StoreItemPos( ClcContact *contact, int ItemType, RECT * rc );

+	 void _CalcItemsPos( HWND hwnd, HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, RECT *in_row_rc, RECT *in_free_row_rc, int left_pos, int right_pos, int selected, int hottrack );

 	 BOOL __IsVisible( RECT * firtRect, RECT * secondRect );

-	 void _GetBlendMode( IN struct ClcData *dat, IN struct ClcContact * Drawing, IN BOOL selected, IN BOOL hottrack, IN BOOL bFlag, OUT COLORREF * OutColourFg, OUT int * OutMode );

-	 void _DrawContactItems( HWND hwnd, HDC hdcMem, struct ClcData *dat, struct ClcContact *Drawing, RECT *row_rc, RECT *free_row_rc, int left_pos, int right_pos, int selected, int hottrack, RECT *rcPaint );

-	 void _PaintRowItems ( HWND hwnd, HDC hdcMem, struct ClcData *dat, struct ClcContact *Drawing, RECT row_rc, RECT free_row_rc, int left_pos, int right_pos, int selected, int hottrack, RECT *rcPaint );

+	 void _GetBlendMode( IN struct ClcData *dat, IN ClcContact * Drawing, IN BOOL selected, IN BOOL hottrack, IN BOOL bFlag, OUT COLORREF * OutColourFg, OUT int * OutMode );

+	 void _DrawContactItems( HWND hwnd, HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, RECT *row_rc, RECT *free_row_rc, int left_pos, int right_pos, int selected, int hottrack, RECT *rcPaint );

+	 void _PaintRowItems ( HWND hwnd, HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, RECT row_rc, RECT free_row_rc, int left_pos, int right_pos, int selected, int hottrack, RECT *rcPaint );

 	 

-     void _DrawContactAvatar    ( HDC hdcMem, struct ClcData *dat, struct ClcContact *Drawing, RECT *row_rc, int& selected, int& hottrack, RECT& text_rc, RECT * prcItem );

-     void _DrawContactIcon      ( HDC hdcMem, struct ClcData *dat, struct ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * prcItem );

-     void _DrawContactText      ( HDC hdcMem, struct ClcData *dat, struct ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * prcItem, UINT uTextFormat );

-     void _DrawContactSubText   ( HDC hdcMem, struct ClcData *dat, struct ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * prcItem, UINT uTextFormat, BYTE itemType );

-     void _DrawContactTime      ( HDC hdcMem, struct ClcData *dat, struct ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * prcItem );     

-     void _DrawContactExtraIcon ( HDC hdcMem, struct ClcData *dat, struct ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * rc, int iImage );

-     void _DrawContactSelection ( HDC hdcMem, struct ClcData *dat, struct ClcContact *Drawing, int& selected, int& hottrack, RECT *rcPaint, RECT * prcItem );

-     void _DrawContactLine      ( HDC hdcMem, struct ClcData *dat, struct ClcContact *Drawing, RECT *free_row_rc, RECT *rcPaint, RECT& text_rc );

+     void _DrawContactAvatar    ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, RECT *row_rc, int& selected, int& hottrack, RECT& text_rc, RECT * prcItem );

+     void _DrawContactIcon      ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * prcItem );

+     void _DrawContactText      ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * prcItem, UINT uTextFormat );

+     void _DrawContactSubText   ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * prcItem, UINT uTextFormat, BYTE itemType );

+     void _DrawContactTime      ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * prcItem );     

+     void _DrawContactExtraIcon ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT * rc, int iImage );

+     void _DrawContactSelection ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT *rcPaint, RECT * prcItem );

+     void _DrawContactLine      ( HDC hdcMem, struct ClcData *dat, ClcContact *Drawing, RECT *free_row_rc, RECT *rcPaint, RECT& text_rc );

 

      int _rcWidth( RECT *rc ) { return rc->right-rc->left; }

      int _rcHeight( RECT *rc ) { return rc->bottom-rc->top; }

diff --git a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
index d8cb8d33e9..21abadc64c 100644
--- a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
+++ b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
@@ -89,7 +89,7 @@ typedef INT_PTR (*PSYNCCALLBACKPROC)(WPARAM,LPARAM);
 

 

 /* CLCItems */

-BOOL	CLCItems_IsShowOfflineGroup(struct ClcGroup* group);

+BOOL	CLCItems_IsShowOfflineGroup(ClcGroup* group);

 

 /* CListMod */

 int		CListMod_HideWindow(HWND hwndContactList, int mode);

@@ -137,7 +137,7 @@ int		ModernSkinButton_ReposButtons(HWND parent, BYTE draw, RECT * r);
 int     ModernSkinButtonUnloadModule(WPARAM,LPARAM);

 

 /* RowHeight */

-int		RowHeight_CalcRowHeight(struct ClcData *dat, HWND hwnd, struct ClcContact *contact, int item);

+int		RowHeight_CalcRowHeight(struct ClcData *dat, HWND hwnd, ClcContact *contact, int item);

 

 /* SkinEngine */

 BOOL	ske_AlphaBlend(HDC hdcDest,int nXOriginDest,int nYOriginDest,int nWidthDest,int nHeightDest,HDC hdcSrc,int nXOriginSrc,int nYOriginSrc,int nWidthSrc,int nHeightSrc,BLENDFUNCTION blendFunction);

@@ -225,7 +225,7 @@ int		GetAverageMode( void );																	//clisttray.c
 int		GetContactCachedStatus(HANDLE hContact);											//clistsettings.c

 INT_PTR	GetContactIcon(WPARAM wParam,LPARAM lParam);										//clistmod.c

 int		GetContactIconC(pdisplayNameCacheEntry cacheEntry);									//clistmod.c

-int		GetContactIndex(struct ClcGroup *group,struct ClcContact *contact);					//clcidents.c

+int		GetContactIndex(ClcGroup *group,ClcContact *contact);					//clcidents.c

 int		GetStatusForContact(HANDLE hContact,char *szProto);									//clistsettings.c

 int		InitCustomMenus(void);																//clistmenus.c

 int		InitFramesMenus(void);																//framesmenus.c

@@ -288,18 +288,18 @@ void	cliFreeCacheItem( pdisplayNameCacheEntry p );
 void	cliRebuildEntireList(HWND hwnd,struct ClcData *dat);

 void	cliRecalcScrollBar(HWND hwnd,struct ClcData *dat);

 void	CLUI_cliOnCreateClc(void);

-int		cli_AddItemToGroup(struct ClcGroup *group, int iAboveItem);

-int		cli_AddInfoItemToGroup(struct ClcGroup *group,int flags,const TCHAR *pszText);

-int		cliGetGroupContentsCount(struct ClcGroup *group, int visibleOnly);

+int		cli_AddItemToGroup(ClcGroup *group, int iAboveItem);

+int		cli_AddInfoItemToGroup(ClcGroup *group,int flags,const TCHAR *pszText);

+int		cliGetGroupContentsCount(ClcGroup *group, int visibleOnly);

 int		cliFindRowByText(HWND hwnd, struct ClcData *dat, const TCHAR *text, int prefixOk);

-int		cliGetRowsPriorTo(struct ClcGroup *group,struct ClcGroup *subgroup,int contactIndex);

+int		cliGetRowsPriorTo(ClcGroup *group,ClcGroup *subgroup,int contactIndex);

 int		cli_IconFromStatusMode(const char *szProto,int nStatus, HANDLE hContact);

 int		cli_RemoveEvent(HANDLE hContact, HANDLE hDbEvent);

 void	cli_AddContactToTree(HWND hwnd,struct ClcData *dat,HANDLE hContact,int updateTotalCount,int checkHideOffline);

 void	cli_DeleteItemFromTree(HWND hwnd, HANDLE hItem);

-void	cli_FreeContact( struct ClcContact* );

-void	cli_FreeGroup( struct ClcGroup* );

-char*	cli_GetGroupCountsText(struct ClcData *dat, struct ClcContact *contact);

+void	cli_FreeContact( ClcContact* );

+void	cli_FreeGroup( ClcGroup* );

+char*	cli_GetGroupCountsText(struct ClcData *dat, ClcContact *contact);

 void	cli_ChangeContactIcon(HANDLE hContact,int iIcon,int add);

 LRESULT cli_ProcessExternalMessages(HWND hwnd,struct ClcData *dat,UINT msg,WPARAM wParam,LPARAM lParam);

 struct CListEvent* cliCreateEvent( void );

@@ -307,11 +307,11 @@ struct CListEvent* cli_AddEvent(CLISTEVENT *cle);
 LRESULT CALLBACK cli_ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);

 int		cliShowHide(WPARAM wParam,LPARAM lParam);

 BOOL   CLUI__cliInvalidateRect(HWND hWnd, CONST RECT* lpRect,BOOL bErase );

-int    cliCompareContacts(const struct ClcContact *contact1,const struct ClcContact *contact2);

-int    cliFindItem(HWND hwnd,struct ClcData *dat,HANDLE hItem,struct ClcContact **contact,struct ClcGroup **subgroup,int *isVisible);

+int    cliCompareContacts(const ClcContact *contact1,const ClcContact *contact2);

+int    cliFindItem(HWND hwnd,struct ClcData *dat,HANDLE hItem,ClcContact **contact,ClcGroup **subgroup,int *isVisible);

 void   cliTrayIconUpdateBase(const char *szChangedProto);

 void   cliCluiProtocolStatusChanged(int status,const char * proto);

-HMENU  cliBuildGroupPopupMenu(struct ClcGroup *group);

+HMENU  cliBuildGroupPopupMenu(ClcGroup *group);

 void   cliInvalidateDisplayNameCacheEntry(HANDLE hContact);

 void   cliCheckCacheItem(pdisplayNameCacheEntry pdnce);

 void   cli_SaveStateAndRebuildList(HWND hwnd, struct ClcData *dat);

@@ -319,7 +319,7 @@ void   CLUI_cli_LoadCluiGlobalOpts(void);
 INT_PTR cli_TrayIconProcessMessage(WPARAM wParam,LPARAM lParam);

 BOOL   CLUI__cliInvalidateRect(HWND hWnd, CONST RECT* lpRect,BOOL bErase );

 

-struct ClcContact* cliCreateClcContact( void );

+ClcContact* cliCreateClcContact( void );

 ClcCacheEntryBase* cliCreateCacheItem(HANDLE hContact);

 ClcCacheEntryBase* cliGetCacheEntry(HANDLE hContact);

 

diff --git a/plugins/Clist_modern/src/hdr/modern_gettextasync.h b/plugins/Clist_modern/src/hdr/modern_gettextasync.h
index 881e2b738d..3a4d9639bc 100644
--- a/plugins/Clist_modern/src/hdr/modern_gettextasync.h
+++ b/plugins/Clist_modern/src/hdr/modern_gettextasync.h
@@ -2,4 +2,4 @@
 void InitCacheAsync();

 void UninitCacheAsync();

 void gtaRenewText(HANDLE hContact);

-int gtaAddRequest(struct ClcData *dat,struct ClcContact *contact,HANDLE hContact);
\ No newline at end of file
+int gtaAddRequest(struct ClcData *dat,ClcContact *contact,HANDLE hContact);

diff --git a/plugins/Clist_modern/src/hdr/modern_rowheight_funcs.h b/plugins/Clist_modern/src/hdr/modern_rowheight_funcs.h
index 57223cf3c0..ea74b5498f 100644
--- a/plugins/Clist_modern/src/hdr/modern_rowheight_funcs.h
+++ b/plugins/Clist_modern/src/hdr/modern_rowheight_funcs.h
@@ -47,7 +47,7 @@ BOOL RowHeights_Alloc(struct ClcData *dat, int size);
 int RowHeights_GetMaxRowHeight(struct ClcData *dat, HWND hwnd);

 

 // Calc and store row height

-int RowHeights_GetRowHeight(struct ClcData *dat, HWND hwnd, struct ClcContact *contact, int item);

+int RowHeights_GetRowHeight(struct ClcData *dat, HWND hwnd, ClcContact *contact, int item);

 

 // Calc and store row height for all itens in the list

 void RowHeights_CalcRowHeights(struct ClcData *dat, HWND hwnd);