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, 55 insertions, 55 deletions

diff --git a/protocols/Tlen/src/tlen_advsearch.cpp b/protocols/Tlen/src/tlen_advsearch.cpp
index ad3bcc323e..b140736096 100644
--- a/protocols/Tlen/src/tlen_advsearch.cpp
+++ b/protocols/Tlen/src/tlen_advsearch.cpp
@@ -28,7 +28,7 @@ static void InitComboBox(HWND hwndCombo, TLEN_FIELD_MAP *fieldMap)
 {

 	int i, n;

 

-	n = SendMessage(hwndCombo, CB_ADDSTRING, 0, (LPARAM)_T(""));

+	n = SendMessage(hwndCombo, CB_ADDSTRING, 0, (LPARAM)L"");

 	SendMessage(hwndCombo, CB_SETITEMDATA, n, 0);

 	SendMessage(hwndCombo, CB_SETCURSEL, n, 0);

 	for (i=0;;i++) {

diff --git a/protocols/Tlen/src/tlen_avatar.cpp b/protocols/Tlen/src/tlen_avatar.cpp
index 15c352612f..19466f5c10 100644
--- a/protocols/Tlen/src/tlen_avatar.cpp
+++ b/protocols/Tlen/src/tlen_avatar.cpp
@@ -37,9 +37,9 @@ void TlenGetAvatarFileName(TlenProtocol *proto, TLEN_LIST_ITEM *item, TCHAR* pts
 	if (_taccess(ptszDest, 0)) {
 		int ret = CreateDirectoryTreeT(ptszDest);
 		if (ret == 0)
-			proto->debugLog(_T("getAvatarFilename(): Created new directory for avatar cache: %s."), ptszDest);
+			proto->debugLog(L"getAvatarFilename(): Created new directory for avatar cache: %s.", ptszDest);
 		else {
-			proto->debugLog(_T("getAvatarFilename(): Can not create directory for avatar cache: %s. errno=%d: %s"), ptszDest, errno, strerror(errno));
+			proto->debugLog(L"getAvatarFilename(): Can not create directory for avatar cache: %s. errno=%d: %s", ptszDest, errno, strerror(errno));
 			TCHAR buffer[512];
 			mir_sntprintf(buffer, TranslateT("Cannot create avatars cache directory. ERROR: %d: %s\n%s"), errno, _tcserror(errno), ptszDest);
 			PUShowMessageT(buffer, SM_WARNING);
diff --git a/protocols/Tlen/src/tlen_opt.cpp b/protocols/Tlen/src/tlen_opt.cpp
index fe413beb9b..e3058a8526 100644
--- a/protocols/Tlen/src/tlen_opt.cpp
+++ b/protocols/Tlen/src/tlen_opt.cpp
@@ -416,7 +416,7 @@ static INT_PTR CALLBACK TlenAdvOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam,
 				SetDlgItemText(hwndDlg, IDC_EDIT_LOGIN_SERVER, dbv.ptszVal);
 				db_free(&dbv);
 			}
-			else SetDlgItemText(hwndDlg, IDC_EDIT_LOGIN_SERVER, _T("tlen.pl"));
+			else SetDlgItemText(hwndDlg, IDC_EDIT_LOGIN_SERVER, L"tlen.pl");
 
 			EnableWindow(GetDlgItem(hwndDlg, IDC_HOST), TRUE);
 			EnableWindow(GetDlgItem(hwndDlg, IDC_HOSTPORT), TRUE);
@@ -425,7 +425,7 @@ static INT_PTR CALLBACK TlenAdvOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam,
 				SetDlgItemText(hwndDlg, IDC_HOST, dbv.ptszVal);
 				db_free(&dbv);
 			}
-			else SetDlgItemText(hwndDlg, IDC_HOST, _T("s1.tlen.pl"));
+			else SetDlgItemText(hwndDlg, IDC_HOST, L"s1.tlen.pl");
 
 			SetDlgItemInt(hwndDlg, IDC_HOSTPORT, db_get_w(NULL, proto->m_szModuleName, "ManualPort", TLEN_DEFAULT_PORT), FALSE);
 
@@ -458,8 +458,8 @@ static INT_PTR CALLBACK TlenAdvOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam,
 			EnableWindow(GetDlgItem(hwndDlg, IDC_FILE_PROXY_PASSWORD), bChecked);
 
 			SendDlgItemMessage(hwndDlg, IDC_FILE_PROXY_TYPE, CB_ADDSTRING, 0, (LPARAM)TranslateT("Forwarding"));
-			SendDlgItemMessage(hwndDlg, IDC_FILE_PROXY_TYPE, CB_ADDSTRING, 0, (LPARAM)_T("SOCKS4"));
-			SendDlgItemMessage(hwndDlg, IDC_FILE_PROXY_TYPE, CB_ADDSTRING, 0, (LPARAM)_T("SOCKS5"));
+			SendDlgItemMessage(hwndDlg, IDC_FILE_PROXY_TYPE, CB_ADDSTRING, 0, (LPARAM)L"SOCKS4");
+			SendDlgItemMessage(hwndDlg, IDC_FILE_PROXY_TYPE, CB_ADDSTRING, 0, (LPARAM)L"SOCKS5");
 			SendDlgItemMessage(hwndDlg, IDC_FILE_PROXY_TYPE, CB_SETCURSEL, db_get_w(NULL, proto->m_szModuleName, "FileProxyType", 0), 0);
 			if (!db_get_ts(NULL, proto->m_szModuleName, "FileProxyHost", &dbv)) {
 				SetDlgItemText(hwndDlg, IDC_FILE_PROXY_HOST, dbv.ptszVal);
@@ -660,7 +660,7 @@ static INT_PTR CALLBACK TlenPopupsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam,
 					MailPopupPreview((DWORD) SendDlgItemMessage(hwndDlg,IDC_COLORBKG,CPM_GETCOLOUR,0,0),
 									(DWORD) SendDlgItemMessage(hwndDlg,IDC_COLORTXT,CPM_GETCOLOUR,0,0),
 									title,
-									_T("From: test@test.test\nSubject: test"),
+									L"From: test@test.test\nSubject: test",
 									delay);
 				}
 
diff --git a/protocols/Tlen/src/tlen_picture.cpp b/protocols/Tlen/src/tlen_picture.cpp
index 765792a643..a4d77111ca 100644
--- a/protocols/Tlen/src/tlen_picture.cpp
+++ b/protocols/Tlen/src/tlen_picture.cpp
@@ -263,7 +263,7 @@ BOOL SendPicture(TlenProtocol *proto, MCONTACT hContact) {
 		ofn.Flags = OFN_FILEMUSTEXIST;

 		if (GetOpenFileName(&ofn)) {

 			long size;

-			FILE* fp = _tfopen(tszFileName, _T("rb"));

+			FILE* fp = _tfopen(tszFileName, L"rb");

 			if (fp) {

 				fseek(fp, 0, SEEK_END);

 				size = ftell(fp);

diff --git a/protocols/Tlen/src/tlen_userinfo.cpp b/protocols/Tlen/src/tlen_userinfo.cpp
index fbe38e7a51..04ca98b5aa 100644
--- a/protocols/Tlen/src/tlen_userinfo.cpp
+++ b/protocols/Tlen/src/tlen_userinfo.cpp
@@ -32,46 +32,46 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "tlen_avatar.h"

 

 TLEN_FIELD_MAP tlenFieldGender[] = {

-	{ 1, _T("Male") },

-	{ 2, _T("Female") },

+	{ 1, L"Male" },

+	{ 2, L"Female" },

 	{ 0, NULL }

 };

 TLEN_FIELD_MAP tlenFieldLookfor[] = {

-	{ 1, _T("Somebody to talk") },

-	{ 2, _T("Friendship") },

-	{ 3, _T("Flirt/romance") },

-	{ 4, _T("Love") },

-	{ 5, _T("Nothing") },

+	{ 1, L"Somebody to talk" },

+	{ 2, L"Friendship" },

+	{ 3, L"Flirt/romance" },

+	{ 4, L"Love" },

+	{ 5, L"Nothing" },

 	{ 0, NULL }

 };

 TLEN_FIELD_MAP tlenFieldStatus[] = {

-	{ 1, _T("All") },

-	{ 2, _T("Available") },

-	{ 3, _T("Free for chat") },

+	{ 1, L"All" },

+	{ 2, L"Available" },

+	{ 3, L"Free for chat" },

 	{ 0, NULL }

 };

 TLEN_FIELD_MAP tlenFieldOccupation[] = {

-	{ 1, _T("Student") },

-	{ 2, _T("College student") },

-	{ 3, _T("Farmer") },

-	{ 4, _T("Manager") },

-	{ 5, _T("Specialist") },

-	{ 6, _T("Clerk") },

-	{ 7, _T("Unemployed") },

-	{ 8, _T("Pensioner") },

-	{ 9, _T("Housekeeper") },

-	{ 10, _T("Teacher") },

-	{ 11, _T("Doctor") },

-	{ 12, _T("Other") },

+	{ 1, L"Student" },

+	{ 2, L"College student" },

+	{ 3, L"Farmer" },

+	{ 4, L"Manager" },

+	{ 5, L"Specialist" },

+	{ 6, L"Clerk" },

+	{ 7, L"Unemployed" },

+	{ 8, L"Pensioner" },

+	{ 9, L"Housekeeper" },

+	{ 10, L"Teacher" },

+	{ 11, L"Doctor" },

+	{ 12, L"Other" },

 	{ 0, NULL }

 };

 TLEN_FIELD_MAP tlenFieldPlan[] = {

-	{ 1, _T("I'd like to go downtown") },

-	{ 2, _T("I'd like to go to the cinema") },

-	{ 3, _T("I'd like to take a walk") },

-	{ 4, _T("I'd like to go to the disco") },

-	{ 5, _T("I'd like to go on a blind date") },

-	{ 6, _T("Waiting for suggestion") },

+	{ 1, L"I'd like to go downtown" },

+	{ 2, L"I'd like to go to the cinema" },

+	{ 3, L"I'd like to take a walk" },

+	{ 4, L"I'd like to go to the disco" },

+	{ 5, L"I'd like to go on a blind date" },

+	{ 6, L"Waiting for suggestion" },

 	{ 0, NULL }

 };

 

@@ -81,7 +81,7 @@ static void InitComboBox(HWND hwndCombo, TLEN_FIELD_MAP *fieldMap)
 {

 	int i, n;

 

-	n = SendMessage(hwndCombo, CB_ADDSTRING, 0, (LPARAM)_T(""));

+	n = SendMessage(hwndCombo, CB_ADDSTRING, 0, (LPARAM)L"");

 	SendMessage(hwndCombo, CB_SETITEMDATA, n, 0);

 	SendMessage(hwndCombo, CB_SETCURSEL, n, 0);

 	for (i=0;;i++) {

@@ -180,38 +180,38 @@ static INT_PTR CALLBACK TlenUserInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wPara
 			int i;

 			TLEN_LIST_ITEM *item;

 

-			SetDlgItemText(hwndDlg, IDC_INFO_JID, _T(""));

-			SetDlgItemText(hwndDlg, IDC_SUBSCRIPTION, _T(""));

+			SetDlgItemText(hwndDlg, IDC_INFO_JID, L"");

+			SetDlgItemText(hwndDlg, IDC_SUBSCRIPTION, L"");

 			SetFocus(GetDlgItem(hwndDlg, IDC_STATIC));

 

 			if (!db_get_ts(data->hContact, data->proto->m_szModuleName, "FirstName", &dbv)) {

 				SetDlgItemText(hwndDlg, IDC_FIRSTNAME, dbv.ptszVal);

 				db_free(&dbv);

-			} else SetDlgItemText(hwndDlg, IDC_FIRSTNAME, _T(""));

+			} else SetDlgItemText(hwndDlg, IDC_FIRSTNAME, L"");

 			if (!db_get_ts(data->hContact, data->proto->m_szModuleName, "LastName", &dbv)) {

 				SetDlgItemText(hwndDlg, IDC_LASTNAME, dbv.ptszVal);

 				db_free(&dbv);

-			} else SetDlgItemText(hwndDlg, IDC_LASTNAME, _T(""));

+			} else SetDlgItemText(hwndDlg, IDC_LASTNAME, L"");

 			if (!db_get_ts(data->hContact, data->proto->m_szModuleName, "Nick", &dbv)) {

 				SetDlgItemText(hwndDlg, IDC_NICKNAME, dbv.ptszVal);

 				db_free(&dbv);

-			} else SetDlgItemText(hwndDlg, IDC_NICKNAME, _T(""));

+			} else SetDlgItemText(hwndDlg, IDC_NICKNAME, L"");

 			if (!db_get_ts(data->hContact, data->proto->m_szModuleName, "e-mail", &dbv)) {

 				SetDlgItemText(hwndDlg, IDC_EMAIL, dbv.ptszVal);

 				db_free(&dbv);

-			} else SetDlgItemText(hwndDlg, IDC_EMAIL, _T(""));

+			} else SetDlgItemText(hwndDlg, IDC_EMAIL, L"");

 			if (!db_get(data->hContact, data->proto->m_szModuleName, "Age", &dbv)) {

 				SetDlgItemInt(hwndDlg, IDC_AGE, dbv.wVal, FALSE);

 				db_free(&dbv);

-			} else SetDlgItemText(hwndDlg, IDC_AGE, _T(""));

+			} else SetDlgItemText(hwndDlg, IDC_AGE, L"");

 			if (!db_get_ts(data->hContact, data->proto->m_szModuleName, "City", &dbv)) {

 				SetDlgItemText(hwndDlg, IDC_CITY, dbv.ptszVal);

 				db_free(&dbv);

-			} else SetDlgItemText(hwndDlg, IDC_CITY, _T(""));

+			} else SetDlgItemText(hwndDlg, IDC_CITY, L"");

 			if (!db_get_ts(data->hContact, data->proto->m_szModuleName, "School", &dbv)) {

 				SetDlgItemText(hwndDlg, IDC_SCHOOL, dbv.ptszVal);

 				db_free(&dbv);

-			} else SetDlgItemText(hwndDlg, IDC_SCHOOL, _T(""));

+			} else SetDlgItemText(hwndDlg, IDC_SCHOOL, L"");

 			switch (db_get_b(data->hContact, data->proto->m_szModuleName, "Gender", '?')) {

 				case 'M':

 					SendDlgItemMessage(hwndDlg, IDC_GENDER, CB_SETCURSEL, 1, 0);

@@ -223,7 +223,7 @@ static INT_PTR CALLBACK TlenUserInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wPara
 					break;

 				default:

 					SendDlgItemMessage(hwndDlg, IDC_GENDER, CB_SETCURSEL, 0, 0);

-					SetDlgItemText(hwndDlg, IDC_GENDER_TEXT, _T(""));

+					SetDlgItemText(hwndDlg, IDC_GENDER_TEXT, L"");

 					break;

 			}

 			i = db_get_w(data->hContact, data->proto->m_szModuleName, "Occupation", 0);

@@ -231,7 +231,7 @@ static INT_PTR CALLBACK TlenUserInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wPara
 				SetDlgItemText(hwndDlg, IDC_OCCUPATION_TEXT, TranslateTS(tlenFieldOccupation[i-1].name));

 				SendDlgItemMessage(hwndDlg, IDC_OCCUPATION, CB_SETCURSEL, i, 0);

 			} else {

-				SetDlgItemText(hwndDlg, IDC_OCCUPATION_TEXT, _T(""));

+				SetDlgItemText(hwndDlg, IDC_OCCUPATION_TEXT, L"");

 				SendDlgItemMessage(hwndDlg, IDC_OCCUPATION, CB_SETCURSEL, 0, 0);

 			}

 			i = db_get_w(data->hContact, data->proto->m_szModuleName, "LookingFor", 0);

