bye-bye old coding style in Jabber

git-svn-id: http://svn.miranda-ng.org/main/trunk@2322 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 27 insertions, 27 deletions

diff --git a/protocols/JabberG/src/jabber_message_manager.cpp b/protocols/JabberG/src/jabber_message_manager.cpp
index 67e9982eb3..0c7ad7f6d9 100644
--- a/protocols/JabberG/src/jabber_message_manager.cpp
+++ b/protocols/JabberG/src/jabber_message_manager.cpp
@@ -1,15 +1,15 @@
 /*

 

 Jabber Protocol Plugin for Miranda IM

-Copyright ( C ) 2002-04  Santithorn Bunchua

-Copyright ( C ) 2005-08  George Hazan

-Copyright ( C ) 2007     Maxim Mluhov

-Copyright ( C ) 2008-09  Dmitriy Chervov

+Copyright (C) 2002-04  Santithorn Bunchua

+Copyright (C) 2005-08  George Hazan

+Copyright (C) 2007     Maxim Mluhov

+Copyright (C) 2008-09  Dmitriy Chervov

 

 This program is free software; you can redistribute it and/or

 modify it under the terms of the GNU General Public License

 as published by the Free Software Foundation; either version 2

-of the License, or ( at your option ) any later version.

+of the License, or (at your option) any later version.

 

 This program is distributed in the hope that it will be useful,

 but WITHOUT ANY WARRANTY; without even the implied warranty of

@@ -27,10 +27,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 BOOL CJabberMessageManager::FillPermanentHandlers()

 {

-	AddPermanentHandler( &CJabberProto::OnMessageError, JABBER_MESSAGE_TYPE_ERROR, JABBER_MESSAGE_PARSE_FROM | JABBER_MESSAGE_PARSE_HCONTACT, NULL, FALSE, _T("error"));

-	AddPermanentHandler( &CJabberProto::OnMessageIbb, 0, 0, _T(JABBER_FEAT_IBB), FALSE, _T("data"));

-	AddPermanentHandler( &CJabberProto::OnMessagePubsubEvent, 0, 0, _T(JABBER_FEAT_PUBSUB_EVENT), FALSE, _T("event"));

-	AddPermanentHandler( &CJabberProto::OnMessageGroupchat, JABBER_MESSAGE_TYPE_GROUPCHAT, JABBER_MESSAGE_PARSE_FROM, NULL, FALSE, NULL );

+	AddPermanentHandler(&CJabberProto::OnMessageError, JABBER_MESSAGE_TYPE_ERROR, JABBER_MESSAGE_PARSE_FROM | JABBER_MESSAGE_PARSE_HCONTACT, NULL, FALSE, _T("error"));

+	AddPermanentHandler(&CJabberProto::OnMessageIbb, 0, 0, _T(JABBER_FEAT_IBB), FALSE, _T("data"));

+	AddPermanentHandler(&CJabberProto::OnMessagePubsubEvent, 0, 0, _T(JABBER_FEAT_PUBSUB_EVENT), FALSE, _T("event"));

+	AddPermanentHandler(&CJabberProto::OnMessageGroupchat, JABBER_MESSAGE_TYPE_GROUPCHAT, JABBER_MESSAGE_PARSE_FROM, NULL, FALSE, NULL);

 	return TRUE;

 }

 

@@ -39,22 +39,22 @@ BOOL CJabberMessageManager::HandleMessagePermanent(HXML node, ThreadData *pThrea
 	BOOL bStopHandling = FALSE;

 	Lock();

 	CJabberMessagePermanentInfo *pInfo = m_pPermanentHandlers;

-	while ( pInfo && !bStopHandling ) {

+	while (pInfo && !bStopHandling) {

 	// have to get all data here, in the loop, because there's always possibility that previous handler modified it

 		CJabberMessageInfo messageInfo;

 

 		LPCTSTR szType = xmlGetAttrValue(node, _T("type"));

-		if ( szType )

+		if (szType)

 		{

-			if ( !_tcsicmp( szType, _T("normal")))

+			if ( !_tcsicmp(szType, _T("normal")))

 				messageInfo.m_nMessageType = JABBER_MESSAGE_TYPE_NORMAL;

-			else if ( !_tcsicmp( szType, _T("error")))

+			else if ( !_tcsicmp(szType, _T("error")))

 				messageInfo.m_nMessageType = JABBER_MESSAGE_TYPE_ERROR;

-			else if ( !_tcsicmp( szType, _T("chat")))

+			else if ( !_tcsicmp(szType, _T("chat")))

 				messageInfo.m_nMessageType = JABBER_MESSAGE_TYPE_CHAT;

-			else if ( !_tcsicmp( szType, _T("groupchat")))

+			else if ( !_tcsicmp(szType, _T("groupchat")))

 				messageInfo.m_nMessageType = JABBER_MESSAGE_TYPE_GROUPCHAT;

-			else if ( !_tcsicmp( szType, _T("headline")))

+			else if ( !_tcsicmp(szType, _T("headline")))

 				messageInfo.m_nMessageType = JABBER_MESSAGE_TYPE_HEADLINE;

 			else

 				break; // m_nMessageType = JABBER_MESSAGE_TYPE_FAIL;

@@ -63,35 +63,35 @@ BOOL CJabberMessageManager::HandleMessagePermanent(HXML node, ThreadData *pThrea
 			messageInfo.m_nMessageType = JABBER_MESSAGE_TYPE_NORMAL;

 		}

 

-		if ( (pInfo->m_nMessageTypes & messageInfo.m_nMessageType )) {

+		if ((pInfo->m_nMessageTypes & messageInfo.m_nMessageType)) {

 			int i;

-			for ( i = xmlGetChildCount( node ) - 1; i >= 0; i-- ) {

+			for (i = xmlGetChildCount(node) - 1; i >= 0; i--) {

 			// enumerate all children and see whether this node suits handler criteria

-				HXML child = xmlGetChild( node, i );

+				HXML child = xmlGetChild(node, i);

 				

 				LPCTSTR szTagName = xmlGetName(child);

-				LPCTSTR szXmlns = xmlGetAttrValue( child, _T("xmlns"));

+				LPCTSTR szXmlns = xmlGetAttrValue(child, _T("xmlns"));

 

-				if ( (!pInfo->m_szXmlns || ( szXmlns && !_tcscmp( pInfo->m_szXmlns, szXmlns ))) &&

-				( !pInfo->m_szTag || !_tcscmp( pInfo->m_szTag, szTagName ))) {

+				if ((!pInfo->m_szXmlns || (szXmlns && !_tcscmp(pInfo->m_szXmlns, szXmlns))) &&

+				(!pInfo->m_szTag || !_tcscmp(pInfo->m_szTag, szTagName))) {

 				// node suits handler criteria, call the handler

 					messageInfo.m_hChildNode = child;

 					messageInfo.m_szChildTagName = szTagName;

 					messageInfo.m_szChildTagXmlns = szXmlns;

 					messageInfo.m_pUserData = pInfo->m_pUserData;

-					messageInfo.m_szFrom = xmlGetAttrValue( node, _T("from")); // is necessary for ppro->Log() below, that's why we must parse it even if JABBER_MESSAGE_PARSE_FROM flag is not set

+					messageInfo.m_szFrom = xmlGetAttrValue(node, _T("from")); // is necessary for ppro->Log() below, that's why we must parse it even if JABBER_MESSAGE_PARSE_FROM flag is not set

 

 					if (pInfo->m_dwParamsToParse & JABBER_MESSAGE_PARSE_ID_STR)

-						messageInfo.m_szId = xmlGetAttrValue( node, _T("id"));

+						messageInfo.m_szId = xmlGetAttrValue(node, _T("id"));

 

 					if (pInfo->m_dwParamsToParse & JABBER_IQ_PARSE_TO)

-						messageInfo.m_szTo = xmlGetAttrValue( node, _T("to"));

+						messageInfo.m_szTo = xmlGetAttrValue(node, _T("to"));

 

 					if (pInfo->m_dwParamsToParse & JABBER_MESSAGE_PARSE_HCONTACT)

-						messageInfo.m_hContact = ppro->HContactFromJID( messageInfo.m_szFrom, 3 );

+						messageInfo.m_hContact = ppro->HContactFromJID(messageInfo.m_szFrom, 3);

 

 					if (messageInfo.m_szFrom)

-						ppro->Log( "Handling message from " TCHAR_STR_PARAM, messageInfo.m_szFrom );

+						ppro->Log("Handling message from " TCHAR_STR_PARAM, messageInfo.m_szFrom);

 					if ((ppro->*(pInfo->m_pHandler))(node, pThreadData, &messageInfo)) {

 						bStopHandling = TRUE;

 						break;