less TCHARs:

- TCHAR is replaced with wchar_t everywhere;
- LPGENT replaced with either LPGENW or LPGEN;
- fixes for ANSI plugins that improperly used _t functions;
- TCHAR *t removed from MAllStrings;
- ptszGroup, ptszTitle & ptszTab in OPTIONSDIALOGPAGE replaced with pwsz*

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

1 files changed, 19 insertions, 19 deletions

diff --git a/plugins/FavContacts/src/services.cpp b/plugins/FavContacts/src/services.cpp
index 7a2658b6bc..556e0ebbaa 100644
--- a/plugins/FavContacts/src/services.cpp
+++ b/plugins/FavContacts/src/services.cpp
@@ -128,27 +128,27 @@ int ProcessReloadFonts(WPARAM, LPARAM)
 

 	LOGFONT lf = { 0 };

 	FontIDT fontid = { sizeof(fontid) };

-	mir_tstrcpy(fontid.group, LPGENT("Favorite Contacts"));

-	mir_tstrcpy(fontid.name, LPGENT("Contact name"));

+	mir_tstrcpy(fontid.group, LPGENW("Favorite Contacts"));

+	mir_tstrcpy(fontid.name, LPGENW("Contact name"));

 	g_Options.clLine1 = CallService(MS_FONT_GETT, (WPARAM)&fontid, (LPARAM)&lf);

 	g_Options.hfntName = CreateFontIndirect(&lf);

 

-	mir_tstrcpy(fontid.name, LPGENT("Second line"));

+	mir_tstrcpy(fontid.name, LPGENW("Second line"));

 	g_Options.clLine2 = CallService(MS_FONT_GETT, (WPARAM)&fontid, (LPARAM)&lf);

 	g_Options.hfntSecond = CreateFontIndirect(&lf);

 

-	mir_tstrcpy(fontid.name, LPGENT("Selected contact name (color)"));

+	mir_tstrcpy(fontid.name, LPGENW("Selected contact name (color)"));

 	g_Options.clLine1Sel = CallService(MS_FONT_GETT, (WPARAM)&fontid, (LPARAM)&lf);

 

-	mir_tstrcpy(fontid.name, LPGENT("Selected second line (color)"));

+	mir_tstrcpy(fontid.name, LPGENW("Selected second line (color)"));

 	g_Options.clLine2Sel = CallService(MS_FONT_GETT, (WPARAM)&fontid, (LPARAM)&lf);

 

 	ColourIDT colourid = { sizeof(colourid) };

-	mir_tstrcpy(colourid.group, LPGENT("Favorite Contacts"));

-	mir_tstrcpy(colourid.name, LPGENT("Background"));

+	mir_tstrcpy(colourid.group, LPGENW("Favorite Contacts"));

+	mir_tstrcpy(colourid.name, LPGENW("Background"));

 	g_Options.clBack = CallService(MS_COLOUR_GETT, (WPARAM)&colourid, (LPARAM)&lf);

 

-	mir_tstrcpy(colourid.name, LPGENT("Selected background"));

+	mir_tstrcpy(colourid.name, LPGENW("Selected background"));

 	g_Options.clBackSel = CallService(MS_COLOUR_GETT, (WPARAM)&colourid, (LPARAM)&lf);

 

 	return 0;

@@ -171,38 +171,38 @@ int ProcessModulesLoaded(WPARAM, LPARAM)
 	/////////////////////////////////////////////////////////////////////////////////////

 

 	FontIDT fontid = { sizeof(fontid) };

-	mir_tstrcpy(fontid.group, LPGENT("Favorite Contacts"));

+	mir_tstrcpy(fontid.group, LPGENW("Favorite Contacts"));

 	mir_strcpy(fontid.dbSettingsGroup, "FavContacts");

-	mir_tstrcpy(fontid.backgroundGroup, LPGENT("Favorite Contacts"));

+	mir_tstrcpy(fontid.backgroundGroup, LPGENW("Favorite Contacts"));

 	fontid.flags = FIDF_DEFAULTVALID;

 	fontid.deffontsettings.charset = DEFAULT_CHARSET;

 	fontid.deffontsettings.size = -11;

 	mir_tstrcpy(fontid.deffontsettings.szFace, L"MS Shell Dlg");

 	fontid.deffontsettings.style = 0;

 

-	mir_tstrcpy(fontid.backgroundName, LPGENT("Background"));

+	mir_tstrcpy(fontid.backgroundName, LPGENW("Background"));

 

-	mir_tstrcpy(fontid.name, LPGENT("Contact name"));

+	mir_tstrcpy(fontid.name, LPGENW("Contact name"));

 	mir_strcpy(fontid.prefix, "fntName");

 	fontid.deffontsettings.colour = GetSysColor(COLOR_MENUTEXT);

 	fontid.deffontsettings.style = DBFONTF_BOLD;

 	FontRegisterT(&fontid);

 

-	mir_tstrcpy(fontid.name, LPGENT("Second line"));

+	mir_tstrcpy(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);

 

-	mir_tstrcpy(fontid.backgroundName, LPGENT("Selected background"));

+	mir_tstrcpy(fontid.backgroundName, LPGENW("Selected background"));

 

-	mir_tstrcpy(fontid.name, LPGENT("Selected contact name (color)"));

+	mir_tstrcpy(fontid.name, LPGENW("Selected contact name (color)"));

 	mir_strcpy(fontid.prefix, "fntNameSel");

 	fontid.deffontsettings.colour = GetSysColor(COLOR_HIGHLIGHTTEXT);

 	fontid.deffontsettings.style = DBFONTF_BOLD;

 	FontRegisterT(&fontid);

 

-	mir_tstrcpy(fontid.name, LPGENT("Selected second line (color)"));

+	mir_tstrcpy(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;

@@ -211,15 +211,15 @@ int ProcessModulesLoaded(WPARAM, LPARAM)
 	/////////////////////////////////////////////////////////////////////////////////////

 

 	ColourIDT colourid = { sizeof(colourid) };

-	mir_tstrcpy(colourid.group, LPGENT("Favorite Contacts"));

+	mir_tstrcpy(colourid.group, LPGENW("Favorite Contacts"));

 	mir_strcpy(colourid.dbSettingsGroup, "FavContacts");

 

-	mir_tstrcpy(colourid.name, LPGENT("Background"));

+	mir_tstrcpy(colourid.name, LPGENW("Background"));

 	mir_strcpy(colourid.setting, "BackColour");

 	colourid.defcolour = GetSysColor(COLOR_MENU);

 	ColourRegisterT(&colourid);

 

-	mir_tstrcpy(colourid.name, LPGENT("Selected background"));

+	mir_tstrcpy(colourid.name, LPGENW("Selected background"));

 	mir_strcpy(colourid.setting, "SelectedColour");

 	colourid.defcolour = GetSysColor(COLOR_HIGHLIGHT);

 	ColourRegisterT(&colourid);