From 6e53dfca72b932c4bdcd7aa02ca62bf8b2630eac Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 26 Jul 2016 09:20:25 +0000 Subject: 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 --- plugins/YAPP/src/yapp.cpp | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'plugins/YAPP/src/yapp.cpp') diff --git a/plugins/YAPP/src/yapp.cpp b/plugins/YAPP/src/yapp.cpp index 9b64c9803b..06ce6610fd 100644 --- a/plugins/YAPP/src/yapp.cpp +++ b/plugins/YAPP/src/yapp.cpp @@ -94,8 +94,8 @@ static void InitFonts() { font_id_firstline.cbSize = sizeof(FontIDT); font_id_firstline.flags = FIDF_ALLOWEFFECTS; - mir_tstrcpy(font_id_firstline.group, LPGENT("Popups")); - mir_tstrcpy(font_id_firstline.name, LPGENT("First line")); + mir_tstrcpy(font_id_firstline.group, LPGENW("Popups")); + mir_tstrcpy(font_id_firstline.name, LPGENW("First line")); mir_strcpy(font_id_firstline.dbSettingsGroup, MODULE); mir_strcpy(font_id_firstline.prefix, "FontFirst"); mir_tstrcpy(font_id_firstline.backgroundGroup, L"Popups"); @@ -105,8 +105,8 @@ static void InitFonts() font_id_secondline.cbSize = sizeof(FontIDT); font_id_secondline.flags = FIDF_ALLOWEFFECTS; - mir_tstrcpy(font_id_secondline.group, LPGENT("Popups")); - mir_tstrcpy(font_id_secondline.name, LPGENT("Second line")); + mir_tstrcpy(font_id_secondline.group, LPGENW("Popups")); + mir_tstrcpy(font_id_secondline.name, LPGENW("Second line")); mir_strcpy(font_id_secondline.dbSettingsGroup, MODULE); mir_strcpy(font_id_secondline.prefix, "FontSecond"); mir_tstrcpy(font_id_secondline.backgroundGroup, L"Popups"); @@ -116,8 +116,8 @@ static void InitFonts() font_id_time.cbSize = sizeof(FontIDT); font_id_time.flags = FIDF_ALLOWEFFECTS; - mir_tstrcpy(font_id_time.group, LPGENT("Popups")); - mir_tstrcpy(font_id_time.name, LPGENT("Time")); + mir_tstrcpy(font_id_time.group, LPGENW("Popups")); + mir_tstrcpy(font_id_time.name, LPGENW("Time")); mir_strcpy(font_id_time.dbSettingsGroup, MODULE); mir_strcpy(font_id_time.prefix, "FontTime"); mir_tstrcpy(font_id_time.backgroundGroup, L"Popups"); @@ -126,8 +126,8 @@ static void InitFonts() FontRegisterT(&font_id_time); colour_id_bg.cbSize = sizeof(ColourIDT); - mir_tstrcpy(colour_id_bg.group, LPGENT("Popups")); - mir_tstrcpy(colour_id_bg.name, LPGENT("Background")); + mir_tstrcpy(colour_id_bg.group, LPGENW("Popups")); + mir_tstrcpy(colour_id_bg.name, LPGENW("Background")); mir_strcpy(colour_id_bg.dbSettingsGroup, MODULE); mir_strcpy(colour_id_bg.setting, "ColourBg"); colour_id_bg.defcolour = GetSysColor(COLOR_3DSHADOW); @@ -135,8 +135,8 @@ static void InitFonts() ColourRegisterT(&colour_id_bg); colour_id_border.cbSize = sizeof(ColourIDT); - mir_tstrcpy(colour_id_border.group, LPGENT("Popups")); - mir_tstrcpy(colour_id_border.name, LPGENT("Border")); + mir_tstrcpy(colour_id_border.group, LPGENW("Popups")); + mir_tstrcpy(colour_id_border.name, LPGENW("Border")); mir_strcpy(colour_id_border.dbSettingsGroup, MODULE); mir_strcpy(colour_id_border.setting, "ColourBorder"); colour_id_border.defcolour = RGB(0, 0, 0); @@ -144,8 +144,8 @@ static void InitFonts() ColourRegisterT(&colour_id_border); colour_id_sidebar.cbSize = sizeof(ColourIDT); - mir_tstrcpy(colour_id_sidebar.group, LPGENT("Popups")); - mir_tstrcpy(colour_id_sidebar.name, LPGENT("Sidebar")); + mir_tstrcpy(colour_id_sidebar.group, LPGENW("Popups")); + mir_tstrcpy(colour_id_sidebar.name, LPGENW("Sidebar")); mir_strcpy(colour_id_sidebar.dbSettingsGroup, MODULE); mir_strcpy(colour_id_sidebar.setting, "ColourSidebar"); colour_id_sidebar.defcolour = RGB(128, 128, 128); @@ -153,8 +153,8 @@ static void InitFonts() ColourRegisterT(&colour_id_sidebar); colour_id_titleunderline.cbSize = sizeof(ColourIDT); - mir_tstrcpy(colour_id_titleunderline.group, LPGENT("Popups")); - mir_tstrcpy(colour_id_titleunderline.name, LPGENT("Title underline")); + mir_tstrcpy(colour_id_titleunderline.group, LPGENW("Popups")); + mir_tstrcpy(colour_id_titleunderline.name, LPGENW("Title underline")); mir_strcpy(colour_id_titleunderline.dbSettingsGroup, MODULE); mir_strcpy(colour_id_titleunderline.setting, "ColourTitleUnderline"); colour_id_titleunderline.defcolour = GetSysColor(COLOR_3DSHADOW); @@ -168,7 +168,7 @@ void InitMenuItems(void) { bool isEnabled = db_get_b(0, "Popup", "ModuleIsEnabled", 1) == 1; - hMenuRoot = Menu_CreateRoot(MO_MAIN, LPGENT("Popups"), 500010000, IcoLib_GetIcon(isEnabled ? ICO_POPUP_ON : ICO_POPUP_OFF, 0)); + hMenuRoot = Menu_CreateRoot(MO_MAIN, LPGENW("Popups"), 500010000, IcoLib_GetIcon(isEnabled ? ICO_POPUP_ON : ICO_POPUP_OFF, 0)); Menu_ConfigureItem(hMenuRoot, MCI_OPT_UID, "043A641A-2767-4C57-AA57-9233D6F9DC54"); CMenuItem mi; @@ -178,13 +178,13 @@ void InitMenuItems(void) SET_UID(mi, 0x92c386ae, 0x6e81, 0x452d, 0xb5, 0x71, 0x87, 0x46, 0xe9, 0x2, 0x66, 0xe9); mi.hIcolibItem = IcoLib_GetIcon(ICO_HISTORY, 0); mi.pszService= MS_POPUP_SHOWHISTORY; - mi.name.t = LPGENT("Popup History"); + mi.name.w = LPGENW("Popup History"); hMenuItemHistory = Menu_AddMainMenuItem(&mi); SET_UID(mi, 0x4353d44e, 0x177, 0x4843, 0x88, 0x30, 0x25, 0x5d, 0x91, 0xad, 0xdf, 0x3f); mi.hIcolibItem = IcoLib_GetIcon(isEnabled ? ICO_POPUP_ON : ICO_POPUP_OFF, 0); mi.pszService = "Popup/EnableDisableMenuCommand"; - mi.name.t = (isEnabled ? LPGENT("Disable Popups") : LPGENT("Enable Popups")); + mi.name.w = (isEnabled ? LPGENW("Disable Popups") : LPGENW("Enable Popups")); hMenuItem = Menu_AddMainMenuItem(&mi); } -- cgit v1.2.3