no more TCHARs

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

8 files changed, 21 insertions, 21 deletions

diff --git a/plugins/SendScreenshotPlus/src/CSend.cpp b/plugins/SendScreenshotPlus/src/CSend.cpp
index ac1082df93..61e4be2080 100644
--- a/plugins/SendScreenshotPlus/src/CSend.cpp
+++ b/plugins/SendScreenshotPlus/src/CSend.cpp
@@ -124,16 +124,16 @@ INT_PTR CALLBACK CSend::ResultDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam,
 				case ID_btnCopy:
 				case ID_btnThumbCopy:
 					SendDlgItemMessage(hwndDlg, i, BM_SETIMAGE, IMAGE_ICON, (LPARAM)GetIconBtn(ICO_BTN_COPY));
-					SendDlgItemMessage(hwndDlg, i, BUTTONADDTOOLTIP, (WPARAM)LPGENW("Copy"), BATF_TCHAR);
+					SendDlgItemMessage(hwndDlg, i, BUTTONADDTOOLTIP, (WPARAM)LPGENW("Copy"), BATF_UNICODE);
 					break;
 				case ID_btnBBC:
 				case ID_btnThumbBBC:
 					SendDlgItemMessage(hwndDlg, i, BM_SETIMAGE, IMAGE_ICON, (LPARAM)GetIconBtn(ICO_BTN_BBC));
-					SendDlgItemMessage(hwndDlg, i, BUTTONADDTOOLTIP, (WPARAM)LPGENW("Copy BBCode"), BATF_TCHAR);
+					SendDlgItemMessage(hwndDlg, i, BUTTONADDTOOLTIP, (WPARAM)LPGENW("Copy BBCode"), BATF_UNICODE);
 					break;
 				default:
 					SendDlgItemMessage(hwndDlg, i, BM_SETIMAGE, IMAGE_ICON, (LPARAM)GetIconBtn(ICO_BTN_BBCLNK));
-					SendDlgItemMessage(hwndDlg, i, BUTTONADDTOOLTIP, (WPARAM)LPGENW("Copy BBCode w/ link"), BATF_TCHAR);
+					SendDlgItemMessage(hwndDlg, i, BUTTONADDTOOLTIP, (WPARAM)LPGENW("Copy BBCode w/ link"), BATF_UNICODE);
 				}
 			}
 		}
@@ -404,7 +404,7 @@ void CSend::Error(LPCTSTR pszFormat, ...)
 
 	va_list vl;
 	va_start(vl, pszFormat);
-	mir_vsnwprintf(tszMsg, _countof(tszMsg), TranslateTS(pszFormat), vl);
+	mir_vsnwprintf(tszMsg, _countof(tszMsg), TranslateW(pszFormat), vl);
 	va_end(vl);
 	mir_free(m_ErrorMsg), m_ErrorMsg = mir_wstrdup(tszMsg);
 
@@ -436,7 +436,7 @@ void CSend::Exit(unsigned int Result)
 			break;
 		case ACKRESULT_DENIED:
 			SkinPlaySound("FileDenied");
-			Error(L"%s (%i):\nFile transfer denied.", TranslateTS(m_pszSendTyp), Result);
+			Error(L"%s (%i):\nFile transfer denied.", TranslateW(m_pszSendTyp), Result);
 			MsgBoxService(NULL, (LPARAM)&m_box);
 			err = false;
 			break;
diff --git a/plugins/SendScreenshotPlus/src/CSendDropbox.cpp b/plugins/SendScreenshotPlus/src/CSendDropbox.cpp
index 47b7f778e6..948dcbccc1 100644
--- a/plugins/SendScreenshotPlus/src/CSendDropbox.cpp
+++ b/plugins/SendScreenshotPlus/src/CSendDropbox.cpp
@@ -60,7 +60,7 @@ void CSendDropbox::SendThread()
 
 	if (CallService(MS_DROPBOX_UPLOAD, (WPARAM)&m_URL, (LPARAM)&ui))
 	{
-		Error(LPGENW("%s (%i):\nCould not add a share to the Dropbox plugin."), TranslateTS(m_pszSendTyp), 0);
+		Error(LPGENW("%s (%i):\nCould not add a share to the Dropbox plugin."), TranslateW(m_pszSendTyp), 0);
 		Exit(ACKRESULT_FAILED); return;
 	}
 
