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/QuickContacts/src/options.cpp | 2 +- plugins/QuickContacts/src/quickcontacts.cpp | 34 ++++++++++++++--------------- 2 files changed, 18 insertions(+), 18 deletions(-) (limited to 'plugins/QuickContacts') diff --git a/plugins/QuickContacts/src/options.cpp b/plugins/QuickContacts/src/options.cpp index 21d23ef10f..ca5df48c19 100644 --- a/plugins/QuickContacts/src/options.cpp +++ b/plugins/QuickContacts/src/options.cpp @@ -55,7 +55,7 @@ int InitOptionsCallback(WPARAM wParam, LPARAM) odp.pwszTitle = LPGENW("Quick Contacts"); odp.pfnDlgProc = OptionsDlgProc; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT); - odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR; + odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE; Options_AddPage(wParam, &odp); return 0; } diff --git a/plugins/QuickContacts/src/quickcontacts.cpp b/plugins/QuickContacts/src/quickcontacts.cpp index 855c5df62d..5f10956175 100644 --- a/plugins/QuickContacts/src/quickcontacts.cpp +++ b/plugins/QuickContacts/src/quickcontacts.cpp @@ -124,10 +124,10 @@ int ModulesLoaded(WPARAM, LPARAM) HOTKEYDESC hkd = {0}; hkd.cbSize = sizeof(hkd); - hkd.dwFlags = HKD_TCHAR; + hkd.dwFlags = HKD_UNICODE; hkd.pszName = "Quick Contacts/Open dialog"; - hkd.ptszDescription = LPGENW("Open dialog"); - hkd.ptszSection = LPGENW("Quick Contacts"); + hkd.pwszDescription = LPGENW("Open dialog"); + hkd.pwszSection = LPGENW("Quick Contacts"); hkd.pszService = MS_QC_SHOW_DIALOG; hkd.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_ALT, 'Q'); Hotkey_Register(&hkd); @@ -137,37 +137,37 @@ int ModulesLoaded(WPARAM, LPARAM) hkd.lParam = HOTKEY_FILE; hkd.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, 'F'); hkd.pszName = "Quick Contacts/File"; - hkd.ptszDescription = LPGENW("Send file"); + hkd.pwszDescription = LPGENW("Send file"); Hotkey_Register(&hkd); hkd.lParam = HOTKEY_URL; hkd.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, 'U'); hkd.pszName = "Quick Contacts/URL"; - hkd.ptszDescription = LPGENW("Send URL"); + hkd.pwszDescription = LPGENW("Send URL"); Hotkey_Register(&hkd); hkd.lParam = HOTKEY_INFO; hkd.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, 'I'); hkd.pszName = "Quick Contacts/Info"; - hkd.ptszDescription = LPGENW("Open user info"); + hkd.pwszDescription = LPGENW("Open user info"); Hotkey_Register(&hkd); hkd.lParam = HOTKEY_HISTORY; hkd.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, 'H'); hkd.pszName = "Quick Contacts/History"; - hkd.ptszDescription = LPGENW("Open history"); + hkd.pwszDescription = LPGENW("Open history"); Hotkey_Register(&hkd); hkd.lParam = HOTKEY_MENU; hkd.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, 'M'); hkd.pszName = "Quick Contacts/Menu"; - hkd.ptszDescription = LPGENW("Open contact menu"); + hkd.pwszDescription = LPGENW("Open contact menu"); Hotkey_Register(&hkd); hkd.lParam = HOTKEY_ALL_CONTACTS; hkd.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, 'A'); hkd.pszName = "Quick Contacts/All Contacts"; - hkd.ptszDescription = LPGENW("Show all contacts"); + hkd.pwszDescription = LPGENW("Show all contacts"); Hotkey_Register(&hkd); if (ServiceExists(MS_SKIN_ADDHOTKEY)) @@ -189,7 +189,7 @@ int ModulesLoaded(WPARAM, LPARAM) CMenuItem mi; SET_UID(mi, 0x3a3f768a, 0xcf47, 0x43d5, 0x92, 0x16, 0xe4, 0xeb, 0x93, 0xf6, 0x72, 0xfa); mi.position = 500100001; - mi.flags = CMIF_TCHAR; + mi.flags = CMIF_UNICODE; mi.name.w = LPGENW("Quick Contacts..."); mi.pszService = MS_QC_SHOW_DIALOG; Menu_AddMainMenuItem(&mi); @@ -400,7 +400,7 @@ void LoadContacts(HWND hwndDlg, BOOL show_all) if (opts.group_append) { DBVARIANT dbv; - if (db_get_ts(hMeta == NULL ? hContact : hMeta, "CList", "Group", &dbv) == 0) + if (db_get_ws(hMeta == NULL ? hContact : hMeta, "CList", "Group", &dbv) == 0) { if (dbv.ptszVal != NULL) mir_wstrncpy(contact->szgroup, dbv.ptszVal, _countof(contact->szgroup)); @@ -714,12 +714,12 @@ static void FillButton(HWND hwndDlg, int dlgItem, wchar_t *name, wchar_t *key, H wchar_t *full = tmp; if (key == NULL) - full = TranslateTS(name); + full = TranslateW(name); else - mir_snwprintf(tmp, L"%s (%s)", TranslateTS(name), key); + mir_snwprintf(tmp, L"%s (%s)", TranslateW(name), key); SendDlgItemMessage(hwndDlg, dlgItem, BUTTONSETASFLATBTN, 0, 0); - SendDlgItemMessage(hwndDlg, dlgItem, BUTTONADDTOOLTIP, (LPARAM)full, BATF_TCHAR); + SendDlgItemMessage(hwndDlg, dlgItem, BUTTONADDTOOLTIP, (LPARAM)full, BATF_UNICODE); SendDlgItemMessage(hwndDlg, dlgItem, BM_SETIMAGE, IMAGE_ICON, (LPARAM)icon); } @@ -730,9 +730,9 @@ static void FillCheckbox(HWND hwndDlg, int dlgItem, wchar_t *name, wchar_t *key) wchar_t *full = tmp; if (key == NULL) - full = TranslateTS(name); + full = TranslateW(name); else - mir_snwprintf(tmp, L"%s (%s)", TranslateTS(name), key); + mir_snwprintf(tmp, L"%s (%s)", TranslateW(name), key); SetDlgItemText(hwndDlg, dlgItem, full); } @@ -825,7 +825,7 @@ static INT_PTR CALLBACK MainDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA if (!IsWindowEnabled(GetDlgItem(hwndDlg, IDC_MESSAGE))) break; - CallService(MS_MSG_SENDMESSAGET, hContact, 0); + CallService(MS_MSG_SENDMESSAGEW, hContact, 0); db_set_dw(NULL, MODULE_NAME, "LastSentTo", hContact); SendMessage(hwndDlg, WM_CLOSE, 0, 0); -- cgit v1.2.3