no more TCHARs

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

3 files changed, 11 insertions, 11 deletions

diff --git a/src/core/stdclist/src/clcfonts.cpp b/src/core/stdclist/src/clcfonts.cpp
index 74c09a7278..dc53eed62d 100644
--- a/src/core/stdclist/src/clcfonts.cpp
+++ b/src/core/stdclist/src/clcfonts.cpp
@@ -51,7 +51,7 @@ static int FS_FontsChanged(WPARAM, LPARAM)
 

 void RegisterCListFonts()

 {

-	FontIDT fontid = { sizeof(fontid) };

+	FontIDW fontid = { sizeof(fontid) };

 	fontid.flags = FIDF_DEFAULTVALID | FIDF_ALLOWREREGISTER | FIDF_APPENDNAME | FIDF_NOAS | FIDF_SAVEPOINTSIZE | FIDF_ALLOWEFFECTS;

 	strncpy(fontid.dbSettingsGroup, "CLC", sizeof(fontid.dbSettingsGroup));

 	wcsncpy(fontid.group, LPGENW("Contact list"), _countof(fontid.group));

@@ -76,13 +76,13 @@ void RegisterCListFonts()
 		mir_snprintf(idstr, "Font%d", i);

 		strncpy(fontid.prefix, idstr, _countof(fontid.prefix));

 		fontid.order = i;

-		FontRegisterT(&fontid);

+		FontRegisterW(&fontid);

 	}

 	ReleaseDC(NULL, hdc);

 

 	// and colours

-	ColourIDT colourid = { 0 };

-	colourid.cbSize = sizeof(ColourIDT);

+	ColourIDW colourid = { 0 };

+	colourid.cbSize = sizeof(ColourIDW);

 	colourid.order = 0;

 	strncpy(colourid.dbSettingsGroup, "CLC", sizeof(colourid.dbSettingsGroup));

 

@@ -90,25 +90,25 @@ void RegisterCListFonts()
 	wcsncpy(colourid.name, LPGENW("Background"), _countof(colourid.name));

 	wcsncpy(colourid.group, LPGENW("Contact list"), _countof(colourid.group));

 	colourid.defcolour = CLCDEFAULT_BKCOLOUR;

-	ColourRegisterT(&colourid);

+	ColourRegisterW(&colourid);

 

 	strncpy(colourid.setting, "SelTextColour", sizeof(colourid.setting));

 	wcsncpy(colourid.name, LPGENW("Selected text"), _countof(colourid.name));

 	colourid.order = 1;

 	colourid.defcolour = CLCDEFAULT_SELTEXTCOLOUR;

-	ColourRegisterT(&colourid);

+	ColourRegisterW(&colourid);

 

 	strncpy(colourid.setting, "HotTextColour", sizeof(colourid.setting));

 	wcsncpy(colourid.name, LPGENW("Hottrack text"), _countof(colourid.name));

 	colourid.order = 1;

 	colourid.defcolour = CLCDEFAULT_HOTTEXTCOLOUR;

-	ColourRegisterT(&colourid);

+	ColourRegisterW(&colourid);

 

 	strncpy(colourid.setting, "QuickSearchColour", sizeof(colourid.setting));

 	wcsncpy(colourid.name, LPGENW("Quicksearch text"), _countof(colourid.name));

 	colourid.order = 1;

 	colourid.defcolour = CLCDEFAULT_QUICKSEARCHCOLOUR;

-	ColourRegisterT(&colourid);

+	ColourRegisterW(&colourid);

 

 	HookEvent(ME_FONT_RELOAD, FS_FontsChanged);

 }

diff --git a/src/core/stdclist/src/clcopts.cpp b/src/core/stdclist/src/clcopts.cpp
index 53d42c65c3..d0c625c2c7 100644
--- a/src/core/stdclist/src/clcopts.cpp
+++ b/src/core/stdclist/src/clcopts.cpp
@@ -94,7 +94,7 @@ static void FillCheckBoxTree(HWND hwndTree, const struct CheckBoxValues_t *value
 	tvis.item.mask = TVIF_PARAM | TVIF_TEXT | TVIF_STATE;

 	for (int i = 0; i < nValues; i++) {

 		tvis.item.lParam = values[i].style;

-		tvis.item.pszText = TranslateTS(values[i].szDescr);

+		tvis.item.pszText = TranslateW(values[i].szDescr);

 		tvis.item.stateMask = TVIS_STATEIMAGEMASK;

 		tvis.item.state = INDEXTOSTATEIMAGEMASK((style & tvis.item.lParam) != 0 ? 2 : 1);

 		TreeView_InsertItem(hwndTree, &tvis);

diff --git a/src/core/stdclist/src/cluiopts.cpp b/src/core/stdclist/src/cluiopts.cpp
index fdd473a268..d911261f71 100644
--- a/src/core/stdclist/src/cluiopts.cpp
+++ b/src/core/stdclist/src/cluiopts.cpp
@@ -74,7 +74,7 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
 		}

 

 		{	DBVARIANT dbv;

-		if (!db_get_ts(NULL, "CList", "TitleText", &dbv)) {

+		if (!db_get_ws(NULL, "CList", "TitleText", &dbv)) {

 			SetDlgItemText(hwndDlg, IDC_TITLETEXT, dbv.ptszVal);

 			db_free(&dbv);

 		}

@@ -172,7 +172,7 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			{

 				wchar_t title[256];

 				GetDlgItemText(hwndDlg, IDC_TITLETEXT, title, _countof(title));

-				db_set_ts(NULL, "CList", "TitleText", title);

+				db_set_ws(NULL, "CList", "TitleText", title);

 				SetWindowText(pcli->hwndContactList, title);

 			}