From 82a3bbaf034bc286665465d8904e6d1db52e5eb4 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sun, 8 Jan 2017 20:59:11 +0300
Subject: code cleaning

---
 plugins/Clist_nicer/src/clc.cpp      |  2 +-
 plugins/Clist_nicer/src/clc.h        | 26 +++++++++++++-------------
 plugins/Clist_nicer/src/clcitems.cpp |  4 ++--
 plugins/Clist_nicer/src/clcpaint.cpp |  8 ++++----
 4 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'plugins/Clist_nicer/src')

diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp
index 2f15c72d6d..fafadeb568 100644
--- a/plugins/Clist_nicer/src/clc.cpp
+++ b/plugins/Clist_nicer/src/clc.cpp
@@ -423,7 +423,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 	case INTM_AVATARCHANGED:
 		contact = NULL;
 		{
-			avatarCacheEntry *cEntry = (struct avatarCacheEntry *)lParam;
+			AVATARCACHEENTRY *cEntry = (struct AVATARCACHEENTRY *)lParam;
 
 			if (wParam == 0) {
 				//RemoveFromImgCache(0, cEntry);
diff --git a/plugins/Clist_nicer/src/clc.h b/plugins/Clist_nicer/src/clc.h
index 56b8fe301f..f5303f506d 100644
--- a/plugins/Clist_nicer/src/clc.h
+++ b/plugins/Clist_nicer/src/clc.h
@@ -117,20 +117,20 @@ struct TExtraCache
 
 struct ClcContact : public ClcContactBase
 {
-	BOOL		bIsMeta;
-	BYTE		xStatus;
-	int			xStatusIcon;
+	BOOL     bIsMeta;
+	BYTE     xStatus;
+	int      xStatusIcon;
 	MCONTACT	hSubContact;
-	char		*metaProto;
-	DWORD		codePage;
-	WORD		wStatus;
-	int			avatarLeft, extraIconRightBegin;
-	int			isRtl;
-	DWORD		cFlags;
-	BYTE		bSecondLine;
-
-	avatarCacheEntry	*ace;
-	TExtraCache*		pExtra;
+	char    *metaProto;
+	DWORD    codePage;
+	WORD     wStatus;
+	int      avatarLeft, extraIconRightBegin;
+	int      isRtl;
+	DWORD    cFlags;
+	BYTE     bSecondLine;
+
+	AVATARCACHEENTRY *ace;
+	TExtraCache *pExtra;
 };
 
 #define DRAGSTAGE_NOTMOVED		0
diff --git a/plugins/Clist_nicer/src/clcitems.cpp b/plugins/Clist_nicer/src/clcitems.cpp
index 0ab9137e9d..ebfdcd6cc8 100644
--- a/plugins/Clist_nicer/src/clcitems.cpp
+++ b/plugins/Clist_nicer/src/clcitems.cpp
@@ -84,8 +84,8 @@ void LoadAvatarForContact(ClcContact *p)
 
 	p->ace = NULL;
 	if (cfg::dat.bAvatarServiceAvail && (p->cFlags & ECF_AVATAR) && (!cfg::dat.bNoOfflineAvatars || p->wStatus != ID_STATUS_OFFLINE)) {
-		p->ace = (struct avatarCacheEntry *)CallService(MS_AV_GETAVATARBITMAP, (WPARAM)p->hContact, 0);
-		if (p->ace != NULL && p->ace->cbSize != sizeof(struct avatarCacheEntry))
+		p->ace = (struct AVATARCACHEENTRY *)CallService(MS_AV_GETAVATARBITMAP, (WPARAM)p->hContact, 0);
+		if (p->ace != NULL && p->ace->cbSize != sizeof(struct AVATARCACHEENTRY))
 			p->ace = NULL;
 		if (p->ace != NULL)
 			p->ace->t_lastAccess = cfg::dat.t_now;
diff --git a/plugins/Clist_nicer/src/clcpaint.cpp b/plugins/Clist_nicer/src/clcpaint.cpp
index 4436f60553..f4b72bb304 100644
--- a/plugins/Clist_nicer/src/clcpaint.cpp
+++ b/plugins/Clist_nicer/src/clcpaint.cpp
@@ -262,7 +262,7 @@ static int __fastcall DrawAvatar(HDC hdcMem, RECT *rc, ClcContact *contact, int
 	if (!cfg::dat.bAvatarServiceAvail || dat->bisEmbedded)
 		return 0;
 
-	if (contact->ace != NULL && contact->ace->cbSize == sizeof(struct avatarCacheEntry)) {
+	if (contact->ace != NULL && contact->ace->cbSize == sizeof(struct AVATARCACHEENTRY)) {
 		if (contact->ace->dwFlags & AVS_HIDEONCLIST)
 			return (cfg::dat.dwFlags & CLUI_FRAME_ALWAYSALIGNNICK) ? avatar_size + 2 : 0;
 
@@ -1458,11 +1458,11 @@ bgdone:
 		line_num++;
 		ClcContact *cc = group->cl[group->scanIndex];
 		if (cfg::dat.bForceRefetchOnPaint)
-			cc->ace = (struct avatarCacheEntry*) - 1;
+			cc->ace = (struct AVATARCACHEENTRY*) - 1;
 
 		if (y > rcPaint->top - dat->row_heights[line_num] && y <= rcPaint->bottom) {
-			if (cc->ace == (struct avatarCacheEntry*) - 1)
-				cc->ace = (struct avatarCacheEntry *)CallService(MS_AV_GETAVATARBITMAP, (WPARAM)cc->hContact, 0);
+			if (cc->ace == (struct AVATARCACHEENTRY*) - 1)
+				cc->ace = (struct AVATARCACHEENTRY *)CallService(MS_AV_GETAVATARBITMAP, (WPARAM)cc->hContact, 0);
 			RowHeight::getRowHeight(dat, cc, line_num, style);
 			PaintItem(hdcMem, group, cc, indent, y, dat, index, hwnd, style, &clRect, &bFirstNGdrawn, groupCountsFontTopShift, dat->row_heights[line_num]);
 		}
-- 
cgit v1.2.3