hello, Unix.

phase 1: removing _T()

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

5 files changed, 26 insertions, 26 deletions

diff --git a/plugins/mTextControl/src/FormattedTextDraw.cpp b/plugins/mTextControl/src/FormattedTextDraw.cpp
index 0c734a02b8..8bce9290e3 100644
--- a/plugins/mTextControl/src/FormattedTextDraw.cpp
+++ b/plugins/mTextControl/src/FormattedTextDraw.cpp
@@ -120,7 +120,7 @@ HRESULT CFormattedTextDraw::putTextA(char *newVal)
 	cf.cbSize = sizeof(cf);

 	cf.dwMask = CFM_FACE | CFM_BOLD;

 	cf.dwEffects = 0;

-	_tcsncpy_s(cf.szFaceName, _T("MS Shell Dlg"), _TRUNCATE);

+	_tcsncpy_s(cf.szFaceName, L"MS Shell Dlg", _TRUNCATE);

 	m_spTextServices->TxSendMessage(EM_SETCHARFORMAT, (WPARAM)(SCF_ALL), (LPARAM)&cf, &lResult);

 

 	return S_OK;

@@ -148,7 +148,7 @@ HRESULT CFormattedTextDraw::putTextW(WCHAR *newVal)
 	cf.cbSize = sizeof(cf);

 	cf.dwMask = CFM_FACE | CFM_BOLD;

 	cf.dwEffects = 0;

-	_tcsncpy_s(cf.szFaceName, _T("MS Shell Dlg"), _TRUNCATE);

+	_tcsncpy_s(cf.szFaceName, L"MS Shell Dlg", _TRUNCATE);

 	m_spTextServices->TxSendMessage(EM_SETCHARFORMAT, (WPARAM)(SCF_ALL), (LPARAM)&cf, &lResult);

 	return S_OK;

 }

diff --git a/plugins/mTextControl/src/ImageDataObjectHlp.cpp b/plugins/mTextControl/src/ImageDataObjectHlp.cpp
index a7d8ae6a06..762ccf7322 100644
--- a/plugins/mTextControl/src/ImageDataObjectHlp.cpp
+++ b/plugins/mTextControl/src/ImageDataObjectHlp.cpp
@@ -72,7 +72,7 @@ HENHMETAFILE CacheIconToEmf(HICON hIcon)
 		emfCache = newItem;

 		emfCacheSize++;

 

-		HDC emfdc = CreateEnhMetaFile(NULL, NULL, NULL, _T("icon"));

+		HDC emfdc = CreateEnhMetaFile(NULL, NULL, NULL, L"icon");

 		DrawIconEx(emfdc, 0, 0, (HICON)hIcon, 16, 16, 0, NULL, DI_NORMAL);

 		emfCache->hIcon = hIcon;

 		emfCache->hEmf = CloseEnhMetaFile(emfdc);

diff --git a/plugins/mTextControl/src/fancy_rtf.cpp b/plugins/mTextControl/src/fancy_rtf.cpp
index e94ef784af..a210632700 100644
--- a/plugins/mTextControl/src/fancy_rtf.cpp
+++ b/plugins/mTextControl/src/fancy_rtf.cpp
@@ -55,7 +55,7 @@ static bool bbCodeSimpleFunc(IFormattedTextDraw *ftd, CHARRANGE range, TCHAR *,
 	ts->TxSendMessage(EM_SETSEL, range.cpMin, -1, &lResult);

 	ts->TxSendMessage(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf, &lResult);

 	ts->TxSendMessage(EM_SETSEL, range.cpMin, range.cpMax, &lResult);

-	ts->TxSendMessage(EM_REPLACESEL, FALSE, (LPARAM)_T(""), &lResult);

+	ts->TxSendMessage(EM_REPLACESEL, FALSE, (LPARAM)L"", &lResult);

 

 	return true;

 }

