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, 239 insertions, 239 deletions

diff --git a/protocols/JabberG/src/jabber_caps.cpp b/protocols/JabberG/src/jabber_caps.cpp
index 380cf03087..8c5f3f484b 100644
--- a/protocols/JabberG/src/jabber_caps.cpp
+++ b/protocols/JabberG/src/jabber_caps.cpp
@@ -1,14 +1,14 @@
 /*

 

 Jabber Protocol Plugin for Miranda IM

-Copyright ( C ) 2002-04  Santithorn Bunchua

-Copyright ( C ) 2005-12  George Hazan

-Copyright ( C ) 2007     Maxim Mluhov

+Copyright (C) 2002-04  Santithorn Bunchua

+Copyright (C) 2005-12  George Hazan

+Copyright (C) 2007     Maxim Mluhov

 

 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

@@ -85,180 +85,180 @@ const JabberFeatCapPair g_JabberFeatCapPairsExt[] = {
 	{	NULL,                             0                                }

 };

 

-void CJabberProto::OnIqResultCapsDiscoInfoSI( HXML, CJabberIqInfo* pInfo )

+void CJabberProto::OnIqResultCapsDiscoInfoSI(HXML, CJabberIqInfo* pInfo)

 {

-	JABBER_RESOURCE_STATUS *r = ResourceInfoFromJID( pInfo->GetFrom());

-	if ( !r )

+	JABBER_RESOURCE_STATUS *r = ResourceInfoFromJID(pInfo->GetFrom());

+	if ( !r)

 		return;

 

-	if ( r->szCapsNode == NULL )

-		OnIqResultCapsDiscoInfo( NULL, pInfo );

+	if (r->szCapsNode == NULL)

+		OnIqResultCapsDiscoInfo(NULL, pInfo);

 

 	HXML query = pInfo->GetChildNode();

-	if ( pInfo->GetIqType() == JABBER_IQ_TYPE_RESULT && query ) {

+	if (pInfo->GetIqType() == JABBER_IQ_TYPE_RESULT && query) {

 		// XEP-0232 support

 		HXML xform;

-		for ( int i = 1; ( xform = xmlGetNthChild( query, _T("x"), i)) != NULL; i++ ) {

-			TCHAR *szFormTypeValue = XPath( xform, _T("field[@var='FORM_TYPE']/value"));

-			if ( szFormTypeValue && !_tcscmp( szFormTypeValue, _T("urn:xmpp:dataforms:softwareinfo"))) {

-				if ( r->pSoftwareInfo )

+		for (int i = 1; (xform = xmlGetNthChild(query, _T("x"), i)) != NULL; i++) {

+			TCHAR *szFormTypeValue = XPath(xform, _T("field[@var='FORM_TYPE']/value"));

+			if (szFormTypeValue && !_tcscmp(szFormTypeValue, _T("urn:xmpp:dataforms:softwareinfo"))) {

+				if (r->pSoftwareInfo)

 					delete r->pSoftwareInfo;

 				r->pSoftwareInfo = new JABBER_XEP0232_SOFTWARE_INFO;

-				if ( r->pSoftwareInfo ) {

-					TCHAR *szTmp = XPath( xform, _T("field[@var='os']/value"));

-					if ( szTmp )

-						r->pSoftwareInfo->szOs = mir_tstrdup( szTmp );

-					szTmp = XPath( xform, _T("field[@var='os_version']/value"));

-					if ( szTmp )

-						r->pSoftwareInfo->szOsVersion = mir_tstrdup( szTmp );

-					szTmp = XPath( xform, _T("field[@var='software']/value"));

-					if ( szTmp )

-						r->pSoftwareInfo->szSoftware = mir_tstrdup( szTmp );

-					szTmp = XPath( xform, _T("field[@var='software_version']/value"));

-					if ( szTmp )

-						r->pSoftwareInfo->szSoftwareVersion = mir_tstrdup( szTmp );

-					szTmp = XPath( xform, _T("field[@var='x-miranda-core-version']/value"));

-					if ( szTmp )

-						r->pSoftwareInfo->szXMirandaCoreVersion = mir_tstrdup( szTmp );

-					szTmp = XPath( xform, _T("field[@var='x-miranda-core-is-unicode']/value"));

-					if ( !szTmp ) // old deprecated format

-						szTmp = XPath( xform, _T("field[@var='x-miranda-is-unicode']/value"));

-					if ( szTmp && _ttoi( szTmp ))

+				if (r->pSoftwareInfo) {

+					TCHAR *szTmp = XPath(xform, _T("field[@var='os']/value"));

+					if (szTmp)

+						r->pSoftwareInfo->szOs = mir_tstrdup(szTmp);

+					szTmp = XPath(xform, _T("field[@var='os_version']/value"));

+					if (szTmp)

+						r->pSoftwareInfo->szOsVersion = mir_tstrdup(szTmp);

+					szTmp = XPath(xform, _T("field[@var='software']/value"));

+					if (szTmp)

+						r->pSoftwareInfo->szSoftware = mir_tstrdup(szTmp);

+					szTmp = XPath(xform, _T("field[@var='software_version']/value"));

+					if (szTmp)

+						r->pSoftwareInfo->szSoftwareVersion = mir_tstrdup(szTmp);

+					szTmp = XPath(xform, _T("field[@var='x-miranda-core-version']/value"));

+					if (szTmp)

+						r->pSoftwareInfo->szXMirandaCoreVersion = mir_tstrdup(szTmp);

+					szTmp = XPath(xform, _T("field[@var='x-miranda-core-is-unicode']/value"));

+					if ( !szTmp) // old deprecated format

+						szTmp = XPath(xform, _T("field[@var='x-miranda-is-unicode']/value"));

+					if (szTmp && _ttoi(szTmp))

 						r->pSoftwareInfo->bXMirandaIsUnicode = TRUE;

-					szTmp = XPath( xform, _T("field[@var='x-miranda-core-is-alpha']/value"));

-					if ( !szTmp ) // old deprecated format

-						szTmp = XPath( xform, _T("field[@var='x-miranda-is-alpha']/value"));

-					if ( szTmp && _ttoi( szTmp ))

+					szTmp = XPath(xform, _T("field[@var='x-miranda-core-is-alpha']/value"));

+					if ( !szTmp) // old deprecated format

+						szTmp = XPath(xform, _T("field[@var='x-miranda-is-alpha']/value"));

+					if (szTmp && _ttoi(szTmp))

 						r->pSoftwareInfo->bXMirandaIsAlpha = TRUE;

-					szTmp = XPath( xform, _T("field[@var='x-miranda-jabber-is-debug']/value"));

-					if ( szTmp && _ttoi( szTmp ))

+					szTmp = XPath(xform, _T("field[@var='x-miranda-jabber-is-debug']/value"));

+					if (szTmp && _ttoi(szTmp))

 						r->pSoftwareInfo->bXMirandaIsDebug = TRUE;

 				}

-				JabberUserInfoUpdate( pInfo->GetHContact());

+				JabberUserInfoUpdate(pInfo->GetHContact());

 			}

 		}

 	}

 }

 

-void CJabberProto::OnIqResultCapsDiscoInfo( HXML, CJabberIqInfo* pInfo )

+void CJabberProto::OnIqResultCapsDiscoInfo(HXML, CJabberIqInfo* pInfo)

 {

-	JABBER_RESOURCE_STATUS *r = ResourceInfoFromJID( pInfo->GetFrom());

+	JABBER_RESOURCE_STATUS *r = ResourceInfoFromJID(pInfo->GetFrom());

 

 	HXML query = pInfo->GetChildNode();

-	if ( pInfo->GetIqType() == JABBER_IQ_TYPE_RESULT && query ) {

+	if (pInfo->GetIqType() == JABBER_IQ_TYPE_RESULT && query) {

 		JabberCapsBits jcbCaps = 0;

 		HXML feature;

-		for ( int i = 1; ( feature = xmlGetNthChild( query, _T("feature"), i )) != NULL; i++ ) {

-			const TCHAR *featureName = xmlGetAttrValue( feature, _T("var"));

-			if ( featureName ) {

-				for ( int j = 0; g_JabberFeatCapPairs[j].szFeature; j++ ) {

-					if ( !_tcscmp( g_JabberFeatCapPairs[j].szFeature, featureName )) {

+		for (int i = 1; (feature = xmlGetNthChild(query, _T("feature"), i)) != NULL; i++) {

+			const TCHAR *featureName = xmlGetAttrValue(feature, _T("var"));

+			if (featureName) {

+				for (int j = 0; g_JabberFeatCapPairs[j].szFeature; j++) {

+					if ( !_tcscmp(g_JabberFeatCapPairs[j].szFeature, featureName)) {

 						jcbCaps |= g_JabberFeatCapPairs[j].jcbCap;

 						break;

 		}	}	}	}

 

 		// no version info support and no XEP-0115 support?

-		if ( r && r->dwVersionRequestTime == -1 && !r->version && !r->software && !r->szCapsNode ) {

+		if (r && r->dwVersionRequestTime == -1 && !r->version && !r->software && !r->szCapsNode) {

 			r->jcbCachedCaps = jcbCaps;

 			r->dwDiscoInfoRequestTime = -1;

 			return;

 		}

 

-		if (!m_clientCapsManager.SetClientCaps( pInfo->GetIqId(), jcbCaps ))

-			if ( r )

+		if ( !m_clientCapsManager.SetClientCaps(pInfo->GetIqId(), jcbCaps))

+			if (r)

 				r->jcbCachedCaps = jcbCaps;

-		JabberUserInfoUpdate( pInfo->GetHContact());

+		JabberUserInfoUpdate(pInfo->GetHContact());

 	}

 	else {

 		// no version info support and no XEP-0115 support?

-		if ( r && r->dwVersionRequestTime == -1 && !r->version && !r->software && !r->szCapsNode ) {

+		if (r && r->dwVersionRequestTime == -1 && !r->version && !r->software && !r->szCapsNode) {

 			r->jcbCachedCaps = JABBER_RESOURCE_CAPS_NONE;

 			r->dwDiscoInfoRequestTime = -1;

 			return;

 		}

-		m_clientCapsManager.SetClientCaps( pInfo->GetIqId(), JABBER_RESOURCE_CAPS_ERROR );

+		m_clientCapsManager.SetClientCaps(pInfo->GetIqId(), JABBER_RESOURCE_CAPS_ERROR);

 	}

 }

 

-JabberCapsBits CJabberProto::GetTotalJidCapabilites( const TCHAR *jid )

+JabberCapsBits CJabberProto::GetTotalJidCapabilites(const TCHAR *jid)

 {

-	if ( !jid )

+	if ( !jid)

 		return JABBER_RESOURCE_CAPS_NONE;

 

 	TCHAR szBareJid[ JABBER_MAX_JID_LEN ];

-	JabberStripJid( jid, szBareJid, SIZEOF( szBareJid ));

+	JabberStripJid(jid, szBareJid, SIZEOF(szBareJid));

 

-	JABBER_LIST_ITEM *item = ListGetItemPtr( LIST_ROSTER, szBareJid );

-	if ( !item )

-		item = ListGetItemPtr( LIST_VCARD_TEMP, szBareJid );

+	JABBER_LIST_ITEM *item = ListGetItemPtr(LIST_ROSTER, szBareJid);

+	if ( !item)

+		item = ListGetItemPtr(LIST_VCARD_TEMP, szBareJid);

 

 	JabberCapsBits jcbToReturn = JABBER_RESOURCE_CAPS_NONE;

 

 	// get bare jid info only if where is no resources

-	if ( !item || ( item && !item->resourceCount )) {

-		jcbToReturn = GetResourceCapabilites( szBareJid, FALSE );

-		if ( jcbToReturn & JABBER_RESOURCE_CAPS_ERROR)

+	if ( !item || (item && !item->resourceCount)) {

+		jcbToReturn = GetResourceCapabilites(szBareJid, FALSE);

+		if (jcbToReturn & JABBER_RESOURCE_CAPS_ERROR)

 			jcbToReturn = JABBER_RESOURCE_CAPS_NONE;

 	}

 

-	if ( item ) {

-		for ( int i = 0; i < item->resourceCount; i++ ) {

+	if (item) {

+		for (int i = 0; i < item->resourceCount; i++) {

 			TCHAR szFullJid[ JABBER_MAX_JID_LEN ];

-			mir_sntprintf( szFullJid, JABBER_MAX_JID_LEN, _T("%s/%s"), szBareJid, item->resource[i].resourceName );

-			JabberCapsBits jcb = GetResourceCapabilites( szFullJid, FALSE );

-			if ( !( jcb & JABBER_RESOURCE_CAPS_ERROR ))

+			mir_sntprintf(szFullJid, JABBER_MAX_JID_LEN, _T("%s/%s"), szBareJid, item->resource[i].resourceName);

+			JabberCapsBits jcb = GetResourceCapabilites(szFullJid, FALSE);

+			if ( !(jcb & JABBER_RESOURCE_CAPS_ERROR))

 				jcbToReturn |= jcb;

 		}

 	}

 	return jcbToReturn;

 }

 

-JabberCapsBits CJabberProto::GetResourceCapabilites( const TCHAR *jid, BOOL appendBestResource )

+JabberCapsBits CJabberProto::GetResourceCapabilites(const TCHAR *jid, BOOL appendBestResource)

 {

 	TCHAR fullJid[ JABBER_MAX_JID_LEN ];

-	if ( appendBestResource )

-		GetClientJID( jid, fullJid, SIZEOF( fullJid ));

+	if (appendBestResource)

+		GetClientJID(jid, fullJid, SIZEOF(fullJid));

 	else

-		_tcsncpy( fullJid, jid, SIZEOF( fullJid ));

+		_tcsncpy(fullJid, jid, SIZEOF(fullJid));

 

-	JABBER_RESOURCE_STATUS *r = ResourceInfoFromJID( fullJid );

-	if ( r == NULL )

+	JABBER_RESOURCE_STATUS *r = ResourceInfoFromJID(fullJid);

+	if (r == NULL)

 		return JABBER_RESOURCE_CAPS_ERROR;

 

 	// XEP-0115 mode

-	if ( r->szCapsNode && r->szCapsVer ) {

+	if (r->szCapsNode && r->szCapsVer) {

 		JabberCapsBits jcbCaps = 0, jcbExtCaps = 0;

 		BOOL bRequestSent = FALSE;

-		JabberCapsBits jcbMainCaps = m_clientCapsManager.GetClientCaps( r->szCapsNode, r->szCapsVer );

+		JabberCapsBits jcbMainCaps = m_clientCapsManager.GetClientCaps(r->szCapsNode, r->szCapsVer);

 

-		if ( jcbMainCaps == JABBER_RESOURCE_CAPS_TIMEOUT && !r->dwDiscoInfoRequestTime )

+		if (jcbMainCaps == JABBER_RESOURCE_CAPS_TIMEOUT && !r->dwDiscoInfoRequestTime)

 			jcbMainCaps = JABBER_RESOURCE_CAPS_ERROR;

 

-		if ( jcbMainCaps == JABBER_RESOURCE_CAPS_UNINIT ) {

+		if (jcbMainCaps == JABBER_RESOURCE_CAPS_UNINIT) {

 			// send disco#info query

 

-			CJabberIqInfo *pInfo = m_iqManager.AddHandler( &CJabberProto::OnIqResultCapsDiscoInfo, JABBER_IQ_TYPE_GET, fullJid, JABBER_IQ_PARSE_FROM | JABBER_IQ_PARSE_CHILD_TAG_NODE );

-			pInfo->SetTimeout( JABBER_RESOURCE_CAPS_QUERY_TIMEOUT );

-			m_clientCapsManager.SetClientCaps( r->szCapsNode, r->szCapsVer, JABBER_RESOURCE_CAPS_IN_PROGRESS, pInfo->GetIqId());

+			CJabberIqInfo *pInfo = m_iqManager.AddHandler(&CJabberProto::OnIqResultCapsDiscoInfo, JABBER_IQ_TYPE_GET, fullJid, JABBER_IQ_PARSE_FROM | JABBER_IQ_PARSE_CHILD_TAG_NODE);

+			pInfo->SetTimeout(JABBER_RESOURCE_CAPS_QUERY_TIMEOUT);

+			m_clientCapsManager.SetClientCaps(r->szCapsNode, r->szCapsVer, JABBER_RESOURCE_CAPS_IN_PROGRESS, pInfo->GetIqId());

 			r->dwDiscoInfoRequestTime = pInfo->GetRequestTime();

 

 			TCHAR queryNode[512];

-			mir_sntprintf( queryNode, SIZEOF(queryNode), _T("%s#%s"), r->szCapsNode, r->szCapsVer );

-			m_ThreadInfo->send( XmlNodeIq( pInfo ) << XQUERY( _T(JABBER_FEAT_DISCO_INFO)) << XATTR( _T("node"), queryNode ));

+			mir_sntprintf(queryNode, SIZEOF(queryNode), _T("%s#%s"), r->szCapsNode, r->szCapsVer);

+			m_ThreadInfo->send(XmlNodeIq(pInfo) << XQUERY(_T(JABBER_FEAT_DISCO_INFO)) << XATTR(_T("node"), queryNode));

 

 			bRequestSent = TRUE;

 		}

-		else if ( jcbMainCaps == JABBER_RESOURCE_CAPS_IN_PROGRESS )

+		else if (jcbMainCaps == JABBER_RESOURCE_CAPS_IN_PROGRESS)

 			bRequestSent = TRUE;

-		else if ( jcbMainCaps != JABBER_RESOURCE_CAPS_TIMEOUT )

+		else if (jcbMainCaps != JABBER_RESOURCE_CAPS_TIMEOUT)

 			jcbCaps |= jcbMainCaps;

 

-		if ( jcbMainCaps != JABBER_RESOURCE_CAPS_TIMEOUT && r->szCapsExt ) {

-			TCHAR *caps = mir_tstrdup( r->szCapsExt );

+		if (jcbMainCaps != JABBER_RESOURCE_CAPS_TIMEOUT && r->szCapsExt) {

+			TCHAR *caps = mir_tstrdup(r->szCapsExt);

 

-			TCHAR *token = _tcstok( caps, _T(" "));

-			while ( token ) {

-				switch ( jcbExtCaps = m_clientCapsManager.GetClientCaps( r->szCapsNode, token )) {

+			TCHAR *token = _tcstok(caps, _T(" "));

+			while (token) {

+				switch (jcbExtCaps = m_clientCapsManager.GetClientCaps(r->szCapsNode, token)) {

 				case JABBER_RESOURCE_CAPS_ERROR:

 					break;

 

@@ -266,14 +266,14 @@ JabberCapsBits CJabberProto::GetResourceCapabilites( const TCHAR *jid, BOOL appe
 				{

 					// send disco#info query

 

-					CJabberIqInfo* pInfo = m_iqManager.AddHandler( &CJabberProto::OnIqResultCapsDiscoInfo, JABBER_IQ_TYPE_GET, fullJid, JABBER_IQ_PARSE_FROM | JABBER_IQ_PARSE_CHILD_TAG_NODE );

-					pInfo->SetTimeout( JABBER_RESOURCE_CAPS_QUERY_TIMEOUT );

-					m_clientCapsManager.SetClientCaps( r->szCapsNode, token, JABBER_RESOURCE_CAPS_IN_PROGRESS, pInfo->GetIqId());

+					CJabberIqInfo* pInfo = m_iqManager.AddHandler(&CJabberProto::OnIqResultCapsDiscoInfo, JABBER_IQ_TYPE_GET, fullJid, JABBER_IQ_PARSE_FROM | JABBER_IQ_PARSE_CHILD_TAG_NODE);

+					pInfo->SetTimeout(JABBER_RESOURCE_CAPS_QUERY_TIMEOUT);

+					m_clientCapsManager.SetClientCaps(r->szCapsNode, token, JABBER_RESOURCE_CAPS_IN_PROGRESS, pInfo->GetIqId());

 

 					TCHAR queryNode[512];

-					mir_sntprintf( queryNode, SIZEOF(queryNode), _T("%s#%s"), r->szCapsNode, token );

+					mir_sntprintf(queryNode, SIZEOF(queryNode), _T("%s#%s"), r->szCapsNode, token);

 					m_ThreadInfo->send(

-						XmlNodeIq( pInfo ) << XQUERY( _T(JABBER_FEAT_DISCO_INFO)) << XATTR( _T("node"), queryNode ));

+						XmlNodeIq(pInfo) << XQUERY(_T(JABBER_FEAT_DISCO_INFO)) << XATTR(_T("node"), queryNode));

 

 					bRequestSent = TRUE;

 					break;

@@ -286,13 +286,13 @@ JabberCapsBits CJabberProto::GetResourceCapabilites( const TCHAR *jid, BOOL appe
 					jcbCaps |= jcbExtCaps;

 				}

 

-				token = _tcstok( NULL, _T(" "));

+				token = _tcstok(NULL, _T(" "));

 			}

 

 			mir_free(caps);

 		}

 

-		if ( bRequestSent )

+		if (bRequestSent)

 			return JABBER_RESOURCE_CAPS_IN_PROGRESS;

 

 		return jcbCaps | r->jcbManualDiscoveredCaps;

@@ -301,46 +301,46 @@ JabberCapsBits CJabberProto::GetResourceCapabilites( const TCHAR *jid, BOOL appe
 	// capability mode (version request + service discovery)

 

 	// no version info:

-	if ( !r->version && !r->software ) {

+	if ( !r->version && !r->software) {

 		// version request not sent:

-		if ( !r->dwVersionRequestTime ) {

+		if ( !r->dwVersionRequestTime) {

 			// send version query

 

-			CJabberIqInfo *pInfo = m_iqManager.AddHandler( &CJabberProto::OnIqResultVersion, JABBER_IQ_TYPE_GET, fullJid, JABBER_IQ_PARSE_FROM | JABBER_IQ_PARSE_HCONTACT | JABBER_IQ_PARSE_CHILD_TAG_NODE );

-			pInfo->SetTimeout( JABBER_RESOURCE_CAPS_QUERY_TIMEOUT );

+			CJabberIqInfo *pInfo = m_iqManager.AddHandler(&CJabberProto::OnIqResultVersion, JABBER_IQ_TYPE_GET, fullJid, JABBER_IQ_PARSE_FROM | JABBER_IQ_PARSE_HCONTACT | JABBER_IQ_PARSE_CHILD_TAG_NODE);

+			pInfo->SetTimeout(JABBER_RESOURCE_CAPS_QUERY_TIMEOUT);

 			r->dwVersionRequestTime = pInfo->GetRequestTime();

 

-			XmlNodeIq iq( pInfo );

-			iq << XQUERY( _T(JABBER_FEAT_VERSION));

-			m_ThreadInfo->send( iq );

+			XmlNodeIq iq(pInfo);

+			iq << XQUERY(_T(JABBER_FEAT_VERSION));

+			m_ThreadInfo->send(iq);

 			return JABBER_RESOURCE_CAPS_IN_PROGRESS;

 		}

 		// version not received:

-		else if ( r->dwVersionRequestTime != -1 ) {

+		else if (r->dwVersionRequestTime != -1) {

 			// no timeout?

-			if ( GetTickCount() - r->dwVersionRequestTime < JABBER_RESOURCE_CAPS_QUERY_TIMEOUT )

+			if (GetTickCount() - r->dwVersionRequestTime < JABBER_RESOURCE_CAPS_QUERY_TIMEOUT)

 				return JABBER_RESOURCE_CAPS_IN_PROGRESS;

 

 			// timeout

 			r->dwVersionRequestTime = -1;

 		}

 		// no version information, try direct service discovery

-		if ( !r->dwDiscoInfoRequestTime ) {

+		if ( !r->dwDiscoInfoRequestTime) {

 			// send disco#info query

 

-			CJabberIqInfo *pInfo = m_iqManager.AddHandler( &CJabberProto::OnIqResultCapsDiscoInfo, JABBER_IQ_TYPE_GET, fullJid, JABBER_IQ_PARSE_FROM | JABBER_IQ_PARSE_CHILD_TAG_NODE );

-			pInfo->SetTimeout( JABBER_RESOURCE_CAPS_QUERY_TIMEOUT );

+			CJabberIqInfo *pInfo = m_iqManager.AddHandler(&CJabberProto::OnIqResultCapsDiscoInfo, JABBER_IQ_TYPE_GET, fullJid, JABBER_IQ_PARSE_FROM | JABBER_IQ_PARSE_CHILD_TAG_NODE);

+			pInfo->SetTimeout(JABBER_RESOURCE_CAPS_QUERY_TIMEOUT);

 			r->dwDiscoInfoRequestTime = pInfo->GetRequestTime();

 

-			XmlNodeIq iq( pInfo );

-			iq << XQUERY( _T(JABBER_FEAT_DISCO_INFO));

-			m_ThreadInfo->send( iq );

+			XmlNodeIq iq(pInfo);

+			iq << XQUERY(_T(JABBER_FEAT_DISCO_INFO));

+			m_ThreadInfo->send(iq);

 

 			return JABBER_RESOURCE_CAPS_IN_PROGRESS;

 		}

-		else if ( r->dwDiscoInfoRequestTime == -1 )

+		else if (r->dwDiscoInfoRequestTime == -1)

 			return r->jcbCachedCaps | r->jcbManualDiscoveredCaps;

-		else if ( GetTickCount() - r->dwDiscoInfoRequestTime < JABBER_RESOURCE_CAPS_QUERY_TIMEOUT )

+		else if (GetTickCount() - r->dwDiscoInfoRequestTime < JABBER_RESOURCE_CAPS_QUERY_TIMEOUT)

 			return JABBER_RESOURCE_CAPS_IN_PROGRESS;

 		else

 			r->dwDiscoInfoRequestTime = -1;

@@ -349,36 +349,36 @@ JabberCapsBits CJabberProto::GetResourceCapabilites( const TCHAR *jid, BOOL appe
 	}

 

 	// version info available:

-	if ( r->software && r->version ) {

-		JabberCapsBits jcbMainCaps = m_clientCapsManager.GetClientCaps( r->software, r->version );

-		if ( jcbMainCaps == JABBER_RESOURCE_CAPS_ERROR ) {

+	if (r->software && r->version) {

+		JabberCapsBits jcbMainCaps = m_clientCapsManager.GetClientCaps(r->software, r->version);

+		if (jcbMainCaps == JABBER_RESOURCE_CAPS_ERROR) {

 			// Bombus hack:

-			if ( !_tcscmp( r->software, _T( "Bombus" )) || !_tcscmp( r->software, _T( "BombusMod" ))) {

+			if ( !_tcscmp(r->software, _T("Bombus")) || !_tcscmp(r->software, _T("BombusMod"))) {

 				jcbMainCaps = JABBER_CAPS_SI|JABBER_CAPS_SI_FT|JABBER_CAPS_IBB|JABBER_CAPS_MESSAGE_EVENTS|JABBER_CAPS_MESSAGE_EVENTS_NO_DELIVERY|JABBER_CAPS_DATA_FORMS|JABBER_CAPS_LAST_ACTIVITY|JABBER_CAPS_VERSION|JABBER_CAPS_COMMANDS|JABBER_CAPS_VCARD_TEMP;

-				m_clientCapsManager.SetClientCaps( r->software, r->version, jcbMainCaps );

+				m_clientCapsManager.SetClientCaps(r->software, r->version, jcbMainCaps);

 			}

 			// Neos hack:

-			else if ( !_tcscmp( r->software, _T( "neos" ))) {

+			else if ( !_tcscmp(r->software, _T("neos"))) {

 				jcbMainCaps = JABBER_CAPS_OOB|JABBER_CAPS_MESSAGE_EVENTS|JABBER_CAPS_MESSAGE_EVENTS_NO_DELIVERY|JABBER_CAPS_LAST_ACTIVITY|JABBER_CAPS_VERSION;

-				m_clientCapsManager.SetClientCaps( r->software, r->version, jcbMainCaps );

+				m_clientCapsManager.SetClientCaps(r->software, r->version, jcbMainCaps);

 			}

 			// sim hack:

-			else if ( !_tcscmp( r->software, _T( "sim" ))) {

+			else if ( !_tcscmp(r->software, _T("sim"))) {

 				jcbMainCaps = JABBER_CAPS_OOB|JABBER_CAPS_VERSION|JABBER_CAPS_MESSAGE_EVENTS|JABBER_CAPS_MESSAGE_EVENTS_NO_DELIVERY;

-				m_clientCapsManager.SetClientCaps( r->software, r->version, jcbMainCaps );

+				m_clientCapsManager.SetClientCaps(r->software, r->version, jcbMainCaps);

 		}	}

 

-		else if ( jcbMainCaps == JABBER_RESOURCE_CAPS_UNINIT ) {

+		else if (jcbMainCaps == JABBER_RESOURCE_CAPS_UNINIT) {

 			// send disco#info query

 

-			CJabberIqInfo *pInfo = m_iqManager.AddHandler( &CJabberProto::OnIqResultCapsDiscoInfo, JABBER_IQ_TYPE_GET, fullJid, JABBER_IQ_PARSE_FROM | JABBER_IQ_PARSE_CHILD_TAG_NODE );

-			pInfo->SetTimeout( JABBER_RESOURCE_CAPS_QUERY_TIMEOUT );

-			m_clientCapsManager.SetClientCaps( r->software, r->version, JABBER_RESOURCE_CAPS_IN_PROGRESS, pInfo->GetIqId());

+			CJabberIqInfo *pInfo = m_iqManager.AddHandler(&CJabberProto::OnIqResultCapsDiscoInfo, JABBER_IQ_TYPE_GET, fullJid, JABBER_IQ_PARSE_FROM | JABBER_IQ_PARSE_CHILD_TAG_NODE);

+			pInfo->SetTimeout(JABBER_RESOURCE_CAPS_QUERY_TIMEOUT);

+			m_clientCapsManager.SetClientCaps(r->software, r->version, JABBER_RESOURCE_CAPS_IN_PROGRESS, pInfo->GetIqId());

 			r->dwDiscoInfoRequestTime = pInfo->GetRequestTime();

 

-			XmlNodeIq iq( pInfo );

-			iq << XQUERY( _T(JABBER_FEAT_DISCO_INFO));

-			m_ThreadInfo->send( iq );

+			XmlNodeIq iq(pInfo);

+			iq << XQUERY(_T(JABBER_FEAT_DISCO_INFO));

+			m_ThreadInfo->send(iq);

 

 			jcbMainCaps = JABBER_RESOURCE_CAPS_IN_PROGRESS;

 		}

@@ -391,9 +391,9 @@ JabberCapsBits CJabberProto::GetResourceCapabilites( const TCHAR *jid, BOOL appe
 /////////////////////////////////////////////////////////////////////////////////////////

 //  CJabberClientPartialCaps class members

 

-CJabberClientPartialCaps::CJabberClientPartialCaps( const TCHAR *szVer )

+CJabberClientPartialCaps::CJabberClientPartialCaps(const TCHAR *szVer)

 {

-	m_szVer = mir_tstrdup( szVer );

+	m_szVer = mir_tstrdup(szVer);

 	m_jcbCaps = JABBER_RESOURCE_CAPS_UNINIT;

 	m_pNext = NULL;

 	m_nIqId = -1;

@@ -402,21 +402,21 @@ CJabberClientPartialCaps::CJabberClientPartialCaps( const TCHAR *szVer )
 

 CJabberClientPartialCaps::~CJabberClientPartialCaps()

 {

-	mir_free( m_szVer );

-	if ( m_pNext )

+	mir_free(m_szVer);

+	if (m_pNext)

 		delete m_pNext;

 }

 

-CJabberClientPartialCaps* CJabberClientPartialCaps::SetNext( CJabberClientPartialCaps *pCaps )

+CJabberClientPartialCaps* CJabberClientPartialCaps::SetNext(CJabberClientPartialCaps *pCaps)

 {

 	CJabberClientPartialCaps *pRetVal = m_pNext;

 	m_pNext = pCaps;

 	return pRetVal;

 }

 

-void CJabberClientPartialCaps::SetCaps( JabberCapsBits jcbCaps, int nIqId /*= -1*/ )

