From 428bf0cbd77813a43094cb5c984436deff251936 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 29 Jul 2016 12:36:34 +0000 Subject: no more TCHARs git-svn-id: http://svn.miranda-ng.org/main/trunk@17143 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/NewXstatusNotify/src/indsnd.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'plugins/NewXstatusNotify/src/indsnd.cpp') diff --git a/plugins/NewXstatusNotify/src/indsnd.cpp b/plugins/NewXstatusNotify/src/indsnd.cpp index eeceb22253..504d63ddc3 100644 --- a/plugins/NewXstatusNotify/src/indsnd.cpp +++ b/plugins/NewXstatusNotify/src/indsnd.cpp @@ -33,14 +33,14 @@ void PreviewSound(HWND hList) int hlpStatus = lvi.lParam; ListView_GetItemText(hList, lvi.iItem, 1, buff, _countof(buff)); - if (!mir_wstrcmp(buff, TranslateTS(DEFAULT_SOUND))) { + if (!mir_wstrcmp(buff, TranslateW(DEFAULT_SOUND))) { if (hlpStatus < ID_STATUS_MIN) SkinPlaySound(StatusListEx[hlpStatus].lpzSkinSoundName); else SkinPlaySound(StatusList[Index(hlpStatus)].lpzSkinSoundName); } else { - PathToAbsoluteT(buff, stzSoundPath); + PathToAbsoluteW(buff, stzSoundPath); SkinPlaySoundFile(stzSoundPath); } } @@ -51,7 +51,7 @@ BOOL RemoveSoundFromList(HWND hList) if (iSel != -1) { iSel = -1; while ((iSel = ListView_GetNextItem(hList, iSel, LVNI_SELECTED)) != -1) - ListView_SetItemText(hList, iSel, 1, TranslateTS(DEFAULT_SOUND)); + ListView_SetItemText(hList, iSel, 1, TranslateW(DEFAULT_SOUND)); return TRUE; } @@ -64,7 +64,7 @@ wchar_t *SelectSound(HWND hwndDlg, wchar_t *buff, size_t bufflen) HWND hList = GetDlgItem(hwndDlg, IDC_INDSNDLIST); ListView_GetItemText(hList, ListView_GetNextItem(hList, -1, LVNI_SELECTED), 1, buff, (DWORD)bufflen); - if (!mir_wstrcmp(buff, TranslateTS(DEFAULT_SOUND))) + if (!mir_wstrcmp(buff, TranslateW(DEFAULT_SOUND))) buff = NULL; ofn.lStructSize = sizeof(ofn); @@ -146,14 +146,14 @@ INT_PTR CALLBACK DlgProcSoundUIPage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA lvi.iSubItem = 0; lvi.iImage = Index(i); lvi.lParam = (LPARAM)i; - lvi.pszText = TranslateTS(StatusList[Index(i)].lpzSkinSoundDesc); + lvi.pszText = TranslateW(StatusList[Index(i)].lpzSkinSoundDesc); lvi.iItem = ListView_InsertItem(hList, &lvi); - if (!db_get_ts(hContact, MODULE, StatusList[Index(i)].lpzSkinSoundName, &dbv)) { + if (!db_get_ws(hContact, MODULE, StatusList[Index(i)].lpzSkinSoundName, &dbv)) { mir_wstrcpy(buff, dbv.ptszVal); db_free(&dbv); } - else mir_wstrcpy(buff, TranslateTS(DEFAULT_SOUND)); + else mir_wstrcpy(buff, TranslateW(DEFAULT_SOUND)); ListView_SetItemText(hList, lvi.iItem, 1, buff); } @@ -166,14 +166,14 @@ INT_PTR CALLBACK DlgProcSoundUIPage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA lvi.iSubItem = 0; lvi.iImage = Index(ID_STATUS_MAX) + 1; // additional icon lvi.lParam = (LPARAM)i; - lvi.pszText = TranslateTS(StatusListEx[i].lpzSkinSoundDesc); + lvi.pszText = TranslateW(StatusListEx[i].lpzSkinSoundDesc); lvi.iItem = ListView_InsertItem(hList, &lvi); - if (!db_get_ts(hContact, MODULE, StatusList[i].lpzSkinSoundName, &dbv)) { + if (!db_get_ws(hContact, MODULE, StatusList[i].lpzSkinSoundName, &dbv)) { wcsncpy(buff, dbv.ptszVal, _countof(buff)-1); db_free(&dbv); } - else wcsncpy(buff, TranslateTS(DEFAULT_SOUND), _countof(buff)-1); + else wcsncpy(buff, TranslateW(DEFAULT_SOUND), _countof(buff)-1); ListView_SetItemText(hList, lvi.iItem, 1, buff); } @@ -236,7 +236,7 @@ INT_PTR CALLBACK DlgProcSoundUIPage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA ListView_GetItem(hList, &lvi); ListView_GetItemText(hList, lvi.iItem, 1, buff, _countof(buff)); - if (!mir_wstrcmp(buff, TranslateTS(DEFAULT_SOUND))) { + if (!mir_wstrcmp(buff, TranslateW(DEFAULT_SOUND))) { if (lvi.lParam < ID_STATUS_MIN) db_unset(hContact, MODULE, StatusListEx[lvi.lParam].lpzSkinSoundName); else -- cgit v1.2.3