minor clists' code cleaning

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

8 files changed, 58 insertions, 58 deletions

diff --git a/plugins/Clist_mw/src/clc.cpp b/plugins/Clist_mw/src/clc.cpp
index 386fa06f11..840943b2e8 100644
--- a/plugins/Clist_mw/src/clc.cpp
+++ b/plugins/Clist_mw/src/clc.cpp
@@ -83,7 +83,7 @@ void StatusUpdaterThread(void*)
 	}

 }

 

-HMENU BuildGroupPopupMenu( struct ClcGroup* group )

+HMENU BuildGroupPopupMenu( ClcGroup* group )

 {

 	return (HMENU)CallService(MS_CLIST_MENUBUILDSUBGROUP,(WPARAM)group,0);

 }

@@ -143,7 +143,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 

 	case INTM_ICONCHANGED:

 	{	struct ClcContact *contact = NULL;

-		struct ClcGroup *group = NULL;

+		ClcGroup *group = NULL;

 		int recalcScrollBar = 0,shouldShow;

 		HANDLE hSelItem = NULL;

 		struct ClcContact *selcontact = NULL;

@@ -197,7 +197,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 					dat->needsResort = 1;

 		}	}

 		if (hSelItem) {

-			struct ClcGroup *selgroup;

+			ClcGroup *selgroup;

 			if (FindItem(hwnd,dat,hSelItem,&selcontact,&selgroup,NULL))

 				dat->selection = GetRowsPriorTo(&dat->list,selgroup,List_IndexOf((SortedList*)&selgroup->cl, selcontact));

 			else

@@ -210,7 +210,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 	}

 	case INTM_STATUSMSGCHANGED:

 	{	struct ClcContact *contact = NULL;

-		struct ClcGroup *group = NULL;

+		ClcGroup *group = NULL;

 		DBVARIANT dbv;

 

 		if (!(dat->style&CLS_SHOWSTATUSMESSAGES)) break;

diff --git a/plugins/Clist_mw/src/clc.h b/plugins/Clist_mw/src/clc.h
index 29b7086d20..94de40448a 100644
--- a/plugins/Clist_mw/src/clc.h
+++ b/plugins/Clist_mw/src/clc.h
@@ -79,23 +79,23 @@ struct ClcData : public ClcDataBase
 };

 

 //clcidents.c

-int GetRowsPriorTo(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);

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

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

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

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

 void ClearRowByIndexCache();

 

 //clcitems.c

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

-void FreeGroup(struct ClcGroup *group);

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

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

+void FreeGroup(ClcGroup *group);

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

 void FreeContact(struct ClcContact *p);

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

-struct ClcGroup *RemoveItemFromGroup(HWND hwnd,struct ClcGroup *group,struct ClcContact *contact,int updateTotalCount);

+ClcGroup *RemoveItemFromGroup(HWND hwnd,ClcGroup *group,struct ClcContact *contact,int updateTotalCount);

 void DeleteItemFromTree(HWND hwnd,HANDLE hItem);

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

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

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

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

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

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

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

 

 //clcmsgs.c

@@ -104,7 +104,7 @@ LRESULT ProcessExternalMessages(HWND hwnd,struct ClcData *dat,UINT msg,WPARAM wP
 //clcutils.c

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

 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 LoadClcOptions(HWND hwnd,struct ClcData *dat);

 

diff --git a/plugins/Clist_mw/src/clcidents.cpp b/plugins/Clist_mw/src/clcidents.cpp
index 58517fa8c0..2d706916a9 100644
--- a/plugins/Clist_mw/src/clcidents.cpp
+++ b/plugins/Clist_mw/src/clcidents.cpp
@@ -27,7 +27,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

@@ -41,7 +41,7 @@ exclusively externally
 2->1: GetRowByIndex()

 */

 

-int GetRowsPriorTo(struct ClcGroup *group,struct ClcGroup *subgroup,int contactIndex)

+int GetRowsPriorTo(ClcGroup *group,ClcGroup *subgroup,int contactIndex)

 {

 	int count = 0;

 

@@ -143,11 +143,11 @@ void SetClcContactCacheItem(struct ClcData *dat,HANDLE hContact,void *contact)
 	}

 }

 