@@ -239,7 +239,7 @@ static INT_PTR CALLBACK TlenUserInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wPara
 				SetDlgItemText(hwndDlg, IDC_LOOKFOR_TEXT, TranslateTS(tlenFieldLookfor[i-1].name));

 				SendDlgItemMessage(hwndDlg, IDC_LOOKFOR, CB_SETCURSEL, i, 0);

 			} else {

-				SetDlgItemText(hwndDlg, IDC_LOOKFOR_TEXT, _T(""));

+				SetDlgItemText(hwndDlg, IDC_LOOKFOR_TEXT, L"");

 				SendDlgItemMessage(hwndDlg, IDC_LOOKFOR, CB_SETCURSEL, 0, 0);

 			}

 			i = db_get_w(data->hContact, data->proto->m_szModuleName, "VoiceChat", 0);

diff --git a/protocols/Tlen/src/tlen_voice.cpp b/protocols/Tlen/src/tlen_voice.cpp
index 5548662415..0002d8c9c4 100644
--- a/protocols/Tlen/src/tlen_voice.cpp
+++ b/protocols/Tlen/src/tlen_voice.cpp
@@ -722,7 +722,7 @@ static HBITMAP TlenVoiceMakeBitmap(int w, int h, int bpp, void *ptr)
 	bmih.bmiHeader.biYPelsPerMeter = 0;

 	bmih.bmiHeader.biClrUsed = 0;

 	bmih.bmiHeader.biClrImportant = 0;

