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/HistoryStats/src/dlgoption_suboutput.cpp | 104 +++++++++++------------ 1 file changed, 52 insertions(+), 52 deletions(-) (limited to 'plugins/HistoryStats/src/dlgoption_suboutput.cpp') diff --git a/plugins/HistoryStats/src/dlgoption_suboutput.cpp b/plugins/HistoryStats/src/dlgoption_suboutput.cpp index 866c865dd6..67c58f9910 100644 --- a/plugins/HistoryStats/src/dlgoption_suboutput.cpp +++ b/plugins/HistoryStats/src/dlgoption_suboutput.cpp @@ -137,44 +137,44 @@ void DlgOption::SubOutput::onWMInitDialog() m_hAutoOpenMenu = m_Options.insertCheck(hTemp2, TranslateT("...via Miranda NG main menu")); // our sort levels - static const TCHAR* sortLevels[Settings::cNumSortLevels] = { - LPGENT("First sort by"), - LPGENT("Then sort by"), - LPGENT("Finally sort by") + static const wchar_t* sortLevels[Settings::cNumSortLevels] = { + LPGENW("First sort by"), + LPGENW("Then sort by"), + LPGENW("Finally sort by") }; // our sort keys static const struct { int key; - TCHAR* desc; + wchar_t* desc; } sortKeys[] = { - { Settings::skNick , LPGENT("Nick") }, - { Settings::skProtocol , LPGENT("Protocol") }, - { Settings::skGroup , LPGENT("Group") }, - { Settings::skBytesIn , LPGENT("Characters (incoming, absolute)") }, - { Settings::skBytesOut , LPGENT("Characters (outgoing, absolute)") }, - { Settings::skBytesTotal , LPGENT("Characters (all, absolute)") }, - { Settings::skBytesInAvg , LPGENT("Characters (incoming, average)") }, - { Settings::skBytesOutAvg , LPGENT("Characters (outgoing, average)") }, - { Settings::skBytesTotalAvg , LPGENT("Characters (all, average)") }, - { Settings::skMessagesIn , LPGENT("Messages (incoming, absolute)") }, - { Settings::skMessagesOut , LPGENT("Messages (outgoing, absolute)") }, - { Settings::skMessagesTotal , LPGENT("Messages (all, absolute)") }, - { Settings::skMessagesInAvg , LPGENT("Messages (incoming, average)") }, - { Settings::skMessagesOutAvg , LPGENT("Messages (outgoing, average)") }, - { Settings::skMessagesTotalAvg , LPGENT("Messages (all, average)") }, - { Settings::skChatsIn , LPGENT("Chats (incoming, absolute)") }, - { Settings::skChatsOut , LPGENT("Chats (outgoing, absolute)") }, - { Settings::skChatsTotal , LPGENT("Chats (all, absolute)") }, - { Settings::skChatsInAvg , LPGENT("Chats (incoming, average)") }, - { Settings::skChatsOutAvg , LPGENT("Chats (outgoing, average)") }, - { Settings::skChatsTotalAvg , LPGENT("Chats (all, average)") }, - { Settings::skChatDurationTotal , LPGENT("Chat duration (total)") }, - { Settings::skChatDurationMin , LPGENT("Chat duration (minimum)") }, - { Settings::skChatDurationAvg , LPGENT("Chat duration (average)") }, - { Settings::skChatDurationMax , LPGENT("Chat duration (maximum)") }, - { Settings::skTimeOfFirstMessage, LPGENT("Time of first message to/from contact") }, - { Settings::skTimeOfLastMessage , LPGENT("Time of last message to/from contact") }, + { Settings::skNick , LPGENW("Nick") }, + { Settings::skProtocol , LPGENW("Protocol") }, + { Settings::skGroup , LPGENW("Group") }, + { Settings::skBytesIn , LPGENW("Characters (incoming, absolute)") }, + { Settings::skBytesOut , LPGENW("Characters (outgoing, absolute)") }, + { Settings::skBytesTotal , LPGENW("Characters (all, absolute)") }, + { Settings::skBytesInAvg , LPGENW("Characters (incoming, average)") }, + { Settings::skBytesOutAvg , LPGENW("Characters (outgoing, average)") }, + { Settings::skBytesTotalAvg , LPGENW("Characters (all, average)") }, + { Settings::skMessagesIn , LPGENW("Messages (incoming, absolute)") }, + { Settings::skMessagesOut , LPGENW("Messages (outgoing, absolute)") }, + { Settings::skMessagesTotal , LPGENW("Messages (all, absolute)") }, + { Settings::skMessagesInAvg , LPGENW("Messages (incoming, average)") }, + { Settings::skMessagesOutAvg , LPGENW("Messages (outgoing, average)") }, + { Settings::skMessagesTotalAvg , LPGENW("Messages (all, average)") }, + { Settings::skChatsIn , LPGENW("Chats (incoming, absolute)") }, + { Settings::skChatsOut , LPGENW("Chats (outgoing, absolute)") }, + { Settings::skChatsTotal , LPGENW("Chats (all, absolute)") }, + { Settings::skChatsInAvg , LPGENW("Chats (incoming, average)") }, + { Settings::skChatsOutAvg , LPGENW("Chats (outgoing, average)") }, + { Settings::skChatsTotalAvg , LPGENW("Chats (all, average)") }, + { Settings::skChatDurationTotal , LPGENW("Chat duration (total)") }, + { Settings::skChatDurationMin , LPGENW("Chat duration (minimum)") }, + { Settings::skChatDurationAvg , LPGENW("Chat duration (average)") }, + { Settings::skChatDurationMax , LPGENW("Chat duration (maximum)") }, + { Settings::skTimeOfFirstMessage, LPGENW("Time of first message to/from contact") }, + { Settings::skTimeOfLastMessage , LPGENW("Time of last message to/from contact") }, }; m_SortKeyToIndex.resize(Settings::skLAST - Settings::skFIRST + 1); @@ -205,26 +205,26 @@ void DlgOption::SubOutput::onWMInitDialog() } // our "omit by value" data - static const TCHAR* omitData[] = { - LPGENT("Characters (incoming, absolute)"), - LPGENT("Characters (outgoing, absolute)"), - LPGENT("Characters (all, absolute)"), - LPGENT("Characters (incoming, average per week)"), - LPGENT("Characters (outgoing, average per week)"), - LPGENT("Characters (all, average per week)"), - LPGENT("Messages (incoming, absolute)"), - LPGENT("Messages (outgoing, absolute)"), - LPGENT("Messages (all, absolute)"), - LPGENT("Messages (incoming, average per week)"), - LPGENT("Messages (outgoing, average per week)"), - LPGENT("Messages (all, average per week)"), - LPGENT("Chats (incoming, absolute)"), - LPGENT("Chats (outgoing, absolute)"), - LPGENT("Chats (all, absolute)"), - LPGENT("Chats (incoming, average per week)"), - LPGENT("Chats (outgoing, average per week)"), - LPGENT("Chats (all, average per week)"), - LPGENT("Chat duration (total, hours)"), + static const wchar_t* omitData[] = { + LPGENW("Characters (incoming, absolute)"), + LPGENW("Characters (outgoing, absolute)"), + LPGENW("Characters (all, absolute)"), + LPGENW("Characters (incoming, average per week)"), + LPGENW("Characters (outgoing, average per week)"), + LPGENW("Characters (all, average per week)"), + LPGENW("Messages (incoming, absolute)"), + LPGENW("Messages (outgoing, absolute)"), + LPGENW("Messages (all, absolute)"), + LPGENW("Messages (incoming, average per week)"), + LPGENW("Messages (outgoing, average per week)"), + LPGENW("Messages (all, average per week)"), + LPGENW("Chats (incoming, absolute)"), + LPGENW("Chats (outgoing, absolute)"), + LPGENW("Chats (all, absolute)"), + LPGENW("Chats (incoming, average per week)"), + LPGENW("Chats (outgoing, average per week)"), + LPGENW("Chats (all, average per week)"), + LPGENW("Chat duration (total, hours)"), }; array_each_(i, omitData) -- cgit v1.2.3