+void CJabberClientPartialCaps::SetCaps(JabberCapsBits jcbCaps, int nIqId /*= -1*/)

 {

-	if ( jcbCaps == JABBER_RESOURCE_CAPS_IN_PROGRESS )

+	if (jcbCaps == JABBER_RESOURCE_CAPS_IN_PROGRESS)

 		m_dwRequestTime = GetTickCount();

 	else

 		m_dwRequestTime = 0;

@@ -426,121 +426,121 @@ void CJabberClientPartialCaps::SetCaps( JabberCapsBits jcbCaps, int nIqId /*= -1
 

 JabberCapsBits CJabberClientPartialCaps::GetCaps()

 {

-	if ( m_jcbCaps == JABBER_RESOURCE_CAPS_IN_PROGRESS && GetTickCount() - m_dwRequestTime > JABBER_RESOURCE_CAPS_QUERY_TIMEOUT ) {

+	if (m_jcbCaps == JABBER_RESOURCE_CAPS_IN_PROGRESS && GetTickCount() - m_dwRequestTime > JABBER_RESOURCE_CAPS_QUERY_TIMEOUT) {

 		m_jcbCaps = JABBER_RESOURCE_CAPS_TIMEOUT;

 		m_dwRequestTime = 0;

 	}

 	return m_jcbCaps;

 }

 

-CJabberClientPartialCaps* CJabberClientCaps::FindByVersion( const TCHAR *szVer )

+CJabberClientPartialCaps* CJabberClientCaps::FindByVersion(const TCHAR *szVer)

 {

-	if ( !m_pCaps || !szVer )

+	if ( !m_pCaps || !szVer)

 		return NULL;

 

 	CJabberClientPartialCaps *pCaps = m_pCaps;

-	while ( pCaps ) {

-		if ( !_tcscmp( szVer, pCaps->GetVersion()))

+	while (pCaps) {

+		if ( !_tcscmp(szVer, pCaps->GetVersion()))

 			break;

 		pCaps = pCaps->GetNext();

 	}

 	return pCaps;

 }

 

-CJabberClientPartialCaps* CJabberClientCaps::FindById( int nIqId )

+CJabberClientPartialCaps* CJabberClientCaps::FindById(int nIqId)

 {

-	if ( !m_pCaps || nIqId == -1 )

+	if ( !m_pCaps || nIqId == -1)

 		return NULL;

 

 	CJabberClientPartialCaps *pCaps = m_pCaps;

-	while ( pCaps ) {

-		if ( pCaps->GetIqId() == nIqId )

+	while (pCaps) {

+		if (pCaps->GetIqId() == nIqId)

 			break;

 		pCaps = pCaps->GetNext();

 	}

 	return pCaps;

 }

 

-CJabberClientCaps::CJabberClientCaps( const TCHAR *szNode )

+CJabberClientCaps::CJabberClientCaps(const TCHAR *szNode)

 {

-	m_szNode = mir_tstrdup( szNode );

+	m_szNode = mir_tstrdup(szNode);

 	m_pCaps = NULL;

 	m_pNext= NULL;

 }

 

 CJabberClientCaps::~CJabberClientCaps() {

-	mir_free( m_szNode );

-	if ( m_pCaps )

+	mir_free(m_szNode);

+	if (m_pCaps)

 		delete m_pCaps;

-	if ( m_pNext )

+	if (m_pNext)

 		delete m_pNext;

 }

 

-CJabberClientCaps* CJabberClientCaps::SetNext( CJabberClientCaps *pClient )

+CJabberClientCaps* CJabberClientCaps::SetNext(CJabberClientCaps *pClient)

 {

 	CJabberClientCaps *pRetVal = m_pNext;

 	m_pNext = pClient;

 	return pRetVal;

 }

 

-JabberCapsBits CJabberClientCaps::GetPartialCaps( TCHAR *szVer ) {

-	CJabberClientPartialCaps *pCaps = FindByVersion( szVer );

-	if ( !pCaps )

+JabberCapsBits CJabberClientCaps::GetPartialCaps(TCHAR *szVer) {

+	CJabberClientPartialCaps *pCaps = FindByVersion(szVer);

+	if ( !pCaps)

 		return JABBER_RESOURCE_CAPS_UNINIT;

 	return pCaps->GetCaps();

 }

 

-BOOL CJabberClientCaps::SetPartialCaps( const TCHAR *szVer, JabberCapsBits jcbCaps, int nIqId /*= -1*/ ) {

-	CJabberClientPartialCaps *pCaps = FindByVersion( szVer );

-	if ( !pCaps ) {

-		pCaps = new CJabberClientPartialCaps( szVer );

-		if ( !pCaps )

+BOOL CJabberClientCaps::SetPartialCaps(const TCHAR *szVer, JabberCapsBits jcbCaps, int nIqId /*= -1*/) {

+	CJabberClientPartialCaps *pCaps = FindByVersion(szVer);

+	if ( !pCaps) {

+		pCaps = new CJabberClientPartialCaps(szVer);

+		if ( !pCaps)

 			return FALSE;

-		pCaps->SetNext( m_pCaps );

+		pCaps->SetNext(m_pCaps);

 		m_pCaps = pCaps;

 	}

-	if ( !(jcbCaps & JABBER_RESOURCE_CAPS_ERROR) && m_szNode && szVer ) {

-		if ( !_tcscmp( m_szNode, _T( "http://miranda-im.org/caps" )) && !_tcscmp( szVer, _T( "0.7.0.13" )))

-			jcbCaps = jcbCaps & ( ~JABBER_CAPS_MESSAGE_RECEIPTS );

+	if ( !(jcbCaps & JABBER_RESOURCE_CAPS_ERROR) && m_szNode && szVer) {

+		if ( !_tcscmp(m_szNode, _T("http://miranda-im.org/caps")) && !_tcscmp(szVer, _T("0.7.0.13")))

+			jcbCaps = jcbCaps & (~JABBER_CAPS_MESSAGE_RECEIPTS);

 	}

-	pCaps->SetCaps( jcbCaps, nIqId );

+	pCaps->SetCaps(jcbCaps, nIqId);

 	return TRUE;

 }

 

-BOOL CJabberClientCaps::SetPartialCaps( int nIqId, JabberCapsBits jcbCaps ) {

-	CJabberClientPartialCaps *pCaps = FindById( nIqId );

-	if ( !pCaps )

+BOOL CJabberClientCaps::SetPartialCaps(int nIqId, JabberCapsBits jcbCaps) {

+	CJabberClientPartialCaps *pCaps = FindById(nIqId);

+	if ( !pCaps)

 		return FALSE;

 	if ( !(jcbCaps & JABBER_RESOURCE_CAPS_ERROR) && m_szNode && pCaps->GetVersion()) {

-		if ( !_tcscmp( m_szNode, _T( "http://miranda-im.org/caps" )) && !_tcscmp( pCaps->GetVersion(), _T( "0.7.0.13" )))

-			jcbCaps = jcbCaps & ( ~JABBER_CAPS_MESSAGE_RECEIPTS );

+		if ( !_tcscmp(m_szNode, _T("http://miranda-im.org/caps")) && !_tcscmp(pCaps->GetVersion(), _T("0.7.0.13")))

+			jcbCaps = jcbCaps & (~JABBER_CAPS_MESSAGE_RECEIPTS);

 	}

-	pCaps->SetCaps( jcbCaps, -1 );

+	pCaps->SetCaps(jcbCaps, -1);

 	return TRUE;

 }

 

-CJabberClientCapsManager::CJabberClientCapsManager( CJabberProto* proto )

+CJabberClientCapsManager::CJabberClientCapsManager(CJabberProto* proto)

 {

 	ppro = proto;

-	InitializeCriticalSection( &m_cs );

+	InitializeCriticalSection(&m_cs);

 	m_pClients = NULL;

 }

 

 CJabberClientCapsManager::~CJabberClientCapsManager()

 {

-	if ( m_pClients )

+	if (m_pClients)

 		delete m_pClients;

-	DeleteCriticalSection( &m_cs );

+	DeleteCriticalSection(&m_cs);

 }

 

-CJabberClientCaps * CJabberClientCapsManager::FindClient( const TCHAR *szNode )

+CJabberClientCaps * CJabberClientCapsManager::FindClient(const TCHAR *szNode)

 {

-	if ( !m_pClients || !szNode )

+	if ( !m_pClients || !szNode)

 		return NULL;

 

 	CJabberClientCaps *pClient = m_pClients;

-	while ( pClient ) {

-		if ( !_tcscmp( szNode, pClient->GetNode()))

+	while (pClient) {

+		if ( !_tcscmp(szNode, pClient->GetNode()))

 			break;

 		pClient = pClient->GetNext();

 	}

@@ -548,58 +548,58 @@ CJabberClientCaps * CJabberClientCapsManager::FindClient( const TCHAR *szNode )
 }

 

 void CJabberClientCapsManager::AddDefaultCaps() {

-	SetClientCaps( _T(JABBER_CAPS_MIRANDA_NODE), szCoreVersion, JABBER_CAPS_MIRANDA_ALL );

+	SetClientCaps(_T(JABBER_CAPS_MIRANDA_NODE), szCoreVersion, JABBER_CAPS_MIRANDA_ALL);

 

-	for ( int i = 0; g_JabberFeatCapPairsExt[i].szFeature; i++ )

-		SetClientCaps( _T(JABBER_CAPS_MIRANDA_NODE), g_JabberFeatCapPairsExt[i].szFeature, g_JabberFeatCapPairsExt[i].jcbCap );

+	for (int i = 0; g_JabberFeatCapPairsExt[i].szFeature; i++)

+		SetClientCaps(_T(JABBER_CAPS_MIRANDA_NODE), g_JabberFeatCapPairsExt[i].szFeature, g_JabberFeatCapPairsExt[i].jcbCap);

 }

 

-JabberCapsBits CJabberClientCapsManager::GetClientCaps( TCHAR *szNode, TCHAR *szVer )

+JabberCapsBits CJabberClientCapsManager::GetClientCaps(TCHAR *szNode, TCHAR *szVer)

 {

 	Lock();

-	CJabberClientCaps *pClient = FindClient( szNode );

-	if ( !pClient ) {

+	CJabberClientCaps *pClient = FindClient(szNode);

+	if ( !pClient) {

 		Unlock();

-		ppro->Log( "CAPS: get no caps for: " TCHAR_STR_PARAM ", " TCHAR_STR_PARAM, szNode, szVer );

+		ppro->Log("CAPS: get no caps for: " TCHAR_STR_PARAM ", " TCHAR_STR_PARAM, szNode, szVer);

 		return JABBER_RESOURCE_CAPS_UNINIT;

 	}

-	JabberCapsBits jcbCaps = pClient->GetPartialCaps( szVer );

+	JabberCapsBits jcbCaps = pClient->GetPartialCaps(szVer);

 	Unlock();

-	ppro->Log( "CAPS: get caps %I64x for: " TCHAR_STR_PARAM ", " TCHAR_STR_PARAM, jcbCaps, szNode, szVer );

+	ppro->Log("CAPS: get caps %I64x for: " TCHAR_STR_PARAM ", " TCHAR_STR_PARAM, jcbCaps, szNode, szVer);

 	return jcbCaps;

 }

 

-BOOL CJabberClientCapsManager::SetClientCaps( const TCHAR *szNode, const TCHAR *szVer, JabberCapsBits jcbCaps, int nIqId /*= -1*/ )

+BOOL CJabberClientCapsManager::SetClientCaps(const TCHAR *szNode, const TCHAR *szVer, JabberCapsBits jcbCaps, int nIqId /*= -1*/)

 {

 	Lock();

-	CJabberClientCaps *pClient = FindClient( szNode );

-	if (!pClient) {

-		pClient = new CJabberClientCaps( szNode );

-		if ( !pClient ) {

+	CJabberClientCaps *pClient = FindClient(szNode);

+	if ( !pClient) {

+		pClient = new CJabberClientCaps(szNode);

+		if ( !pClient) {

 			Unlock();

 			return FALSE;

 		}

-		pClient->SetNext( m_pClients );

+		pClient->SetNext(m_pClients);

 		m_pClients = pClient;

 	}

-	BOOL bOk = pClient->SetPartialCaps( szVer, jcbCaps, nIqId );

+	BOOL bOk = pClient->SetPartialCaps(szVer, jcbCaps, nIqId);

 	Unlock();

-	ppro->Log( "CAPS: set caps %I64x for: " TCHAR_STR_PARAM ", " TCHAR_STR_PARAM, jcbCaps, szNode, szVer );

+	ppro->Log("CAPS: set caps %I64x for: " TCHAR_STR_PARAM ", " TCHAR_STR_PARAM, jcbCaps, szNode, szVer);

 	return bOk;

 }

 

-BOOL CJabberClientCapsManager::SetClientCaps( int nIqId, JabberCapsBits jcbCaps )

+BOOL CJabberClientCapsManager::SetClientCaps(int nIqId, JabberCapsBits jcbCaps)

 {

 	Lock();

-	if ( !m_pClients ) {

+	if ( !m_pClients) {

 		Unlock();

 		return FALSE;

 	}

 	BOOL bOk = FALSE;

 	CJabberClientCaps *pClient = m_pClients;

-	while ( pClient ) {

-		if ( pClient->SetPartialCaps( nIqId, jcbCaps )) {

-			ppro->Log( "CAPS: set caps %I64x for iq %d", jcbCaps, nIqId );

+	while (pClient) {

+		if (pClient->SetPartialCaps(nIqId, jcbCaps)) {

+			ppro->Log("CAPS: set caps %I64x for iq %d", jcbCaps, nIqId);

 			bOk = TRUE;

 			break;

 		}

@@ -609,89 +609,89 @@ BOOL CJabberClientCapsManager::SetClientCaps( int nIqId, JabberCapsBits jcbCaps
 	return bOk;

 }

 

-BOOL CJabberClientCapsManager::HandleInfoRequest( HXML, CJabberIqInfo* pInfo, const TCHAR* szNode )

+BOOL CJabberClientCapsManager::HandleInfoRequest(HXML, CJabberIqInfo* pInfo, const TCHAR *szNode)

 {

 	int i;

 	JabberCapsBits jcb = 0;

 

-	if ( szNode ) {

-		for ( i = 0; g_JabberFeatCapPairsExt[i].szFeature; i++ ) {

+	if (szNode) {

+		for (i = 0; g_JabberFeatCapPairsExt[i].szFeature; i++) {

 			TCHAR szExtCap[ 512 ];

-			mir_sntprintf( szExtCap, SIZEOF(szExtCap), _T("%s#%s"), _T(JABBER_CAPS_MIRANDA_NODE), g_JabberFeatCapPairsExt[i].szFeature );

-			if ( !_tcscmp( szNode, szExtCap )) {

+			mir_sntprintf(szExtCap, SIZEOF(szExtCap), _T("%s#%s"), _T(JABBER_CAPS_MIRANDA_NODE), g_JabberFeatCapPairsExt[i].szFeature);

+			if ( !_tcscmp(szNode, szExtCap)) {

 				jcb = g_JabberFeatCapPairsExt[i].jcbCap;

 				break;

 			}

 		}

 

 		// check features registered through IJabberNetInterface::RegisterFeature() and IJabberNetInterface::AddFeatures()

-		for ( i = 0; i < ppro->m_lstJabberFeatCapPairsDynamic.getCount(); i++ ) {

+		for (i = 0; i < ppro->m_lstJabberFeatCapPairsDynamic.getCount(); i++) {

 			TCHAR szExtCap[ 512 ];

-			mir_sntprintf( szExtCap, SIZEOF(szExtCap), _T("%s#%s"), _T(JABBER_CAPS_MIRANDA_NODE), ppro->m_lstJabberFeatCapPairsDynamic[i]->szExt );

-			if ( !_tcscmp( szNode, szExtCap )) {

+			mir_sntprintf(szExtCap, SIZEOF(szExtCap), _T("%s#%s"), _T(JABBER_CAPS_MIRANDA_NODE), ppro->m_lstJabberFeatCapPairsDynamic[i]->szExt);

+			if ( !_tcscmp(szNode, szExtCap)) {

 				jcb = ppro->m_lstJabberFeatCapPairsDynamic[i]->jcbCap;

 				break;

 			}

 		}

 

 		// unknown node, not XEP-0115 request

-		if ( !jcb )

+		if ( !jcb)

 			return FALSE;

 	}

 	else {

 		jcb = JABBER_CAPS_MIRANDA_ALL;

-		for ( i = 0; i < ppro->m_lstJabberFeatCapPairsDynamic.getCount(); i++ )

+		for (i = 0; i < ppro->m_lstJabberFeatCapPairsDynamic.getCount(); i++)

 			jcb |= ppro->m_lstJabberFeatCapPairsDynamic[i]->jcbCap;

 	}

 

-	if (!ppro->m_options.AllowVersionRequests)

+	if ( !ppro->m_options.AllowVersionRequests)

 		jcb &= ~JABBER_CAPS_VERSION;

 

-	XmlNodeIq iq( _T("result"), pInfo );

+	XmlNodeIq iq(_T("result"), pInfo);

 

-	HXML query = iq << XQUERY( _T(JABBER_FEAT_DISCO_INFO));

-	if ( szNode )

-		query << XATTR( _T("node"), szNode );

+	HXML query = iq << XQUERY(_T(JABBER_FEAT_DISCO_INFO));

+	if (szNode)

+		query << XATTR(_T("node"), szNode);

 

-	query << XCHILD( _T("identity")) << XATTR( _T("category"), _T("client"))

-			<< XATTR( _T("type"), _T("pc")) << XATTR( _T("name"), _T("Miranda"));

+	query << XCHILD(_T("identity")) << XATTR(_T("category"), _T("client"))

+			<< XATTR(_T("type"), _T("pc")) << XATTR(_T("name"), _T("Miranda"));

 

-	for ( i = 0; g_JabberFeatCapPairs[i].szFeature; i++ )

-		if ( jcb & g_JabberFeatCapPairs[i].jcbCap )

-			query << XCHILD( _T("feature")) << XATTR( _T("var"), g_JabberFeatCapPairs[i].szFeature );

+	for (i = 0; g_JabberFeatCapPairs[i].szFeature; i++)

+		if (jcb & g_JabberFeatCapPairs[i].jcbCap)

+			query << XCHILD(_T("feature")) << XATTR(_T("var"), g_JabberFeatCapPairs[i].szFeature);

 

-	for ( i = 0; i < ppro->m_lstJabberFeatCapPairsDynamic.getCount(); i++ )

-		if ( jcb & ppro->m_lstJabberFeatCapPairsDynamic[i]->jcbCap )

-			query << XCHILD( _T("feature")) << XATTR( _T("var"), ppro->m_lstJabberFeatCapPairsDynamic[i]->szFeature );

+	for (i = 0; i < ppro->m_lstJabberFeatCapPairsDynamic.getCount(); i++)

+		if (jcb & ppro->m_lstJabberFeatCapPairsDynamic[i]->jcbCap)

+			query << XCHILD(_T("feature")) << XATTR(_T("var"), ppro->m_lstJabberFeatCapPairsDynamic[i]->szFeature);

 

-	if ( ppro->m_options.AllowVersionRequests && !szNode ) {

+	if (ppro->m_options.AllowVersionRequests && !szNode) {

 		TCHAR szOsBuffer[256] = {0};

 		TCHAR *os = szOsBuffer;

 

-		if ( ppro->m_options.ShowOSVersion ) {

-			if (!GetOSDisplayString(szOsBuffer, SIZEOF(szOsBuffer)))

+		if (ppro->m_options.ShowOSVersion) {

+			if ( !GetOSDisplayString(szOsBuffer, SIZEOF(szOsBuffer)))

 				lstrcpyn(szOsBuffer, _T(""), SIZEOF(szOsBuffer));

 			else {

 				TCHAR *szOsWindows = _T("Microsoft Windows");

-				size_t nOsWindowsLength = _tcslen( szOsWindows );

-				if (!_tcsnicmp(szOsBuffer, szOsWindows, nOsWindowsLength))

+				size_t nOsWindowsLength = _tcslen(szOsWindows);

+				if ( !_tcsnicmp(szOsBuffer, szOsWindows, nOsWindowsLength))

 					os += nOsWindowsLength + 1;

 			}

 		}

 

-		HXML form = query << XCHILDNS( _T("x"), _T(JABBER_FEAT_DATA_FORMS)) << XATTR( _T("type"), _T("result"));

-		form << XCHILD( _T("field")) << XATTR( _T("var"), _T("FORM_TYPE")) << XATTR( _T("type"), _T("hidden"))

-			<< XCHILD( _T("value"), _T("urn:xmpp:dataforms:softwareinfo"));

+		HXML form = query << XCHILDNS(_T("x"), _T(JABBER_FEAT_DATA_FORMS)) << XATTR(_T("type"), _T("result"));

+		form << XCHILD(_T("field")) << XATTR(_T("var"), _T("FORM_TYPE")) << XATTR(_T("type"), _T("hidden"))

+			<< XCHILD(_T("value"), _T("urn:xmpp:dataforms:softwareinfo"));

 

-		if ( ppro->m_options.ShowOSVersion ) {

-			form << XCHILD( _T("field")) << XATTR( _T("var"), _T("os")) << XCHILD( _T("value"), _T("Microsoft Windows"));

-			form << XCHILD( _T("field")) << XATTR( _T("var"), _T("os_version")) << XCHILD( _T("value"), os );

+		if (ppro->m_options.ShowOSVersion) {

+			form << XCHILD(_T("field")) << XATTR(_T("var"), _T("os")) << XCHILD(_T("value"), _T("Microsoft Windows"));

+			form << XCHILD(_T("field")) << XATTR(_T("var"), _T("os_version")) << XCHILD(_T("value"), os);

 		}

-		form << XCHILD( _T("field")) << XATTR( _T("var"), _T("software")) << XCHILD( _T("value"), _T("Miranda NG Jabber Protocol"));

-		form << XCHILD( _T("field")) << XATTR( _T("var"), _T("software_version")) << XCHILD( _T("value"), szCoreVersion);

+		form << XCHILD(_T("field")) << XATTR(_T("var"), _T("software")) << XCHILD(_T("value"), _T("Miranda NG Jabber Protocol"));

+		form << XCHILD(_T("field")) << XATTR(_T("var"), _T("software_version")) << XCHILD(_T("value"), szCoreVersion);

 	}

 

-	ppro->m_ThreadInfo->send( iq );

+	ppro->m_ThreadInfo->send(iq);

 

 	return TRUE;

 }