From 95aa036670a1ce2c461ffd9bd3a586d191ee4675 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 19 Jul 2012 22:48:01 +0000
Subject: - various icolib fixes; - code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@1061 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/SRMM/globals.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'plugins/SRMM')

diff --git a/plugins/SRMM/globals.cpp b/plugins/SRMM/globals.cpp
index 802bc9fccc..e6d0175f1c 100644
--- a/plugins/SRMM/globals.cpp
+++ b/plugins/SRMM/globals.cpp
@@ -28,8 +28,8 @@ static int AvatarChanged(WPARAM wParam, LPARAM lParam);
 
 typedef struct IconDefStruct 
 {
-	const char *szName;
-	const char *szDescr;
+	char *szName;
+	char *szDescr;
 	int defIconID;
 } IconList;
 
@@ -45,13 +45,12 @@ HANDLE hIconLibItem[SIZEOF(iconList)];
 
 static void InitIcons(void)
 {
-	TCHAR szFile[MAX_PATH];
 	char szSettingName[100];
-	SKINICONDESC sid = {0};
-	unsigned i;
 
+	TCHAR szFile[MAX_PATH];
 	GetModuleFileName(g_hInst, szFile, SIZEOF(szFile));
 
+	SKINICONDESC sid = {0};
 	sid.cbSize = sizeof(SKINICONDESC);
 	sid.ptszDefaultFile = szFile;
 	sid.pszName = szSettingName;
@@ -59,10 +58,9 @@ static void InitIcons(void)
 	sid.flags = SIDF_PATH_TCHAR;
 	sid.cx = 10; sid.cy = 10;
 
-	for (i = 0; i < SIZEOF(iconList); i++) 
-	{
+	for (int i=0; i < SIZEOF(iconList); i++) {
 		mir_snprintf(szSettingName, sizeof(szSettingName), "SRMM_%s", iconList[i].szName);
-		sid.pszDescription = (char*)iconList[i].szDescr;
+		sid.pszDescription = iconList[i].szDescr;
 		sid.iDefaultIndex = -iconList[i].defIconID;
 		hIconLibItem[i] = Skin_AddIcon(&sid);
 	}	
-- 
cgit v1.2.3