From 8ae3679aa1339ce9abee53adb69902bd6b7513dc Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 25 Jul 2016 10:31:04 +0000
Subject: hello, Unix. phase 1: removing _T()

git-svn-id: http://svn.miranda-ng.org/main/trunk@17127 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/IEView/src/HTMLBuilder.cpp         |  4 ++--
 plugins/IEView/src/IEView.cpp              |  2 +-
 plugins/IEView/src/Options.cpp             |  2 +-
 plugins/IEView/src/TemplateHTMLBuilder.cpp | 10 +++++-----
 plugins/IEView/src/Utils.cpp               |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'plugins/IEView')

diff --git a/plugins/IEView/src/HTMLBuilder.cpp b/plugins/IEView/src/HTMLBuilder.cpp
index 2833d432de..24d39ed408 100644
--- a/plugins/IEView/src/HTMLBuilder.cpp
+++ b/plugins/IEView/src/HTMLBuilder.cpp
@@ -185,10 +185,10 @@ void HTMLBuilder::getUINs(MCONTACT hContact, char *&uinIn, char *&uinOut)
 	hContact = getRealContact(hContact);
 
 	ptrT id(Contact_GetInfo(CNF_UNIQUEID, hContact));
-	uinIn = mir_utf8encodeT(id ? id.get() : _T(""));
+	uinIn = mir_utf8encodeT(id ? id.get() : L"");
 
 	id = Contact_GetInfo(CNF_UNIQUEID, NULL);
-	uinOut = mir_utf8encodeT(id ? id.get() : _T(""));
+	uinOut = mir_utf8encodeT(id ? id.get() : L"");
 }
 
 wchar_t* HTMLBuilder::getContactName(MCONTACT hContact, const char *szProto)