diff --git a/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp b/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp
index 3267ecdd14..e742c7fe08 100644
--- a/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp
+++ b/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp
@@ -74,7 +74,7 @@ void CSendFTPFile::SendThread()
 
 	INT_PTR ret = FTPFileUploadA(m_hContact, FNUM_DEFAULT, FMODE_RAWFILE, &m_pszFileName, 1);
 	if (ret != 0) {
-		Error(LPGENW("%s (%i):\nCould not add a share to the FTP File plugin."), TranslateTS(m_pszSendTyp), ret);
+		Error(LPGENW("%s (%i):\nCould not add a share to the FTP File plugin."), TranslateW(m_pszSendTyp), ret);
 		Exit(ret); return;
 	}
 
diff --git a/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp b/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp
index 636b49d1b3..f02707547b 100644
--- a/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp
+++ b/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp
@@ -102,7 +102,7 @@ void CSendHTTPServer::SendThread()
 	}
 
 	if (ret != 0) {
-		Error(LPGENW("%s (%i):\nCould not add a share to the HTTP Server plugin."), TranslateTS(m_pszSendTyp), ret);
+		Error(LPGENW("%s (%i):\nCould not add a share to the HTTP Server plugin."), TranslateW(m_pszSendTyp), ret);
 		Exit(ret); return;
 	}
 
diff --git a/plugins/SendScreenshotPlus/src/Main.cpp b/plugins/SendScreenshotPlus/src/Main.cpp
index dd1e9f5111..045bcbff2c 100644
--- a/plugins/SendScreenshotPlus/src/Main.cpp
+++ b/plugins/SendScreenshotPlus/src/Main.cpp
@@ -81,7 +81,7 @@ wchar_t* GetCustomPath()
 		MessageBox(NULL, L"Can not retrieve screenshot path.", L"SendSS", MB_OK | MB_ICONERROR | MB_APPLMODAL);
 		return 0;
 	}
-	int result = CreateDirectoryTreeT(pszPath);
+	int result = CreateDirectoryTreeW(pszPath);
 	if (result) {
 		wchar_t szError[MAX_PATH];
 		mir_snwprintf(szError, MAX_PATH, TranslateT("Could not create screenshot folder (error code: %d):\n%s\nDo you have write permissions?"), result, pszPath);
@@ -234,7 +234,7 @@ int hook_ModulesLoaded(WPARAM, LPARAM)
 	NETLIBUSER nlu = { sizeof(nlu) };
 	nlu.szSettingsModule = __PLUGIN_NAME;
 	nlu.ptszDescriptiveName = TranslateT("SendSS HTTP connections");
-	nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_TCHAR;			//|NUF_NOHTTPSOPTION;
+	nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_UNICODE;			//|NUF_NOHTTPSOPTION;
 	g_hNetlibUser = (HANDLE)CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM)&nlu);
 	// load my button class / or use UInfoEx
 	CtrlButtonLoadModule();
@@ -285,7 +285,7 @@ DLL_EXPORT int Load(void)
 
 	// menu items
 	CMenuItem mi;
-	mi.flags = CMIF_TCHAR;
+	mi.flags = CMIF_UNICODE;
 	mi.hIcolibItem = GetIconHandle(ICO_MAINXS);
 
 	SET_UID(mi, 0xa559a22e, 0xd0f9, 0x4553, 0x8e, 0x68, 0x55, 0xb3, 0xae, 0xc4, 0x5d, 0x93);
@@ -309,12 +309,12 @@ DLL_EXPORT int Load(void)
 	/// hotkey's
 	HOTKEYDESC hkd = { sizeof(hkd) };
 	hkd.pszName = "Open SendSS+";
-	hkd.ptszDescription = LPGENW("Open SendSS+");
-	hkd.ptszSection = L"SendSS+";
+	hkd.pwszDescription = LPGENW("Open SendSS+");
+	hkd.pwszSection = L"SendSS+";
 	hkd.pszService = MS_SENDSS_OPENDIALOG;
 	//hkd.DefHotKey=HOTKEYCODE(HOTKEYF_CONTROL, VK_F10) | HKF_MIRANDA_LOCAL;
 	hkd.lParam = 0xFFFF;
