From 2f261839b60692e33d0e160344d0d636d49c90ba Mon Sep 17 00:00:00 2001 From: George Hazan 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/XSoundNotify/src/dialog.cpp | 14 +++++++------- plugins/XSoundNotify/src/options.cpp | 16 ++++++++-------- plugins/XSoundNotify/src/xsn_main.cpp | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) (limited to 'plugins/XSoundNotify/src') diff --git a/plugins/XSoundNotify/src/dialog.cpp b/plugins/XSoundNotify/src/dialog.cpp index 5a6bff9772..ca68cabc9f 100644 --- a/plugins/XSoundNotify/src/dialog.cpp +++ b/plugins/XSoundNotify/src/dialog.cpp @@ -35,17 +35,17 @@ static INT_PTR CALLBACK DlgProcContactsOptions(HWND hwndDlg, UINT msg, WPARAM wP break; case DBVT_ASCIIZ: - mir_tstrcpy(uid, _A2T(dbvuid.pszVal)); + mir_wstrcpy(uid, _A2T(dbvuid.pszVal)); break; case DBVT_UTF8: - mir_tstrcpy(uid, ptrT(mir_utf8decodeT(dbvuid.pszVal))); + mir_wstrcpy(uid, ptrW(mir_utf8decodeW(dbvuid.pszVal))); break; } wchar_t *nick = (wchar_t *)pcli->pfnGetContactDisplayName(hContact, 0); wchar_t value[100]; - mir_sntprintf(value, TranslateT("Custom sound for %s (%s)"), nick, uid); + mir_snwprintf(value, TranslateT("Custom sound for %s (%s)"), nick, uid); SetWindowText(hwndDlg, value); db_free(&dbvuid); } @@ -67,7 +67,7 @@ static INT_PTR CALLBACK DlgProcContactsOptions(HWND hwndDlg, UINT msg, WPARAM wP CheckDlgButton(hwndDlg, IDC_CONT_IGNORE_SOUND, db_get_b(hContact, SETTINGSNAME, SETTINGSIGNOREKEY, 0) ? BST_CHECKED : BST_UNCHECKED); p = XSN_Users.find((XSN_Data *)&hContact); if (p == NULL) { - ptrT name(db_get_tsa(hContact, SETTINGSNAME, SETTINGSKEY)); + ptrW name(db_get_tsa(hContact, SETTINGSNAME, SETTINGSKEY)); if (name != NULL) XSN_Users.insert(new XSN_Data(hContact, name, IsDlgButtonChecked(hwndDlg, IDC_CONT_IGNORE_SOUND) ? 1 : 0)); } @@ -79,7 +79,7 @@ static INT_PTR CALLBACK DlgProcContactsOptions(HWND hwndDlg, UINT msg, WPARAM wP case IDOK: p = XSN_Users.find((XSN_Data *)&hContact); if (p != NULL) { - if (mir_tstrcmpi(p->path, L"")) { + if (mir_wstrcmpi(p->path, L"")) { wchar_t shortpath[MAX_PATH]; PathToRelativeT(p->path, shortpath); db_set_ts(hContact, SETTINGSNAME, SETTINGSKEY, shortpath); @@ -100,9 +100,9 @@ static INT_PTR CALLBACK DlgProcContactsOptions(HWND hwndDlg, UINT msg, WPARAM wP ofn.lStructSize = sizeof(ofn); wchar_t tmp[MAX_PATH]; if (GetModuleHandle(L"bass_interface.dll")) - mir_sntprintf(tmp, L"%s (*.wav, *.mp3, *.ogg)%c*.wav;*.mp3;*.ogg%c%c", TranslateT("Sound files"), 0, 0, 0); + mir_snwprintf(tmp, L"%s (*.wav, *.mp3, *.ogg)%c*.wav;*.mp3;*.ogg%c%c", TranslateT("Sound files"), 0, 0, 0); else - mir_sntprintf(tmp, L"%s (*.wav)%c*.wav%c%c", TranslateT("WAV files"), 0, 0, 0); + mir_snwprintf(tmp, L"%s (*.wav)%c*.wav%c%c", TranslateT("WAV files"), 0, 0, 0); ofn.lpstrFilter = tmp; ofn.hwndOwner = 0; ofn.lpstrFile = FileName; diff --git a/plugins/XSoundNotify/src/options.cpp b/plugins/XSoundNotify/src/options.cpp index 775cfc6ffd..61a846a53e 100644 --- a/plugins/XSoundNotify/src/options.cpp +++ b/plugins/XSoundNotify/src/options.cpp @@ -66,21 +66,21 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l break; case DBVT_ASCIIZ: - mir_tstrcpy(uid, _A2T(dbvuid.pszVal)); + mir_wstrcpy(uid, _A2T(dbvuid.pszVal)); break; case DBVT_UTF8: - mir_tstrcpy(uid, ptrT(mir_utf8decodeT(dbvuid.pszVal))); + mir_wstrcpy(uid, ptrW(mir_utf8decodeW(dbvuid.pszVal))); break; default: - mir_tstrcpy(uid, TranslateT("(Unknown contact)")); + mir_wstrcpy(uid, TranslateT("(Unknown contact)")); } wchar_t *nick = (wchar_t *)pcli->pfnGetContactDisplayName(hContact, 0); - size_t value_max_len = (mir_tstrlen(uid) + mir_tstrlen(nick) + 4); + size_t value_max_len = (mir_wstrlen(uid) + mir_wstrlen(nick) + 4); wchar_t *value = (wchar_t *)mir_alloc(sizeof(wchar_t) * value_max_len); - mir_sntprintf(value, value_max_len, L"%s (%s)", nick, uid); + mir_snwprintf(value, value_max_len, L"%s (%s)", nick, uid); SendDlgItemMessage(hwndDlg, IDC_OPT_COMBO_USERS, CB_SETITEMDATA, SendDlgItemMessage(hwndDlg, IDC_OPT_COMBO_USERS, CB_ADDSTRING, 0, (LPARAM)value), hContact); mir_free(value); db_free(&dbvuid); @@ -122,9 +122,9 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l ofn.lStructSize = sizeof(ofn); wchar_t tmp[MAX_PATH]; if (GetModuleHandle(L"bass_interface.dll")) - mir_sntprintf(tmp, L"%s (*.wav, *.mp3, *.ogg)%c*.wav;*.mp3;*.ogg%c%c", TranslateT("Sound files"), 0, 0, 0); + mir_snwprintf(tmp, L"%s (*.wav, *.mp3, *.ogg)%c*.wav;*.mp3;*.ogg%c%c", TranslateT("Sound files"), 0, 0, 0); else - mir_sntprintf(tmp, L"%s (*.wav)%c*.wav%c%c", TranslateT("WAV files"), 0, 0, 0); + mir_snwprintf(tmp, L"%s (*.wav)%c*.wav%c%c", TranslateT("WAV files"), 0, 0, 0); ofn.lpstrFilter = tmp; ofn.hwndOwner = 0; ofn.lpstrFile = FileName; @@ -224,7 +224,7 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l switch (hdr->code) { case PSN_APPLY: for (int i = 0; i < XSN_Users.getCount(); i++) { - if (mir_tstrcmpi(XSN_Users[i]->path, L"")) { + if (mir_wstrcmpi(XSN_Users[i]->path, L"")) { wchar_t shortpath[MAX_PATH]; PathToRelativeT(XSN_Users[i]->path, shortpath); db_set_ts(XSN_Users[i]->hContact, SETTINGSNAME, SETTINGSKEY, shortpath); diff --git a/plugins/XSoundNotify/src/xsn_main.cpp b/plugins/XSoundNotify/src/xsn_main.cpp index afb720d85b..02ea729792 100644 --- a/plugins/XSoundNotify/src/xsn_main.cpp +++ b/plugins/XSoundNotify/src/xsn_main.cpp @@ -77,7 +77,7 @@ void InitSelfSounds() mir_snprintf(namebuf, "%s%s", protos[i]->szModuleName, selfSounds[j].szName); wchar_t infobuf[256]; - mir_sntprintf(infobuf, L"%s [%s]", TranslateT("Self status"), protos[i]->tszAccountName); + mir_snwprintf(infobuf, L"%s [%s]", TranslateT("Self status"), protos[i]->tszAccountName); SkinAddNewSoundExT(namebuf, infobuf, pcli->pfnGetStatusModeDescription(selfSounds[j].iStatus, 0)); } } @@ -141,7 +141,7 @@ static int ProcessChatEvent(WPARAM, LPARAM lParam) MCONTACT hContact = pci->FindRoom(gcd->pszModule, gcd->ptszID); if (hContact != 0) { - ptrT nick(db_get_tsa(hContact, gcd->pszModule, "MyNick")); + ptrW nick(db_get_tsa(hContact, gcd->pszModule, "MyNick")); if (nick == NULL || gce->ptszText == NULL) return 0; if (wcsstr(gce->ptszText, nick)) { -- cgit v1.2.3