From 4b99b5b4abad1cf12ac5c7bbb8788899ba6a48ab Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 9 Jul 2018 13:03:28 +0300 Subject: massive Variables-related code cleaning (removed TCHAR, manually created unions replaced with MAllString etc) --- plugins/ListeningTo/src/listeningto.cpp | 40 ++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'plugins/ListeningTo') diff --git a/plugins/ListeningTo/src/listeningto.cpp b/plugins/ListeningTo/src/listeningto.cpp index f65198e41e..b8b7f0f02b 100644 --- a/plugins/ListeningTo/src/listeningto.cpp +++ b/plugins/ListeningTo/src/listeningto.cpp @@ -237,53 +237,53 @@ int ModulesLoaded(WPARAM, LPARAM) tr.memType = TR_MEM_MIRANDA; tr.flags = TRF_FREEMEM | TRF_PARSEFUNC | TRF_FIELD | TRF_TCHAR; - tr.tszTokenString = L"listening_info"; - tr.parseFunctionT = VariablesParseInfo; + tr.szTokenString.w = L"listening_info"; + tr.parseFunctionW = VariablesParseInfo; tr.szHelpText = LPGEN("Listening info") "\t" LPGEN("Listening info as set in the options"); CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr); - tr.tszTokenString = L"listening_type"; - tr.parseFunctionT = VariablesParseType; + tr.szTokenString.w = L"listening_type"; + tr.parseFunctionW = VariablesParseType; tr.szHelpText = LPGEN("Listening info") "\t" LPGEN("Media type: Music, Video, etc."); CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr); - tr.tszTokenString = L"listening_artist"; - tr.parseFunctionT = VariablesParseArtist; + tr.szTokenString.w = L"listening_artist"; + tr.parseFunctionW = VariablesParseArtist; tr.szHelpText = LPGEN("Listening info") "\t" LPGEN("Artist name"); CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr); - tr.tszTokenString = L"listening_album"; - tr.parseFunctionT = VariablesParseAlbum; + tr.szTokenString.w = L"listening_album"; + tr.parseFunctionW = VariablesParseAlbum; tr.szHelpText = LPGEN("Listening info") "\t" LPGEN("Album name"); CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr); - tr.tszTokenString = L"listening_title"; - tr.parseFunctionT = VariablesParseTitle; + tr.szTokenString.w = L"listening_title"; + tr.parseFunctionW = VariablesParseTitle; tr.szHelpText = LPGEN("Listening info") "\t" LPGEN("Song name"); CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr); - tr.tszTokenString = L"listening_track"; - tr.parseFunctionT = VariablesParseTrack; + tr.szTokenString.w = L"listening_track"; + tr.parseFunctionW = VariablesParseTrack; tr.szHelpText = LPGEN("Listening info") "\t" LPGEN("Track number"); CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr); - tr.tszTokenString = L"listening_year"; - tr.parseFunctionT = VariablesParseYear; + tr.szTokenString.w = L"listening_year"; + tr.parseFunctionW = VariablesParseYear; tr.szHelpText = LPGEN("Listening info") "\t" LPGEN("Song year"); CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr); - tr.tszTokenString = L"listening_genre"; - tr.parseFunctionT = VariablesParseGenre; + tr.szTokenString.w = L"listening_genre"; + tr.parseFunctionW = VariablesParseGenre; tr.szHelpText = LPGEN("Listening info") "\t" LPGEN("Song genre"); CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr); - tr.tszTokenString = L"listening_length"; - tr.parseFunctionT = VariablesParseLength; + tr.szTokenString.w = L"listening_length"; + tr.parseFunctionW = VariablesParseLength; tr.szHelpText = LPGEN("Listening info") "\t" LPGEN("Song length"); CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr); - tr.tszTokenString = L"listening_player"; - tr.parseFunctionT = VariablesParsePlayer; + tr.szTokenString.w = L"listening_player"; + tr.parseFunctionW = VariablesParsePlayer; tr.szHelpText = LPGEN("Listening info") "\t" LPGEN("Player name"); CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr); } -- cgit v1.2.3