-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, i;

 	int nowVisible = 1;

-	struct ClcGroup *group = &dat->list;

+	ClcGroup *group = &dat->list;

 

 	group->scanIndex = 0;

 

@@ -178,7 +178,7 @@ int FindItem(HWND hwnd,struct ClcData *dat,HANDLE hItem,struct ClcContact **cont
 

 	for (;;) {

 		if (group->scanIndex == group->cl.count) {

-			struct ClcGroup *tgroup;

+			ClcGroup *tgroup;

 			group = group->parent;

 			if (group == NULL)

 				break;

@@ -223,7 +223,7 @@ int FindItem(HWND hwnd,struct ClcData *dat,HANDLE hItem,struct ClcContact **cont
 				}

 

 		if (group->cl.items[group->scanIndex]->type == CLCIT_GROUP) {

-			struct ClcGroup* save = group;

+			ClcGroup* save = group;

 			group = group->cl.items[group->scanIndex]->group;

 			group->scanIndex = 0;

 			nowVisible &= group->expanded;

@@ -234,7 +234,7 @@ int FindItem(HWND hwnd,struct ClcData *dat,HANDLE hItem,struct ClcContact **cont
 	return 0;

 }

 #define CacheArrSize 255

-struct ClcGroup *CacheIndex[CacheArrSize] = {NULL};

+ClcGroup *CacheIndex[CacheArrSize] = {NULL};

 boolean CacheIndexClear = TRUE;

 void ClearRowByIndexCache()

 {

@@ -244,10 +244,10 @@ void ClearRowByIndexCache()
 	}

 }

 

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

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

 {

 	int index = 0,i;

-	struct ClcGroup *group = &dat->list;

+	ClcGroup *group = &dat->list;

 

 	if (testindex < 0) return -1;

 

diff --git a/plugins/Clist_mw/src/clcitems.cpp b/plugins/Clist_mw/src/clcitems.cpp
index cf3909024f..16d3c2e309 100644
--- a/plugins/Clist_mw/src/clcitems.cpp
+++ b/plugins/Clist_mw/src/clcitems.cpp
@@ -27,11 +27,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "m_metacontacts.h"

 

 

-extern int ( *saveAddItemToGroup )( struct ClcGroup *group, int iAboveItem );

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

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

+extern int ( *saveAddItemToGroup )( ClcGroup *group, int iAboveItem );

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

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

 extern void (*saveFreeContact)(struct ClcContact *p);

-extern void (*saveFreeGroup)(struct ClcGroup *p);

+extern void (*saveFreeGroup)(ClcGroup *p);

 

 //routines for managing adding/removal of items in the list, including sorting

 

@@ -80,16 +80,16 @@ void FreeContact(struct ClcContact *p)
 	saveFreeContact( p );

 }

 

-int AddItemToGroup(struct ClcGroup *group,int iAboveItem)

+int AddItemToGroup(ClcGroup *group,int iAboveItem)

 {

 	iAboveItem = saveAddItemToGroup( group, iAboveItem );

 	ClearRowByIndexCache();

 	return iAboveItem;

 }

 

-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* result;

+	ClcGroup* result;

 

 	ClearRowByIndexCache();	

 	dat->needsResort = 1;

@@ -98,20 +98,20 @@ struct ClcGroup *AddGroup(HWND hwnd,struct ClcData *dat,const TCHAR *szName,DWOR
 	return result;

 }

 

-void FreeGroup(struct ClcGroup *group)

+void FreeGroup(ClcGroup *group)

 {

 	saveFreeGroup( group );

 	ClearRowByIndexCache();

 }

 

-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 );

 	ClearRowByIndexCache();

 	return i;

 }

 

-static struct ClcContact * AddContactToGroup(struct ClcData *dat,struct ClcGroup *group,pdisplayNameCacheEntry cacheEntry)

+static struct ClcContact * AddContactToGroup(struct ClcData *dat,ClcGroup *group,pdisplayNameCacheEntry cacheEntry)

 {

 	char *szProto;

 	WORD apparentMode;

@@ -263,9 +263,9 @@ void AddContactToTree(HWND hwnd,struct ClcData *dat,HANDLE hContact,int updateTo
 	ClearRowByIndexCache();

 }

 

-extern struct ClcGroup* ( *saveRemoveItemFromGroup )(HWND hwnd,struct ClcGroup *group,struct ClcContact *contact,int updateTotalCount);

+extern ClcGroup* ( *saveRemoveItemFromGroup )(HWND hwnd,ClcGroup *group,struct ClcContact *contact,int updateTotalCount);

 

-struct ClcGroup *RemoveItemFromGroup(HWND hwnd,struct ClcGroup *group,struct ClcContact *contact,int updateTotalCount)

+ClcGroup *RemoveItemFromGroup(HWND hwnd,ClcGroup *group,struct ClcContact *contact,int updateTotalCount)

 {

 	ClearRowByIndexCache();

 	if (contact->type == CLCIT_CONTACT) {

@@ -282,7 +282,7 @@ struct ClcGroup *RemoveItemFromGroup(HWND hwnd,struct ClcGroup *group,struct Clc
 void DeleteItemFromTree(HWND hwnd,HANDLE hItem)

 {

 	struct ClcContact *contact;

-	struct ClcGroup *group;

+	ClcGroup *group;

 	struct ClcData *dat = (struct ClcData*)GetWindowLongPtr(hwnd,0);

 	

 	ClearRowByIndexCache();

@@ -327,7 +327,7 @@ void RebuildEntireList(HWND hwnd,struct ClcData *dat)
 	DWORD style = GetWindowLongPtr(hwnd,GWL_STYLE);

 	HANDLE hContact;

 	struct ClcContact * cont;

-	struct ClcGroup *group;

+	ClcGroup *group;

 	//DBVARIANT dbv;

 	int tick = GetTickCount();

 

@@ -432,10 +432,10 @@ void RebuildEntireList(HWND hwnd,struct ClcData *dat)
 }

 

 

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

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

 {

 	int lastcount = 0, count = 0;//group->cl.count;

-	struct ClcGroup *topgroup = group;

+	ClcGroup *topgroup = group;

 	if (selection<0) {

 		return 0;

 	}

@@ -468,10 +468,10 @@ int GetNewSelection(struct ClcGroup *group, int selection, int direction)
 	return lastcount;

  }

 

-int GetGroupContentsCount(struct ClcGroup *group,int visibleOnly)

+int GetGroupContentsCount(ClcGroup *group,int visibleOnly)

 {

 	int count = 0;//group->cl.count;

-	struct ClcGroup *topgroup = group;

+	ClcGroup *topgroup = group;

 

 	group->scanIndex = 0;

 	for (;;) {

@@ -550,7 +550,7 @@ void SaveStateAndRebuildList(HWND hwnd,struct ClcData *dat)
 	int savedContactCount = 0,savedContactAlloced = 0;

 	struct SavedInfoState_t *savedInfo = NULL;

 	int savedInfoCount = 0,savedInfoAlloced = 0;

-	struct ClcGroup *group;

+	ClcGroup *group;

 	struct ClcContact *contact;

 

 	int tick = GetTickCount();

diff --git a/plugins/Clist_mw/src/clcpaint.cpp b/plugins/Clist_mw/src/clcpaint.cpp
index b4fc20850f..ee5e17fb53 100644
--- a/plugins/Clist_mw/src/clcpaint.cpp
+++ b/plugins/Clist_mw/src/clcpaint.cpp
@@ -151,7 +151,7 @@ void InternalPaintClc(HWND hwnd,struct ClcData *dat,HDC hdc,RECT *rcPaint)
 	RECT clRect;

 	int y,indent,index,fontHeight, subindex, subident;

 	struct ClcContact *Drawing;

-	struct ClcGroup *group;

+	ClcGroup *group;

 	HBITMAP hBmpOsb;

 	DWORD style = GetWindowLongPtr(hwnd,GWL_STYLE);

 	int status = GetGeneralisedStatus();

@@ -452,9 +452,9 @@ void InternalPaintClc(HWND hwnd,struct ClcData *dat,HDC hdc,RECT *rcPaint)
 			else if (Drawing->type == CLCIT_GROUP) {

 				RECT rc;

 				if (szCounts[0]) {

-					struct ClcGroup *clcg;

+					ClcGroup *clcg;

 

-					clcg = (struct ClcGroup *)Drawing;

+					clcg = (ClcGroup *)Drawing;

 

 					fontHeight = dat->fontInfo[FONTID_GROUPS].fontHeight;

 

diff --git a/plugins/Clist_mw/src/clcutils.cpp b/plugins/Clist_mw/src/clcutils.cpp
index e9253b4082..db47677f84 100644
--- a/plugins/Clist_mw/src/clcutils.cpp
+++ b/plugins/Clist_mw/src/clcutils.cpp
@@ -26,10 +26,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 //loads of stuff that didn't really fit anywhere else

 

-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, subident,ic = 0;

 	SIZE textSize;

@@ -238,7 +238,7 @@ void RecalcScrollBar(HWND hwnd,struct ClcData *dat)
 	ScrollTo(hwnd,dat,dat->yScroll,1);

 }

 

-void CalcEipPosition( struct ClcData *dat, struct ClcContact *contact, struct ClcGroup *group, POINT *result)

+void CalcEipPosition( struct ClcData *dat, struct ClcContact *contact, ClcGroup *group, POINT *result)

 {

 	int indent;

 	for (indent = 0; group->parent; indent++, group = group->parent);

diff --git a/plugins/Clist_mw/src/groupmenu.cpp b/plugins/Clist_mw/src/groupmenu.cpp
index 496f98e78c..a92a2b4113 100644
--- a/plugins/Clist_mw/src/groupmenu.cpp
+++ b/plugins/Clist_mw/src/groupmenu.cpp
@@ -444,7 +444,7 @@ static INT_PTR RemoveSubGroupMenuItem(WPARAM wParam,LPARAM lParam)
 static int OnBuildSubGroupMenu(WPARAM wParam,LPARAM lParam)

 {

 	CLISTMENUITEM mi;

-	struct ClcGroup *group = (struct ClcGroup *)wParam;

+	ClcGroup *group = (ClcGroup *)wParam;

 	if (wParam == 0) return 0;

 

 	//contact->group

diff --git a/plugins/Clist_mw/src/init.cpp b/plugins/Clist_mw/src/init.cpp
index 2144ab6eb8..ea29d0d419 100644
--- a/plugins/Clist_mw/src/init.cpp
+++ b/plugins/Clist_mw/src/init.cpp
@@ -29,9 +29,9 @@ int hLangpack;
 

 static HANDLE hCListShutdown = 0;

 

-HMENU BuildGroupPopupMenu( struct ClcGroup* group );

+HMENU BuildGroupPopupMenu( ClcGroup* group );

 

-void  CalcEipPosition( struct ClcData *dat, struct ClcContact *contact, struct ClcGroup *group, POINT *result);

+void  CalcEipPosition( struct ClcData *dat, struct ClcContact *contact, ClcGroup *group, POINT *result);

 void  CheckPDNCE(ClcCacheEntryBase*);

 void  CluiProtocolStatusChanged( int, const char* );

 int   CompareContacts( const struct ClcContact *contact1, const struct ClcContact *contact2 );

@@ -40,11 +40,11 @@ void  GetDefaultFontSetting(int i,LOGFONT *lf,COLORREF *colour);
 void  RebuildEntireList(HWND hwnd,struct ClcData *dat);

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

 

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

-struct ClcGroup* ( *saveRemoveItemFromGroup )(HWND hwnd,struct ClcGroup *group,struct ClcContact *contact,int updateTotalCount);

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

+ClcGroup* ( *saveRemoveItemFromGroup )(HWND hwnd,ClcGroup *group,struct ClcContact *contact,int updateTotalCount);

 

 void (*saveFreeContact)(struct ClcContact *p);

-void (*saveFreeGroup)(struct ClcGroup *p);

+void (*saveFreeGroup)(ClcGroup *p);

 

 LRESULT ( CALLBACK *saveContactListControlWndProc )( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam );

 LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);

@@ -54,11 +54,11 @@ LRESULT CALLBACK ContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
 

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

 

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

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

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

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

 

-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);

 

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

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