hello, Unix.

phase 1: removing _T()

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

6 files changed, 15 insertions, 15 deletions

diff --git a/protocols/IcqOscarJ/src/editlist.cpp b/protocols/IcqOscarJ/src/editlist.cpp
index dfaebb4c85..df0840385a 100644
--- a/protocols/IcqOscarJ/src/editlist.cpp
+++ b/protocols/IcqOscarJ/src/editlist.cpp
@@ -79,7 +79,7 @@ void ChangeInfoData::BeginListEdit(int iItem, RECT *rc, int iSetting, WORD wVKey
 	UpdateWindow(hwndList);

 

 	dataListEdit = this;

-	hwndListEdit = CreateWindowEx(WS_EX_TOOLWINDOW | WS_EX_TOPMOST, _T("LISTBOX"), _T(""), WS_POPUP | WS_BORDER | WS_VSCROLL,

+	hwndListEdit = CreateWindowEx(WS_EX_TOOLWINDOW | WS_EX_TOPMOST, L"LISTBOX", L"", WS_POPUP | WS_BORDER | WS_VSCROLL,

 											rc->left, rc->bottom, rc->right - rc->left, 150, NULL, NULL, hInst, NULL);

 	SendMessage(hwndListEdit, WM_SETFONT, (WPARAM)hListFont, 0);

 	int itemHeight = SendMessage(hwndListEdit, LB_GETITEMHEIGHT, 0, 0);

diff --git a/protocols/IcqOscarJ/src/editstring.cpp b/protocols/IcqOscarJ/src/editstring.cpp
index 1cd3a2f805..94b41836ee 100644
--- a/protocols/IcqOscarJ/src/editstring.cpp
+++ b/protocols/IcqOscarJ/src/editstring.cpp
@@ -257,7 +257,7 @@ void ChangeInfoData::BeginStringEdit(int iItem, RECT *rc, int i, WORD wVKey)
 	}

 

 	dataStringEdit = this;

-	hwndEdit = CreateWindow(_T("EDIT"), _T(""), WS_VISIBLE | WS_CHILD | ES_AUTOHSCROLL | ((si.displayType&LIM_TYPE) == LI_NUMBER ? ES_NUMBER : 0) | (si.displayType&LIF_PASSWORD ? ES_PASSWORD : 0), rc->left, rc->top, rc->right - rc->left, rc->bottom - rc->top, hwndList, NULL, hInst, NULL);

+	hwndEdit = CreateWindow(L"EDIT", L"", WS_VISIBLE | WS_CHILD | ES_AUTOHSCROLL | ((si.displayType&LIM_TYPE) == LI_NUMBER ? ES_NUMBER : 0) | (si.displayType&LIF_PASSWORD ? ES_PASSWORD : 0), rc->left, rc->top, rc->right - rc->left, rc->bottom - rc->top, hwndList, NULL, hInst, NULL);

 	SetWindowTextUtf(hwndEdit, szValue);

 	if (alloced) SAFE_FREE(&szValue);

 	mir_subclassWindow(hwndEdit, StringEditSubclassProc);

@@ -265,7 +265,7 @@ void ChangeInfoData::BeginStringEdit(int iItem, RECT *rc, int i, WORD wVKey)
 	if ((si.displayType & LIM_TYPE) == LI_NUMBER) {

 		int *range = (int*)si.pList;

 		RECT rcUpDown;

-		hwndUpDown = CreateWindow(UPDOWN_CLASS, _T(""), WS_VISIBLE | WS_CHILD | UDS_AUTOBUDDY | UDS_ALIGNRIGHT | UDS_HOTTRACK | UDS_NOTHOUSANDS | UDS_SETBUDDYINT, 0, 0, 0, 0, hwndList, NULL, hInst, NULL);

+		hwndUpDown = CreateWindow(UPDOWN_CLASS, L"", WS_VISIBLE | WS_CHILD | UDS_AUTOBUDDY | UDS_ALIGNRIGHT | UDS_HOTTRACK | UDS_NOTHOUSANDS | UDS_SETBUDDYINT, 0, 0, 0, 0, hwndList, NULL, hInst, NULL);

 		SendMessage(hwndUpDown, UDM_SETRANGE32, range[0], range[1]);

 		SendMessage(hwndUpDown, UDM_SETPOS32, 0, sid.value);

 		if (!(si.displayType & LIF_ZEROISVALID) && sid.value == 0)

diff --git a/protocols/IcqOscarJ/src/fam_04message.cpp b/protocols/IcqOscarJ/src/fam_04message.cpp
index f0f32a831b..da09e845dd 100644
--- a/protocols/IcqOscarJ/src/fam_04message.cpp
+++ b/protocols/IcqOscarJ/src/fam_04message.cpp
@@ -948,7 +948,7 @@ void CIcqProto::handleRecvServMsgContacts(BYTE *buf, size_t wLen, DWORD dwUin, c
 						contacts[iContact] = (ICQSEARCHRESULT*)SAFE_MALLOC(sizeof(ICQSEARCHRESULT));

 						contacts[iContact]->hdr.cbSize = sizeof(ICQSEARCHRESULT);

 						contacts[iContact]->hdr.flags = PSR_TCHAR;

-						contacts[iContact]->hdr.nick.t = null_strdup(_T(""));

+						contacts[iContact]->hdr.nick.t = null_strdup(L"");

 						contacts[iContact]->hdr.id.t = ansi_to_tchar(szUid);

 

 						if (IsStringUIN(szUid)) { // icq contact

diff --git a/protocols/IcqOscarJ/src/icq_avatar.cpp b/protocols/IcqOscarJ/src/icq_avatar.cpp
index c1d1b30564..130f8796c7 100644
--- a/protocols/IcqOscarJ/src/icq_avatar.cpp
+++ b/protocols/IcqOscarJ/src/icq_avatar.cpp
@@ -76,7 +76,7 @@ void CIcqProto::GetFullAvatarFileName(int dwUin, const char *szUid, int dwFormat
 void CIcqProto::GetAvatarFileName(int dwUin, const char *szUid, TCHAR *pszDest, size_t cbLen)

 {

 	TCHAR szPath[MAX_PATH * 2];

-	mir_sntprintf(szPath, _T("%s\\%S\\"), VARST(_T("%miranda_avatarcache%")), m_szModuleName);

+	mir_sntprintf(szPath, L"%s\\%S\\", VARST(L"%miranda_avatarcache%"), m_szModuleName);

 

 	FOLDERSGETDATA fgd = { sizeof(fgd) };

 	fgd.nMaxPathSize = _countof(szPath);

@@ -100,14 +100,14 @@ void CIcqProto::GetAvatarFileName(int dwUin, const char *szUid, TCHAR *pszDest,
 	else {

 		TCHAR szBuf[MAX_PATH];

 		if (CallService(MS_DB_GETPROFILENAMET, MAX_PATH, (LPARAM)szBuf))

-			mir_tstrcpy(pszDest + tPathLen, _T("avatar"));

+			mir_tstrcpy(pszDest + tPathLen, L"avatar");

 		else {

 			TCHAR *szLastDot = _tcsrchr(szBuf, '.');

 			if (szLastDot)

 				szLastDot[0] = '\0';

 

 			mir_tstrcpy(pszDest + tPathLen, szBuf);

-			mir_tstrcat(pszDest + tPathLen, _T("_avt"));

+			mir_tstrcat(pszDest + tPathLen, L"_avt");

 		}

 	}

 }

@@ -115,7 +115,7 @@ void CIcqProto::GetAvatarFileName(int dwUin, const char *szUid, TCHAR *pszDest,
 void AddAvatarExt(int dwFormat, TCHAR *pszDest)

 {

 	const TCHAR *ext = ProtoGetAvatarExtension(dwFormat);

-	mir_tstrcat(pszDest, (*ext == 0) ? _T(".dat") : ext);

+	mir_tstrcat(pszDest, (*ext == 0) ? L".dat" : ext);

 }

 

 #define MD5_BLOCK_SIZE 1024*1024 /* use 1MB blocks */

@@ -1212,7 +1212,7 @@ void avatars_server_connection::handleAvatarFam(BYTE *pBuffer, size_t wBufferLen
 					const TCHAR *ptszExt;

 					int dwPaFormat = ProtoGetBufferFormat(pBuffer, &ptszExt);

 					TCHAR tszImageFile[MAX_PATH];

-					mir_sntprintf(tszImageFile, _T("%s%s"), pCookieData->szFile, ptszExt);

+					mir_sntprintf(tszImageFile, L"%s%s", pCookieData->szFile, ptszExt);

 

 					ppro->setByte(pCookieData->hContact, "AvatarType", (BYTE)dwPaFormat);

 					ai.format = dwPaFormat; // set the format

diff --git a/protocols/IcqOscarJ/src/icq_proto.cpp b/protocols/IcqOscarJ/src/icq_proto.cpp
index 12c8b99307..12694a3763 100644
--- a/protocols/IcqOscarJ/src/icq_proto.cpp
+++ b/protocols/IcqOscarJ/src/icq_proto.cpp
@@ -386,7 +386,7 @@ int CIcqProto::Authorize(MEVENT hDbEvent)
 		if (getContactUid(hContact, &uin, &uid))

 			return 1;

 

-		icq_sendAuthResponseServ(uin, uid, 1, _T(""));

+		icq_sendAuthResponseServ(uin, uid, 1, L"");

 

 		delSetting(hContact, "Grant");

 

diff --git a/protocols/IcqOscarJ/src/icq_xstatus.cpp b/protocols/IcqOscarJ/src/icq_xstatus.cpp
index 9a21a65877..3168d290ec 100644
--- a/protocols/IcqOscarJ/src/icq_xstatus.cpp
+++ b/protocols/IcqOscarJ/src/icq_xstatus.cpp
@@ -126,14 +126,14 @@ static HANDLE LoadXStatusIconLibrary(TCHAR *path, const TCHAR *sub)
 	HANDLE hLib;

 

 	mir_tstrcpy(p, sub);

-	mir_tstrcat(p, _T("\\xstatus_ICQ.dll"));

+	mir_tstrcat(p, L"\\xstatus_ICQ.dll");

 	if (hLib = LoadLibrary(path))

 		return hLib;

 	mir_tstrcpy(p, sub);

-	mir_tstrcat(p, _T("\\xstatus_icons.dll"));

+	mir_tstrcat(p, L"\\xstatus_icons.dll");

 	if (hLib = LoadLibrary(path))

 		return hLib;

-	mir_tstrcpy(p, _T("\\"));

+	mir_tstrcpy(p, L"\\");

 	return hLib;

 }

 

@@ -145,9 +145,9 @@ static TCHAR* InitXStatusIconLibrary(TCHAR *buf, size_t buf_size)
 	// get miranda's exe path

 	GetModuleFileName(NULL, path, MAX_PATH);

 

-	hXStatusIconsDLL = (HMODULE)LoadXStatusIconLibrary(path, _T("\\Icons"));

+	hXStatusIconsDLL = (HMODULE)LoadXStatusIconLibrary(path, L"\\Icons");

 	if (!hXStatusIconsDLL) // TODO: add "Custom Folders" support

-		hXStatusIconsDLL = (HMODULE)LoadXStatusIconLibrary(path, _T("\\Plugins"));

+		hXStatusIconsDLL = (HMODULE)LoadXStatusIconLibrary(path, L"\\Plugins");

 

 	if (hXStatusIconsDLL) {

 		null_strcpy(buf, path, buf_size - 1);