-	HDC hdc = CreateDC(_T("DISPLAY"), NULL, NULL, NULL);

+	HDC hdc = CreateDC(L"DISPLAY", NULL, NULL, NULL);

 	HBITMAP hbm = CreateDIBitmap(hdc, (PBITMAPINFOHEADER)&bmih, CBM_INIT, ptr, &bmih, DIB_RGB_COLORS);

 	ReleaseDC(NULL, hdc);

 	return hbm;

@@ -779,10 +779,10 @@ static INT_PTR CALLBACK TlenVoiceDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam,
 		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)proto);

 		proto->voiceDlgHWND = hwndDlg;

 		TranslateDialogDefault(hwndDlg);

-		SendDlgItemMessage(hwndDlg, IDC_VCQUALITY, CB_ADDSTRING, 0, (LPARAM)_T("8000 Hz / 13.8 kbps"));

-		SendDlgItemMessage(hwndDlg, IDC_VCQUALITY, CB_ADDSTRING, 0, (LPARAM)_T("11025 Hz / 19.1 kbps"));

-		SendDlgItemMessage(hwndDlg, IDC_VCQUALITY, CB_ADDSTRING, 0, (LPARAM)_T("22050 Hz / 36.8 kbps"));

-		SendDlgItemMessage(hwndDlg, IDC_VCQUALITY, CB_ADDSTRING, 0, (LPARAM)_T("44100 Hz / 72 kbps"));

+		SendDlgItemMessage(hwndDlg, IDC_VCQUALITY, CB_ADDSTRING, 0, (LPARAM)L"8000 Hz / 13.8 kbps");

+		SendDlgItemMessage(hwndDlg, IDC_VCQUALITY, CB_ADDSTRING, 0, (LPARAM)L"11025 Hz / 19.1 kbps");

+		SendDlgItemMessage(hwndDlg, IDC_VCQUALITY, CB_ADDSTRING, 0, (LPARAM)L"22050 Hz / 36.8 kbps");

+		SendDlgItemMessage(hwndDlg, IDC_VCQUALITY, CB_ADDSTRING, 0, (LPARAM)L"44100 Hz / 72 kbps");

 		SendDlgItemMessage(hwndDlg, IDC_VCQUALITY, CB_SETCURSEL, 1, 0);

 		SendDlgItemMessage(hwndDlg, IDC_MICROPHONE, BUTTONSETASFLATBTN, TRUE, 0);

 		SendDlgItemMessage(hwndDlg, IDC_SPEAKER, BUTTONSETASFLATBTN, TRUE, 0);