hello, Unix.

phase 1: removing _T()

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

8 files changed, 16 insertions, 16 deletions

diff --git a/plugins/StatusPlugins/AdvancedAutoAway/msgoptions.cpp b/plugins/StatusPlugins/AdvancedAutoAway/msgoptions.cpp
index 5c896b8c11..0ae73b66d0 100644
--- a/plugins/StatusPlugins/AdvancedAutoAway/msgoptions.cpp
+++ b/plugins/StatusPlugins/AdvancedAutoAway/msgoptions.cpp
@@ -128,7 +128,7 @@ INT_PTR CALLBACK DlgProcAutoAwayMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
 						SetDlgItemTextA(hwndDlg, IDC_STATUSMSG, settings[i]->msg);

 					else {

 						ptrT msg((TCHAR*)CallService(MS_AWAYMSG_GETSTATUSMSGT, settings[i]->status, 0));

-						SetDlgItemText(hwndDlg, IDC_STATUSMSG, (msg != NULL) ? msg : _T(""));

+						SetDlgItemText(hwndDlg, IDC_STATUSMSG, (msg != NULL) ? msg : L"");

 					}

 

 					if (settings[i]->useCustom) {

diff --git a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp b/plugins/StatusPlugins/KeepStatus/keepstatus.cpp
index 017b1d07de..6f76de23d5 100644
--- a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp
+++ b/plugins/StatusPlugins/KeepStatus/keepstatus.cpp
@@ -146,7 +146,7 @@ int LoadMainOptions()
 		hCSStatusChangeExHook = HookEvent(ME_CS_STATUSCHANGEEX, CSStatusChangeEx);
 		if (db_get_b(NULL, MODULENAME, SETTING_CHECKAPMRESUME, 0) && (CallService(MS_SYSTEM_GETVERSION, 0, 0) >= 0x00040000)) {
 			if (!IsWindow(hMessageWindow)) {
-				hMessageWindow = CreateWindowEx(0, _T("STATIC"), NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL);
+				hMessageWindow = CreateWindowEx(0, L"STATIC", NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL);
 				SetWindowLongPtr(hMessageWindow, GWLP_WNDPROC, (LONG_PTR)MessageWndProc);
 			}
 		}
@@ -932,7 +932,7 @@ static int ProcessPopup(int reason, LPARAM lParam)
 			TCHAR protoInfoLine[512], protoInfo[MAX_SECONDLINE];
 			memset(protoInfoLine, '\0', sizeof(protoInfoLine));
 			memset(protoInfo, '\0', sizeof(protoInfo));
-			mir_tstrcpy(protoInfo, _T("\r\n"));
+			mir_tstrcpy(protoInfo, L"\r\n");
 			for (int i = 0; i < connectionSettings.getCount(); i++) {
 				if (mir_tstrlen(ps[i]->tszAccName) > 0 && mir_strlen(ps[i]->szName) > 0) {
 					if (db_get_b(NULL, MODULENAME, SETTING_PUSHOWEXTRA, TRUE)) {
diff --git a/plugins/StatusPlugins/StartupStatus/options.cpp b/plugins/StatusPlugins/StartupStatus/options.cpp
index 33c3c126b4..f50907a46f 100644
--- a/plugins/StatusPlugins/StartupStatus/options.cpp
+++ b/plugins/StatusPlugins/StartupStatus/options.cpp
@@ -165,7 +165,7 @@ HRESULT CreateLink(TSettingsList& protoSettings)
 	if (SHGetSpecialFolderPath(NULL, savePath, 0x10, FALSE))

 		_tcsncat_s(savePath, SHORTCUT_FILENAME, _countof(savePath) - mir_tstrlen(savePath));

 	else

-		mir_sntprintf(savePath, _T(".\\%s"), SHORTCUT_FILENAME);

+		mir_sntprintf(savePath, L".\\%s", SHORTCUT_FILENAME);

 

 	// Get a pointer to the IShellLink interface.

 	IShellLink *psl;

diff --git a/plugins/StatusPlugins/StartupStatus/profiles.cpp b/plugins/StatusPlugins/StartupStatus/profiles.cpp
index 0eeb6d5225..cfc69ce732 100644
--- a/plugins/StatusPlugins/StartupStatus/profiles.cpp
+++ b/plugins/StatusPlugins/StartupStatus/profiles.cpp
@@ -272,7 +272,7 @@ static int UnregisterHotKeys()
 // assumes UnregisterHotKeys was called before
 static int RegisterHotKeys()
 {
-	hMessageWindow = CreateWindowEx(0, _T("STATIC"), NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL);
+	hMessageWindow = CreateWindowEx(0, L"STATIC", NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL);
 	SetWindowLongPtr(hMessageWindow, GWLP_WNDPROC, (LONG_PTR)MessageWndProc);
 
 	int count = GetProfileCount(0, 0);
diff --git a/plugins/StatusPlugins/StartupStatus/startupstatus.cpp b/plugins/StatusPlugins/StartupStatus/startupstatus.cpp
index 2efe6d8466..e592da5e71 100644
--- a/plugins/StatusPlugins/StartupStatus/startupstatus.cpp
+++ b/plugins/StatusPlugins/StartupStatus/startupstatus.cpp
@@ -416,7 +416,7 @@ int CSModuleLoaded(WPARAM wParam, LPARAM lParam)
 	HookEvent(ME_SYSTEM_OKTOEXIT, OnOkToExit);

 	HookEvent(ME_SYSTEM_PRESHUTDOWN, OnShutdown);

 	/* message window for poweroff */

-	hMessageWindow = CreateWindowEx(0, _T("STATIC"), NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL);

+	hMessageWindow = CreateWindowEx(0, L"STATIC", NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL);

 	SetWindowLongPtr(hMessageWindow, GWLP_WNDPROC, (LONG_PTR)MessageWndProc);

 

 	GetProfile(-1, startupSettings);

diff --git a/plugins/StatusPlugins/StartupStatus/startupstatus.h b/plugins/StatusPlugins/StartupStatus/startupstatus.h
index 500454a654..0346567861 100644
--- a/plugins/StatusPlugins/StartupStatus/startupstatus.h
+++ b/plugins/StatusPlugins/StartupStatus/startupstatus.h
@@ -122,8 +122,8 @@ typedef struct {
 #define SETTING_SETPROFILEDELAY			"SetStatusDelay"

 #define SETTING_DLGTIMEOUT				"DialogTimeout"

 

-#define SHORTCUT_DESC					_T("Miranda NG")

-#define SHORTCUT_FILENAME				_T("\\Miranda NG.lnk")

+#define SHORTCUT_DESC					L"Miranda NG"

+#define SHORTCUT_FILENAME				L"\\Miranda NG.lnk"

 

 #define DOCKED_NONE						0

 #define DOCKED_LEFT						1

diff --git a/plugins/StatusPlugins/commonstatus.cpp b/plugins/StatusPlugins/commonstatus.cpp
index 9221754198..4f78f829d1 100644
--- a/plugins/StatusPlugins/commonstatus.cpp
+++ b/plugins/StatusPlugins/commonstatus.cpp
@@ -177,9 +177,9 @@ static void SetStatusMsg(PROTOCOLSETTINGEX *ps, int newstatus)
 				continue;

 

 			TCHAR substituteStr[128];

-			if (!_tcsnicmp(tszMsg + j, _T("%time%"), 6))

+			if (!_tcsnicmp(tszMsg + j, L"%time%", 6))

 				GetTimeFormat(LOCALE_USER_DEFAULT, TIME_NOSECONDS, 0, 0, substituteStr, _countof(substituteStr));

-			else if (!_tcsnicmp(tszMsg + j, _T("%date%"), 6))

+			else if (!_tcsnicmp(tszMsg + j, L"%date%", 6))

 				GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, 0, 0, substituteStr, _countof(substituteStr));

 			else

 				continue;

diff --git a/plugins/StatusPlugins/confirmdialog.cpp b/plugins/StatusPlugins/confirmdialog.cpp
index 1b1f5b03fc..ac622de347 100644
--- a/plugins/StatusPlugins/confirmdialog.cpp
+++ b/plugins/StatusPlugins/confirmdialog.cpp
@@ -127,11 +127,11 @@ static int SetStatusList(HWND hwndDlg)
 		TCHAR* status = pcli->pfnGetStatusModeDescription(actualStatus, 0);

 		switch ((*confirmSettings)[i].status) {

 		case ID_STATUS_LAST:

-			mir_sntprintf(buf, _T("%s (%s)"), TranslateT("<last>"), status);

+			mir_sntprintf(buf, L"%s (%s)", TranslateT("<last>"), status);

 			ListView_SetItemText(hList, lvItem.iItem, 1, buf);

 			break;

 		case ID_STATUS_CURRENT:

-			mir_sntprintf(buf, _T("%s (%s)"), TranslateT("<current>"), status);

+			mir_sntprintf(buf, L"%s (%s)", TranslateT("<current>"), status);

 			ListView_SetItemText(hList, lvItem.iItem, 1, buf);

 			break;

 		default:

@@ -269,7 +269,7 @@ static INT_PTR CALLBACK ConfirmDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				// LAST STATUS

 				if (proto->status == ID_STATUS_LAST) {

 					TCHAR last[80];

-					mir_sntprintf(last, _T("%s (%s)"), TranslateT("<last>"), pcli->pfnGetStatusModeDescription(proto->lastStatus, 0));

+					mir_sntprintf(last, L"%s (%s)", TranslateT("<last>"), pcli->pfnGetStatusModeDescription(proto->lastStatus, 0));

 					ListView_SetItemText(GetDlgItem(hwndDlg, IDC_STARTUPLIST), lvItem.iItem, 1, last);

 					actualStatus = proto->lastStatus;

 				}

@@ -278,7 +278,7 @@ static INT_PTR CALLBACK ConfirmDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				else if (proto->status == ID_STATUS_CURRENT) {

 					int currentStatus = CallProtoService(proto->szName, PS_GETSTATUS, 0, 0);

 					TCHAR current[80];

-					mir_sntprintf(current, _T("%s (%s)"), TranslateT("<current>"), pcli->pfnGetStatusModeDescription(currentStatus, 0));

+					mir_sntprintf(current, L"%s (%s)", TranslateT("<current>"), pcli->pfnGetStatusModeDescription(currentStatus, 0));

 					ListView_SetItemText(GetDlgItem(hwndDlg, IDC_STARTUPLIST), lvItem.iItem, 1, current);

 					actualStatus = currentStatus;

 				}

@@ -344,7 +344,7 @@ static INT_PTR CALLBACK ConfirmDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 

 				// last

 				TCHAR buf[100];

-				mir_sntprintf(buf, _T("%s (%s)"), TranslateT("<last>"), pcli->pfnGetStatusModeDescription(proto->lastStatus, 0));

+				mir_sntprintf(buf, L"%s (%s)", TranslateT("<last>"), pcli->pfnGetStatusModeDescription(proto->lastStatus, 0));

 				int item = SendDlgItemMessage(hwndDlg, IDC_STATUS, CB_ADDSTRING, 0, (LPARAM)buf);

 				SendDlgItemMessage(hwndDlg, IDC_STATUS, CB_SETITEMDATA, item, ID_STATUS_LAST);

 				if (proto->status == ID_STATUS_LAST) {

@@ -354,7 +354,7 @@ static INT_PTR CALLBACK ConfirmDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 

 				// current

 				int currentStatus = CallProtoService(proto->szName, PS_GETSTATUS, 0, 0);

-				mir_sntprintf(buf, _T("%s (%s)"), TranslateT("<current>"), pcli->pfnGetStatusModeDescription(currentStatus, 0));

+				mir_sntprintf(buf, L"%s (%s)", TranslateT("<current>"), pcli->pfnGetStatusModeDescription(currentStatus, 0));

 				item = SendDlgItemMessage(hwndDlg, IDC_STATUS, CB_ADDSTRING, 0, (LPARAM)buf);

 				SendDlgItemMessage(hwndDlg, IDC_STATUS, CB_SETITEMDATA, item, ID_STATUS_CURRENT);

 				if (proto->status == ID_STATUS_CURRENT) {