code cleaning;

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

1 files changed, 37 insertions, 41 deletions

diff --git a/plugins/FloatingContacts/src/thumbs.h b/plugins/FloatingContacts/src/thumbs.h
index a6187e1315..083f2bb4b3 100644
--- a/plugins/FloatingContacts/src/thumbs.h
+++ b/plugins/FloatingContacts/src/thumbs.h
@@ -12,63 +12,59 @@ DockOpt;
 

 struct ThumbInfo

 {

-public: // TODO: make private

-	HWND			hwnd;

-	TCHAR			ptszName[ USERNAME_LEN ];

-	HANDLE			hContact;

-	int				iIcon;

-	CDropTarget *	dropTarget;

-	DockOpt			dockOpt;

-	BOOL			fTipActive;

-	BOOL			fTipTimerActive;

-	POINT			ptTipSt;

+	HANDLE       hContact;

+	HWND         hwnd;

+	TCHAR        ptszName[USERNAME_LEN];

+	int          iIcon;

+	CDropTarget *dropTarget;

+	DockOpt      dockOpt;

+	BOOL         fTipActive;

+	BOOL         fTipTimerActive;

+	POINT        ptTipSt;

 

-	BYTE			btAlpha;

-	MyBitmap		bmpContent;

+	BYTE         btAlpha;

+	MyBitmap     bmpContent;

 

-	POINT			ptPos;

-	SIZE			szSize;

+	POINT        ptPos;

+	SIZE         szSize;

 

 public:

 	ThumbInfo();

 	~ThumbInfo();

 

-	void GetThumbRect			(RECT *rc);

-	void PositionThumb			(int nX, int nY); 

-	void PositionThumbWorker	(int nX, int nY, POINT *rcNewPos); 

-	void ResizeThumb			();

-	void RefreshContactIcon		(int iIcon);

-	void RefreshContactStatus	(int idStatus);

-	void DeleteContactPos		();

-	void OnLButtonDown			(int nX, int nY);

-	void OnLButtonUp			();

-	void OnMouseMove			(int nX, int nY, WPARAM wParam);

-	void ThumbSelect			(BOOL bMouse);

-	void ThumbDeselect			(BOOL bMouse);

-	void SetThumbOpacity		(BYTE btAlpha);

-	void KillTip				();

-	void UpdateContent			();

-	void PopupMessageDialog		();

-	void OnTimer				(BYTE idTimer);

+	void GetThumbRect(RECT *rc);

+	void PositionThumb(int nX, int nY); 

+	void PositionThumbWorker(int nX, int nY, POINT *rcNewPos); 

+	void ResizeThumb();

+	void RefreshContactIcon(int iIcon);

+	void RefreshContactStatus(int idStatus);

+	void DeleteContactPos();

+	void OnLButtonDown(int nX, int nY);

+	void OnLButtonUp();

+	void OnMouseMove(int nX, int nY, WPARAM wParam);

+	void ThumbSelect(BOOL bMouse);

+	void ThumbDeselect(BOOL bMouse);

+	void SetThumbOpacity(BYTE btAlpha);

+	void KillTip();

+	void UpdateContent();

+	void PopupMessageDialog();

+	void OnTimer(BYTE idTimer);

 };

 

-void UndockThumbs	( ThumbInfo *pThumb1, ThumbInfo *pThumb2 );

-void DockThumbs		( ThumbInfo *pThumbLeft, ThumbInfo *pThumbRight, BOOL bMoveLeft );

+void UndockThumbs(ThumbInfo *pThumb1, ThumbInfo *pThumb2);

+void DockThumbs(ThumbInfo *pThumbLeft, ThumbInfo *pThumbRight, BOOL bMoveLeft);

 

-class ThumbList: public LIST<ThumbInfo>

+class ThumbList: public OBJLIST<ThumbInfo>

 {

 public:

 	ThumbList();

 	~ThumbList();

 

-	ThumbInfo*	AddThumb			(HWND hwnd, TCHAR *ptszName, HANDLE hContact);

-	void		RemoveThumb			(ThumbInfo *pThumb);

+	ThumbInfo* AddThumb(HWND hwnd, TCHAR *ptszName, HANDLE hContact);

+	void       RemoveThumb(ThumbInfo *pThumb);

 

-	ThumbInfo*	FindThumb			(HWND hwnd);

-	ThumbInfo*	FindThumbByContact	(HANDLE hContact);

-

-private:

-	static int cmp(const ThumbInfo *p1, const ThumbInfo *p2);

+	ThumbInfo* FindThumb(HWND hwnd);

+	ThumbInfo* FindThumbByContact(HANDLE hContact);

 };

 

 extern ThumbList thumbList;