rest of TCHAR_STR_PARAM replaced

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

4 files changed, 8 insertions, 8 deletions

diff --git a/protocols/IRCG/src/irclib.cpp b/protocols/IRCG/src/irclib.cpp
index 217861ba90..1f13b5159f 100644
--- a/protocols/IRCG/src/irclib.cpp
+++ b/protocols/IRCG/src/irclib.cpp
@@ -197,7 +197,7 @@ bool CIrcProto::Connect(const CIrcSessionInfo& info)
 	con = (HANDLE) CallService( MS_NETLIB_OPENCONNECTION, (WPARAM) hNetlib, (LPARAM) & ncon);

 	if (con == NULL) {

 		TCHAR szTemp[300];

-		mir_sntprintf(szTemp, SIZEOF(szTemp), _T("\0035%s \002%s\002 (") _T(TCHAR_STR_PARAM) _T(": %u)."),

+		mir_sntprintf(szTemp, SIZEOF(szTemp), _T("\0035%s \002%s\002 (%S: %u)."),

 			TranslateT("Failed to connect to"), si.sNetwork.c_str(), si.sServer.c_str(), si.iPort);

 		DoEvent(GC_EVENT_INFORMATION, SERVERWINDOW, NULL, szTemp, NULL, NULL, NULL, true, false);

 		return false;

@@ -1471,7 +1471,7 @@ LBL_Parse:
 			{

 				if (PeerPortNrRcvd == g_Instances[i]->m_info.iPort && LocalPortNrRcvd == g_Instances[i]->m_myLocalPort) 

 				{

-					cbLen = mir_snprintf(buf, SIZEOF(buf), "%s : USERID : " TCHAR_STR_PARAM " : " TCHAR_STR_PARAM "\r\n", 

+					cbLen = mir_snprintf(buf, SIZEOF(buf), "%s : USERID : %S : %S\r\n", 

 						szBuf, g_Instances[i]->m_info.sIdentServerType.c_str() , g_Instances[i]->m_info.sUserID.c_str());

 					break;

 				}

diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp
index 0f8aa6e1bb..42aeddb16e 100644
--- a/protocols/IRCG/src/ircproto.cpp
+++ b/protocols/IRCG/src/ircproto.cpp
@@ -268,7 +268,7 @@ int CIrcProto::OnModulesLoaded( WPARAM, LPARAM )
 	}

 

 	TCHAR szTemp[MAX_PATH];

-	mir_sntprintf(szTemp, SIZEOF(szTemp), _T("%%miranda_path%%\\Plugins\\") _T(TCHAR_STR_PARAM) _T("_perform.ini"), m_szModuleName);

+	mir_sntprintf(szTemp, SIZEOF(szTemp), _T("%%miranda_path%%\\Plugins\\%S_perform.ini"), m_szModuleName);

 	TCHAR *szLoadFileName = Utils_ReplaceVarsT( szTemp );

 	char* pszPerformData = IrcLoadFile( szLoadFileName );

 	if ( pszPerformData != NULL ) {

@@ -782,7 +782,7 @@ HANDLE __cdecl CIrcProto::SendFile( HANDLE hContact, const TCHAR*, TCHAR** ppszF
 			index++;

 			while( ppszFiles[index] ) {

 				if ( _taccess(ppszFiles[index], 0) == 0 ) {

-					PostIrcMessage( _T("/DCC SEND %s ") _T(TCHAR_STR_PARAM), dci->sContactName.c_str(), ppszFiles[index]);

+					PostIrcMessage( _T("/DCC SEND %s %S"), dci->sContactName.c_str(), ppszFiles[index]);

 				}

 				index++;

 			}

diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp
index a01e34822b..db56f9aded 100644
--- a/protocols/IRCG/src/options.cpp
+++ b/protocols/IRCG/src/options.cpp
@@ -1362,7 +1362,7 @@ static LRESULT CALLBACK ListviewSubclassProc(HWND hwnd, UINT msg, WPARAM wParam,
 void CIrcProto::InitIgnore( void )

 {

 	TCHAR szTemp[ MAX_PATH ];

-	mir_sntprintf(szTemp, SIZEOF(szTemp), _T("%%miranda_path%%\\Plugins\\") _T(TCHAR_STR_PARAM) _T("_ignore.ini"), m_szModuleName);

+	mir_sntprintf(szTemp, SIZEOF(szTemp), _T("%%miranda_path%%\\Plugins\\%S_ignore.ini"), m_szModuleName);

 	TCHAR *szLoadFileName = Utils_ReplaceVarsT( szTemp );

 	char* pszIgnoreData = IrcLoadFile(szLoadFileName);

 	if ( pszIgnoreData != NULL ) {

diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp
index e1987e9e0f..d0e6814dd8 100644
--- a/protocols/IRCG/src/services.cpp
+++ b/protocols/IRCG/src/services.cpp
@@ -353,7 +353,7 @@ INT_PTR __cdecl CIrcProto::OnMenuIgnore(WPARAM wp, LPARAM)
 					S = "+qnidcm";

 				else

 					S = "+qnidc";

-				PostIrcMessage( _T("/IGNORE %%question=\"%s\",\"%s\",\"*!*@") _T(TCHAR_STR_PARAM) _T("\" %s"),

+				PostIrcMessage( _T("/IGNORE %%question=\"%s\",\"%s\",\"*!*@%S\" %s"),

 					TranslateT("Please enter the hostmask (nick!user@host) \nNOTE! Contacts on your contact list are never ignored"),

 					TranslateT("Ignore"), host, S.c_str());

 				DBFreeVariant(&dbv1);

@@ -1170,7 +1170,7 @@ void CIrcProto::ConnectToServer(void)
 		InterlockedIncrement((long *) &m_bConnectRequested);

 

 	TCHAR szTemp[300];

-	mir_sntprintf(szTemp, SIZEOF(szTemp), _T("\0033%s \002%s\002 (") _T(TCHAR_STR_PARAM) _T(": %u)"),

+	mir_sntprintf(szTemp, SIZEOF(szTemp), _T("\0033%s \002%s\002 (%S: %u)"),

 		TranslateT("Connecting to"), si.sNetwork.c_str(), si.sServer.c_str(), si.iPort);

 	DoEvent(GC_EVENT_INFORMATION, SERVERWINDOW, NULL, szTemp, NULL, NULL, NULL, true, false);

 }

@@ -1222,7 +1222,7 @@ VOID CALLBACK RetryTimerProc( HWND, UINT, UINT_PTR idEvent, DWORD )
 		ppro->si.iPort = ppro->m_portCount;

 

 		TCHAR szTemp[300];

-		mir_sntprintf(szTemp, SIZEOF(szTemp), _T("\0033%s \002%s\002 (") _T(TCHAR_STR_PARAM) _T(": %u, try %u)"),

+		mir_sntprintf(szTemp, SIZEOF(szTemp), _T("\0033%s \002%s\002 (%S: %u, try %u)"),

 			TranslateT("Reconnecting to"), ppro->si.sNetwork.c_str(), ppro->si.sServer.c_str(), ppro->si.iPort, ppro->m_iRetryCount);

 

 		ppro->DoEvent(GC_EVENT_INFORMATION, SERVERWINDOW, NULL, szTemp, NULL, NULL, NULL, true, false);