no more TCHARs

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

3 files changed, 15 insertions, 15 deletions

diff --git a/plugins/TrafficCounter/src/TrafficCounter.cpp b/plugins/TrafficCounter/src/TrafficCounter.cpp
index 2366819516..04058633e6 100644
--- a/plugins/TrafficCounter/src/TrafficCounter.cpp
+++ b/plugins/TrafficCounter/src/TrafficCounter.cpp
@@ -84,8 +84,8 @@ BYTE online_count = 0;
 //font service support

 /*-------------------------------------------------------------------------------------------------------------------*/

 int TrafficFontHeight = 0;

-FontIDT TrafficFontID;

-ColourIDT TrafficBackgroundColorID;

+FontIDW TrafficFontID;

+ColourIDW TrafficBackgroundColorID;

 

 //---------------------------------------------------------------------------------------------

 // Для ToolTip

@@ -215,7 +215,7 @@ int TrafficCounterModulesLoaded(WPARAM, LPARAM)
 	Traffic_PopupTimeoutValue = db_get_b(NULL, TRAFFIC_SETTINGS_GROUP, SETTINGS_POPUP_TIMEOUT_VALUE, 5);

 

 	// Формат счётчика для каждого активного протокола

-	if (db_get_ts(NULL, TRAFFIC_SETTINGS_GROUP, SETTINGS_COUNTER_FORMAT, &dbv) == 0) {

+	if (db_get_ws(NULL, TRAFFIC_SETTINGS_GROUP, SETTINGS_COUNTER_FORMAT, &dbv) == 0) {

 		if (mir_wstrlen(dbv.ptszVal) > 0)

 			mir_wstrncpy(Traffic_CounterFormat, dbv.ptszVal, _countof(Traffic_CounterFormat));

 		//

@@ -227,7 +227,7 @@ int TrafficCounterModulesLoaded(WPARAM, LPARAM)
 	}

 

 	// Формат всплывающих подсказок

-	if (db_get_ts(NULL, TRAFFIC_SETTINGS_GROUP, SETTINGS_TOOLTIP_FORMAT, &dbv) == 0) {

+	if (db_get_ws(NULL, TRAFFIC_SETTINGS_GROUP, SETTINGS_TOOLTIP_FORMAT, &dbv) == 0) {

 		if (mir_wstrlen(dbv.ptszVal) > 0)

 			mir_wstrncpy(Traffic_TooltipFormat, dbv.ptszVal, _countof(Traffic_TooltipFormat));

 		//

@@ -244,7 +244,7 @@ int TrafficCounterModulesLoaded(WPARAM, LPARAM)
 	OverallInfo.Total.Timer = db_get_dw(NULL, TRAFFIC_SETTINGS_GROUP, SETTINGS_TOTAL_ONLINE_TIME, 0);

 

 	//register traffic font

-	TrafficFontID.cbSize = sizeof(FontIDT);

+	TrafficFontID.cbSize = sizeof(FontIDW);

 	mir_wstrcpy(TrafficFontID.group, LPGENW("Traffic counter"));

 	mir_wstrcpy(TrafficFontID.name, LPGENW("Font"));

 	mir_strcpy(TrafficFontID.dbSettingsGroup, TRAFFIC_SETTINGS_GROUP);

@@ -256,16 +256,16 @@ int TrafficCounterModulesLoaded(WPARAM, LPARAM)
 	TrafficFontID.deffontsettings.style = 0;

 	mir_wstrcpy(TrafficFontID.deffontsettings.szFace, L"Arial");

 	TrafficFontID.order = 0;

-	FontRegisterT(&TrafficFontID);

+	FontRegisterW(&TrafficFontID);

 

 	// Регистрируем цвет фона

-	TrafficBackgroundColorID.cbSize = sizeof(ColourIDT);

+	TrafficBackgroundColorID.cbSize = sizeof(ColourIDW);

 	mir_wstrcpy(TrafficBackgroundColorID.group, LPGENW("Traffic counter"));

 	mir_wstrcpy(TrafficBackgroundColorID.name, LPGENW("Font"));

 	mir_strcpy(TrafficBackgroundColorID.dbSettingsGroup, TRAFFIC_SETTINGS_GROUP);

 	mir_strcpy(TrafficBackgroundColorID.setting, "FontBkColor");

 	TrafficBackgroundColorID.defcolour = GetSysColor(COLOR_BTNFACE);

-	ColourRegisterT(&TrafficBackgroundColorID);

+	ColourRegisterW(&TrafficBackgroundColorID);

 

 	HookEvent(ME_FONT_RELOAD, UpdateFonts);

 

@@ -333,9 +333,9 @@ void SaveSettings(BYTE OnlyCnt)
 	db_set_b(NULL, TRAFFIC_SETTINGS_GROUP, SETTINGS_POPUP_TIMEOUT_VALUE, Traffic_PopupTimeoutValue);

 	//

 	// Формат счётчиков

-	db_set_ts(NULL, TRAFFIC_SETTINGS_GROUP, SETTINGS_COUNTER_FORMAT, Traffic_CounterFormat);

+	db_set_ws(NULL, TRAFFIC_SETTINGS_GROUP, SETTINGS_COUNTER_FORMAT, Traffic_CounterFormat);

 

-	db_set_ts(NULL, TRAFFIC_SETTINGS_GROUP, SETTINGS_TOOLTIP_FORMAT, Traffic_TooltipFormat);

+	db_set_ws(NULL, TRAFFIC_SETTINGS_GROUP, SETTINGS_TOOLTIP_FORMAT, Traffic_TooltipFormat);

 

 	db_set_b(NULL, TRAFFIC_SETTINGS_GROUP, SETTINGS_ADDITION_SPACE, Traffic_AdditionSpace);

 	// Сохраняем флаги

@@ -1163,14 +1163,14 @@ int UpdateFonts(WPARAM, LPARAM)
 {

 	LOGFONT logfont;

 	//if no font service

-	if (!ServiceExists(MS_FONT_GETT)) return 0;

+	if (!ServiceExists(MS_FONT_GETW)) return 0;

 	//update traffic font

 	if (Traffic_h_font) DeleteObject(Traffic_h_font);

-	Traffic_FontColor = CallService(MS_FONT_GETT, (WPARAM)&TrafficFontID, (LPARAM)&logfont);

+	Traffic_FontColor = CallService(MS_FONT_GETW, (WPARAM)&TrafficFontID, (LPARAM)&logfont);

 	Traffic_h_font = CreateFontIndirect(&logfont);

 	//

 	TrafficFontHeight = abs(logfont.lfHeight) + 1;

-	Traffic_BkColor = CallService(MS_COLOUR_GETT, (WPARAM)&TrafficBackgroundColorID, 0);

+	Traffic_BkColor = CallService(MS_COLOUR_GETW, (WPARAM)&TrafficBackgroundColorID, 0);

 

 	// Ключевой цвет

 	UseKeyColor = db_get_b(NULL, "ModernSettings", "UseKeyColor", 1);

diff --git a/plugins/TrafficCounter/src/opttree.cpp b/plugins/TrafficCounter/src/opttree.cpp
index b75de3cca5..1fb69b220e 100644
--- a/plugins/TrafficCounter/src/opttree.cpp
+++ b/plugins/TrafficCounter/src/opttree.cpp
@@ -38,7 +38,7 @@ static void OptTree_TranslateItem(HWND hwndTree, HTREEITEM hItem)
 	SendMessage(hwndTree, TVM_GETITEM, 0, (LPARAM)&tvi);

 	// Проверим, надо ли переводить.

 	if ((tvi.lParam != -1) && (pOptions[tvi.lParam].dwFlag & OPTTREE_NOTRANSLATE)) return;

-	tvi.pszText = TranslateTS(tvi.pszText);

+	tvi.pszText = TranslateW(tvi.pszText);

 	SendMessage(hwndTree, TVM_SETITEM, 0, (LPARAM)&tvi);

 }

 

diff --git a/plugins/TrafficCounter/src/statistics.cpp b/plugins/TrafficCounter/src/statistics.cpp
index 1815f8544c..85a6ac1281 100644
--- a/plugins/TrafficCounter/src/statistics.cpp
+++ b/plugins/TrafficCounter/src/statistics.cpp
@@ -301,7 +301,7 @@ void Stat_ReadFile(BYTE n)
 	SYSTEMTIME stNow;

 

 	pszPath = Utils_ReplaceVarsT(L"%miranda_userdata%\\statistics");

-	CreateDirectoryTreeT(pszPath);

+	CreateDirectoryTreeW(pszPath);

 	mir_snwprintf(FileName, L"%s\\%S.stat", pszPath, ProtoList[n].name);

 	mir_free(pszPath);

 	GetLocalTime(&stNow);