From 428bf0cbd77813a43094cb5c984436deff251936 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
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/wbOSD/src/events.cpp  |  8 ++++----
 plugins/wbOSD/src/options.cpp | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'plugins/wbOSD/src')

diff --git a/plugins/wbOSD/src/events.cpp b/plugins/wbOSD/src/events.cpp
index e2207bd059..2aba79e1dd 100644
--- a/plugins/wbOSD/src/events.cpp
+++ b/plugins/wbOSD/src/events.cpp
@@ -20,7 +20,7 @@ void showmsgwnd(unsigned int param)
 {
 	logmsg("showmsgwnd");
 	if (db_get_b(NULL,THIS_MODULE, "showMessageWindow", DEFAULT_SHOWMSGWIN))
-		CallService(MS_MSG_SENDMESSAGET, (WPARAM)param, 0);
+		CallService(MS_MSG_SENDMESSAGEW, (WPARAM)param, 0);
 }
 
 LRESULT ShowOSD(wchar_t *str, int timeout, COLORREF color, MCONTACT user)
@@ -154,7 +154,7 @@ int HookedNewEvent(WPARAM wParam, LPARAM hDBEvent)
 	wcsncpy(buf, DEFAULT_MESSAGEFORMAT,_countof(buf));
 
 	DBVARIANT dbv;
-	if(!db_get_ts(NULL,THIS_MODULE,"message_format",&dbv)) {
+	if(!db_get_ws(NULL,THIS_MODULE,"message_format",&dbv)) {
 		mir_wstrcpy(buf, dbv.ptszVal);
 		db_free(&dbv);
 	}
@@ -185,12 +185,12 @@ int HookedNewEvent(WPARAM wParam, LPARAM hDBEvent)
 	if ( i1 == 1 )
 		c1 = mir_wstrdup(pcli->pfnGetContactDisplayName(wParam, 0));
 	else if ( i1 == 2 )
-		c1 = DbGetEventTextT( &dbe, 0 );
+		c1 = DbGetEventTextW( &dbe, 0 );
 
 	if ( i2 == 1 )
 		c2 = mir_wstrdup(pcli->pfnGetContactDisplayName(wParam, 0));
 	else if ( i2 == 2 )
-		c2 = DbGetEventTextT( &dbe, 0 );
+		c2 = DbGetEventTextW( &dbe, 0 );
 
 	wchar_t buffer[512];
 	mir_snwprintf(buffer, buf, c1, c2);
diff --git a/plugins/wbOSD/src/options.cpp b/plugins/wbOSD/src/options.cpp
index 3749330a0f..f0d278b074 100644
--- a/plugins/wbOSD/src/options.cpp
+++ b/plugins/wbOSD/src/options.cpp
@@ -127,7 +127,7 @@ void loadDBSettings(plgsettings *ps)
 	ps->showWhen = db_get_dw(NULL, THIS_MODULE, "showWhen", DEFAULT_SHOWWHEN);
 
 	DBVARIANT dbv;
-	if (!db_get_ts(NULL, THIS_MODULE, "message_format", &dbv)) {
+	if (!db_get_ws(NULL, THIS_MODULE, "message_format", &dbv)) {
 		mir_wstrcpy(ps->msgformat, dbv.ptszVal);
 		db_free(&dbv);
 	}
@@ -149,7 +149,7 @@ void loadDBSettings(plgsettings *ps)
 	ps->lf.lfQuality = db_get_b(NULL, THIS_MODULE, "fntQuality", DEFAULT_FNT_QUALITY);
 	ps->lf.lfPitchAndFamily = db_get_b(NULL, THIS_MODULE, "fntPitchAndFamily", DEFAULT_FNT_PITCHANDFAM);
 
-	if (!db_get_ts(NULL, THIS_MODULE, "fntFaceName", &dbv)) {
+	if (!db_get_ws(NULL, THIS_MODULE, "fntFaceName", &dbv)) {
 		mir_wstrcpy(ps->lf.lfFaceName, dbv.ptszVal);
 		db_free(&dbv);
 	}
@@ -176,7 +176,7 @@ void saveDBSettings(plgsettings *ps)
 	db_set_b(NULL, THIS_MODULE, "transparent", ps->transparent);
 	db_set_b(NULL, THIS_MODULE, "messages", ps->messages);
 	db_set_b(NULL, THIS_MODULE, "a_user", ps->a_user);
-	db_set_ts(NULL, THIS_MODULE, "message_format", ps->msgformat);
+	db_set_ws(NULL, THIS_MODULE, "message_format", ps->msgformat);
 
 	db_set_b(NULL, THIS_MODULE, "align", ps->align);
 	db_set_b(NULL, THIS_MODULE, "salign", ps->salign);
@@ -201,7 +201,7 @@ void saveDBSettings(plgsettings *ps)
 	db_set_b(NULL, THIS_MODULE, "fntClipPrecision", ps->lf.lfClipPrecision);
 	db_set_b(NULL, THIS_MODULE, "fntQuality", ps->lf.lfQuality);
 	db_set_b(NULL, THIS_MODULE, "fntPitchAndFamily", ps->lf.lfPitchAndFamily);
-	db_set_ts(NULL, THIS_MODULE, "fntFaceName", ps->lf.lfFaceName);
+	db_set_ws(NULL, THIS_MODULE, "fntFaceName", ps->lf.lfFaceName);
 
 	db_set_dw(NULL, THIS_MODULE, "announce", ps->announce);
 
@@ -417,7 +417,7 @@ int OptionsInit(WPARAM wparam, LPARAM)
 	odp.pwszGroup = LPGENW("Plugins");
 	odp.pwszTitle = LPGENW("OSD");
 	odp.pfnDlgProc = OptDlgProc;
-	odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;
+	odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
 	Options_AddPage(wparam, &odp);
 	return 0;
 }
-- 
cgit v1.2.3