From 428bf0cbd77813a43094cb5c984436deff251936 Mon Sep 17 00:00:00 2001 From: George Hazan 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/FavContacts/src/favlist.h | 2 +- plugins/FavContacts/src/menu.cpp | 4 ++-- plugins/FavContacts/src/services.cpp | 32 ++++++++++++++++---------------- 3 files changed, 19 insertions(+), 19 deletions(-) (limited to 'plugins/FavContacts/src') diff --git a/plugins/FavContacts/src/favlist.h b/plugins/FavContacts/src/favlist.h index 3cbb4a8285..b111550237 100644 --- a/plugins/FavContacts/src/favlist.h +++ b/plugins/FavContacts/src/favlist.h @@ -20,7 +20,7 @@ public: name = mir_wstrdup(pcli->pfnGetContactDisplayName(hContact, 0)); if (g_Options.bUseGroups) { - if ((group = db_get_tsa(hContact, "CList", "Group")) == NULL) + if ((group = db_get_wsa(hContact, "CList", "Group")) == NULL) group = mir_wstrdup(TranslateT("")); } else group = mir_wstrdup(TranslateT("Favorite Contacts")); diff --git a/plugins/FavContacts/src/menu.cpp b/plugins/FavContacts/src/menu.cpp index 64568587c2..ebf50f87fa 100644 --- a/plugins/FavContacts/src/menu.cpp +++ b/plugins/FavContacts/src/menu.cpp @@ -71,7 +71,7 @@ static BOOL sttMeasureItem_Contact(LPMEASUREITEMSTRUCT lpmis, Options *options) if (options->bSecondLine) { bool bFree = false; - wchar_t *title = db_get_tsa(hContact, "CList", "StatusMsg"); + wchar_t *title = db_get_wsa(hContact, "CList", "StatusMsg"); if (title == NULL) { char *proto = GetContactProto(hContact); int status = db_get_w(hContact, proto, "Status", ID_STATUS_OFFLINE); @@ -315,7 +315,7 @@ static BOOL sttDrawItem_Contact(LPDRAWITEMSTRUCT lpdis, Options *options = NULL) if (options->bSecondLine) { bool bFree = false; - wchar_t *title = db_get_tsa(hContact, "CList", "StatusMsg"); + wchar_t *title = db_get_wsa(hContact, "CList", "StatusMsg"); if (title == NULL) { int status = db_get_w(hContact, proto, "Status", ID_STATUS_OFFLINE); title = pcli->pfnGetStatusModeDescription(status, 0); diff --git a/plugins/FavContacts/src/services.cpp b/plugins/FavContacts/src/services.cpp index 00a053b996..2a6cab99c5 100644 --- a/plugins/FavContacts/src/services.cpp +++ b/plugins/FavContacts/src/services.cpp @@ -127,29 +127,29 @@ int ProcessReloadFonts(WPARAM, LPARAM) if (g_Options.hfntSecond) DeleteObject(g_Options.hfntSecond); LOGFONT lf = { 0 }; - FontIDT fontid = { sizeof(fontid) }; + FontIDW fontid = { sizeof(fontid) }; mir_wstrcpy(fontid.group, LPGENW("Favorite Contacts")); mir_wstrcpy(fontid.name, LPGENW("Contact name")); - g_Options.clLine1 = CallService(MS_FONT_GETT, (WPARAM)&fontid, (LPARAM)&lf); + g_Options.clLine1 = CallService(MS_FONT_GETW, (WPARAM)&fontid, (LPARAM)&lf); g_Options.hfntName = CreateFontIndirect(&lf); mir_wstrcpy(fontid.name, LPGENW("Second line")); - g_Options.clLine2 = CallService(MS_FONT_GETT, (WPARAM)&fontid, (LPARAM)&lf); + g_Options.clLine2 = CallService(MS_FONT_GETW, (WPARAM)&fontid, (LPARAM)&lf); g_Options.hfntSecond = CreateFontIndirect(&lf); mir_wstrcpy(fontid.name, LPGENW("Selected contact name (color)")); - g_Options.clLine1Sel = CallService(MS_FONT_GETT, (WPARAM)&fontid, (LPARAM)&lf); + g_Options.clLine1Sel = CallService(MS_FONT_GETW, (WPARAM)&fontid, (LPARAM)&lf); mir_wstrcpy(fontid.name, LPGENW("Selected second line (color)")); - g_Options.clLine2Sel = CallService(MS_FONT_GETT, (WPARAM)&fontid, (LPARAM)&lf); + g_Options.clLine2Sel = CallService(MS_FONT_GETW, (WPARAM)&fontid, (LPARAM)&lf); - ColourIDT colourid = { sizeof(colourid) }; + ColourIDW colourid = { sizeof(colourid) }; mir_wstrcpy(colourid.group, LPGENW("Favorite Contacts")); mir_wstrcpy(colourid.name, LPGENW("Background")); - g_Options.clBack = CallService(MS_COLOUR_GETT, (WPARAM)&colourid, (LPARAM)&lf); + g_Options.clBack = CallService(MS_COLOUR_GETW, (WPARAM)&colourid, (LPARAM)&lf); mir_wstrcpy(colourid.name, LPGENW("Selected background")); - g_Options.clBackSel = CallService(MS_COLOUR_GETT, (WPARAM)&colourid, (LPARAM)&lf); + g_Options.clBackSel = CallService(MS_COLOUR_GETW, (WPARAM)&colourid, (LPARAM)&lf); return 0; } @@ -170,7 +170,7 @@ int ProcessModulesLoaded(WPARAM, LPARAM) ///////////////////////////////////////////////////////////////////////////////////// - FontIDT fontid = { sizeof(fontid) }; + FontIDW fontid = { sizeof(fontid) }; mir_wstrcpy(fontid.group, LPGENW("Favorite Contacts")); mir_strcpy(fontid.dbSettingsGroup, "FavContacts"); mir_wstrcpy(fontid.backgroundGroup, LPGENW("Favorite Contacts")); @@ -186,13 +186,13 @@ int ProcessModulesLoaded(WPARAM, LPARAM) mir_strcpy(fontid.prefix, "fntName"); fontid.deffontsettings.colour = GetSysColor(COLOR_MENUTEXT); fontid.deffontsettings.style = DBFONTF_BOLD; - FontRegisterT(&fontid); + FontRegisterW(&fontid); mir_wstrcpy(fontid.name, LPGENW("Second line")); mir_strcpy(fontid.prefix, "fntSecond"); fontid.deffontsettings.colour = sttShadeColor(GetSysColor(COLOR_MENUTEXT), GetSysColor(COLOR_MENU)); fontid.deffontsettings.style = 0; - FontRegisterT(&fontid); + FontRegisterW(&fontid); mir_wstrcpy(fontid.backgroundName, LPGENW("Selected background")); @@ -200,29 +200,29 @@ int ProcessModulesLoaded(WPARAM, LPARAM) mir_strcpy(fontid.prefix, "fntNameSel"); fontid.deffontsettings.colour = GetSysColor(COLOR_HIGHLIGHTTEXT); fontid.deffontsettings.style = DBFONTF_BOLD; - FontRegisterT(&fontid); + FontRegisterW(&fontid); mir_wstrcpy(fontid.name, LPGENW("Selected second line (color)")); mir_strcpy(fontid.prefix, "fntSecondSel"); fontid.deffontsettings.colour = sttShadeColor(GetSysColor(COLOR_HIGHLIGHTTEXT), GetSysColor(COLOR_HIGHLIGHT)); fontid.deffontsettings.style = 0; - FontRegisterT(&fontid); + FontRegisterW(&fontid); ///////////////////////////////////////////////////////////////////////////////////// - ColourIDT colourid = { sizeof(colourid) }; + ColourIDW colourid = { sizeof(colourid) }; mir_wstrcpy(colourid.group, LPGENW("Favorite Contacts")); mir_strcpy(colourid.dbSettingsGroup, "FavContacts"); mir_wstrcpy(colourid.name, LPGENW("Background")); mir_strcpy(colourid.setting, "BackColour"); colourid.defcolour = GetSysColor(COLOR_MENU); - ColourRegisterT(&colourid); + ColourRegisterW(&colourid); mir_wstrcpy(colourid.name, LPGENW("Selected background")); mir_strcpy(colourid.setting, "SelectedColour"); colourid.defcolour = GetSysColor(COLOR_HIGHLIGHT); - ColourRegisterT(&colourid); + ColourRegisterW(&colourid); HookEvent(ME_FONT_RELOAD, ProcessReloadFonts); HookEvent(ME_COLOUR_RELOAD, ProcessReloadFonts); -- cgit v1.2.3