diff --git a/plugins/IEView/src/IEView.cpp b/plugins/IEView/src/IEView.cpp
index d57f9c8582..adc87feb1b 100644
--- a/plugins/IEView/src/IEView.cpp
+++ b/plugins/IEView/src/IEView.cpp
@@ -168,7 +168,7 @@ void IEViewSink::PropertyChange(BSTR) {}
 void IEViewSink::BeforeNavigate2(IDispatch*, VARIANT* url, VARIANT*, VARIANT*, VARIANT*, VARIANT*, VARIANT_BOOL* cancel)
 {
 #ifndef GECKO
-	if (mir_tstrcmp(url->bstrVal, _T("about:blank")))
+	if (mir_tstrcmp(url->bstrVal, L"about:blank"))
 	{
 		Utils_OpenUrlT(url->bstrVal);
 		*cancel = VARIANT_TRUE;
diff --git a/plugins/IEView/src/Options.cpp b/plugins/IEView/src/Options.cpp
index b7fa241abd..94495a434c 100644
--- a/plugins/IEView/src/Options.cpp
+++ b/plugins/IEView/src/Options.cpp
@@ -509,7 +509,7 @@ static INT_PTR CALLBACK IEViewGeneralOptDlgProc(HWND hwndDlg, UINT msg, WPARAM w
 		EnableWindow(GetDlgItem(hwndDlg, IDC_SMILEYS_IN_NAMES), Options::isSmileyAdd());
 		EnableWindow(GetDlgItem(hwndDlg, IDC_EMBED_SIZE), IsDlgButtonChecked(hwndDlg, IDC_ENABLE_EMBED));
 		{
-			TCHAR* size[] = { _T("320 x 205"), _T("480 x 385"), _T("560 x 349"), _T("640 x 390") };
+			TCHAR* size[] = { L"320 x 205", L"480 x 385", L"560 x 349", L"640 x 390" };
 			for (int i = 0; i < _countof(size); ++i) {
 				int item = SendDlgItemMessage(hwndDlg, IDC_EMBED_SIZE, CB_ADDSTRING, 0, (LPARAM)TranslateTS(size[i]));
 				SendDlgItemMessage(hwndDlg, IDC_EMBED_SIZE, CB_SETITEMDATA, item, 0);
diff --git a/plugins/IEView/src/TemplateHTMLBuilder.cpp b/plugins/IEView/src/TemplateHTMLBuilder.cpp
index 9be18d0f3e..49ee57bc83 100644
--- a/plugins/IEView/src/TemplateHTMLBuilder.cpp
+++ b/plugins/IEView/src/TemplateHTMLBuilder.cpp
@@ -58,7 +58,7 @@ char* TemplateHTMLBuilder::getAvatar(MCONTACT hContact, const char *szProto)
 			if (result == NULL) {
 				/* relative -> absolute */
 				mir_tstrcpy(tmpPath, dbv.ptszVal);
-				if (_tcsncmp(tmpPath, _T("http://"), 7))
+				if (_tcsncmp(tmpPath, L"http://", 7))
 					PathToAbsoluteT(dbv.ptszVal, tmpPath);
 				result = tmpPath;
 			}
@@ -86,7 +86,7 @@ char *TemplateHTMLBuilder::timestampToString(DWORD dwFlags, time_t check, int mo
 	TCHAR str[300];
 
 	if (mode) // time
-		TimeZone_ToStringT(check, (dwFlags & Options::LOG_SHOW_SECONDS) ? _T("s") : _T("t"), str, _countof(str));
+		TimeZone_ToStringT(check, (dwFlags & Options::LOG_SHOW_SECONDS) ? L"s" : L"t", str, _countof(str));
 	else { // date
 		struct tm tm_now, tm_today;
 		time_t now = time(NULL);
@@ -100,7 +100,7 @@ char *TemplateHTMLBuilder::timestampToString(DWORD dwFlags, time_t check, int mo
 		else if (dwFlags & Options::LOG_RELATIVE_DATE && check > (today - 86400))
 			_tcsncpy(str, TranslateT("Yesterday"), _countof(str));
 		else
-			TimeZone_ToStringT(check, (dwFlags & Options::LOG_LONG_DATE) ? _T("D") : _T("d"), str, _countof(str));
+			TimeZone_ToStringT(check, (dwFlags & Options::LOG_LONG_DATE) ? L"D" : L"d", str, _countof(str));
 	}
 
 	mir_strncpy(szResult, T2Utf(str), 500);
@@ -157,7 +157,7 @@ void TemplateHTMLBuilder::buildHeadTemplate(IEView *view, IEVIEWEVENT *event, Pr
 	TCHAR *szNoAvatarPathTmp = _tcsrchr(szNoAvatarPath, '\\');
 	if (szNoAvatarPathTmp != NULL)
 		*szNoAvatarPathTmp = 0;
-	mir_tstrcat(szNoAvatarPath, _T("\\noavatar.png"));
+	mir_tstrcat(szNoAvatarPath, L"\\noavatar.png");
 	if (_taccess(szNoAvatarPath, 0) == -1)
 		mir_snprintf(tempStr, "%snoavatar.jpg", tempBase);
 	else
@@ -326,7 +326,7 @@ void TemplateHTMLBuilder::appendEventTemplate(IEView *view, IEVIEWEVENT *event,
 	TCHAR *szNoAvatarPathTmp = _tcsrchr(szNoAvatarPath, '\\');
 	if (szNoAvatarPathTmp != NULL)
 		*szNoAvatarPathTmp = 0;
-	mir_tstrcat(szNoAvatarPath, _T("\\noavatar.png"));
+	mir_tstrcat(szNoAvatarPath, L"\\noavatar.png");
 	if (_taccess(szNoAvatarPath, 0) == -1)
 		mir_snprintf(tempStr, "%snoavatar.jpg", tempBase);
 	else
diff --git a/plugins/IEView/src/Utils.cpp b/plugins/IEView/src/Utils.cpp
index a7e55a5541..56af00067a 100644
--- a/plugins/IEView/src/Utils.cpp
+++ b/plugins/IEView/src/Utils.cpp
@@ -25,7 +25,7 @@ wchar_t Utils::base_dir[MAX_PATH];
 
 const wchar_t *Utils::getBaseDir()
 {
-	PathToAbsoluteT(_T("miranda32.exe"), base_dir);
+	PathToAbsoluteT(L"miranda32.exe", base_dir);
 	return base_dir;
 }
 
-- 
cgit v1.2.3