From e97a58a54dee4112d50fcbfb2d971d63297fe434 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Wed, 22 Jul 2015 05:25:12 +0000 Subject: vc2015 compilation fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@14622 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/src/jabber_xstatus.cpp | 4 ++-- protocols/MRA/src/MraIcons.cpp | 2 +- protocols/Xfire/src/main.cpp | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'protocols') diff --git a/protocols/JabberG/src/jabber_xstatus.cpp b/protocols/JabberG/src/jabber_xstatus.cpp index 5e532fb7c5..5c830ca8c2 100644 --- a/protocols/JabberG/src/jabber_xstatus.cpp +++ b/protocols/JabberG/src/jabber_xstatus.cpp @@ -1508,12 +1508,12 @@ void g_XstatusIconsInit() mir_tstrcpy(p + 1, _T("..\\Icons\\xstatus_jabber.dll")); TCHAR szSection[100]; - mir_tstrcpy(szSection, _T("Protocols/Jabber/")LPGENT("Moods")); + mir_tstrcpy(szSection, _T("Protocols/Jabber/") LPGENT("Moods")); for (int i = 1; i < _countof(g_arrMoods); i++) g_MoodIcons.RegisterIcon(g_arrMoods[i].szTag, szFile, -(200 + i), szSection, TranslateTS(g_arrMoods[i].szName)); - mir_tstrcpy(szSection, _T("Protocols/Jabber/")LPGENT("Activities")); + mir_tstrcpy(szSection, _T("Protocols/Jabber/") LPGENT("Activities")); for (int k = 0; k < _countof(g_arrActivities); k++) { if (g_arrActivities[k].szFirst) g_ActivityIcons.RegisterIcon(g_arrActivities[k].szFirst, szFile, g_arrActivities[k].iconid, szSection, TranslateTS(g_arrActivities[k].szTitle)); diff --git a/protocols/MRA/src/MraIcons.cpp b/protocols/MRA/src/MraIcons.cpp index 17eaded5e0..e3ab42fa65 100644 --- a/protocols/MRA/src/MraIcons.cpp +++ b/protocols/MRA/src/MraIcons.cpp @@ -101,7 +101,7 @@ void InitXStatusIcons() GetModuleFileName((g_hDLLXStatusIcons != NULL) ? g_hDLLXStatusIcons : g_hInstance, szBuff, _countof(szBuff)); SKINICONDESC sid = { 0 }; - sid.section.t = LPGENT("Protocols")_T("/")LPGENT("MRA")_T("/")LPGENT("Custom Status"); + sid.section.t = LPGENT("Protocols")_T("/") LPGENT("MRA") _T("/") LPGENT("Custom Status"); sid.defaultFile.t = szBuff; sid.flags = SIDF_ALL_TCHAR; diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp index b4d234d3c1..0f237313ce 100644 --- a/protocols/Xfire/src/main.cpp +++ b/protocols/Xfire/src/main.cpp @@ -904,42 +904,42 @@ static int OnSystemModulesLoaded(WPARAM wParam, LPARAM lParam) tr.szTokenString = "xfiregame"; tr.parseFunction = Varxfiregame; - tr.szHelpText = LPGEN("XFire")"\t"LPGEN("Current Game"); + tr.szHelpText = LPGEN("XFire") "\t" LPGEN("Current Game"); CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr); tr.szTokenString = "myxfiregame"; tr.parseFunction = Varmyxfiregame; - tr.szHelpText = LPGEN("XFire")"\t"LPGEN("My Current Game"); + tr.szHelpText = LPGEN("XFire") "\t" LPGEN("My Current Game"); CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr); tr.szTokenString = "xfireserverip"; tr.parseFunction = Varxfireserverip; - tr.szHelpText = LPGEN("XFire")"\t"LPGEN("ServerIP"); + tr.szHelpText = LPGEN("XFire") "\t" LPGEN("ServerIP"); CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr); tr.szTokenString = "myxfireserverip"; tr.parseFunction = Varmyxfireserverip; - tr.szHelpText = LPGEN("XFire")"\t"LPGEN("My Current ServerIP"); + tr.szHelpText = LPGEN("XFire") "\t" LPGEN("My Current ServerIP"); CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr); tr.szTokenString = "xfirevoice"; tr.parseFunction = Varxfirevoice; - tr.szHelpText = LPGEN("XFire")"\t"LPGEN("Voice"); + tr.szHelpText = LPGEN("XFire") "\t" LPGEN("Voice"); CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr); tr.szTokenString = "myxfirevoice"; tr.parseFunction = Varmyxfirevoice; - tr.szHelpText = LPGEN("XFire")"\t"LPGEN("My Current Voice"); + tr.szHelpText = LPGEN("XFire") "\t" LPGEN("My Current Voice"); CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr); tr.szTokenString = "xfirevoiceip"; tr.parseFunction = Varxfirevoiceip; - tr.szHelpText = LPGEN("XFire")"\t"LPGEN("Voice ServerIP"); + tr.szHelpText = LPGEN("XFire") "\t" LPGEN("Voice ServerIP"); CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr); tr.szTokenString = "myxfirevoiceip"; tr.parseFunction = Varmyxfirevoiceip; - tr.szHelpText = LPGEN("XFire")"\t"LPGEN("My Voice ServerIP"); + tr.szHelpText = LPGEN("XFire") "\t" LPGEN("My Voice ServerIP"); CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr); } @@ -1221,7 +1221,7 @@ extern "C" __declspec(dllexport) int Load(void) XFireLog("Wasn't able to get GetExtendedUdpTable function"); } - Icon_Register(hinstance, LPGEN("Protocols")"/"LPGEN("XFire"), &icon, 1); + Icon_Register(hinstance, LPGEN("Protocols") "/" LPGEN("XFire"), &icon, 1); hExtraIcon1 = ExtraIcon_Register("xfire_game", LPGEN("XFire game icon"), "", NULL, ExtraImageApply1); hExtraIcon2 = ExtraIcon_Register("xfire_voice", LPGEN("XFire voice icon"), "", NULL, ExtraImageApply2); -- cgit v1.2.3