@@ -85,24 +85,24 @@ static bool bbCodeImageFunc(IFormattedTextDraw *ftd, CHARRANGE range, TCHAR *txt
 

 static BBCodeInfo bbCodes[] =

 {

-	{ _T("[b]"), 0, bbCodeSimpleFunc, BBS_BOLD_S },

-	{ _T("[/b]"), 0, bbCodeSimpleFunc, BBS_BOLD_E },

-	{ _T("[i]"), 0, bbCodeSimpleFunc, BBS_ITALIC_S },

-	{ _T("[/i]"), 0, bbCodeSimpleFunc, BBS_ITALIC_E },

-	{ _T("[u]"), 0, bbCodeSimpleFunc, BBS_UNDERLINE_S },

-	{ _T("[/u]"), 0, bbCodeSimpleFunc, BBS_UNDERLINE_E },

-	{ _T("[s]"), 0, bbCodeSimpleFunc, BBS_STRIKEOUT_S },

-	{ _T("[/s]"), 0, bbCodeSimpleFunc, BBS_STRIKEOUT_E },

-

-	//	{ _T("[color="),  _T("]"),     bbCodeSimpleFunc, BBS_COLOR_S },

-	//	{ _T("[/color]"), 0,           bbCodeSimpleFunc, BBS_COLOR_E }

-

-	{ _T("[$hicon="), _T("$]"), bbCodeImageFunc, 0 }

-

-	//	{ _T("[url]"),   _T("[/url]"), bbCodeSimpleFunc, BBS_URL1 },

-	//	{ _T("[url="),    _T("]"),     bbCodeSimpleFunc, BBS_URL2 },

-	//	{ _T("[url]"),   _T("[/url]"), bbCodeSimpleFunc, BBS_IMG1 },

-	//	{ _T("[url="),    _T("]"),     bbCodeSimpleFunc, BBS_IMG2 },

+	{ L"[b]", 0, bbCodeSimpleFunc, BBS_BOLD_S },

+	{ L"[/b]", 0, bbCodeSimpleFunc, BBS_BOLD_E },

+	{ L"[i]", 0, bbCodeSimpleFunc, BBS_ITALIC_S },

+	{ L"[/i]", 0, bbCodeSimpleFunc, BBS_ITALIC_E },

+	{ L"[u]", 0, bbCodeSimpleFunc, BBS_UNDERLINE_S },

+	{ L"[/u]", 0, bbCodeSimpleFunc, BBS_UNDERLINE_E },

+	{ L"[s]", 0, bbCodeSimpleFunc, BBS_STRIKEOUT_S },

+	{ L"[/s]", 0, bbCodeSimpleFunc, BBS_STRIKEOUT_E },

+

+	//	{ L"[color=",  L"]",     bbCodeSimpleFunc, BBS_COLOR_S },

+	//	{ L"[/color]", 0,           bbCodeSimpleFunc, BBS_COLOR_E }

+

+	{ L"[$hicon=", L"$]", bbCodeImageFunc, 0 }

+

+	//	{ L"[url]",   L"[/url]", bbCodeSimpleFunc, BBS_URL1 },

+	//	{ L"[url=",    L"]",     bbCodeSimpleFunc, BBS_URL2 },

+	//	{ L"[url]",   L"[/url]", bbCodeSimpleFunc, BBS_IMG1 },

+	//	{ L"[url=",    L"]",     bbCodeSimpleFunc, BBS_IMG2 },

 };

 static int bbCodeCount = sizeof(bbCodes) / sizeof(*bbCodes);

 

diff --git a/plugins/mTextControl/src/main.cpp b/plugins/mTextControl/src/main.cpp
index 96c9d4865f..f96175de84 100644
--- a/plugins/mTextControl/src/main.cpp
+++ b/plugins/mTextControl/src/main.cpp
@@ -60,7 +60,7 @@ extern "C" __declspec(dllexport) int Load(void)
 	mir_getLP(&pluginInfoEx);

 

 	MyCreateTextServices = 0;

-	hMsfteditDll = LoadLibrary(_T("msftedit.dll"));

+	hMsfteditDll = LoadLibrary(L"msftedit.dll");

 	if (hMsfteditDll)

 		MyCreateTextServices = (pfnMyCreateTextServices)GetProcAddress(hMsfteditDll, "CreateTextServices");

 

diff --git a/plugins/mTextControl/src/richeditutils.cpp b/plugins/mTextControl/src/richeditutils.cpp
index 16008472f9..d94785d475 100644
--- a/plugins/mTextControl/src/richeditutils.cpp
+++ b/plugins/mTextControl/src/richeditutils.cpp
@@ -77,7 +77,7 @@ public:
 	HRESULT STDMETHODCALLTYPE  GetNewStorage(LPSTORAGE * lplpstg)

 	{

 		TCHAR sztName[64];

-		mir_sntprintf(sztName, _T("s%u"), this->nextStgId);

+		mir_sntprintf(sztName, L"s%u", this->nextStgId);

 		if (this->pictStg == NULL)

 			return STG_E_MEDIUMFULL;

 

@@ -135,7 +135,7 @@ void LoadRichEdit()
 	wcl.hCursor = LoadCursor(NULL, IDC_ARROW);

 	wcl.hbrBackground = (HBRUSH)GetStockObject(LTGRAY_BRUSH);

 	wcl.lpszMenuName = NULL;

-	wcl.lpszClassName = _T("NBRichEditProxyWndClass");

+	wcl.lpszClassName = L"NBRichEditProxyWndClass";

 	wcl.hIconSm = 0;

 	RegisterClassEx(&wcl);

 }

@@ -147,7 +147,7 @@ void UnloadRichEdit()
 

 HWND CreateProxyWindow(ITextServices *ts)

 {

-	HWND hwnd = CreateWindow(_T("NBRichEditProxyWndClass"), _T(""), 0, 0, 0, 0, 0, 0, 0, hInst, 0);

+	HWND hwnd = CreateWindow(L"NBRichEditProxyWndClass", L"", 0, 0, 0, 0, 0, 0, 0, hInst, 0);

 	SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)ts);

 	return hwnd;

 }