hello, Unix.

phase 1: removing _T()

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

2 files changed, 17 insertions, 17 deletions

diff --git a/plugins/MyDetails/src/data.cpp b/plugins/MyDetails/src/data.cpp
index 39132d8121..838c398f46 100644
--- a/plugins/MyDetails/src/data.cpp
+++ b/plugins/MyDetails/src/data.cpp
@@ -134,7 +134,7 @@ int Protocol::GetStatus()
 	else {

 		TCHAR *p = (tszXStatusName[0] != 0) ? TranslateTS(tszXStatusName) : TranslateT("<no status name>");

 		if (tszXStatusMessage[0])

-			mir_sntprintf(status_name, _T("%s: %s"), p, tszXStatusMessage);

+			mir_sntprintf(status_name, L"%s: %s", p, tszXStatusMessage);

 		else

 			lcopystr(status_name, p, _countof(status_name));

 	}

@@ -212,14 +212,14 @@ bool Protocol::CanSetStatusMsg(int aStatus)
 void Protocol::GetStatusMsg(int aStatus, TCHAR *msg, size_t msg_size)

 {

 	if (!CanGetStatusMsg())

-		lcopystr(msg, _T(""), msg_size);

+		lcopystr(msg, L"", msg_size);

 	else if (aStatus == status && ProtoServiceExists(name, PS_GETMYAWAYMSG)) {

 		ptrT tmp((TCHAR *)CallProtoService(name, PS_GETMYAWAYMSG, 0, SGMA_TCHAR));

-		lcopystr(msg, tmp == NULL ? _T("") : tmp, msg_size);

+		lcopystr(msg, tmp == NULL ? L"" : tmp, msg_size);

 	}

 	else if (ServiceExists(MS_AWAYMSG_GETSTATUSMSGT)) {

 		ptrT tmp((TCHAR *)CallService(MS_AWAYMSG_GETSTATUSMSGT, (WPARAM)aStatus, (LPARAM)name));

-		lcopystr(msg, tmp == NULL ? _T("") : tmp, msg_size);

+		lcopystr(msg, tmp == NULL ? L"" : tmp, msg_size);

 	}

 }

 

@@ -287,7 +287,7 @@ int Protocol::GetNickMaxLength()
 TCHAR* Protocol::GetNick()

 {

 	ptrT nick(Contact_GetInfo(CNF_DISPLAY, NULL, name));

-	lcopystr(nickname, (nick != NULL) ? nick : _T(""), _countof(nickname));

+	lcopystr(nickname, (nick != NULL) ? nick : L"", _countof(nickname));

 	return nickname;

 }

 

