hello, Unix.

phase 1: removing _T()

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

23 files changed, 123 insertions, 123 deletions

diff --git a/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp b/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp
index cd6ef31f0d..d28f9fcd36 100644
--- a/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp
+++ b/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp
@@ -284,7 +284,7 @@ static INT_PTR ServiceCreateMergedFlagIcon(WPARAM wParam,LPARAM lParam)
 void InitIcons()

 {

 	// all those flag icons storing in a large 24bit opaque bitmap to reduce file size

-	FIBITMAP *dib = LoadResource(IDB_FLAGSPNG, _T("PNG"));

+	FIBITMAP *dib = LoadResource(IDB_FLAGSPNG, L"PNG");

 	if (dib == NULL)

 		return;

 

diff --git a/plugins/UserInfoEx/src/classMTime.cpp b/plugins/UserInfoEx/src/classMTime.cpp
index 9a357172a3..8c2049b3d7 100644
--- a/plugins/UserInfoEx/src/classMTime.cpp
+++ b/plugins/UserInfoEx/src/classMTime.cpp
@@ -368,7 +368,7 @@ WORD	MTime::DateFormatAlt(LPTSTR ptszTimeFormat, WORD cchTimeFormat)
 	TCHAR * tszYear = _tcsstr(ptszTimeFormat, tszText);

 

 	if (tszYear && mir_tstrlen(tszYear) == 4)

-		mir_tstrcpy(tszYear, _T("????"));

+		mir_tstrcpy(tszYear, L"????");

 	else {

 		*ptszTimeFormat = 0;

 		return 0;

diff --git a/plugins/UserInfoEx/src/classPsTreeItem.cpp b/plugins/UserInfoEx/src/classPsTreeItem.cpp
index 05b88064ec..ca46d61dfa 100644
--- a/plugins/UserInfoEx/src/classPsTreeItem.cpp
+++ b/plugins/UserInfoEx/src/classPsTreeItem.cpp
@@ -31,7 +31,7 @@ BOOL CALLBACK BoldGroupTitlesEnumChildren(HWND hWnd, LPARAM lParam)
 {

 	 TCHAR szClass[64];

 	 GetClassName(hWnd, szClass, 64);

-	 if (!mir_tstrcmp(szClass, _T("Button")) && (GetWindowLongPtr(hWnd, GWL_STYLE) & 0x0F) == BS_GROUPBOX)

+	 if (!mir_tstrcmp(szClass, L"Button") && (GetWindowLongPtr(hWnd, GWL_STYLE) & 0x0F) == BS_GROUPBOX)

 			SendMessage(hWnd, WM_SETFONT, lParam, NULL);

 	 return TRUE;

 }

@@ -403,13 +403,13 @@ int CPsTreeItem::Create(CPsHdr* pPsh, OPTIONSDIALOGPAGE *odp)
 

 		if (pPsh->_dwFlags & PSF_PROTOPAGESONLY) {

 			if (_dwFlags & ODPF_USERINFOTAB)

-				mir_sntprintf(szTitle, _T("%s %d\\%s"), odp->ptszTitle, pPsh->_nSubContact+1, odp->ptszTab);

+				mir_sntprintf(szTitle, L"%s %d\\%s", odp->ptszTitle, pPsh->_nSubContact+1, odp->ptszTab);

 			else

-				mir_sntprintf(szTitle, _T("%s %d"), odp->ptszTitle, pPsh->_nSubContact+1);

+				mir_sntprintf(szTitle, L"%s %d", odp->ptszTitle, pPsh->_nSubContact+1);

 		}

 		else {

 			if (_dwFlags & ODPF_USERINFOTAB)

-				mir_sntprintf(szTitle, _T("%s\\%s"), odp->ptszTitle, odp->ptszTab);

+				mir_sntprintf(szTitle, L"%s\\%s", odp->ptszTitle, odp->ptszTab);

 			else

 				mir_tstrcpy(szTitle, odp->ptszTitle);

 		}

diff --git a/plugins/UserInfoEx/src/ctrl_annivedit.cpp b/plugins/UserInfoEx/src/ctrl_annivedit.cpp
index 18e1bda0e6..591df8f8b3 100644
--- a/plugins/UserInfoEx/src/ctrl_annivedit.cpp
+++ b/plugins/UserInfoEx/src/ctrl_annivedit.cpp
@@ -404,7 +404,7 @@ INT_PTR CAnnivEditCtrl::SetCurSel(WORD wIndex)
 	}

 	else {

 		TCHAR szText[MAX_DESC];

-		mir_sntprintf(szText, _T("'%s'"), TranslateT("Unspecified"));

+		mir_sntprintf(szText, L"'%s'", TranslateT("Unspecified"));

 		DateTime_SetSystemtime(_hwndDate, GDT_NONE, NULL);

 		DateTime_SetFormat(_hwndDate, szText);

 	}

diff --git a/plugins/UserInfoEx/src/ctrl_contact.cpp b/plugins/UserInfoEx/src/ctrl_contact.cpp
index 262a180124..b37897793b 100644
--- a/plugins/UserInfoEx/src/ctrl_contact.cpp
+++ b/plugins/UserInfoEx/src/ctrl_contact.cpp
@@ -328,7 +328,7 @@ INT_PTR CALLBACK DlgProc_Phone(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam
 

 				GetDlgItemText(hDlg, EDIT_AREA, szArea, _countof(szArea));

 				GetDlgItemText(hDlg, EDIT_NUMBER, szData, _countof(szData));

-				mir_sntprintf(szPhone, _T("+%u (%s) %s"), nCountry, szArea, szData);

+				mir_sntprintf(szPhone, L"+%u (%s) %s", nCountry, szArea, szData);

 				noRecursion = 1;

 				SetDlgItemText(hDlg, EDIT_PHONE, szPhone);

 				noRecursion = 0;

@@ -362,19 +362,19 @@ INT_PTR CALLBACK DlgProc_Phone(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam
 					}

 				}

 				if (isValid) {

-					pArea = pText + _tcscspn(pText, _T("0123456789"));

-					pText = pArea + _tcsspn(pArea, _T("0123456789"));

+					pArea = pText + _tcscspn(pText, L"0123456789");

+					pText = pArea + _tcsspn(pArea, L"0123456789");

 					if (*pText) {

 						*pText = '\0';

-						pNumber = pText + 1 + _tcscspn(pText + 1, _T("0123456789"));

+						pNumber = pText + 1 + _tcscspn(pText + 1, L"0123456789");

 						SetDlgItemText(hDlg, EDIT_NUMBER, pNumber);

 					}

 					SetDlgItemText(hDlg, EDIT_AREA, pArea);

 				}

 				if (!isValid) {

 					SendDlgItemMessage(hDlg, EDIT_COUNTRY, CB_SETCURSEL, -1, 0);

-					SetDlgItemText(hDlg, EDIT_AREA, _T(""));

-					SetDlgItemText(hDlg, EDIT_NUMBER, _T(""));

+					SetDlgItemText(hDlg, EDIT_AREA, L"");

+					SetDlgItemText(hDlg, EDIT_NUMBER, L"");

 				}

 			}

 			noRecursion = 0;

