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/DbEditorPP/src/watchedvars.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'plugins/DbEditorPP/src/watchedvars.cpp')

diff --git a/plugins/DbEditorPP/src/watchedvars.cpp b/plugins/DbEditorPP/src/watchedvars.cpp
index 6407bd5b35..e4a175d1ff 100644
--- a/plugins/DbEditorPP/src/watchedvars.cpp
+++ b/plugins/DbEditorPP/src/watchedvars.cpp
@@ -131,16 +131,16 @@ void addwatchtolist(HWND hwnd, struct DBsetting *lParam)
 		break;
 	}
 	case DBVT_BYTE:
-		mir_sntprintf(data, L"0x%02X (%s)", dbv->bVal, _ultow(dbv->bVal, tmp, 10));
+		mir_snwprintf(data, L"0x%02X (%s)", dbv->bVal, _ultow(dbv->bVal, tmp, 10));
 		ListView_SetItemText(hwnd, index, 3, data);
 		break;
 	case DBVT_WORD:
-		mir_sntprintf(data, L"0x%04X (%s)", dbv->wVal, _ultow(dbv->wVal, tmp, 10));
+		mir_snwprintf(data, L"0x%04X (%s)", dbv->wVal, _ultow(dbv->wVal, tmp, 10));
 		ListView_SetItemText(hwnd, index, 3, data);
 		break;
 
 	case DBVT_DWORD:
-		mir_sntprintf(data, L"0x%08X (%s)", dbv->dVal, _ultow(dbv->dVal, tmp, 10));
+		mir_snwprintf(data, L"0x%08X (%s)", dbv->dVal, _ultow(dbv->dVal, tmp, 10));
 		ListView_SetItemText(hwnd, index, 3, data);
 		break;
 
@@ -150,14 +150,14 @@ void addwatchtolist(HWND hwnd, struct DBsetting *lParam)
 
 	case DBVT_WCHAR:
 	{
-		ptrT str(mir_u2t(dbv->pwszVal));
+		ptrW str(mir_wstrdup(dbv->pwszVal));
 		ListView_SetItemText(hwnd, index, 3, str);
 		break;
 	}
 
 	case DBVT_UTF8:
 	{
-		ptrT str(mir_utf8decodeT(dbv->pszVal));
+		ptrW str(mir_utf8decodeW(dbv->pszVal));
 		ListView_SetItemText(hwnd, index, 3, str);
 		break;
 	}
@@ -357,13 +357,13 @@ void popupWatchedVar(MCONTACT hContact, const char *module, const char *setting)
 
 	// 2nd line
 	int type = GetValue(hContact, module, setting, value, _countof(value));
-	mir_sntprintf(text, TranslateT("Database Setting Changed: \nModule: \"%s\", Setting: \"%s\"\nNew Value (%s): \"%s\""), _A2T(module), _A2T(setting), DBVType(type), value);
+	mir_snwprintf(text, TranslateT("Database Setting Changed: \nModule: \"%s\", Setting: \"%s\"\nNew Value (%s): \"%s\""), _A2T(module), _A2T(setting), DBVType(type), value);
 
 	POPUPDATAT ppd = { 0 };
 	ppd.lchContact = (MCONTACT)hContact;
 	ppd.lchIcon = LoadIcon(hInst, MAKEINTRESOURCE(ICO_REGEDIT));
-	mir_tstrncpy(ppd.lptzContactName, name, _countof(ppd.lptzContactName));
-	mir_tstrncpy(ppd.lptzText, text, _countof(ppd.lptzText));
+	mir_wstrncpy(ppd.lptzContactName, name, _countof(ppd.lptzContactName));
+	mir_wstrncpy(ppd.lptzText, text, _countof(ppd.lptzText));
 	ppd.colorBack = colorBack;
 	ppd.colorText = colorText;
 	ppd.iSeconds = timeout ? timeout : -1;
-- 
cgit v1.2.3