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/Popup/src/avatars.cpp        | 2 +-
 plugins/Popup/src/avatars_gif.cpp    | 2 +-
 plugins/Popup/src/avatars_gif.h      | 2 +-
 plugins/Popup/src/avatars_simple.cpp | 4 ++--
 plugins/Popup/src/avatars_simple.h   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'plugins/Popup/src')

diff --git a/plugins/Popup/src/avatars.cpp b/plugins/Popup/src/avatars.cpp
index 73bd43ede4..d099ddbd73 100644
--- a/plugins/Popup/src/avatars.cpp
+++ b/plugins/Popup/src/avatars.cpp
@@ -27,7 +27,7 @@ PopupAvatar *PopupAvatar::create(MCONTACT hContact)
 {
 	if (hContact) {
 		if (ServiceExists(MS_AV_GETAVATARBITMAP)) {
-			avatarCacheEntry *av = (avatarCacheEntry *)CallService(MS_AV_GETAVATARBITMAP, hContact, 0);
+			AVATARCACHEENTRY *av = (AVATARCACHEENTRY*)CallService(MS_AV_GETAVATARBITMAP, hContact, 0);
 			if (av && (mir_wstrlen(av->szFilename) > 4))
 				if (!mir_wstrcmpi(av->szFilename + mir_wstrlen(av->szFilename) - 4, L".gif"))
 					if (db_get_b(NULL, MODULNAME, "EnableGifAnimation", 1) && GDIPlus_IsAnimatedGIF(av->szFilename))
diff --git a/plugins/Popup/src/avatars_gif.cpp b/plugins/Popup/src/avatars_gif.cpp
index c0eba9f628..5b8cbac17c 100644
--- a/plugins/Popup/src/avatars_gif.cpp
+++ b/plugins/Popup/src/avatars_gif.cpp
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 GifAvatar::GifAvatar(MCONTACT hContact) : PopupAvatar()
 {
-	av = (avatarCacheEntry *)CallService(MS_AV_GETAVATARBITMAP, hContact, 0);
+	av = (AVATARCACHEENTRY*)CallService(MS_AV_GETAVATARBITMAP, hContact, 0);
 	bIsAnimated = true;
 	bIsValid = true;
 	GDIPlus_GetGIFSize(av->szFilename, &this->width, &this->height);
diff --git a/plugins/Popup/src/avatars_gif.h b/plugins/Popup/src/avatars_gif.h
index eca4c186c8..07cf5e1a49 100644
--- a/plugins/Popup/src/avatars_gif.h
+++ b/plugins/Popup/src/avatars_gif.h
@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 class GifAvatar : public PopupAvatar
 {
 protected:
-	avatarCacheEntry *av;
+	AVATARCACHEENTRY *av;
 	int cachedWidth, cachedHeight;
 	int activeFrame;
 
diff --git a/plugins/Popup/src/avatars_simple.cpp b/plugins/Popup/src/avatars_simple.cpp
index 5b55467b7f..b887bb27fd 100644
--- a/plugins/Popup/src/avatars_simple.cpp
+++ b/plugins/Popup/src/avatars_simple.cpp
@@ -36,7 +36,7 @@ SimpleAvatar::SimpleAvatar(HANDLE h, bool bUseBitmap)
 		height = abs(bmp.bmHeight);
 
 		avNeedFree = true;
-		av = new avatarCacheEntry;
+		av = new AVATARCACHEENTRY;
 		av->bmHeight = abs(bmp.bmHeight);
 		av->bmWidth = abs(bmp.bmWidth);
 		av->hbmPic = (HBITMAP)h;
@@ -46,7 +46,7 @@ SimpleAvatar::SimpleAvatar(HANDLE h, bool bUseBitmap)
 
 	if (h && ServiceExists(MS_AV_GETAVATARBITMAP)) {
 		avNeedFree = false;
-		av = (avatarCacheEntry *)CallService(MS_AV_GETAVATARBITMAP, (WPARAM)h, 0);
+		av = (AVATARCACHEENTRY*)CallService(MS_AV_GETAVATARBITMAP, (WPARAM)h, 0);
 		if (av) {
 			if (av->hbmPic && (av->dwFlags&AVS_BITMAP_VALID) && !(av->dwFlags&AVS_HIDEONCLIST) && !(av->dwFlags&AVS_NOTREADY)) {
 				width = av->bmWidth;
diff --git a/plugins/Popup/src/avatars_simple.h b/plugins/Popup/src/avatars_simple.h
index 0479674cd4..490e1f403b 100644
--- a/plugins/Popup/src/avatars_simple.h
+++ b/plugins/Popup/src/avatars_simple.h
@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 class SimpleAvatar : public PopupAvatar
 {
 private:
-	avatarCacheEntry *av;
+	AVATARCACHEENTRY *av;
 	bool avNeedFree;
 
 public:
-- 
cgit v1.2.3