@@ -338,13 +338,13 @@ bool Protocol::ListeningToEnabled()
 TCHAR *Protocol::GetListeningTo()

 {

 	if (!CanGetListeningTo()) {

-		lcopystr(listening_to, _T(""), _countof(listening_to));

+		lcopystr(listening_to, L"", _countof(listening_to));

 		return listening_to;

 	}

 

 	DBVARIANT dbv = { 0 };

 	if (db_get_ts(NULL, name, "ListeningTo", &dbv)) {

-		lcopystr(listening_to, _T(""), _countof(listening_to));

+		lcopystr(listening_to, L"", _countof(listening_to));

 		return listening_to;

 	}

 

diff --git a/plugins/MyDetails/src/frame.cpp b/plugins/MyDetails/src/frame.cpp
index ee63734e94..e5a19095d5 100644
--- a/plugins/MyDetails/src/frame.cpp
+++ b/plugins/MyDetails/src/frame.cpp
@@ -22,8 +22,8 @@ Boston, MA 02111-1307, USA.
 // Prototypes /////////////////////////////////////////////////////////////////////////////////////

 

 #define WINDOW_NAME_PREFIX		"mydetails_window"

-#define WINDOW_CLASS_NAME		_T("MyDetailsFrame")

-#define CONTAINER_CLASS_NAME	_T("MyDetailsFrameContainer")

+#define WINDOW_CLASS_NAME		L"MyDetailsFrame"

+#define CONTAINER_CLASS_NAME	L"MyDetailsFrameContainer"

 

 #define ID_FRAME_TIMER			1011

 #define ID_RECALC_TIMER			1012

@@ -33,9 +33,9 @@ Boston, MA 02111-1307, USA.
 

 #define IDC_HAND				MAKEINTRESOURCE(32649)

 

-#define DEFAULT_NICKNAME		_T("<no nickname>")

-#define DEFAULT_STATUS_MESSAGE	_T("<no status message>")

-#define DEFAULT_LISTENING_TO	_T("<nothing playing>")

+#define DEFAULT_NICKNAME		L"<no nickname>"

+#define DEFAULT_STATUS_MESSAGE	L"<no status message>"

+#define DEFAULT_LISTENING_TO	L"<nothing playing>"

 

 

 // Messages

@@ -246,7 +246,7 @@ int CreateFrame()
 		font_id[i].deffontsettings.size = -MulDiv(font_sizes[i], GetDeviceCaps(hdc, LOGPIXELSY), 72);

 		font_id[i].deffontsettings.style = font_styles[i];

 		font_id[i].deffontsettings.charset = DEFAULT_CHARSET;

-		mir_tstrncpy(font_id[i].deffontsettings.szFace, _T("Tahoma"), _countof(font_id[i].deffontsettings.szFace));

+		mir_tstrncpy(font_id[i].deffontsettings.szFace, L"Tahoma", _countof(font_id[i].deffontsettings.szFace));

 		font_id[i].order = i;

 		font_id[i].flags = FIDF_DEFAULTVALID;

 		FontRegisterT(&font_id[i]);

@@ -444,7 +444,7 @@ RECT GetRect(HDC hdc, RECT rc, SIZE s, UINT uFormat, int next_top, int text_left
 		uFormat &= ~DT_END_ELLIPSIS;

 

 		RECT rc_tmp = rc;

-		DrawText(hdc, _T(" ..."), 4, &rc_tmp, DT_CALCRECT | uFormat);

+		DrawText(hdc, L" ...", 4, &rc_tmp, DT_CALCRECT | uFormat);

 

 		s.cx += rc_tmp.right - rc_tmp.left;

 	}

@@ -747,7 +747,7 @@ void CalcRectangles(HWND hwnd)
 		if (opts.show_protocol_cycle_button)

 			tmp_r.right -= 2 * ICON_SIZE;

 

-		data->proto_rect = GetRect(hdc, tmp_r, proto->description, _T(""), proto, uFormat, next_top, tmp_text_left, false, true, false);

+		data->proto_rect = GetRect(hdc, tmp_r, proto->description, L"", proto, uFormat, next_top, tmp_text_left, false, true, false);

 

 		if (opts.show_protocol_cycle_button) {

 			data->draw_proto_cycle = true;

@@ -1055,7 +1055,7 @@ void DrawTextWithRect(HDC hdc, const TCHAR *text, const TCHAR *def_text, RECT rc
 		uFormat &= ~DT_END_ELLIPSIS;

 

 		rc_tmp = r;

-		text_height = DrawText(hdc, _T(" ..."), 4, &rc_tmp, DT_CALCRECT | uFormat);

+		text_height = DrawText(hdc, L" ...", 4, &rc_tmp, DT_CALCRECT | uFormat);

 		rc_tmp.top += (r.bottom - r.top - text_height) >> 1;

 		rc_tmp.bottom = rc_tmp.top + text_height;

 

@@ -1076,7 +1076,7 @@ void DrawTextWithRect(HDC hdc, const TCHAR *text, const TCHAR *def_text, RECT rc
 	DRAW_TEXT(hdc, tmp2, (int)mir_tstrlen(tmp2), &r, uFormat, proto->name);

 

 	if (mouse_over)

-		DrawText(hdc, _T(" ..."), 4, &rc_tmp, uFormat);

+		DrawText(hdc, L" ...", 4, &rc_tmp, uFormat);

 

 	SelectClipRgn(hdc, NULL);

 	DeleteObject(rgn);