-	hkd.dwFlags = HKD_TCHAR;
+	hkd.dwFlags = HKD_UNICODE;
 	Hotkey_Register(&hkd);
 	/// register highlighter window class
 	HBRUSH brush = CreateSolidBrush(0x0000FF00);//owned by class
diff --git a/plugins/SendScreenshotPlus/src/UMainForm.cpp b/plugins/SendScreenshotPlus/src/UMainForm.cpp
index 9d7ac40e04..c572477943 100644
--- a/plugins/SendScreenshotPlus/src/UMainForm.cpp
+++ b/plugins/SendScreenshotPlus/src/UMainForm.cpp
@@ -177,7 +177,7 @@ void TfrmMain::wmInitdialog(WPARAM, LPARAM)
 
 	wchar_t *pt = mir_wstrdup(pcli->pfnGetContactDisplayName(m_hContact, 0));
 	if (pt && (m_hContact != 0)) {
-		CMString string;
+		CMStringW string;
 		string.AppendFormat(TranslateT("Send screenshot to %s"), pt);
 		SetWindowText(m_hWnd, string);
 	}
@@ -988,7 +988,7 @@ INT_PTR TfrmMain::SaveScreenshot(FIBITMAP* dib)
 	GetDlgItemText(m_hwndTabPage, ID_edtCaption, winText, _countof(winText));
 
 
-	CMString tszFileDesc;
+	CMStringW tszFileDesc;
 
 	if (m_opt_tabCapture)
 		tszFileDesc.Format(TranslateT("Screenshot of \"%s\""), winText);
diff --git a/plugins/SendScreenshotPlus/src/ctrl_button.cpp b/plugins/SendScreenshotPlus/src/ctrl_button.cpp
index d68cb3ed14..54d20d58ef 100644
--- a/plugins/SendScreenshotPlus/src/ctrl_button.cpp
+++ b/plugins/SendScreenshotPlus/src/ctrl_button.cpp
@@ -566,7 +566,7 @@ static LRESULT CALLBACK Button_WndProc(HWND hwndBtn, UINT uMsg, WPARAM wParam, L
 	case BUTTONTRANSLATE:
 		wchar_t szButton[MAX_PATH];
 		GetWindowText(bct->hwnd, szButton, _countof(szButton));
-		SetWindowText(bct->hwnd, TranslateTS(szButton));
+		SetWindowText(bct->hwnd, TranslateW(szButton));
 		break;
 	
 	case WM_SETFOCUS: // set keybord bFocus and redraw
diff --git a/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp b/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp
index 95b567af0f..8f5e9ed568 100644
--- a/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp
+++ b/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp
@@ -677,7 +677,7 @@ INT_PTR CALLBACK MsgBox(HWND hParent, UINT uType, LPCTSTR pszTitle, LPCTSTR pszI
 
 	va_list vl;
 	va_start(vl, pszFormat);
-	mir_vsnwprintf(tszMsg, _countof(tszMsg), TranslateTS(pszFormat), vl);
+	mir_vsnwprintf(tszMsg, _countof(tszMsg), TranslateW(pszFormat), vl);
 	va_end(vl);
 
 	MSGBOX mb = { 0 };
@@ -685,8 +685,8 @@ INT_PTR CALLBACK MsgBox(HWND hParent, UINT uType, LPCTSTR pszTitle, LPCTSTR pszI
 	mb.hParent = hParent;
 	mb.hiLogo = IcoLib_GetIcon(ICO_COMMON_MAIN);
 	mb.hiMsg = NULL;
-	mb.ptszTitle = TranslateTS(pszTitle);
-	mb.ptszInfoText = TranslateTS(pszInfo);
+	mb.ptszTitle = TranslateW(pszTitle);
+	mb.ptszInfoText = TranslateW(pszInfo);
 	mb.ptszMsg = tszMsg;
 	mb.uType = uType;
 	return MsgBoxService(NULL, (LPARAM)&mb);
@@ -704,7 +704,7 @@ INT_PTR CALLBACK MsgErr(HWND hParent, LPCTSTR pszFormat, ...)
 
 	va_list vl;
 	va_start(vl, pszFormat);
-	mir_vsnwprintf(tszMsg, TranslateTS(pszFormat), vl);
+	mir_vsnwprintf(tszMsg, TranslateW(pszFormat), vl);
 	va_end(vl);
 
 	MSGBOX mb = { 0 };