From 2f261839b60692e33d0e160344d0d636d49c90ba Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 27 Jul 2016 14:23:31 +0000
Subject: less TCHARs

git-svn-id: http://svn.miranda-ng.org/main/trunk@17138 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Toaster/src/services.cpp           | 6 +++---
 plugins/Toaster/src/structs.h              | 8 ++++----
 plugins/Toaster/src/toast_notification.cpp | 2 +-
 plugins/Toaster/src/utils.h                | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'plugins/Toaster/src')

diff --git a/plugins/Toaster/src/services.cpp b/plugins/Toaster/src/services.cpp
index 1b921690dc..95bfc49a8b 100644
--- a/plugins/Toaster/src/services.cpp
+++ b/plugins/Toaster/src/services.cpp
@@ -12,7 +12,7 @@ void __stdcall ShowToastNotification(void* p)
 	if (!db_get_b(0, "Popup", "ModuleIsEnabled", 1))
 		return;
 
-	ptrT imagePath;
+	ptrW imagePath;
 	if (td->hContact != NULL && td->hContact != INVALID_CONTACT_ID)
 	{
 		const char* szProto = GetContactProto(td->hContact);
@@ -21,7 +21,7 @@ void __stdcall ShowToastNotification(void* p)
 			PROTO_AVATAR_INFORMATION pai = { td->hContact };
 			if (CallProtoService(szProto, PS_GETAVATARINFO, 0, (LPARAM)&pai) == GAIR_SUCCESS)
 			{
-				imagePath = mir_tstrdup(pai.filename);
+				imagePath = mir_wstrdup(pai.filename);
 			}
 		}
 
@@ -140,7 +140,7 @@ static INT_PTR CreateClassPopup(WPARAM, LPARAM lParam)
 		}
 		else
 		{
-			td = new ToastData(ppc->hContact, ptrT(mir_utf8decodeT(ppc->pszTitle)), ptrT(mir_utf8decodeT(ppc->pszText)), it->second->hIcon);
+			td = new ToastData(ppc->hContact, ptrW(mir_utf8decodeW(ppc->pszTitle)), ptrW(mir_utf8decodeW(ppc->pszText)), it->second->hIcon);
 		}
 
 		td->vPopupData = ppc->PluginData;
diff --git a/plugins/Toaster/src/structs.h b/plugins/Toaster/src/structs.h
index fe8a658850..96900ce785 100644
--- a/plugins/Toaster/src/structs.h
+++ b/plugins/Toaster/src/structs.h
@@ -17,8 +17,8 @@ struct ToastData : public MZeroedObject
 
 	ToastData(MCONTACT _hContact, const wchar_t *_tszTitle, const wchar_t *_tszText, HICON _hIcon = NULL) : 
 		hContact(_hContact),
-		tszTitle(mir_tstrdup(_tszTitle)), 
-		tszText(mir_tstrdup(_tszText)), 
+		tszTitle(mir_wstrdup(_tszTitle)), 
+		tszText(mir_wstrdup(_tszText)), 
 		hIcon(_hIcon), 
 		iType(_hIcon ? 2 : 0) ,
 		pPopupProc(NULL),
@@ -26,8 +26,8 @@ struct ToastData : public MZeroedObject
 	{}
 	ToastData(MCONTACT _hContact, const wchar_t *_tszTitle, const wchar_t *_tszText, HBITMAP bmp = NULL) :
 		hContact(_hContact),
-		tszTitle(mir_tstrdup(_tszTitle)),
-		tszText(mir_tstrdup(_tszText)),
+		tszTitle(mir_wstrdup(_tszTitle)),
+		tszText(mir_wstrdup(_tszText)),
 		hBitmap(bmp),
 		iType(bmp ? 1 : 0),
 		pPopupProc(NULL),
diff --git a/plugins/Toaster/src/toast_notification.cpp b/plugins/Toaster/src/toast_notification.cpp
index 2df72af9ad..0ade7ce217 100644
--- a/plugins/Toaster/src/toast_notification.cpp
+++ b/plugins/Toaster/src/toast_notification.cpp
@@ -64,7 +64,7 @@ HRESULT ToastNotification::CreateXml(_Outptr_ ABI::Windows::Data::Xml::Dom::IXml
 	}
 
 	int nLength;
-	ptrT xtmp(xmlToString(xmlToast, &nLength));
+	ptrW xtmp(xmlToString(xmlToast, &nLength));
 	xmlDestroyNode(xmlToast);
 
 	CHECKHR(xmlDocument->LoadXml(StringReferenceWrapper(xtmp, nLength).Get()));
diff --git a/plugins/Toaster/src/utils.h b/plugins/Toaster/src/utils.h
index 85547164ab..fe9e5998bd 100644
--- a/plugins/Toaster/src/utils.h
+++ b/plugins/Toaster/src/utils.h
@@ -8,7 +8,7 @@ extern wchar_t wszTempDir[];
 class ToasterImage
 {
 	HBITMAP _hBitmap;
-	ptrT tszId;
+	ptrW tszId;
 
 public:
 	__inline explicit ToasterImage(HICON hIcon) : _hBitmap(NULL), tszId(CMString(FORMAT, L"%p", hIcon).Detach())
@@ -25,7 +25,7 @@ public:
 	{  
 	}
 
-	__inline explicit ToasterImage(const char *szProto) : _hBitmap(NULL), tszId(mir_a2t(szProto))
+	__inline explicit ToasterImage(const char *szProto) : _hBitmap(NULL), tszId(mir_a2u(szProto))
 	{
 		ICONINFO icon = { 0 };
 		if (GetIconInfo(Skin_LoadProtoIcon(szProto, ID_STATUS_ONLINE, 1), &icon))
-- 
cgit v1.2.3