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/UserInfoEx/src/svc_refreshci.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'plugins/UserInfoEx/src/svc_refreshci.cpp')

diff --git a/plugins/UserInfoEx/src/svc_refreshci.cpp b/plugins/UserInfoEx/src/svc_refreshci.cpp
index 4833e52f12..b844322721 100644
--- a/plugins/UserInfoEx/src/svc_refreshci.cpp
+++ b/plugins/UserInfoEx/src/svc_refreshci.cpp
@@ -115,7 +115,7 @@ public:
 	{
 		if (szText)
 		{
-			TCHAR buf[MAXDATASIZE];
+			wchar_t buf[MAXDATASIZE];
 			va_list vl;
 			
 			va_start(vl, szText);
@@ -144,11 +144,11 @@ public:
 		if (szText)
 		{
 			INT_PTR cch = mir_tstrlen(szText);
-			LPTSTR	fmt = (LPTSTR) mir_alloc((cch + 1) * sizeof(TCHAR));
+			LPTSTR	fmt = (LPTSTR) mir_alloc((cch + 1) * sizeof(wchar_t));
 			
 			if (fmt)
 			{
-				TCHAR buf[MAXDATASIZE];
+				wchar_t buf[MAXDATASIZE];
 				va_list vl;
 
 				mir_tstrcpy(fmt, szText);
@@ -165,13 +165,13 @@ public:
 							// leading bbcode tag (e.g.: [b], [u], [i])
 							if ((s[1] == 'b' || s[1] == 'u' || s[1] == 'i') && s[2] == ']')
 							{
-								memmove(s, s + 3, (e - s - 2) * sizeof(TCHAR));
+								memmove(s, s + 3, (e - s - 2) * sizeof(wchar_t));
 								e -= 3;
 							}
 							// ending bbcode tag (e.g.: [/b], [/u], [/i])
 							else if (s[1] == '/' && (s[2] == 'b' || s[2] == 'u' || s[2] == 'i') && s[3] == ']')
 							{
-								memmove(s, s + 4, (e - s - 3) * sizeof(TCHAR));
+								memmove(s, s + 4, (e - s - 3) * sizeof(wchar_t));
 								e -= 4;
 							}
 						}
@@ -346,7 +346,7 @@ class CPopupUpdProgress : public CUpdProgress
 		if (_szText)
 		{
 			INT_PTR cb = mir_tstrlen(_szText) + 8;
-			LPTSTR	pb = (LPTSTR) mir_alloc(cb * sizeof(TCHAR));
+			LPTSTR	pb = (LPTSTR) mir_alloc(cb * sizeof(wchar_t));
 
 			if (pb)
 			{
@@ -602,7 +602,7 @@ class CContactUpdater : public CContactQueue
 
 		// reset menu
 		if (hMenuItemRefresh)
-			Menu_ModifyItem(hMenuItemRefresh, LPGENT("Refresh contact details"), IcoLib_GetIcon(ICO_BTN_UPDATE));
+			Menu_ModifyItem(hMenuItemRefresh, LPGENW("Refresh contact details"), IcoLib_GetIcon(ICO_BTN_UPDATE));
 	}
 
 	/**
@@ -713,7 +713,7 @@ public:
 
 		// if there are contacts in the queue, change the main menu item to indicate it is meant for canceling.
 		if (hMenuItemRefresh && Size() > 0)
-			Menu_ModifyItem(hMenuItemRefresh, LPGENT("Abort Refreshing Contact Details"), IcoLib_GetIcon(ICO_BTN_CANCEL));
+			Menu_ModifyItem(hMenuItemRefresh, LPGENW("Abort Refreshing Contact Details"), IcoLib_GetIcon(ICO_BTN_CANCEL));
 	}
 
 	/**
@@ -785,20 +785,20 @@ static INT_PTR RefreshService(WPARAM, LPARAM)
 			{
 				ContactUpdater->RefreshAll();
 			}
-			else if (IDYES == MsgBox(NULL, MB_YESNO|MB_ICON_QUESTION, LPGENT("Refresh contact details"), NULL, 
-				LPGENT("Do you want to cancel the current refresh procedure?")))
+			else if (IDYES == MsgBox(NULL, MB_YESNO|MB_ICON_QUESTION, LPGENW("Refresh contact details"), NULL, 
+				LPGENW("Do you want to cancel the current refresh procedure?")))
 			{
 				ContactUpdater->Cancel();
 			}
 		}
 		else
 		{
-			MsgErr(NULL, LPGENT("Miranda must be online for refreshing contact information!"));
+			MsgErr(NULL, LPGENW("Miranda must be online for refreshing contact information!"));
 		}
 	}
 	catch(...)
 	{
-		MsgErr(NULL, LPGENT("The function caused an exception!"));
+		MsgErr(NULL, LPGENW("The function caused an exception!"));
 	}
 	return 0;
 }
@@ -838,7 +838,7 @@ static int OnContactAdded(WPARAM hContact, LPARAM)
 	}
 	catch(...)
 	{
-		MsgErr(NULL, LPGENT("The function caused an exception!"));
+		MsgErr(NULL, LPGENW("The function caused an exception!"));
 	}
 	return 0;
 }
-- 
cgit v1.2.3