From fabb5ec61205a9a3dca6f82645f257d00a534572 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 11 Jan 2014 13:53:27 +0000 Subject: forgotten to declare two remaining fields as const git-svn-id: http://svn.miranda-ng.org/main/trunk@7591 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/IRCG/src/commandmonitor.cpp | 2 +- protocols/IRCG/src/input.cpp | 2 +- protocols/IRCG/src/scripting.cpp | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'protocols/IRCG') diff --git a/protocols/IRCG/src/commandmonitor.cpp b/protocols/IRCG/src/commandmonitor.cpp index 18851cdbf5..603ab055c2 100644 --- a/protocols/IRCG/src/commandmonitor.cpp +++ b/protocols/IRCG/src/commandmonitor.cpp @@ -618,7 +618,7 @@ bool CIrcProto::OnIrc_NOTICE(const CIrcMessage* pmsg) S3.Delete(S3.GetLength()-1, 1); S3.Delete(0,1); CMString Wnd = MakeWndID( S3.c_str()); - gci.pszID = ( TCHAR* )Wnd.c_str(); + gci.pszID = Wnd.c_str(); if ( !CallServiceSync( MS_GC_GETINFO, 0, (LPARAM)&gci ) && gci.iType == GCW_CHATROOM ) S2 = GetWord( gci.pszID, 0 ); else diff --git a/protocols/IRCG/src/input.cpp b/protocols/IRCG/src/input.cpp index 2342aee213..bfad4eedbc 100644 --- a/protocols/IRCG/src/input.cpp +++ b/protocols/IRCG/src/input.cpp @@ -372,7 +372,7 @@ BOOL CIrcProto::DoHardcodedCommand( CMString text, TCHAR* window, HANDLE hContac GC_INFO gci = {0}; gci.Flags = BYID|NAME|COUNT; gci.pszModule = m_szModuleName; - gci.pszID = (TCHAR*)S.c_str(); + gci.pszID = S.c_str(); if ( !CallServiceSync( MS_GC_GETINFO, 0, ( LPARAM )&gci )) mir_sntprintf( szTemp, SIZEOF(szTemp), _T("users: %u"), gci.iCount); diff --git a/protocols/IRCG/src/scripting.cpp b/protocols/IRCG/src/scripting.cpp index 4152ab3a8c..5d3d13d59b 100644 --- a/protocols/IRCG/src/scripting.cpp +++ b/protocols/IRCG/src/scripting.cpp @@ -188,9 +188,9 @@ INT_PTR __cdecl CIrcProto::Scripting_GetIrcData(WPARAM, LPARAM lparam) else if (sRequest == "usercount" && !sChannel.IsEmpty()) { CMString S = MakeWndID(sChannel.c_str()); GC_INFO gci = {0}; - gci.Flags = BYID|COUNT; + gci.Flags = BYID | COUNT; gci.pszModule = m_szModuleName; - gci.pszID = (TCHAR*)S.c_str(); + gci.pszID = S.c_str(); if ( !CallServiceSync( MS_GC_GETINFO, 0, (LPARAM)&gci )) { TCHAR szTemp[40]; mir_sntprintf(szTemp, 35, _T("%u"), gci.iCount); @@ -202,7 +202,7 @@ INT_PTR __cdecl CIrcProto::Scripting_GetIrcData(WPARAM, LPARAM lparam) GC_INFO gci = {0}; gci.Flags = BYID|USERS; gci.pszModule = m_szModuleName; - gci.pszID = ( TCHAR* )S.c_str(); + gci.pszID = S.c_str(); if ( !CallServiceSync( MS_GC_GETINFO, 0, (LPARAM)&gci )) return (INT_PTR)mir_strdup( gci.pszUsers ); } @@ -212,8 +212,8 @@ INT_PTR __cdecl CIrcProto::Scripting_GetIrcData(WPARAM, LPARAM lparam) if ( i >= 0 ) { int j = 0; while (j < i) { - GC_INFO gci = {0}; - gci.Flags = BYINDEX|ID; + GC_INFO gci = { 0 }; + gci.Flags = BYINDEX | ID; gci.pszModule = m_szModuleName; gci.iItem = j; if ( !CallServiceSync( MS_GC_GETINFO, 0, ( LPARAM )&gci )) { -- cgit v1.2.3