hello, Unix.

phase 1: removing _T()

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

3 files changed, 16 insertions, 16 deletions

diff --git a/plugins/XSoundNotify/src/dialog.cpp b/plugins/XSoundNotify/src/dialog.cpp
index 072e063b65..34da7e7d13 100644
--- a/plugins/XSoundNotify/src/dialog.cpp
+++ b/plugins/XSoundNotify/src/dialog.cpp
@@ -79,7 +79,7 @@ static INT_PTR CALLBACK DlgProcContactsOptions(HWND hwndDlg, UINT msg, WPARAM wP
 		case IDOK:

 			p = XSN_Users.find((XSN_Data *)&hContact);

 			if (p != NULL) {

-				if (mir_tstrcmpi(p->path, _T(""))) {

+				if (mir_tstrcmpi(p->path, L"")) {

 					TCHAR shortpath[MAX_PATH];

 					PathToRelativeT(p->path, shortpath);

 					db_set_ts(hContact, SETTINGSNAME, SETTINGSKEY, shortpath);

@@ -94,15 +94,15 @@ static INT_PTR CALLBACK DlgProcContactsOptions(HWND hwndDlg, UINT msg, WPARAM wP
 		case IDC_CONT_BUTTON_CHOOSE_SOUND:

 			{

 				TCHAR FileName[MAX_PATH];

-				TCHAR *tszMirDir = Utils_ReplaceVarsT(_T("%miranda_path%"));

+				TCHAR *tszMirDir = Utils_ReplaceVarsT(L"%miranda_path%");

 

 				OPENFILENAME ofn = { 0 };

 				ofn.lStructSize = sizeof(ofn);

 				TCHAR tmp[MAX_PATH];

-				if (GetModuleHandle(_T("bass_interface.dll")))

-					mir_sntprintf(tmp, _T("%s (*.wav, *.mp3, *.ogg)%c*.wav;*.mp3;*.ogg%c%c"), TranslateT("Sound files"), 0, 0, 0);

+				if (GetModuleHandle(L"bass_interface.dll"))

+					mir_sntprintf(tmp, L"%s (*.wav, *.mp3, *.ogg)%c*.wav;*.mp3;*.ogg%c%c", TranslateT("Sound files"), 0, 0, 0);

 				else

-					mir_sntprintf(tmp, _T("%s (*.wav)%c*.wav%c%c"), TranslateT("WAV files"), 0, 0, 0);

+					mir_sntprintf(tmp, L"%s (*.wav)%c*.wav%c%c", TranslateT("WAV files"), 0, 0, 0);

 				ofn.lpstrFilter = tmp;

 				ofn.hwndOwner = 0;

 				ofn.lpstrFile = FileName;

@@ -111,7 +111,7 @@ static INT_PTR CALLBACK DlgProcContactsOptions(HWND hwndDlg, UINT msg, WPARAM wP
 				ofn.Flags = OFN_HIDEREADONLY | OFN_FILEMUSTEXIST;

 				ofn.lpstrInitialDir = tszMirDir;

 				*FileName = '\0';

-				ofn.lpstrDefExt = _T("");

+				ofn.lpstrDefExt = L"";

 

 				if (GetOpenFileName(&ofn)) {

 					SetDlgItemText(hwndDlg, IDC_CONT_LABEL_SOUND, PathFindFileName(FileName));

@@ -173,7 +173,7 @@ static INT_PTR CALLBACK DlgProcContactsOptions(HWND hwndDlg, UINT msg, WPARAM wP
 					XSN_Users.insert(new XSN_Data(hContact, longpath, IsDlgButtonChecked(hwndDlg, IDC_CONT_IGNORE_SOUND) ? 1 : 0));

 					db_free(&dbv);

 				}

-				else XSN_Users.insert(new XSN_Data(hContact, _T(""), IsDlgButtonChecked(hwndDlg, IDC_CONT_IGNORE_SOUND) ? 1 : 0));

+				else XSN_Users.insert(new XSN_Data(hContact, L"", IsDlgButtonChecked(hwndDlg, IDC_CONT_IGNORE_SOUND) ? 1 : 0));

 			}

 			else p->ignore = IsDlgButtonChecked(hwndDlg, IDC_CONT_IGNORE_SOUND) ? 1 : 0;

 		}

diff --git a/plugins/XSoundNotify/src/options.cpp b/plugins/XSoundNotify/src/options.cpp
index 45174298eb..6317a5ecb6 100644
--- a/plugins/XSoundNotify/src/options.cpp
+++ b/plugins/XSoundNotify/src/options.cpp
@@ -80,7 +80,7 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 							TCHAR *nick = (TCHAR *)pcli->pfnGetContactDisplayName(hContact, 0);

 							size_t value_max_len = (mir_tstrlen(uid) + mir_tstrlen(nick) + 4);

 							TCHAR *value = (TCHAR *)mir_alloc(sizeof(TCHAR) * value_max_len);

-							mir_sntprintf(value, value_max_len, _T("%s (%s)"), nick, uid);

+							mir_sntprintf(value, value_max_len, L"%s (%s)", nick, uid);

 							SendDlgItemMessage(hwndDlg, IDC_OPT_COMBO_USERS, CB_SETITEMDATA, SendDlgItemMessage(hwndDlg, IDC_OPT_COMBO_USERS, CB_ADDSTRING, 0, (LPARAM)value), hContact);

 							mir_free(value);

 							db_free(&dbvuid);

@@ -116,15 +116,15 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 		case IDC_OPT_BUTTON_CHOOSE_SOUND:

 		{

 			TCHAR FileName[MAX_PATH];

-			TCHAR *tszMirDir = Utils_ReplaceVarsT(_T("%miranda_path%"));

+			TCHAR *tszMirDir = Utils_ReplaceVarsT(L"%miranda_path%");

 

 			OPENFILENAME ofn = { 0 };

 			ofn.lStructSize = sizeof(ofn);

 			TCHAR tmp[MAX_PATH];

-			if (GetModuleHandle(_T("bass_interface.dll")))

-				mir_sntprintf(tmp, _T("%s (*.wav, *.mp3, *.ogg)%c*.wav;*.mp3;*.ogg%c%c"), TranslateT("Sound files"), 0, 0, 0);

+			if (GetModuleHandle(L"bass_interface.dll"))

+				mir_sntprintf(tmp, L"%s (*.wav, *.mp3, *.ogg)%c*.wav;*.mp3;*.ogg%c%c", TranslateT("Sound files"), 0, 0, 0);

 			else

-				mir_sntprintf(tmp, _T("%s (*.wav)%c*.wav%c%c"), TranslateT("WAV files"), 0, 0, 0);

+				mir_sntprintf(tmp, L"%s (*.wav)%c*.wav%c%c", TranslateT("WAV files"), 0, 0, 0);

 			ofn.lpstrFilter = tmp;

 			ofn.hwndOwner = 0;

 			ofn.lpstrFile = FileName;

@@ -133,7 +133,7 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 			ofn.Flags = OFN_HIDEREADONLY | OFN_FILEMUSTEXIST;

 			ofn.lpstrInitialDir = tszMirDir;

 			*FileName = '\0';

-			ofn.lpstrDefExt = _T("");

+			ofn.lpstrDefExt = L"";

 

 			if (GetOpenFileName(&ofn)) {

 				SetDlgItemText(hwndDlg, IDC_OPT_LABEL_SOUND, PathFindFileName(FileName));

@@ -210,7 +210,7 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 					XSN_Users.insert(new XSN_Data(hContact, longpath, IsDlgButtonChecked(hwndDlg, IDC_OPT_IGNORE_SOUND) ? 1 : 0));

 					db_free(&dbv);

 				}

-				else XSN_Users.insert(new XSN_Data(hContact, _T(""), IsDlgButtonChecked(hwndDlg, IDC_OPT_IGNORE_SOUND) ? 1 : 0));

+				else XSN_Users.insert(new XSN_Data(hContact, L"", IsDlgButtonChecked(hwndDlg, IDC_OPT_IGNORE_SOUND) ? 1 : 0));

 			}

 			else p->ignore = IsDlgButtonChecked(hwndDlg, IDC_OPT_IGNORE_SOUND) ? 1 : 0;

 			SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

@@ -224,7 +224,7 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 		switch (hdr->code) {

 		case PSN_APPLY:

 			for (int i = 0; i < XSN_Users.getCount(); i++) {

-				if (mir_tstrcmpi(XSN_Users[i]->path, _T(""))) {

+				if (mir_tstrcmpi(XSN_Users[i]->path, L"")) {

 					TCHAR shortpath[MAX_PATH];

 					PathToRelativeT(XSN_Users[i]->path, shortpath);

 					db_set_ts(XSN_Users[i]->hContact, SETTINGSNAME, SETTINGSKEY, shortpath);

diff --git a/plugins/XSoundNotify/src/xsn_main.cpp b/plugins/XSoundNotify/src/xsn_main.cpp
index d43eec86d3..d8ffcb9d97 100644
--- a/plugins/XSoundNotify/src/xsn_main.cpp
+++ b/plugins/XSoundNotify/src/xsn_main.cpp
@@ -77,7 +77,7 @@ void InitSelfSounds()
 			mir_snprintf(namebuf, "%s%s", protos[i]->szModuleName, selfSounds[j].szName);

 

 			TCHAR infobuf[256];

-			mir_sntprintf(infobuf, _T("%s [%s]"), TranslateT("Self status"), protos[i]->tszAccountName);

+			mir_sntprintf(infobuf, L"%s [%s]", TranslateT("Self status"), protos[i]->tszAccountName);

 			SkinAddNewSoundExT(namebuf, infobuf, pcli->pfnGetStatusModeDescription(selfSounds[j].iStatus, 0));

 		}

 	}