no more TCHARs

git-svn-id: http://svn.miranda-ng.org/main/trunk@17143 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 9 insertions, 9 deletions

diff --git a/plugins/BuddyPounce/src/dialog.cpp b/plugins/BuddyPounce/src/dialog.cpp
index 12a70ba570..ed2d9f0a85 100644
--- a/plugins/BuddyPounce/src/dialog.cpp
+++ b/plugins/BuddyPounce/src/dialog.cpp
@@ -65,11 +65,11 @@ void hideAll(HWND hwnd)
 void getDefaultMessage(HWND hwnd, UINT control, MCONTACT hContact)

 {

 	DBVARIANT dbv;

-	if (!db_get_ts(hContact, modname, "PounceMsg", &dbv)) {

+	if (!db_get_ws(hContact, modname, "PounceMsg", &dbv)) {

 		SetDlgItemText(hwnd, control, dbv.ptszVal);

 		db_free(&dbv);

 	}

-	else if (!db_get_ts(NULL, modname, "PounceMsg", &dbv)) {

+	else if (!db_get_ws(NULL, modname, "PounceMsg", &dbv)) {

 		SetDlgItemText(hwnd, control, dbv.ptszVal);

 		db_free(&dbv);

 	}

@@ -224,7 +224,7 @@ INT_PTR CALLBACK BuddyPounceSimpleDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, L
 				if (length>1) {

 					wchar_t *text = (wchar_t*)_alloca(length*sizeof(wchar_t));

 					GetDlgItemText(hwnd, IDC_MESSAGE, text, length);

-					db_set_ts(hContact, modname, "PounceMsg", text);

+					db_set_ws(hContact, modname, "PounceMsg", text);

 				}

 				else db_unset(hContact, modname, "PounceMsg");

 			}

@@ -510,7 +510,7 @@ INT_PTR CALLBACK SendPounceDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 		SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)spdps);

 		{

 			DBVARIANT dbv;

-			if (db_get_ts(spdps->hContact, modname, "PounceMsg", &dbv))

+			if (db_get_ws(spdps->hContact, modname, "PounceMsg", &dbv))

 				DestroyWindow(hwnd);

 			else {

 				SetDlgItemText(hwnd,IDC_MESSAGE, dbv.ptszVal);

@@ -567,7 +567,7 @@ INT_PTR CALLBACK PounceSentDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 		hContact = lParam;

 		{

 			DBVARIANT dbv;

-			if (db_get_ts(hContact, modname, "PounceMsg", &dbv))

+			if (db_get_ws(hContact, modname, "PounceMsg", &dbv))

 				DestroyWindow(hwnd);

 			else {

 				SetDlgItemText(hwnd, IDC_MESSAGE, dbv.ptszVal);

diff --git a/plugins/BuddyPounce/src/main.cpp b/plugins/BuddyPounce/src/main.cpp
index 35e6f5d9ba..dc69bbb53d 100644
--- a/plugins/BuddyPounce/src/main.cpp
+++ b/plugins/BuddyPounce/src/main.cpp
@@ -67,7 +67,7 @@ int MsgAck(WPARAM, LPARAM lParam)
 				DBEVENTINFO dbei = { 0 };

 				DBVARIANT dbv;

 				int reuse = db_get_b(ack->hContact,modname, "Reuse", 0);

-				if (!db_get_ts(ack->hContact, modname, "PounceMsg", &dbv) && (dbv.ptszVal[0] != '\0')) {

+				if (!db_get_ws(ack->hContact, modname, "PounceMsg", &dbv) && (dbv.ptszVal[0] != '\0')) {

 					T2Utf pszUtf(dbv.ptszVal);

 					dbei.cbSize = sizeof(dbei);

 					dbei.eventType = EVENTTYPE_MESSAGE;

@@ -95,7 +95,7 @@ int MsgAck(WPARAM, LPARAM lParam)
 int BuddyPounceOptInit(WPARAM wParam, LPARAM)

 {

 	OPTIONSDIALOGPAGE odp = { 0 };

-	odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;

+	odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;

 	odp.hInstance = hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);

 	odp.pwszGroup = LPGENW("Message sessions");

@@ -160,7 +160,7 @@ int UserOnlineSettingChanged(WPARAM hContact, LPARAM lParam)
 		

 		if (newStatus != oldStatus && hContact != NULL && newStatus != ID_STATUS_OFFLINE) {

 			DBVARIANT dbv;

-			if (!db_get_ts(hContact, modname, "PounceMsg", &dbv) && (dbv.ptszVal[0] != '\0')) {

+			if (!db_get_ws(hContact, modname, "PounceMsg", &dbv) && (dbv.ptszVal[0] != '\0')) {

 				// check my status

 				if (statusCheck(db_get_w(hContact, modname, "SendIfMyStatusIsFLAG", 0), CallProtoService(szProto, PS_GETSTATUS,0,0)) 

 				// check the contacts status

@@ -213,7 +213,7 @@ INT_PTR AddToPounce(WPARAM wParam, LPARAM lParam)
 	MCONTACT hContact = wParam;

 	wchar_t* message = (wchar_t*)lParam;

 	DBVARIANT dbv;

-	if (!db_get_ts(hContact, modname, "PounceMsg",&dbv))

+	if (!db_get_ws(hContact, modname, "PounceMsg",&dbv))

 	{

 		wchar_t* newPounce = (wchar_t*)mir_alloc(mir_wstrlen(dbv.ptszVal) + mir_wstrlen(message) + 1);

 		if (!newPounce) return 1;