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/WinterSpeak/src/ConfigDatabase.cpp | 8 ++++---- plugins/WinterSpeak/src/main.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/WinterSpeak/src') diff --git a/plugins/WinterSpeak/src/ConfigDatabase.cpp b/plugins/WinterSpeak/src/ConfigDatabase.cpp index ed7ff2db52..a67506ad8e 100644 --- a/plugins/WinterSpeak/src/ConfigDatabase.cpp +++ b/plugins/WinterSpeak/src/ConfigDatabase.cpp @@ -105,15 +105,15 @@ void ConfigDatabase::load() //------------------------------------------------------------------------------ void ConfigDatabase::save() { - db_set_ts(NULL, SPEAK, ENGINE, m_voice_desc.engine.c_str()); - db_set_ts(NULL, SPEAK, VOICE, m_voice_desc.voice.c_str()); + db_set_ws(NULL, SPEAK, ENGINE, m_voice_desc.engine.c_str()); + db_set_ws(NULL, SPEAK, VOICE, m_voice_desc.voice.c_str()); db_set_dw(NULL, SPEAK, VOLUME, m_voice_desc.volume); db_set_dw(NULL, SPEAK, PITCH, m_voice_desc.pitch); db_set_dw(NULL, SPEAK, RATE, m_voice_desc.rate); db_set_dw(NULL, SPEAK, ACTIVE_FLAGS, m_active_flags); - db_set_ts(NULL, SPEAK, WELCOME_MSG, m_welcome_msg.c_str()); + db_set_ws(NULL, SPEAK, WELCOME_MSG, m_welcome_msg.c_str()); for (ActiveUsersMap::iterator i = m_active_users.begin(); i != m_active_users.end(); ++i) { @@ -133,7 +133,7 @@ std::wstring ConfigDatabase::DBGetContactSettingString(const char *szModule, con std::wstring ret = def; DBVARIANT dbv; - if (!db_get_ts(NULL, szModule, szSetting, &dbv)) + if (!db_get_ws(NULL, szModule, szSetting, &dbv)) { ret = dbv.pwszVal; } diff --git a/plugins/WinterSpeak/src/main.cpp b/plugins/WinterSpeak/src/main.cpp index d01560d6f4..d19d290d42 100644 --- a/plugins/WinterSpeak/src/main.cpp +++ b/plugins/WinterSpeak/src/main.cpp @@ -72,7 +72,7 @@ int dialogOptionsInitialise(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = g_hInst; odp.pwszGroup = LPGENW("Speak"); - odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR; + odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE; if (g_speak_config) { -- cgit v1.2.3