From 6e53dfca72b932c4bdcd7aa02ca62bf8b2630eac Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 26 Jul 2016 09:20:25 +0000
Subject: less TCHARs: - TCHAR is replaced with wchar_t everywhere; - LPGENT
 replaced with either LPGENW or LPGEN; - fixes for ANSI plugins that
 improperly used _t functions; - TCHAR *t removed from MAllStrings; -
 ptszGroup, ptszTitle & ptszTab in OPTIONSDIALOGPAGE replaced with pwsz*

git-svn-id: http://svn.miranda-ng.org/main/trunk@17133 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Weather/src/weather_popup.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'plugins/Weather/src/weather_popup.cpp')

diff --git a/plugins/Weather/src/weather_popup.cpp b/plugins/Weather/src/weather_popup.cpp
index fcd891e70c..4e721a07a5 100644
--- a/plugins/Weather/src/weather_popup.cpp
+++ b/plugins/Weather/src/weather_popup.cpp
@@ -40,7 +40,7 @@ int WeatherError(WPARAM wParam, LPARAM lParam)
 	if (!opt.UsePopup)
 		return 0;
 
-	TCHAR* tszMsg = (TCHAR*)wParam;
+	wchar_t* tszMsg = (wchar_t*)wParam;
 
 	if ((DWORD)lParam == SM_WARNING)
 		PUShowMessageT(tszMsg, SM_WARNING);
@@ -48,19 +48,19 @@ int WeatherError(WPARAM wParam, LPARAM lParam)
 		PUShowMessageT(tszMsg, SM_NOTIFY);
 	else if ((DWORD)lParam == SM_WEATHERALERT) {
 		POPUPDATAT ppd = { 0 };
-		TCHAR str1[512], str2[512];
+		wchar_t str1[512], str2[512];
 
 		// get the 2 strings
-		_tcsncpy(str1, tszMsg, _countof(str1) - 1);
-		_tcsncpy(str2, tszMsg, _countof(str2) - 1);
-		TCHAR *chop = _tcschr(str1, 255);
+		wcsncpy(str1, tszMsg, _countof(str1) - 1);
+		wcsncpy(str2, tszMsg, _countof(str2) - 1);
+		wchar_t *chop = wcschr(str1, 255);
 		if (chop != NULL)
 			*chop = '\0';
 		else
 			str1[0] = 0;
-		chop = _tcschr(str2, 255);
+		chop = wcschr(str2, 255);
 		if (chop != NULL)
-			_tcsncpy(str2, chop + 1, _countof(str2) - 1);
+			wcsncpy(str2, chop + 1, _countof(str2) - 1);
 		else
 			str2[0] = 0;
 
@@ -81,7 +81,7 @@ int WeatherError(WPARAM wParam, LPARAM lParam)
 //  (threaded)
 // lpzText = error text
 // kind = display type (see m_popup.h)
-int WPShowMessage(TCHAR* lpzText, WORD kind)
+int WPShowMessage(wchar_t* lpzText, WORD kind)
 {
 	NotifyEventHooks(hHookWeatherError, (WPARAM)lpzText, (LPARAM)kind);
 	return 0;
@@ -211,8 +211,8 @@ static void SelectMenuItem(HMENU hMenu, int Check)
 // but does not write to the database
 void ReadPopupOpt(HWND hdlg)
 {
-	TCHAR text[MAX_TEXT_SIZE];
-	TCHAR str[512];
+	wchar_t text[MAX_TEXT_SIZE];
+	wchar_t str[512];
 
 	// popup colour
 	opt.TextColour = SendDlgItemMessage(hdlg, IDC_TEXTCOLOUR, CPM_GETCOLOUR, 0, 0);
@@ -220,7 +220,7 @@ void ReadPopupOpt(HWND hdlg)
 
 	// get delay time
 	GetDlgItemText(hdlg, IDC_DELAY, str, _countof(str));
-	int num = _ttoi(str);
+	int num = _wtoi(str);
 	opt.pDelay = num;
 
 	// other options
@@ -244,7 +244,7 @@ void ReadPopupOpt(HWND hdlg)
 INT_PTR CALLBACK DlgPopupOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	int ID;
-	TCHAR str[512];
+	wchar_t str[512];
 	HMENU hMenu, hMenu1;
 	RECT pos;
 	HWND button;
@@ -273,7 +273,7 @@ INT_PTR CALLBACK DlgPopupOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam)
 		SetDlgItemText(hdlg, IDC_PText, opt.pText);
 		SetDlgItemText(hdlg, IDC_PTitle, opt.pTitle);
 		// setting popup delay option
-		_ltot(opt.pDelay, str, 10);
+		_ltow(opt.pDelay, str, 10);
 		SetDlgItemText(hdlg, IDC_DELAY, str);
 		if (opt.pDelay == -1)
 			CheckRadioButton(hdlg, IDC_PD1, IDC_PD3, IDC_PD2);
@@ -394,7 +394,7 @@ INT_PTR CALLBACK DlgPopupOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam)
 
 		case IDC_VAR3:
 			// display variable list
-			_tcsncpy(str, L"                                                            \n", _countof(str) - 1);		// to make the message box wider
+			wcsncpy(str, L"                                                            \n", _countof(str) - 1);		// to make the message box wider
 			mir_tstrncat(str, VAR_LIST_POPUP, _countof(str) - mir_tstrlen(str));
 			mir_tstrncat(str, L"\n", _countof(str) - mir_tstrlen(str));
 			mir_tstrncat(str, CUSTOM_VARS, _countof(str) - mir_tstrlen(str));
-- 
cgit v1.2.3