From 6e53dfca72b932c4bdcd7aa02ca62bf8b2630eac Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 26 Jul 2016 09:20:25 +0000 Subject: less TCHARs: - TCHAR is replaced with wchar_t everywhere; - LPGENT replaced with either LPGENW or LPGEN; - fixes for ANSI plugins that improperly used _t functions; - TCHAR *t removed from MAllStrings; - ptszGroup, ptszTitle & ptszTab in OPTIONSDIALOGPAGE replaced with pwsz* git-svn-id: http://svn.miranda-ng.org/main/trunk@17133 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/WinterSpeak/src/DialogConfigEngine.cpp | 2 +- plugins/WinterSpeak/src/EventInformation.cpp | 12 ++++++------ plugins/WinterSpeak/src/UserInformation.cpp | 16 ++++++++-------- plugins/WinterSpeak/src/main.cpp | 8 ++++---- 4 files changed, 19 insertions(+), 19 deletions(-) (limited to 'plugins/WinterSpeak/src') diff --git a/plugins/WinterSpeak/src/DialogConfigEngine.cpp b/plugins/WinterSpeak/src/DialogConfigEngine.cpp index 1f0ccbca6e..8914402120 100644 --- a/plugins/WinterSpeak/src/DialogConfigEngine.cpp +++ b/plugins/WinterSpeak/src/DialogConfigEngine.cpp @@ -93,7 +93,7 @@ void DialogConfigEngine::command(HWND window, int control) case IDC_BUTTON_TEST: if (createTts(window)) { - m_test_tts->say(TranslateW(L"testing testing 1 2 3")); + m_test_tts->say(TranslateT("testing testing 1 2 3")); } break; } diff --git a/plugins/WinterSpeak/src/EventInformation.cpp b/plugins/WinterSpeak/src/EventInformation.cpp index 3332a7c235..451449f343 100644 --- a/plugins/WinterSpeak/src/EventInformation.cpp +++ b/plugins/WinterSpeak/src/EventInformation.cpp @@ -8,11 +8,11 @@ EventInformation::EventInformation() : m_event_strings(), m_event_info() { // insert the event strings into a map for easy access - m_event_strings[EVENTTYPE_MESSAGE] = TranslateW(L"incoming message from %u"); - m_event_strings[EVENTTYPE_URL] = TranslateW(L"incoming URL from %u"); - m_event_strings[EVENTTYPE_ADDED] = TranslateW(L"you have been added to %u's contact list"); - m_event_strings[EVENTTYPE_AUTHREQUEST] = TranslateW(L"%u requests your authorization"); - m_event_strings[EVENTTYPE_FILE] = TranslateW(L"there is an incoming file from %u"); + m_event_strings[EVENTTYPE_MESSAGE] = TranslateT("incoming message from %u"); + m_event_strings[EVENTTYPE_URL] = TranslateT("incoming URL from %u"); + m_event_strings[EVENTTYPE_ADDED] = TranslateT("you have been added to %u's contact list"); + m_event_strings[EVENTTYPE_AUTHREQUEST] = TranslateT("%u requests your authorization"); + m_event_strings[EVENTTYPE_FILE] = TranslateT("there is an incoming file from %u"); memset(&m_event_info, 0, sizeof(m_event_info)); } @@ -65,7 +65,7 @@ bool EventInformation::isValidEvent(MEVENT event) //------------------------------------------------------------------------------ std::wstring EventInformation::getMessage() { - const std::wstring intro = TranslateW(L"%u says"); + const std::wstring intro = TranslateT("%u says"); return intro + L" " + mir_a2t_cp((char*)m_event_info.pBlob, CP_UTF8); } diff --git a/plugins/WinterSpeak/src/UserInformation.cpp b/plugins/WinterSpeak/src/UserInformation.cpp index d39ad691be..63576269e3 100644 --- a/plugins/WinterSpeak/src/UserInformation.cpp +++ b/plugins/WinterSpeak/src/UserInformation.cpp @@ -4,14 +4,14 @@ UserInformation::UserInformation() : m_status_info(), m_status_strings() { // insert the status strings into a map for easy access - m_status_strings[ID_STATUS_OFFLINE] = LPGENT("%u is now offline"); - m_status_strings[ID_STATUS_ONLINE] = LPGENT("%u is now online"); - m_status_strings[ID_STATUS_AWAY] = LPGENT("%u is away"); - m_status_strings[ID_STATUS_INVISIBLE] = LPGENT("%u is invisible"); - m_status_strings[ID_STATUS_NA] = LPGENT("%u is not available"); - m_status_strings[ID_STATUS_DND] = LPGENT("%u does not want to be disturbed"); - m_status_strings[ID_STATUS_OCCUPIED] = LPGENT("%u is occupied"); - m_status_strings[ID_STATUS_FREECHAT] = LPGENT("%u is free for chat"); + m_status_strings[ID_STATUS_OFFLINE] = LPGENW("%u is now offline"); + m_status_strings[ID_STATUS_ONLINE] = LPGENW("%u is now online"); + m_status_strings[ID_STATUS_AWAY] = LPGENW("%u is away"); + m_status_strings[ID_STATUS_INVISIBLE] = LPGENW("%u is invisible"); + m_status_strings[ID_STATUS_NA] = LPGENW("%u is not available"); + m_status_strings[ID_STATUS_DND] = LPGENW("%u does not want to be disturbed"); + m_status_strings[ID_STATUS_OCCUPIED] = LPGENW("%u is occupied"); + m_status_strings[ID_STATUS_FREECHAT] = LPGENW("%u is free for chat"); } //------------------------------------------------------------------------------ diff --git a/plugins/WinterSpeak/src/main.cpp b/plugins/WinterSpeak/src/main.cpp index 25852f7b5f..d01560d6f4 100644 --- a/plugins/WinterSpeak/src/main.cpp +++ b/plugins/WinterSpeak/src/main.cpp @@ -71,18 +71,18 @@ int dialogOptionsInitialise(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = g_hInst; - odp.ptszGroup = LPGENT("Speak"); + odp.pwszGroup = LPGENW("Speak"); odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR; if (g_speak_config) { odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONFIG); - odp.ptszTitle = LPGENT("Engine/Voice"); + odp.pwszTitle = LPGENW("Engine/Voice"); odp.pfnDlgProc = DialogConfigEngine::process; Options_AddPage(wParam, &odp); odp.pszTemplate = MAKEINTRESOURCEA(IDD_ACTIVEMODES); - odp.ptszTitle = LPGENT("Active Modes"); + odp.pwszTitle = LPGENW("Active Modes"); odp.pfnDlgProc = DialogConfigActive::process; Options_AddPage(wParam, &odp); } @@ -90,7 +90,7 @@ int dialogOptionsInitialise(WPARAM wParam, LPARAM) if (g_speak_announce) { odp.pszTemplate = MAKEINTRESOURCEA(IDD_ANNOUNCE); - odp.ptszTitle = LPGENT("Announce"); + odp.pwszTitle = LPGENW("Announce"); odp.pfnDlgProc = AnnounceDialog::process; Options_AddPage(wParam, &odp); } -- cgit v1.2.3