no more TCHARs

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

3 files changed, 23 insertions, 23 deletions

diff --git a/plugins/XSoundNotify/src/dialog.cpp b/plugins/XSoundNotify/src/dialog.cpp
index ca68cabc9f..7529110f34 100644
--- a/plugins/XSoundNotify/src/dialog.cpp
+++ b/plugins/XSoundNotify/src/dialog.cpp
@@ -52,7 +52,7 @@ static INT_PTR CALLBACK DlgProcContactsOptions(HWND hwndDlg, UINT msg, WPARAM wP
 			}

 			EnableWindow(GetDlgItem(hwndDlg, IDC_CONT_BUTTON_CHOOSE_SOUND), TRUE);

 			DBVARIANT dbv = { 0 };

-			if (!db_get_ts(hContact, SETTINGSNAME, SETTINGSKEY, &dbv)) {

+			if (!db_get_ws(hContact, SETTINGSNAME, SETTINGSKEY, &dbv)) {

 				EnableWindow(GetDlgItem(hwndDlg, IDC_CONT_BUTTON_TEST_PLAY), TRUE);

 				EnableWindow(GetDlgItem(hwndDlg, IDC_CONT_BUTTON_RESET_SOUND), TRUE);

 				SetDlgItemText(hwndDlg, IDC_CONT_LABEL_SOUND, PathFindFileName(dbv.ptszVal));

@@ -67,7 +67,7 @@ static INT_PTR CALLBACK DlgProcContactsOptions(HWND hwndDlg, UINT msg, WPARAM wP
 			CheckDlgButton(hwndDlg, IDC_CONT_IGNORE_SOUND, db_get_b(hContact, SETTINGSNAME, SETTINGSIGNOREKEY, 0) ? BST_CHECKED : BST_UNCHECKED);

 			p = XSN_Users.find((XSN_Data *)&hContact);

 			if (p == NULL) {

-				ptrW name(db_get_tsa(hContact, SETTINGSNAME, SETTINGSKEY));

+				ptrW name(db_get_wsa(hContact, SETTINGSNAME, SETTINGSKEY));

 				if (name != NULL)

 					XSN_Users.insert(new XSN_Data(hContact, name, IsDlgButtonChecked(hwndDlg, IDC_CONT_IGNORE_SOUND) ? 1 : 0));

 			}

@@ -82,7 +82,7 @@ static INT_PTR CALLBACK DlgProcContactsOptions(HWND hwndDlg, UINT msg, WPARAM wP
 				if (mir_wstrcmpi(p->path, L"")) {

 					wchar_t shortpath[MAX_PATH];

 					PathToRelativeT(p->path, shortpath);

-					db_set_ts(hContact, SETTINGSNAME, SETTINGSKEY, shortpath);

+					db_set_ws(hContact, SETTINGSNAME, SETTINGSKEY, shortpath);

 				}

 				db_set_b(hContact, SETTINGSNAME, SETTINGSIGNOREKEY, p->ignore);

 			}

@@ -134,16 +134,16 @@ static INT_PTR CALLBACK DlgProcContactsOptions(HWND hwndDlg, UINT msg, WPARAM wP
 			isIgnoreSound = 0;

 			if (p == NULL) {

 				DBVARIANT dbv;

-				if (!db_get_ts(hContact, SETTINGSNAME, SETTINGSKEY, &dbv)) {

+				if (!db_get_ws(hContact, SETTINGSNAME, SETTINGSKEY, &dbv)) {

 					wchar_t longpath[MAX_PATH] = { 0 };

-					PathToAbsoluteT(dbv.ptszVal, longpath);

+					PathToAbsoluteW(dbv.ptszVal, longpath);

 					SkinPlaySoundFile(longpath);

 					db_free(&dbv);

 				}

 			}

 			else {

 				wchar_t longpath[MAX_PATH] = { 0 };

-				PathToAbsoluteT(p->path, longpath);

+				PathToAbsoluteW(p->path, longpath);

 				SkinPlaySoundFile(longpath);

 			}

 			break;

@@ -167,9 +167,9 @@ static INT_PTR CALLBACK DlgProcContactsOptions(HWND hwndDlg, UINT msg, WPARAM wP
 			p = XSN_Users.find((XSN_Data *)&hContact);

 			if (p == NULL) {

 				DBVARIANT dbv;

-				if (!db_get_ts(hContact, SETTINGSNAME, SETTINGSKEY, &dbv)) {

+				if (!db_get_ws(hContact, SETTINGSNAME, SETTINGSKEY, &dbv)) {

 					wchar_t longpath[MAX_PATH];

-					PathToAbsoluteT(dbv.ptszVal, longpath);

+					PathToAbsoluteW(dbv.ptszVal, longpath);

 					XSN_Users.insert(new XSN_Data(hContact, longpath, IsDlgButtonChecked(hwndDlg, IDC_CONT_IGNORE_SOUND) ? 1 : 0));

 					db_free(&dbv);

 				}

diff --git a/plugins/XSoundNotify/src/options.cpp b/plugins/XSoundNotify/src/options.cpp
index 61a846a53e..1fab9fedf2 100644
--- a/plugins/XSoundNotify/src/options.cpp
+++ b/plugins/XSoundNotify/src/options.cpp
@@ -96,7 +96,7 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 				MCONTACT hContact = (MCONTACT)SendDlgItemMessage(hwndDlg, IDC_OPT_COMBO_USERS, CB_GETITEMDATA, cursel, 0);

 				EnableWindow(GetDlgItem(hwndDlg, IDC_OPT_BUTTON_CHOOSE_SOUND), TRUE);

 				DBVARIANT dbv = { 0 };

-				if (!db_get_ts(hContact, SETTINGSNAME, SETTINGSKEY, &dbv))

+				if (!db_get_ws(hContact, SETTINGSNAME, SETTINGSKEY, &dbv))

 				{

 					EnableWindow(GetDlgItem(hwndDlg, IDC_OPT_BUTTON_TEST_PLAY), TRUE);

 					EnableWindow(GetDlgItem(hwndDlg, IDC_OPT_BUTTON_RESET_SOUND), TRUE);

@@ -163,16 +163,16 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 			isIgnoreSound = 0;

 			if (p == NULL) {

 				DBVARIANT dbv;

-				if (!db_get_ts(hContact, SETTINGSNAME, SETTINGSKEY, &dbv)) {

+				if (!db_get_ws(hContact, SETTINGSNAME, SETTINGSKEY, &dbv)) {

 					wchar_t longpath[MAX_PATH];

-					PathToAbsoluteT(dbv.ptszVal, longpath);

+					PathToAbsoluteW(dbv.ptszVal, longpath);

 					SkinPlaySoundFile(longpath);

 					db_free(&dbv);

 				}

 			}

 			else {

 				wchar_t longpath[MAX_PATH] = { 0 };

-				PathToAbsoluteT(p->path, longpath);

+				PathToAbsoluteW(p->path, longpath);

 				SkinPlaySoundFile(longpath);

 			}

 		}

@@ -204,9 +204,9 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 			XSN_Data *p = XSN_Users.find((XSN_Data *)&hContact);

 			if (p == NULL) {

 				DBVARIANT dbv;

-				if (!db_get_ts(hContact, SETTINGSNAME, SETTINGSKEY, &dbv)) {

+				if (!db_get_ws(hContact, SETTINGSNAME, SETTINGSKEY, &dbv)) {

 					wchar_t longpath[MAX_PATH];

-					PathToAbsoluteT(dbv.ptszVal, longpath);

+					PathToAbsoluteW(dbv.ptszVal, longpath);

 					XSN_Users.insert(new XSN_Data(hContact, longpath, IsDlgButtonChecked(hwndDlg, IDC_OPT_IGNORE_SOUND) ? 1 : 0));

 					db_free(&dbv);

 				}

@@ -227,7 +227,7 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 				if (mir_wstrcmpi(XSN_Users[i]->path, L"")) {

 					wchar_t shortpath[MAX_PATH];

 					PathToRelativeT(XSN_Users[i]->path, shortpath);

-					db_set_ts(XSN_Users[i]->hContact, SETTINGSNAME, SETTINGSKEY, shortpath);

+					db_set_ws(XSN_Users[i]->hContact, SETTINGSNAME, SETTINGSKEY, shortpath);

 				}

 				db_set_b(XSN_Users[i]->hContact, SETTINGSNAME, SETTINGSIGNOREKEY, XSN_Users[i]->ignore);

 			}

@@ -242,7 +242,7 @@ INT OptInit(WPARAM wParam, LPARAM)
 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.position = 100000000;

 	odp.hInstance = hInst;

-	odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;

+	odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);

 	odp.pwszGroup = LPGENW("Sounds");

 	odp.pwszTitle = LPGENW("XSound Notify");

diff --git a/plugins/XSoundNotify/src/xsn_main.cpp b/plugins/XSoundNotify/src/xsn_main.cpp
index 02ea729792..af0d731e50 100644
--- a/plugins/XSoundNotify/src/xsn_main.cpp
+++ b/plugins/XSoundNotify/src/xsn_main.cpp
@@ -78,7 +78,7 @@ void InitSelfSounds()
 

 			wchar_t infobuf[256];

 			mir_snwprintf(infobuf, L"%s [%s]", TranslateT("Self status"), protos[i]->tszAccountName);

-			SkinAddNewSoundExT(namebuf, infobuf, pcli->pfnGetStatusModeDescription(selfSounds[j].iStatus, 0));

+			SkinAddNewSoundExW(namebuf, infobuf, pcli->pfnGetStatusModeDescription(selfSounds[j].iStatus, 0));

 		}

 	}

 }

@@ -117,9 +117,9 @@ static int ProcessEvent(WPARAM hContact, LPARAM lParam)
 

 	isIgnoreSound = db_get_b(hContact, SETTINGSNAME, SETTINGSIGNOREKEY, 0);

 	DBVARIANT dbv;

-	if (!isIgnoreSound && !db_get_ts(hContact, SETTINGSNAME, SETTINGSKEY, &dbv)) {

+	if (!isIgnoreSound && !db_get_ws(hContact, SETTINGSNAME, SETTINGSKEY, &dbv)) {

 		wchar_t PlaySoundPath[MAX_PATH] = { 0 };

-		PathToAbsoluteT(dbv.ptszVal, PlaySoundPath);

+		PathToAbsoluteW(dbv.ptszVal, PlaySoundPath);

 		isOwnSound = 0;

 		SkinPlaySoundFile(PlaySoundPath);

 		db_free(&dbv);

@@ -141,15 +141,15 @@ static int ProcessChatEvent(WPARAM, LPARAM lParam)
 

 	MCONTACT hContact = pci->FindRoom(gcd->pszModule, gcd->ptszID);

 	if (hContact != 0) {

-		ptrW nick(db_get_tsa(hContact, gcd->pszModule, "MyNick"));

+		ptrW nick(db_get_wsa(hContact, gcd->pszModule, "MyNick"));

 		if (nick == NULL || gce->ptszText == NULL)

 			return 0;

 		if (wcsstr(gce->ptszText, nick)) {

 			isIgnoreSound = db_get_b(hContact, SETTINGSNAME, SETTINGSIGNOREKEY, 0);

 			DBVARIANT dbv;

-			if (!isIgnoreSound && !db_get_ts(hContact, SETTINGSNAME, SETTINGSKEY, &dbv)) {

+			if (!isIgnoreSound && !db_get_ws(hContact, SETTINGSNAME, SETTINGSKEY, &dbv)) {

 				wchar_t PlaySoundPath[MAX_PATH] = { 0 };

-				PathToAbsoluteT(dbv.ptszVal, PlaySoundPath);

+				PathToAbsoluteW(dbv.ptszVal, PlaySoundPath);

 				isOwnSound = 0;

 				SkinPlaySoundFile(PlaySoundPath);

 				db_free(&dbv);

@@ -180,7 +180,7 @@ static int OnLoadInit(WPARAM, LPARAM)
 	CMenuItem mi;

 	SET_UID(mi, 0x5d72ca1f, 0xc52, 0x436d, 0x81, 0x47, 0x29, 0xf6, 0xc3, 0x28, 0xb5, 0xd1);

 	mi.position = -0x7FFFFFFF;

-	mi.flags = CMIF_TCHAR;

+	mi.flags = CMIF_UNICODE;

 	mi.hIcolibItem = Skin_LoadIcon(SKINICON_OTHER_MIRANDA);

 	mi.name.w = LPGENW("Custom contact sound");

 	mi.pszService = "XSoundNotify/ContactMenuCommand";