From 95c0985670fefbe446908ebaef98dc2559f8d9fc Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 2 Mar 2013 12:37:59 +0000
Subject: rest of TCHAR_STR_PARAM replaced

git-svn-id: http://svn.miranda-ng.org/main/trunk@3831 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/skin/skinicons.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/modules/skin')

diff --git a/src/modules/skin/skinicons.cpp b/src/modules/skin/skinicons.cpp
index b9400eeedf..fae9cc9d7c 100644
--- a/src/modules/skin/skinicons.cpp
+++ b/src/modules/skin/skinicons.cpp
@@ -277,11 +277,11 @@ HICON LoadSkinProtoIcon(const char* szProto, int status, bool big)
 			str = _tcsrchr(szPath, '\\');
 			if (str != NULL)
 				*str = 0;
-			mir_sntprintf(szFullPath, SIZEOF(szFullPath), _T("%s\\Icons\\proto_") _T(TCHAR_STR_PARAM) _T(".dll"), szPath, pa->szProtoName);
+			mir_sntprintf(szFullPath, SIZEOF(szFullPath), _T("%s\\Icons\\proto_%S.dll"), szPath, pa->szProtoName);
 			if (GetFileAttributes(szFullPath) != INVALID_FILE_ATTRIBUTES)
 				sid.ptszDefaultFile = szFullPath;
 			else {
-				mir_sntprintf(szFullPath, SIZEOF(szFullPath), _T("%s\\Plugins\\") _T(TCHAR_STR_PARAM) _T(".dll"), szPath, szProto);
+				mir_sntprintf(szFullPath, SIZEOF(szFullPath), _T("%s\\Plugins\\%S.dll"), szPath, szProto);
 				if ((int)ExtractIconEx(szFullPath, statusIcons[statusIndx].resource_id, NULL, &hIcon, 1) > 0) {
 					DestroyIcon(hIcon);
 					sid.ptszDefaultFile = szFullPath;
@@ -444,9 +444,9 @@ int LoadSkinIcons(void)
 		DBDeleteContactSetting(NULL, "Icons", moduleName);
 
 		// make old skinicons' prefix
-		mir_snprintf(moduleName, SIZEOF(moduleName), TCHAR_STR_PARAM, dbv.ptszVal);
+		mir_snprintf(moduleName, SIZEOF(moduleName), "%S", dbv.ptszVal);
 		// make IcoLib's prefix
-		mir_snprintf(iconName, SIZEOF(iconName), "%s" TCHAR_STR_PARAM, statusIconsFmt, dbv.ptszVal);
+		mir_snprintf(iconName, SIZEOF(iconName), "%s%S", statusIconsFmt, dbv.ptszVal);
 
 		convertOneProtocol(moduleName, iconName);
 		db_free(&dbv);
@@ -469,13 +469,13 @@ int LoadSkinIcons(void)
 
 	//
 	//  Add main icons to list
-	//
-	for (i=0; i < SIZEOF(mainIcons); i++) {
-		mir_snprintf(iconName, SIZEOF(iconName), "%s%d", mainIconsFmt, i);
-		sid.pszSection = mainIcons[i].section == NULL ? LPGEN("Main Icons") : (char*)mainIcons[i].section;
-		sid.pszDescription = (char*)mainIcons[i].description;
-		sid.iDefaultIndex = mainIcons[i].resource_id;
-		mainIcons[i].hIcolib = IcoLib_AddNewIcon(0, &sid);
+	//
+	for (i=0; i < SIZEOF(mainIcons); i++) {
+		mir_snprintf(iconName, SIZEOF(iconName), "%s%d", mainIconsFmt, i);
+		sid.pszSection = mainIcons[i].section == NULL ? LPGEN("Main Icons") : (char*)mainIcons[i].section;
+		sid.pszDescription = (char*)mainIcons[i].description;
+		sid.iDefaultIndex = mainIcons[i].resource_id;
+		mainIcons[i].hIcolib = IcoLib_AddNewIcon(0, &sid);
 	}
 	//
 	// Add global icons to list
-- 
cgit v1.2.3