@@ -443,7 +443,7 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg,	WPARAM wParam, L
 

 		if (!(cbex->hBtnEdit = CreateWindowEx(WS_EX_NOPARENTNOTIFY,

 				UINFOBUTTONCLASS, 

-				_T("none"),

+				L"none",

 				WS_VISIBLE|WS_CHILD|WS_TABSTOP, 0, 0,

 				wWidth, wHeight,

 				hwnd,

@@ -470,7 +470,7 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg,	WPARAM wParam, L
 		x += wWidth + 2;

 		wWidth = (WORD)(cbex->rect.right - cbex->rect.left - x - (2 * (wHeight + 2)));

 		if (!(cbex->hEdit = CreateWindowEx(WS_EX_CLIENTEDGE,

-				_T("Edit"), 

+				L"Edit", 

 				NULL,

 				WS_VISIBLE|WS_CHILD|WS_TABSTOP|ES_AUTOHSCROLL,

 				x, 1,

@@ -582,11 +582,11 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg,	WPARAM wParam, L
 	{

 		HICON hIcon = IcoLib_GetIcon(ICO_BTN_ADD);

 		SendMessage(cbex->hBtnAdd, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcon);

-		SetWindowText(cbex->hBtnAdd, (hIcon ? _T("") : _T("+")));

+		SetWindowText(cbex->hBtnAdd, (hIcon ? L"" : L"+"));

 

 		hIcon = IcoLib_GetIcon(ICO_BTN_DELETE);

 		SendMessage(cbex->hBtnDel, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcon);

-		SetWindowText(cbex->hBtnDel, (hIcon ? _T("") : _T("-")));

+		SetWindowText(cbex->hBtnDel, (hIcon ? L"" : L"-"));

 

 		if (cbex->pItems && cbex->numItems > 0) {

 			for (int i = 0; i < cbex->numItems; i++)

@@ -796,7 +796,7 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg,	WPARAM wParam, L
 					// clear value for standard entry

 					if (cbex->pItems[cbex->iSelectedItem].wFlags & CBEXIF_CATREADONLY) {

 						MIR_FREE(cbex->pItems[cbex->iSelectedItem].pszVal);

-						SetWindowText(cbex->hEdit, _T(""));

+						SetWindowText(cbex->hEdit, L"");

 						cbex->pItems[cbex->iSelectedItem].wFlags &= ~CBEXIF_SMS;

 						cbex->pItems[cbex->iSelectedItem].wFlags |= CTRLF_CHANGED;

 					}

@@ -885,7 +885,7 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg,	WPARAM wParam, L
 					if ((ccText = GetWindowTextLength(cbex->hEdit)) <= 0) {

 						if (cbex->pItems[cbex->iSelectedItem].wFlags & CBEXIF_CATREADONLY) {

 							MIR_FREE(cbex->pItems[cbex->iSelectedItem].pszVal);

-							SetWindowText(cbex->hEdit, _T(""));

+							SetWindowText(cbex->hEdit, L"");

 							cbex->pItems[cbex->iSelectedItem].wFlags &= ~CBEXIF_SMS;

 						}

 						else

@@ -946,7 +946,7 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg,	WPARAM wParam, L
 

 		// set category string

 		if (!pItem->pszCat || !pItem->pszCat[0] || !mir_tstrncpy(cbex->pItems[cbex->numItems].szCat, pItem->pszCat, MAX_CAT)) {

-			mir_sntprintf(cbex->pItems[cbex->numItems].szCat, _T("%s %d"), TranslateT("Other"), ++cbex->numOther);

+			mir_sntprintf(cbex->pItems[cbex->numItems].szCat, L"%s %d", TranslateT("Other"), ++cbex->numOther);

 		}

 

 		// set value string

@@ -986,7 +986,7 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg,	WPARAM wParam, L
 		if (pItem->wMask & CBEXIM_CAT) {

 			// set category string

 			if (!pItem->pszCat || !pItem->pszCat[0] || !mir_tstrncpy(cbex->pItems[pItem->iItem].szCat, pItem->pszCat, _countof(cbex->pItems[pItem->iItem].szCat))) 

-				mir_sntprintf(cbex->pItems[pItem->iItem].szCat, _T("%s %d"), TranslateT("Other"), ++cbex->numOther);

+				mir_sntprintf(cbex->pItems[pItem->iItem].szCat, L"%s %d", TranslateT("Other"), ++cbex->numOther);

 			if (pItem->iItem == cbex->iSelectedItem)

 				SetWindowText(cbex->hBtnEdit, cbex->pItems[pItem->iItem].szCat);

 		}

@@ -996,7 +996,7 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg,	WPARAM wParam, L
 			if (pItem->pszVal && pItem->pszVal[0])

 				cbex->pItems[pItem->iItem].pszVal = mir_tstrdup(pItem->pszVal);

 			if (pItem->iItem == cbex->iSelectedItem)

-				SetWindowText(cbex->hEdit, cbex->pItems[pItem->iItem].pszVal ? cbex->pItems[pItem->iItem].pszVal : _T(""));

+				SetWindowText(cbex->hEdit, cbex->pItems[pItem->iItem].pszVal ? cbex->pItems[pItem->iItem].pszVal : L"");

 		}

 

 		// set icon

@@ -1111,8 +1111,8 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg,	WPARAM wParam, L
 			}

 			cbex->numItems = 0;

 			cbex->iSelectedItem = -1;

-			SetWindowText(cbex->hEdit, _T(""));

-			SetWindowText(cbex->hBtnEdit, _T(""));

+			SetWindowText(cbex->hEdit, L"");

+			SetWindowText(cbex->hBtnEdit, L"");

 			SendMessage(cbex->hBtnEdit, WM_SETICON, NULL, NULL);

 		}

 		return TRUE;

@@ -1203,7 +1203,7 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg,	WPARAM wParam, L
 

 		}

 		SetWindowText(cbex->hBtnEdit, cbex->pItems[cbex->iSelectedItem].szCat);

-		SetWindowText(cbex->hEdit, cbex->pItems[cbex->iSelectedItem].pszVal ? cbex->pItems[cbex->iSelectedItem].pszVal : _T(""));

+		SetWindowText(cbex->hEdit, cbex->pItems[cbex->iSelectedItem].pszVal ? cbex->pItems[cbex->iSelectedItem].pszVal : L"");

 		SendMessage(cbex->hBtnEdit, BM_SETIMAGE, IMAGE_ICON, (LPARAM)cbex->pItems[cbex->iSelectedItem].hIcon);

 		CtrlContactWndProc(hwnd, CBEXM_ENABLEITEM, NULL, NULL);

 		cbex->bLocked = 0;

@@ -1297,7 +1297,7 @@ int CtrlContactAddItemFromDB(
 			cbi.pszVal = NULL;

 		else { // check the database value

 			cbi.pszVal = dbv.ptszVal;

-			if (LPTSTR sms = _tcsstr(cbi.pszVal, _T(" SMS"))) {

+			if (LPTSTR sms = _tcsstr(cbi.pszVal, L" SMS")) {

 				cbi.wFlags |= CBEXIF_SMS;

 				*sms = 0;

 			}

@@ -1377,7 +1377,7 @@ int CtrlContactAddMyItemsFromDB(
 				dbv.ptszVal = NULL;

 			}

 		}

-		if (sms = _tcsstr(cbi.pszVal, _T(" SMS"))) {

+		if (sms = _tcsstr(cbi.pszVal, L" SMS")) {

 			cbi.wFlags |= CBEXIF_SMS;

 			*sms = 0;

 		}

@@ -1428,7 +1428,7 @@ int CtrlContactWriteItemToDB(
 		db_unset(hContact, pszModule, pszSetting);

 	else {

 		if (cbi.wFlags & CBEXIF_SMS)

-			mir_tstrncat(szVal, _T(" SMS"), _countof(szVal) - mir_tstrlen(szVal));

+			mir_tstrncat(szVal, L" SMS", _countof(szVal) - mir_tstrlen(szVal));

 

 		if (db_set_ts(hContact, pszModule, pszSetting, szVal)) return 1;

 	}

@@ -1478,7 +1478,7 @@ int CtrlContactWriteMyItemsToDB(
 	while (CtrlContactWndProc(hCtrl, CBEXM_GETITEM, NULL, (LPARAM)&cbi) && cbi.iItem < 50) {

 		if (!(cbi.wFlags & CBEXIF_DELETED) && *szVal) {

 			if (cbi.wFlags & CBEXIF_SMS) {

-				mir_tstrncat(szVal, _T(" SMS"), _countof(szVal) - mir_tstrlen(szVal));

+				mir_tstrncat(szVal, L" SMS", _countof(szVal) - mir_tstrlen(szVal));

 			}

 			mir_snprintf(pszSetting, szFormatCat, i);

 			if (*szCat && _tcsncmp(szCat, pszOther, ccOther)) {

diff --git a/plugins/UserInfoEx/src/ctrl_contact.h b/plugins/UserInfoEx/src/ctrl_contact.h
index 20a5f23902..42f09717cf 100644
--- a/plugins/UserInfoEx/src/ctrl_contact.h
+++ b/plugins/UserInfoEx/src/ctrl_contact.h
@@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 

 /* contact control	v0.1.0.6+

 */

-#define UINFOCOMBOEXCLASS	_T("UInfoComboExWndClass")

+#define UINFOCOMBOEXCLASS	L"UInfoComboExWndClass"

 

 // messages

 #define CBEXM_ADDITEM			 (WM_USER+4)

diff --git a/plugins/UserInfoEx/src/ctrl_edit.cpp b/plugins/UserInfoEx/src/ctrl_edit.cpp
index c67e39e0bd..77a3904eb6 100644
--- a/plugins/UserInfoEx/src/ctrl_edit.cpp
+++ b/plugins/UserInfoEx/src/ctrl_edit.cpp
@@ -144,7 +144,7 @@ BOOL CEditCtrl::OnInfoChanged(MCONTACT hContact, LPCSTR pszProto)
 			}
 
 		default:
-			SetWindowText(_hwnd, _T(""));
+			SetWindowText(_hwnd, L"");
 			db_free(&dbv);
 			break;
 		}
@@ -325,7 +325,7 @@ LRESULT CEditCtrl::LinkNotificationHandler(ENLINK* lnk)
 			if (tr.lpstrText && (SendMessage(_hwnd, EM_GETTEXTRANGE, NULL, (LPARAM)&tr) > 0)) {
 				if (_tcschr(tr.lpstrText, '@') != NULL && _tcschr(tr.lpstrText, ':') == NULL && _tcschr(tr.lpstrText, '/') == NULL) {
 					memmove(tr.lpstrText + 7, tr.lpstrText, (tr.chrg.cpMax - tr.chrg.cpMin + 1)*sizeof(TCHAR));
-					memcpy(tr.lpstrText, _T("mailto:"), (7 * sizeof(TCHAR)));
+					memcpy(tr.lpstrText, L"mailto:", (7 * sizeof(TCHAR)));
 				}
 
 				Utils_OpenUrlT(tr.lpstrText);
diff --git a/plugins/UserInfoEx/src/ctrl_tzcombo.cpp b/plugins/UserInfoEx/src/ctrl_tzcombo.cpp
index 81922204ce..89028e9f55 100644
--- a/plugins/UserInfoEx/src/ctrl_tzcombo.cpp
+++ b/plugins/UserInfoEx/src/ctrl_tzcombo.cpp
@@ -224,5 +224,5 @@ void CTzCombo::OnChangedByUser(WORD wChangedMsg)
  **/

 void CTzCombo::GetTime(LPTSTR szTime, int cchTime)

 {

-	TimeZone_PrintDateTime((HANDLE)ComboBox_GetItemData(_hwnd, _curSel), _T("t"), szTime, cchTime, 0);

+	TimeZone_PrintDateTime((HANDLE)ComboBox_GetItemData(_hwnd, _curSel), L"t", szTime, cchTime, 0);

 }

diff --git a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp
index 1e9ad4ca9b..a1c3fb3be8 100644
--- a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp
+++ b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp
@@ -706,7 +706,7 @@ class CAnnivList
 					if (ad.Age(&mtNow))

 						AddSubItem(iItem, COLUMN_AGE, _itot(ad.Age(&mtNow), szText, 10));

 					else

-						AddSubItem(iItem, COLUMN_AGE, _T("???"));

+						AddSubItem(iItem, COLUMN_AGE, L"???");

 

 					// fifth line: anniversary

 					AddSubItem(iItem, COLUMN_DESC, (LPTSTR)ad.Description());

diff --git a/plugins/UserInfoEx/src/dlg_msgbox.cpp b/plugins/UserInfoEx/src/dlg_msgbox.cpp
index abc7596ccf..8cb11462e3 100644
--- a/plugins/UserInfoEx/src/dlg_msgbox.cpp
+++ b/plugins/UserInfoEx/src/dlg_msgbox.cpp
@@ -687,7 +687,7 @@ INT_PTR CALLBACK MsgBox(HWND hParent, UINT uType, LPCTSTR pszTitle, LPCTSTR pszI
 INT_PTR CALLBACK MsgErr(HWND hParent, LPCTSTR pszFormat, ...)

 {

 	TCHAR tszTitle[MAX_SECONDLINE], tszMsg[MAX_SECONDLINE];

-	mir_sntprintf(tszTitle, _T("%s - %s"), _T(MODNAME), TranslateT("Error"));

+	mir_sntprintf(tszTitle, L"%s - %s", _T(MODNAME), TranslateT("Error"));

 

 	va_list vl;

 	va_start(vl, pszFormat);

diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp
index 31d002e2d3..c03a5a75db 100644
--- a/plugins/UserInfoEx/src/dlg_propsheet.cpp
+++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp
@@ -429,7 +429,7 @@ static int OnShutdown(WPARAM, LPARAM)
 static int AddProtocolPages(OPTIONSDIALOGPAGE& odp, WPARAM wParam, LPSTR pszProto = NULL)

 {

 	TCHAR szTitle[MAX_PATH];

-	const BYTE ofs = (pszProto) ? mir_sntprintf(szTitle, _T("%S\\"), pszProto) : 0;

+	const BYTE ofs = (pszProto) ? mir_sntprintf(szTitle, L"%S\\", pszProto) : 0;

 

 	odp.ptszTitle = szTitle;

 	

@@ -444,21 +444,21 @@ static int AddProtocolPages(OPTIONSDIALOGPAGE& odp, WPARAM wParam, LPSTR pszProt
 	odp.position = 0x8000001;

 	odp.pfnDlgProc = PSPProcContactHome;

 	odp.hIcon = (HICON)ICONINDEX(IDI_TREE_ADDRESS);

-	mir_tstrncpy(szTitle + ofs, LPGENT("General") _T("\\") LPGENT("Contact (private)"), _countof(szTitle) - ofs);

+	mir_tstrncpy(szTitle + ofs, LPGENT("General") L"\\" LPGENT("Contact (private)"), _countof(szTitle) - ofs);

 	AddPage(wParam, (LPARAM)&odp);

 

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_ORIGIN);

 	odp.position = 0x8000002;

 	odp.pfnDlgProc = PSPProcOrigin;

 	odp.hIcon = (HICON)ICONINDEX(IDI_TREE_ADVANCED);

-	mir_tstrncpy(szTitle + ofs, LPGENT("General") _T("\\") LPGENT("Origin"), _countof(szTitle) - ofs);

+	mir_tstrncpy(szTitle + ofs, LPGENT("General") L"\\" LPGENT("Origin"), _countof(szTitle) - ofs);

 	AddPage(wParam, (LPARAM)&odp);

 		

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_ANNIVERSARY);

 	odp.position = 0x8000003;

 	odp.pfnDlgProc = PSPProcAnniversary;

 	odp.hIcon = (HICON)ICONINDEX(IDI_BIRTHDAY);

-	mir_tstrncpy(szTitle + ofs,  LPGENT("General") _T("\\") LPGENT("Anniversaries"), _countof(szTitle) - ofs);

+	mir_tstrncpy(szTitle + ofs,  LPGENT("General") L"\\" LPGENT("Anniversaries"), _countof(szTitle) - ofs);

 	AddPage(wParam, (LPARAM)&odp);

 

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_COMPANY);

@@ -472,7 +472,7 @@ static int AddProtocolPages(OPTIONSDIALOGPAGE& odp, WPARAM wParam, LPSTR pszProt
 	odp.position = 0x8000005;

 	odp.pfnDlgProc = PSPProcContactWork;

 	odp.hIcon = (HICON)ICONINDEX(IDI_TREE_ADDRESS);

-	mir_tstrncpy(szTitle + ofs, LPGENT("Work") _T("\\") LPGENT("Contact (work)"), _countof(szTitle) - ofs);

+	mir_tstrncpy(szTitle + ofs, LPGENT("Work") L"\\" LPGENT("Contact (work)"), _countof(szTitle) - ofs);

 	AddPage(wParam, (LPARAM)&odp);

 		

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_ABOUT);

@@ -486,7 +486,7 @@ static int AddProtocolPages(OPTIONSDIALOGPAGE& odp, WPARAM wParam, LPSTR pszProt
 	odp.position = 0x8000007;

 	odp.pfnDlgProc = PSPProcContactProfile;

 	odp.hIcon = (HICON)ICONINDEX(IDI_TREE_PROFILE);

-	mir_tstrncpy(szTitle + ofs, LPGENT("About") _T("\\") LPGENT("Profile"), _countof(szTitle) - ofs);

+	mir_tstrncpy(szTitle + ofs, LPGENT("About") L"\\" LPGENT("Profile"), _countof(szTitle) - ofs);

 	AddPage(wParam, (LPARAM)&odp);

 	return 0;

 }

@@ -514,7 +514,7 @@ static int InitDetails(WPARAM wParam, LPARAM lParam)
 				// ignore common pages for weather contacts

 				if (!pPsh->_pszProto || _stricmp(pPsh->_pszProto, "weather")) {

 					AddProtocolPages(odp, wParam);

-					odp.ptszTitle = LPGENT("About") _T("\\") LPGENT("Notes");

+					odp.ptszTitle = LPGENT("About") L"\\" LPGENT("Notes");

 				}

 				else

 					odp.ptszTitle = LPGENT("Notes");

@@ -735,7 +735,7 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 

 			GetObject(hNormalFont, sizeof(lf), &lf);

 			lf.lfHeight = 22;

-			mir_tstrcpy(lf.lfFaceName, _T("Segoe UI"));

+			mir_tstrcpy(lf.lfFaceName, L"Segoe UI");

 			pPs->hCaptionFont = CreateFontIndirect(&lf);

 			SendDlgItemMessage(hDlg, IDC_PAGETITLE, WM_SETFONT, (WPARAM)pPs->hCaptionFont, 0);

 

@@ -1101,7 +1101,7 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 

 		HWND hName = GetDlgItem(hDlg, TXT_NAME);

 		SetWindowText(hName, pszName);

-		SetWindowText(hDlg, CMString(FORMAT, _T("%s - %s"), pszName, TranslateT("edit contact information")));

+		SetWindowText(hDlg, CMString(FORMAT, L"%s - %s", pszName, TranslateT("edit contact information")));

 		SetDlgItemText(hDlg, IDC_HEADERBAR, TranslateT("View personal user details and more"));

 

 		// redraw the name control

@@ -1141,12 +1141,12 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 		if (hCtrl = GetDlgItem(hDlg, BTN_IMPORT)) {

 			hIcon = IcoLib_GetIcon(ICO_BTN_IMPORT);

 			SendMessage(hCtrl, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcon);

-			SetWindowText(hCtrl, hIcon ? _T("") : _T("I"));

+			SetWindowText(hCtrl, hIcon ? L"" : L"I");

 		}

 		if (hCtrl = GetDlgItem(hDlg, BTN_EXPORT)) {

 			hIcon = IcoLib_GetIcon(ICO_BTN_EXPORT);

 			SendMessage(hCtrl, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcon);

-			SetWindowText(hCtrl, hIcon ? _T("") : _T("E"));

+			SetWindowText(hCtrl, hIcon ? L"" : L"E");

 		}

 		// update page icons

 		if (PtrIsValid(pPs) && (pPs->dwFlags & PSF_INITIALIZED))

diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
index 870353bb72..39e31af3ab 100644
--- a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
@@ -687,7 +687,7 @@ int CExImContactXML::Import(BYTE keepMetaSubContact)
 				// load all subcontacts

 				do {

 					// update progressbar and abort if user clicked cancel

-					int result = _pXmlFile->_progress.UpdateContact(_T("Sub Contact: %s (%S)"), 

+					int result = _pXmlFile->_progress.UpdateContact(L"Sub Contact: %s (%S)", 

 						ptrT(mir_utf8decodeT(xContact->Attribute("nick"))), xContact->Attribute("proto"));

 					

 					// user clicked abort button

diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp
index e460672a2a..5c43c0a7f1 100644
--- a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp
@@ -221,7 +221,7 @@ INT_PTR CALLBACK SelectModulesToExport_DlgProc(HWND hDlg, UINT uMsg, WPARAM wPar
 				}

 				TranslateDialogDefault(hDlg);			//to translate oldTitle

 				GetWindowText(hDlg, oldTitle, _countof(oldTitle));

-				mir_sntprintf(newTitle, _T("%s - %s"), name, oldTitle);

+				mir_sntprintf(newTitle, L"%s - %s", name, oldTitle);

 				SetWindowText(hDlg, newTitle);

 			}

 

diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
index 5ccbaf537e..e54f06003b 100644
--- a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
@@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 

 #include "../stdafx.h"

 

-#define HKEY_MIRANDA_PLACESBAR	_T("Software\\Miranda NG\\PlacesBar")

-#define HKEY_WINPOL_PLACESBAR	_T("Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\ComDlg32\\PlacesBar")

+#define HKEY_MIRANDA_PLACESBAR	L"Software\\Miranda NG\\PlacesBar"

+#define HKEY_WINPOL_PLACESBAR	L"Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\ComDlg32\\PlacesBar"

 

 /**

  * This function maps the current users registry to a dummy key and

@@ -56,9 +56,9 @@ static void InitAlteredPlacesBar()
 			CHAR szProfilePath[MAX_PATH];

 

 			// default places: Desktop, My Documents, My Computer

-			dwFolderID = 0;	 RegSetValueEx(hkPlacesBar, _T("Place0"), 0, REG_DWORD, (PBYTE)&dwFolderID, sizeof(DWORD));

-			dwFolderID = 5;	RegSetValueEx(hkPlacesBar, _T("Place1"), 0, REG_DWORD, (PBYTE)&dwFolderID, sizeof(DWORD));

-			dwFolderID = 17; RegSetValueEx(hkPlacesBar, _T("Place2"), 0, REG_DWORD, (PBYTE)&dwFolderID, sizeof(DWORD));

+			dwFolderID = 0;	 RegSetValueEx(hkPlacesBar, L"Place0", 0, REG_DWORD, (PBYTE)&dwFolderID, sizeof(DWORD));

+			dwFolderID = 5;	RegSetValueEx(hkPlacesBar, L"Place1", 0, REG_DWORD, (PBYTE)&dwFolderID, sizeof(DWORD));

+			dwFolderID = 17; RegSetValueEx(hkPlacesBar, L"Place2", 0, REG_DWORD, (PBYTE)&dwFolderID, sizeof(DWORD));

 

 			// Miranda's installation path

 			GetModuleFileNameA(GetModuleHandleA("mir_app.mir"), szMirandaPath, _countof(szMirandaPath));

diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
index 4b403e195e..157094e89e 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
@@ -281,7 +281,7 @@ INT_PTR svcExIm_Group_Service(WPARAM wParam, LPARAM)
 		if (SendMessage(hClist,CLM_GETITEMTYPE, (WPARAM)hItem, 0) == CLCIT_GROUP) {

 			SendMessage(hClist,CLM_GETITEMTEXT, (WPARAM)hItem, (LPARAM)ptszItem);

 			LPTSTR temp = mir_tstrdup(ptszGroup);

-			mir_sntprintf(tszGroup, _T("%s%s%s"), ptszItem, mir_tstrlen(temp)? _T("\\"):_T(""), temp);

+			mir_sntprintf(tszGroup, L"%s%s%s", ptszItem, mir_tstrlen(temp)? L"\\":L"", temp);

 			mir_free (temp);

 		}

 		hParent = SendMessage(hClist,CLM_GETNEXTITEM, (WPARAM)CLGN_PARENT, (LPARAM)hItem);

diff --git a/plugins/UserInfoEx/src/init.cpp b/plugins/UserInfoEx/src/init.cpp
index 219f5b9193..7a829f360e 100644
--- a/plugins/UserInfoEx/src/init.cpp
+++ b/plugins/UserInfoEx/src/init.cpp
@@ -176,7 +176,7 @@ extern "C" int __declspec(dllexport) Load(void)
 		result = CallService(MS_IMG_GETINTERFACE, FI_IF_VERSION, (LPARAM)&FIP);

 

 	if (FIP == NULL || result != S_OK) {

-		MessageBoxEx(NULL, TranslateT("Fatal error, image services not found. Flags module will be disabled."), _T("Error"), MB_OK | MB_ICONERROR | MB_APPLMODAL, 0);

+		MessageBoxEx(NULL, TranslateT("Fatal error, image services not found. Flags module will be disabled."), L"Error", MB_OK | MB_ICONERROR | MB_APPLMODAL, 0);

 		return 1;

 	}

 

diff --git a/plugins/UserInfoEx/src/mir_icolib.cpp b/plugins/UserInfoEx/src/mir_icolib.cpp
index 587da1a03e..9f39826acd 100644
--- a/plugins/UserInfoEx/src/mir_icolib.cpp
+++ b/plugins/UserInfoEx/src/mir_icolib.cpp
@@ -128,9 +128,9 @@ static ICODESC icoDesc[] = {
 LPTSTR IcoLib_GetDefaultIconFileName()

 {

 	static LPTSTR path[] = {

-		_T("Icons\\uinfoex_icons.dll"),

-		_T("Plugins\\uinfoex_icons.dll"),

-		_T("Customize\\Icons\\uinfoex_icons.dll")

+		L"Icons\\uinfoex_icons.dll",

+		L"Plugins\\uinfoex_icons.dll",

+		L"Customize\\Icons\\uinfoex_icons.dll"

 	};

 	TCHAR absolute[MAX_PATH];

 

diff --git a/plugins/UserInfoEx/src/psp_contact.cpp b/plugins/UserInfoEx/src/psp_contact.cpp
index da26528cb9..997df02d38 100644
--- a/plugins/UserInfoEx/src/psp_contact.cpp
+++ b/plugins/UserInfoEx/src/psp_contact.cpp
@@ -46,7 +46,7 @@ INT_PTR CALLBACK PSPProcContactHome(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
 				PSGetBoldFont(hDlg, hBoldFont);

 				SendDlgItemMessage(hDlg, IDC_PAGETITLE, WM_SETFONT, (WPARAM)hBoldFont, 0);

 

-				mir_sntprintf(szAddr, _T("%s (%s)"), TranslateT("Address"), TranslateT("home"));

+				mir_sntprintf(szAddr, L"%s (%s)", TranslateT("Address"), TranslateT("home"));

 				SetDlgItemText(hDlg, IDC_PAGETITLE, szAddr);

 				SendDlgItemMessage(hDlg, BTN_GOTO, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Open in browser"), MBBF_TCHAR);

 				TranslateDialogDefault(hDlg);

@@ -126,7 +126,7 @@ INT_PTR CALLBACK PSPProcContactHome(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
 						{

 							HICON hIcon = IcoLib_GetIcon(ICO_BTN_GOTO);

 							SendDlgItemMessage(hDlg, BTN_GOTO, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcon);

-							SetDlgItemText(hDlg, BTN_GOTO, hIcon ? _T("") : _T("->"));

+							SetDlgItemText(hDlg, BTN_GOTO, hIcon ? L"" : L"->");

 

 							hIcon = IcoLib_GetIcon(ICO_COMMON_ADDRESS);

 							SendDlgItemMessage(hDlg, ICO_ADDRESS, STM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcon);

@@ -192,7 +192,7 @@ INT_PTR CALLBACK PSPProcContactWork(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
 				PSGetBoldFont(hDlg, hBoldFont);

 				SendDlgItemMessage(hDlg, IDC_PAGETITLE, WM_SETFONT, (WPARAM)hBoldFont, 0);

 

-				mir_sntprintf(szAddr, _T("%s (%s)"), TranslateT("Address and contact"), TranslateT("company"));

+				mir_sntprintf(szAddr, L"%s (%s)", TranslateT("Address and contact"), TranslateT("company"));

 				SetDlgItemText(hDlg, IDC_PAGETITLE, szAddr);

 				SendDlgItemMessage(hDlg, BTN_GOTO, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Open in browser"), MBBF_TCHAR);

 				TranslateDialogDefault(hDlg);

@@ -270,7 +270,7 @@ INT_PTR CALLBACK PSPProcContactWork(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
 						{

 							HICON hIcon = IcoLib_GetIcon(ICO_BTN_GOTO);

 							SendDlgItemMessage(hDlg, BTN_GOTO, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcon);

-							SetDlgItemText(hDlg, BTN_GOTO, hIcon ? _T("") : _T("->"));

+							SetDlgItemText(hDlg, BTN_GOTO, hIcon ? L"" : L"->");

 

 							hIcon = IcoLib_GetIcon(ICO_COMMON_ADDRESS);

 							SendDlgItemMessage(hDlg, ICO_ADDRESS, STM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcon);

diff --git a/plugins/UserInfoEx/src/psp_origin.cpp b/plugins/UserInfoEx/src/psp_origin.cpp
index 7e104fc3d4..a2c35c73b2 100644
--- a/plugins/UserInfoEx/src/psp_origin.cpp
+++ b/plugins/UserInfoEx/src/psp_origin.cpp
@@ -92,7 +92,7 @@ INT_PTR CALLBACK PSPProcOrigin(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 									mt.UTCToLocal();

 									mt.DateFormatLong(szTime, _countof(szTime));

 									

-									mir_tstrcat(szTime, _T(" - "));

+									mir_tstrcat(szTime, L" - ");

 									ptr = szTime + mir_tstrlen(szTime);

 									mt.TimeFormat(ptr, _countof(szTime) - (ptr - szTime));

 									SetDlgItemText(hDlg, TXT_DATEADDED, szTime);

diff --git a/plugins/UserInfoEx/src/psp_profile.cpp b/plugins/UserInfoEx/src/psp_profile.cpp
index 67bbeb3249..a2a6917b3c 100644
--- a/plugins/UserInfoEx/src/psp_profile.cpp
+++ b/plugins/UserInfoEx/src/psp_profile.cpp
@@ -331,12 +331,12 @@ static HWND ProfileList_BeginLabelEdit(LPLISTCTRL pList, int iItem, int iSubItem
 	}

 	// create the edit control

 	pList->labelEdit.hEdit = CreateWindowEx(WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE,

-				_T("EDIT"),

+				L"EDIT",

 				(!iSubItem && pItem->idstrList && pItem->iListItem > 0 && pItem->iListItem < pItem->idstrListCount) 

 					? pItem->idstrList[pItem->iListItem].ptszTranslated

 					: (iSubItem >= 0 && iSubItem < 2 && pItem->pszText[iSubItem] && *pItem->pszText[iSubItem])

 						? pItem->pszText[iSubItem] 

-						: _T(""), 

+						: L"", 

 						WS_VISIBLE | WS_CHILD | (iSubItem ? (WS_VSCROLL | ES_MULTILINE | ES_AUTOVSCROLL) : ES_AUTOHSCROLL),

 				pList->labelEdit.rcCombo.left, pList->labelEdit.rcCombo.top,

 				pList->labelEdit.rcCombo.right - pList->labelEdit.rcCombo.left,

@@ -933,7 +933,7 @@ static LRESULT CALLBACK ProfileList_SubclassProc(HWND hwnd, UINT msg, WPARAM wPa
 						rc.bottom = rc.top + listHeight;

 					}

 

-					pList->labelEdit.dropDown.hDrop = CreateWindowEx(0, _T("LISTBOX"), NULL,

+					pList->labelEdit.dropDown.hDrop = CreateWindowEx(0, L"LISTBOX", NULL,

 						WS_CHILD | WS_BORDER | WS_VSCROLL | LBS_COMBOBOX | LBS_HASSTRINGS,

 						rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top,

 						hwnd, NULL, ghInst, NULL);

diff --git a/plugins/UserInfoEx/src/svc_refreshci.cpp b/plugins/UserInfoEx/src/svc_refreshci.cpp
index c9b67be6e6..4833e52f12 100644
--- a/plugins/UserInfoEx/src/svc_refreshci.cpp
+++ b/plugins/UserInfoEx/src/svc_refreshci.cpp
@@ -427,7 +427,7 @@ public:
 		_szText = mir_tstrdup(szTitle);

 		mir_tstrcpy(pd.lptzContactName, _szText);

 		

-		mir_tstrcpy(pd.lptzText, _T(" "));

+		mir_tstrcpy(pd.lptzText, L" ");

 		

 		_pFnCallBack = pFnCallBack;

 		_hWnd = (HWND) CallService(MS_POPUP_ADDPOPUPT, (WPARAM) &pd, APF_RETURN_HWND|APF_NEWDATA);

diff --git a/plugins/UserInfoEx/src/svc_reminder.cpp b/plugins/UserInfoEx/src/svc_reminder.cpp
index 827a7840a7..de7ee4ee19 100644
--- a/plugins/UserInfoEx/src/svc_reminder.cpp
+++ b/plugins/UserInfoEx/src/svc_reminder.cpp
@@ -255,7 +255,7 @@ static int NotifyWithPopup(MCONTACT hContact, CEvent::EType eventType, int DaysT
 

 	if (hContact) {

 		ppd.lchContact = hContact;

-		mir_sntprintf(ppd.lptzContactName, _T("%s - %s"), TranslateTS(pszDesc), DB::Contact::DisplayName(hContact));

+		mir_sntprintf(ppd.lptzContactName, L"%s - %s", TranslateTS(pszDesc), DB::Contact::DisplayName(hContact));

 	}

 	else mir_tstrncpy(ppd.lptzContactName, TranslateT("Reminder"), _countof(ppd.lptzContactName));

 

@@ -406,7 +406,7 @@ static BYTE CheckAnniversaries(MCONTACT hContact, MTime &Now, CEvent &evt, BYTE
 								tszMsg += TranslateT("She has the following anniversaries:");

 								break;

 							}						

-						tszMsg.Append(_T("\n- "));

+						tszMsg.Append(L"\n- ");

 

 						switch (Diff) {

 						case 0:

@@ -428,7 +428,7 @@ static BYTE CheckAnniversaries(MCONTACT hContact, MTime &Now, CEvent &evt, BYTE
 	if (numAnniversaries != 0 && bNotify) {

 		if (tszMsg.GetLength() >= MAX_SECONDLINE) {

 			tszMsg.Truncate(MAX_SECONDLINE - 5);

-			tszMsg.Append(_T("\n..."));

+			tszMsg.Append(L"\n...");

 		}

 

 		NotifyWithPopup(hContact, CEvent::ANNIVERSARY, Diff, LPGENT("Anniversaries"), tszMsg);

diff --git a/plugins/UserInfoEx/src/svc_timezone_old.cpp b/plugins/UserInfoEx/src/svc_timezone_old.cpp
index fea63f3996..bd08054600 100644
--- a/plugins/UserInfoEx/src/svc_timezone_old.cpp
+++ b/plugins/UserInfoEx/src/svc_timezone_old.cpp
@@ -193,13 +193,13 @@ public:
 					pTimeZone = new CTimeZone();

 					if (pTimeZone) {

 						cbData = sizeof(szDisplay);

-						result |= RegQueryValueEx(hKeyTz, _T("Display"), 0, 0, (LPBYTE)szDisplay, &cbData);

+						result |= RegQueryValueEx(hKeyTz, L"Display", 0, 0, (LPBYTE)szDisplay, &cbData);

 

 						cbData = sizeof(REG_TZI_FORMAT);

-						result |= RegQueryValueEx(hKeyTz, _T("TZI"), 0, 0, (LPBYTE)pTimeZone, &cbData);

+						result |= RegQueryValueEx(hKeyTz, L"TZI", 0, 0, (LPBYTE)pTimeZone, &cbData);

 

 						cbData = sizeof(DWORD);

-						if (RegQueryValueEx(hKeyTz, _T("Index"), 0, 0, (LPBYTE)(UINT_PTR)pTimeZone->dwIndex, &cbData) != ERROR_SUCCESS)

+						if (RegQueryValueEx(hKeyTz, L"Index", 0, 0, (LPBYTE)(UINT_PTR)pTimeZone->dwIndex, &cbData) != ERROR_SUCCESS)

 							pTimeZone->dwIndex = TZINDEX_UNSPECIFIED;

 

 						if (result == ERROR_SUCCESS) {

@@ -313,56 +313,56 @@ static TZ_MAP MirTZ2WinTZ(const CHAR MirTz)
 	* for retrieving information about daylight saving time and more.

 	**/

 	static const TZ_MAP TzMap[] = {

-		{ 0,	_T("Dateline Standard Time")},			// GMT-12:00 Eniwetok; Kwajalein

-		{-1,	_T("")},								// GMT-11:30

-		{ 1,	_T("Samoa Standard Time")},				// GMT-11:00 Midway Island; Samoa

-		{-1,	_T("")},								// GMT-10:30

-		{ 2,	_T("Hawaiian Standard Time")},			// GMT-10:00 Hawaii

-		{-1,	_T("")},								// GMT-9:30

-		{ 3,	_T("Alaskan Standard Time")},			// GMT-9:00 Alaska

-		{-1,	_T("")},								// GMT-8:30

-		{ 4,	_T("Pacific Standard Time")},			// GMT-8:00 Pacific Time; Tijuana

-		{-1,	_T("")},								// GMT-7:30

-		{15,	_T("US Mountain Standard Time")},		// GMT-7:00 Arizona; Mountain Time

-		{-1,	_T("")},								// GMT-6:30

-		{33,	_T("Central America Standard Time")},	// GMT-6:00 Central Time; Central America; Saskatchewan

-		{-1,	_T("")},								// GMT-5:30

-		{45,	_T("SA Pacific Standard Time")},		// GMT-5:00 Eastern Time; Bogota; Lima; Quito

-		{-1,	_T("")},								// GMT-4:30

-		{56,	_T("Pacific SA Standard Time")},		// GMT-4:00 Atlantic Time; Santiago; Caracas; La Paz

-		{60,	_T("Newfoundland Standard Time")},		// GMT-3:30 Newfoundland

-		{70,	_T("SA Eastern Standard Time")},		// GMT-3:00 Greenland; Buenos Aires; Georgetown

-		{-1,	_T("")},								// GMT-2:30

-		{75,	_T("Mid-Atlantic Standard Time")},		// GMT-2:00 Mid-Atlantic

-		{-1,	_T("")},								// GMT-1:30

-		{80,	_T("Azores Standard Time")},			// GMT-1:00 Cape Verde Islands; Azores

-		{-1,	_T("")},								// GMT-0:30

-		{85,	_T("GMT Standard Time")},				// GMT+0:00 London; Dublin; Edinburgh; Lisbon; Casablanca

-		{-1,	_T("")},								// GMT+0:30

-		{105,	_T("Romance Standard Time")},			// GMT+1:00 Central European Time; West Central Africa; Warsaw

-		{-1,	_T("")},								// GMT+1:30

-		{140,	_T("South Africa Standard Time")},		// GMT+2:00 Jerusalem; Helsinki; Harare; Cairo; Bucharest; Athens

-		{-1,	_T("")},								// GMT+2:30

-		{145,	_T("Russian Standard Time")},			// GMT+3:00 Moscow; St. Petersburg; Nairobi; Kuwait; Baghdad

-		{160,	_T("Iran Standard Time")},				// GMT+3:30 Tehran

-		{165,	_T("Arabian Standard Time")},			// GMT+4:00 Baku; Tbilisi; Yerevan; Abu Dhabi; Muscat

-		{175,	_T("Afghanistan Standard Time")},		// GMT+4:30 Kabul

-		{185,	_T("West Asia Standard Time")},			// GMT+5:00 Calcutta; Chennai; Mumbai; New Delhi; Ekaterinburg

-		{200,	_T("Sri Lanka Standard Time")},			// GMT+5:30 Sri Jayawardenepura

-		{201,	_T("N. Central Asia Standard Time")},	// GMT+6:00 Astana; Dhaka; Almaty; Novosibirsk

-		{203,	_T("Myanmar Standard Time")},			// GMT+6:30 Rangoon

-		{207,	_T("North Asia Standard Time")},		// GMT+7:00 Bankok; Hanoi; Jakarta; Krasnoyarsk

-		{-1,	_T("")},								// GMT+7:30

-		{210,	_T("China Standard Time")},				// GMT+8:00 Perth; Taipei; Singapore; Hong Kong; Beijing

-		{-1,	_T("")},								// GMT+8:30

-		{235,	_T("Tokyo Standard Time")},				// GMT+9:00 Tokyo; Osaka; Seoul; Sapporo; Yakutsk

-		{245,	_T("AUS Central Standard Time")},		// GMT+9:30 Darwin; Adelaide

-		{270,	_T("Vladivostok Standard Time")},		// GMT+10:00 East Australia; Guam; Vladivostok

-		{-1,	_T("")},								// GMT+10:30

-		{280,	_T("Central Pacific Standard Time")},	// GMT+11:00 Magadan; Solomon Is.; New Caledonia

-		{-1,	_T("")},								// GMT+11:30

-		{290,	_T("New Zealand Standard Time")},		// GMT+12:00 Auckland; Wellington; Fiji; Kamchatka; Marshall Is.

-		{-1,	_T("")}

+		{ 0,	L"Dateline Standard Time"},			// GMT-12:00 Eniwetok; Kwajalein

+		{-1,	L""},								// GMT-11:30

+		{ 1,	L"Samoa Standard Time"},				// GMT-11:00 Midway Island; Samoa

+		{-1,	L""},								// GMT-10:30

+		{ 2,	L"Hawaiian Standard Time"},			// GMT-10:00 Hawaii

+		{-1,	L""},								// GMT-9:30

+		{ 3,	L"Alaskan Standard Time"},			// GMT-9:00 Alaska

+		{-1,	L""},								// GMT-8:30

+		{ 4,	L"Pacific Standard Time"},			// GMT-8:00 Pacific Time; Tijuana

+		{-1,	L""},								// GMT-7:30

+		{15,	L"US Mountain Standard Time"},		// GMT-7:00 Arizona; Mountain Time

+		{-1,	L""},								// GMT-6:30

+		{33,	L"Central America Standard Time"},	// GMT-6:00 Central Time; Central America; Saskatchewan

+		{-1,	L""},								// GMT-5:30

+		{45,	L"SA Pacific Standard Time"},		// GMT-5:00 Eastern Time; Bogota; Lima; Quito

+		{-1,	L""},								// GMT-4:30

+		{56,	L"Pacific SA Standard Time"},		// GMT-4:00 Atlantic Time; Santiago; Caracas; La Paz

+		{60,	L"Newfoundland Standard Time"},		// GMT-3:30 Newfoundland

+		{70,	L"SA Eastern Standard Time"},		// GMT-3:00 Greenland; Buenos Aires; Georgetown

+		{-1,	L""},								// GMT-2:30

+		{75,	L"Mid-Atlantic Standard Time"},		// GMT-2:00 Mid-Atlantic

+		{-1,	L""},								// GMT-1:30

+		{80,	L"Azores Standard Time"},			// GMT-1:00 Cape Verde Islands; Azores

+		{-1,	L""},								// GMT-0:30

+		{85,	L"GMT Standard Time"},				// GMT+0:00 London; Dublin; Edinburgh; Lisbon; Casablanca

+		{-1,	L""},								// GMT+0:30

+		{105,	L"Romance Standard Time"},			// GMT+1:00 Central European Time; West Central Africa; Warsaw

+		{-1,	L""},								// GMT+1:30

+		{140,	L"South Africa Standard Time"},		// GMT+2:00 Jerusalem; Helsinki; Harare; Cairo; Bucharest; Athens

+		{-1,	L""},								// GMT+2:30

+		{145,	L"Russian Standard Time"},			// GMT+3:00 Moscow; St. Petersburg; Nairobi; Kuwait; Baghdad

+		{160,	L"Iran Standard Time"},				// GMT+3:30 Tehran

+		{165,	L"Arabian Standard Time"},			// GMT+4:00 Baku; Tbilisi; Yerevan; Abu Dhabi; Muscat

+		{175,	L"Afghanistan Standard Time"},		// GMT+4:30 Kabul

+		{185,	L"West Asia Standard Time"},			// GMT+5:00 Calcutta; Chennai; Mumbai; New Delhi; Ekaterinburg

+		{200,	L"Sri Lanka Standard Time"},			// GMT+5:30 Sri Jayawardenepura

+		{201,	L"N. Central Asia Standard Time"},	// GMT+6:00 Astana; Dhaka; Almaty; Novosibirsk

+		{203,	L"Myanmar Standard Time"},			// GMT+6:30 Rangoon

+		{207,	L"North Asia Standard Time"},		// GMT+7:00 Bankok; Hanoi; Jakarta; Krasnoyarsk

+		{-1,	L""},								// GMT+7:30

+		{210,	L"China Standard Time"},				// GMT+8:00 Perth; Taipei; Singapore; Hong Kong; Beijing

+		{-1,	L""},								// GMT+8:30

+		{235,	L"Tokyo Standard Time"},				// GMT+9:00 Tokyo; Osaka; Seoul; Sapporo; Yakutsk

+		{245,	L"AUS Central Standard Time"},		// GMT+9:30 Darwin; Adelaide

+		{270,	L"Vladivostok Standard Time"},		// GMT+10:00 East Australia; Guam; Vladivostok

+		{-1,	L""},								// GMT+10:30

+		{280,	L"Central Pacific Standard Time"},	// GMT+11:00 Magadan; Solomon Is.; New Caledonia

+		{-1,	L""},								// GMT+11:30

+		{290,	L"New Zealand Standard Time"},		// GMT+12:00 Auckland; Wellington; Fiji; Kamchatka; Marshall Is.

+		{-1,	L""}

 	};

 	return (MirTz >= -24 && MirTz <= 24) ? TzMap[24 - MirTz] : TzMap[49] ;

 }