rest of TCHAR_STR_PARAM replaced

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

5 files changed, 15 insertions, 15 deletions

diff --git a/src/core/stdchat/src/log.cpp b/src/core/stdchat/src/log.cpp
index 193c9bb719..7720d1dddf 100644
--- a/src/core/stdchat/src/log.cpp
+++ b/src/core/stdchat/src/log.cpp
@@ -607,7 +607,7 @@ char * Log_CreateRtfHeader(MODULEINFO * mi)
 	// font table

 	Log_Append(&buffer, &bufferEnd, &bufferAlloced, "{\\rtf1\\ansi\\deff0{\\fonttbl");

 	for (i = 0; i < OPTIONS_FONTCOUNT; i++)

-		Log_Append(&buffer, &bufferEnd, &bufferAlloced, "{\\f%u\\fnil\\fcharset%u" TCHAR_STR_PARAM ";}", i, aFonts[i].lf.lfCharSet, aFonts[i].lf.lfFaceName);

+		Log_Append(&buffer, &bufferEnd, &bufferAlloced, "{\\f%u\\fnil\\fcharset%u%S;}", i, aFonts[i].lf.lfCharSet, aFonts[i].lf.lfFaceName);

 

 	// colour table

 	Log_Append(&buffer, &bufferEnd, &bufferAlloced, "}{\\colortbl ;");

diff --git a/src/core/stdchat/src/tools.cpp b/src/core/stdchat/src/tools.cpp
index d89e1725dd..d27c147617 100644
--- a/src/core/stdchat/src/tools.cpp
+++ b/src/core/stdchat/src/tools.cpp
@@ -143,7 +143,7 @@ static int ShowPopup (HANDLE hContact, SESSION_INFO* si, HICON hIcon,  char* psz
 	else

 		pd.lchIcon = LoadIconEx( "window", FALSE );

 

-	mir_sntprintf(pd.lptzContactName, MAX_CONTACTNAME-1, _T(TCHAR_STR_PARAM) _T(" - %s"),

+	mir_sntprintf(pd.lptzContactName, MAX_CONTACTNAME-1, _T("%S - %s"),

 		pszProtoName, CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR ));

 	lstrcpyn( pd.lptzText, TranslateTS(szBuf), MAX_SECONDLINE-1);

 	pd.iSeconds = g_Settings.iPopupTimeout;

diff --git a/src/modules/netlib/netlibhttp.cpp b/src/modules/netlib/netlibhttp.cpp
index f675ba8c0f..a2ff6e94d3 100644
--- a/src/modules/netlib/netlibhttp.cpp
+++ b/src/modules/netlib/netlibhttp.cpp
@@ -301,7 +301,7 @@ struct HttpSecurityContext
 				szChallenge, szLogin, szPassw, true, complete);

 

 			if ( !szAuthHdr) {

-				NetlibLogf(NULL, "Security login %s failed, user: " TCHAR_STR_PARAM " pssw: " TCHAR_STR_PARAM,

+				NetlibLogf(NULL, "Security login %s failed, user: %S pssw: %S",

 					szProvider, szLogin ? szLogin : _T("(no user)"), szPassw ? _T("(exist)") : _T("(no psw)"));

 			}

 			else if (justCreated)

diff --git a/src/modules/protocols/protoopts.cpp b/src/modules/protocols/protoopts.cpp
index e94abb718b..7b128dcea7 100644
--- a/src/modules/protocols/protoopts.cpp
+++ b/src/modules/protocols/protoopts.cpp
@@ -611,7 +611,7 @@ INT_PTR CALLBACK AccMgrDlgProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM
 

 			if (lps->itemID == (unsigned)dat->iSelected) {

 				SelectObject(lps->hDC, dat->hfntText);

-				mir_sntprintf(text, size, _T("%s: ") _T(TCHAR_STR_PARAM), TranslateT("Protocol"), acc->szProtoName);

+				mir_sntprintf(text, size, _T("%s: %S"), TranslateT("Protocol"), acc->szProtoName);

 				length = lstrlen(text);

 				DrawText(lps->hDC, text, -1, &lps->rcItem, DT_LEFT|DT_NOPREFIX|DT_SINGLELINE|DT_END_ELLIPSIS);

 				GetTextExtentPoint32(lps->hDC, text, length, &sz);

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