From 7ebaebba8520e457bf374ca245f52332fbb008be Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 15 Nov 2012 21:18:48 +0000 Subject: bye-bye old coding style in Jabber git-svn-id: http://svn.miranda-ng.org/main/trunk@2322 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/src/jabber_xml.cpp | 220 +++++++++++++++++------------------ 1 file changed, 110 insertions(+), 110 deletions(-) (limited to 'protocols/JabberG/src/jabber_xml.cpp') diff --git a/protocols/JabberG/src/jabber_xml.cpp b/protocols/JabberG/src/jabber_xml.cpp index 287a335243..7c7317bfcc 100644 --- a/protocols/JabberG/src/jabber_xml.cpp +++ b/protocols/JabberG/src/jabber_xml.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 @@ -31,229 +31,229 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ///////////////////////////////////////////////////////////////////////////////////////// // XmlNodeIq class members -XmlNodeIq::XmlNodeIq( const TCHAR* type, int id, LPCTSTR to ) : - XmlNode( _T( "iq" )) +XmlNodeIq::XmlNodeIq(const TCHAR *type, int id, LPCTSTR to) : + XmlNode(_T("iq")) { - if ( type != NULL ) *this << XATTR( _T("type"), type ); - if ( to != NULL ) *this << XATTR( _T("to"), to ); - if ( id != -1 ) *this << XATTRID( id ); + if (type != NULL) *this << XATTR(_T("type"), type); + if (to != NULL) *this << XATTR(_T("to"), to); + if (id != -1 ) *this << XATTRID(id); } -XmlNodeIq::XmlNodeIq( const TCHAR* type, LPCTSTR idStr, LPCTSTR to ) : - XmlNode( _T( "iq" )) +XmlNodeIq::XmlNodeIq(const TCHAR *type, LPCTSTR idStr, LPCTSTR to) : + XmlNode(_T("iq")) { - if ( type != NULL ) *this << XATTR( _T("type"), type ); - if ( to != NULL ) *this << XATTR( _T("to"), to ); - if ( idStr != NULL ) *this << XATTR( _T("id"), idStr ); + if (type != NULL) *this << XATTR(_T("type"), type ); + if (to != NULL) *this << XATTR(_T("to"), to ); + if (idStr != NULL) *this << XATTR(_T("id"), idStr); } -XmlNodeIq::XmlNodeIq( const TCHAR* type, HXML node, LPCTSTR to ) : - XmlNode( _T( "iq" )) +XmlNodeIq::XmlNodeIq(const TCHAR *type, HXML node, LPCTSTR to) : + XmlNode(_T("iq")) { - if ( type != NULL ) *this << XATTR( _T("type"), type ); - if ( to != NULL ) *this << XATTR( _T("to"), to ); - if ( node != NULL ) { - const TCHAR *iqId = xmlGetAttrValue( *this, _T( "id" )); - if ( iqId != NULL ) *this << XATTR( _T("id"), iqId ); + if (type != NULL) *this << XATTR(_T("type"), type ); + if (to != NULL) *this << XATTR(_T("to"), to ); + if (node != NULL) { + const TCHAR *iqId = xmlGetAttrValue(*this, _T("id")); + if (iqId != NULL) *this << XATTR(_T("id"), iqId); } } -XmlNodeIq::XmlNodeIq( CJabberIqInfo* pInfo ) : - XmlNode( _T( "iq" )) +XmlNodeIq::XmlNodeIq(CJabberIqInfo* pInfo) : + XmlNode(_T("iq")) { - if ( pInfo ) { - if ( pInfo->GetCharIqType() != NULL ) *this << XATTR( _T("type"), _A2T(pInfo->GetCharIqType())); - if ( pInfo->GetReceiver() != NULL ) *this << XATTR( _T("to"), pInfo->GetReceiver()); - if ( pInfo->GetIqId() != -1 ) *this << XATTRID( pInfo->GetIqId()); + if (pInfo) { + if (pInfo->GetCharIqType() != NULL) *this << XATTR(_T("type"), _A2T(pInfo->GetCharIqType())); + if (pInfo->GetReceiver() != NULL) *this << XATTR(_T("to"), pInfo->GetReceiver()); + if (pInfo->GetIqId() != -1) *this << XATTRID(pInfo->GetIqId()); } } -XmlNodeIq::XmlNodeIq( const TCHAR* type, CJabberIqInfo* pInfo ) : - XmlNode( _T( "iq" )) +XmlNodeIq::XmlNodeIq(const TCHAR *type, CJabberIqInfo* pInfo) : + XmlNode(_T("iq")) { - if ( type != NULL ) *this << XATTR( _T("type"), type ); - if ( pInfo ) { - if ( pInfo->GetFrom() != NULL ) *this << XATTR( _T("to"), pInfo->GetFrom()); - if ( pInfo->GetIdStr() != NULL ) *this << XATTR( _T("id"), pInfo->GetIdStr()); + if (type != NULL) *this << XATTR(_T("type"), type); + if (pInfo) { + if (pInfo->GetFrom() != NULL) *this << XATTR(_T("to"), pInfo->GetFrom()); + if (pInfo->GetIdStr() != NULL) *this << XATTR(_T("id"), pInfo->GetIdStr()); } } ///////////////////////////////////////////////////////////////////////////////////////// // XmlNode class members -XmlNode::XmlNode( LPCTSTR pszName ) +XmlNode::XmlNode(LPCTSTR pszName) { - m_hXml = xi.createNode( T2UTF(pszName), NULL, 0 ); + m_hXml = xi.createNode(T2UTF(pszName), NULL, 0); } -XmlNode::XmlNode( LPCTSTR pszName, LPCTSTR ptszText ) +XmlNode::XmlNode(LPCTSTR pszName, LPCTSTR ptszText) { - m_hXml = xi.createNode( T2UTF(pszName), ptszText, 0 ); + m_hXml = xi.createNode(T2UTF(pszName), ptszText, 0); } -XmlNode::XmlNode( const XmlNode& n ) +XmlNode::XmlNode(const XmlNode& n) { - m_hXml = xi.copyNode( n ); + m_hXml = xi.copyNode(n); } -XmlNode& XmlNode::operator =( const XmlNode& n ) +XmlNode& XmlNode::operator =(const XmlNode& n) { - if ( m_hXml ) - xi.destroyNode( m_hXml ); - m_hXml = xi.copyNode( n ); + if (m_hXml) + xi.destroyNode(m_hXml); + m_hXml = xi.copyNode(n); return *this; } XmlNode::~XmlNode() { - if ( m_hXml ) { - xi.destroyNode( m_hXml ); + if (m_hXml) { + xi.destroyNode(m_hXml); m_hXml = NULL; } } ///////////////////////////////////////////////////////////////////////////////////////// -HXML __fastcall operator<<( HXML node, const XCHILDNS& child ) +HXML __fastcall operator<<(HXML node, const XCHILDNS& child) { - HXML res = xmlAddChild( node, child.name ); - xmlAddAttr( res, _T("xmlns"), child.ns ); + HXML res = xmlAddChild(node, child.name); + xmlAddAttr(res, _T("xmlns"), child.ns); return res; } -HXML __fastcall operator<<( HXML node, const XQUERY& child ) +HXML __fastcall operator<<(HXML node, const XQUERY& child) { - HXML n = xmlAddChild( node, _T("query")); - if ( n ) - xmlAddAttr( n, _T("xmlns"), child.ns ); + HXML n = xmlAddChild(node, _T("query")); + if (n) + xmlAddAttr(n, _T("xmlns"), child.ns); return n; } ///////////////////////////////////////////////////////////////////////////////////////// -void __fastcall xmlAddAttr( HXML hXml, LPCTSTR name, LPCTSTR value ) +void __fastcall xmlAddAttr(HXML hXml, LPCTSTR name, LPCTSTR value) { - if ( value ) - xi.addAttr( hXml, name, T2UTF(value)); + if (value) + xi.addAttr(hXml, name, T2UTF(value)); } -void __fastcall xmlAddAttr( HXML hXml, LPCTSTR pszName, int value ) +void __fastcall xmlAddAttr(HXML hXml, LPCTSTR pszName, int value) { - xi.addAttrInt( hXml, T2UTF(pszName), value ); + xi.addAttrInt(hXml, T2UTF(pszName), value); } -void __fastcall xmlAddAttr( HXML hXml, LPCTSTR pszName, unsigned __int64 value ) +void __fastcall xmlAddAttr(HXML hXml, LPCTSTR pszName, unsigned __int64 value) { TCHAR buf[60]; - _ui64tot( value, buf, 10 ); + _ui64tot(value, buf, 10); - xi.addAttr( hXml, T2UTF(pszName), T2UTF(buf)); + xi.addAttr(hXml, T2UTF(pszName), T2UTF(buf)); } -void __fastcall xmlAddAttrID( HXML hXml, int id ) +void __fastcall xmlAddAttrID(HXML hXml, int id) { TCHAR text[ 100 ]; - mir_sntprintf( text, SIZEOF(text), _T("mir_%d"), id ); - xmlAddAttr( hXml, _T("id"), text ); + mir_sntprintf(text, SIZEOF(text), _T("mir_%d"), id); + xmlAddAttr(hXml, _T("id"), text); } ///////////////////////////////////////////////////////////////////////////////////////// -LPCTSTR __fastcall xmlGetAttr( HXML hXml, int n ) +LPCTSTR __fastcall xmlGetAttr(HXML hXml, int n) { - return xi.getAttr( hXml, n ); + return xi.getAttr(hXml, n); } -int __fastcall xmlGetAttrCount( HXML hXml ) +int __fastcall xmlGetAttrCount(HXML hXml) { - return xi.getAttrCount( hXml ); + return xi.getAttrCount(hXml); } -LPCTSTR __fastcall xmlGetAttrName( HXML hXml, int n ) +LPCTSTR __fastcall xmlGetAttrName(HXML hXml, int n) { - return xi.getAttrName( hXml, n ); + return xi.getAttrName(hXml, n); } ///////////////////////////////////////////////////////////////////////////////////////// -void __fastcall xmlAddChild( HXML hXml, HXML n ) +void __fastcall xmlAddChild(HXML hXml, HXML n) { - xi.addChild2( n, hXml ); + xi.addChild2(n, hXml); } -HXML __fastcall xmlAddChild( HXML hXml, LPCTSTR name ) +HXML __fastcall xmlAddChild(HXML hXml, LPCTSTR name) { - return xi.addChild( hXml, T2UTF(name), NULL ); + return xi.addChild(hXml, T2UTF(name), NULL); } -HXML __fastcall xmlAddChild( HXML hXml, LPCTSTR name, LPCTSTR value ) +HXML __fastcall xmlAddChild(HXML hXml, LPCTSTR name, LPCTSTR value) { - return xi.addChild( hXml, T2UTF(name), T2UTF(value)); + return xi.addChild(hXml, T2UTF(name), T2UTF(value)); } -HXML __fastcall xmlAddChild( HXML hXml, LPCTSTR name, int value ) +HXML __fastcall xmlAddChild(HXML hXml, LPCTSTR name, int value) { TCHAR buf[40]; - _itot( value, buf, 10 ); - return xi.addChild( hXml, T2UTF(name), buf ); + _itot(value, buf, 10); + return xi.addChild(hXml, T2UTF(name), buf); } ///////////////////////////////////////////////////////////////////////////////////////// -LPCTSTR __fastcall xmlGetAttrValue( HXML hXml, LPCTSTR key ) +LPCTSTR __fastcall xmlGetAttrValue(HXML hXml, LPCTSTR key) { - return xi.getAttrValue( hXml, key ); + return xi.getAttrValue(hXml, key); } -HXML __fastcall xmlGetChild( HXML hXml, int n ) +HXML __fastcall xmlGetChild(HXML hXml, int n) { - return xi.getChild( hXml, n ); + return xi.getChild(hXml, n); } -HXML __fastcall xmlGetChild( HXML hXml, LPCTSTR key ) +HXML __fastcall xmlGetChild(HXML hXml, LPCTSTR key) { - return xi.getNthChild( hXml, key, 0 ); + return xi.getNthChild(hXml, key, 0); } -HXML __fastcall xmlGetChild( HXML hXml, LPCSTR key ) +HXML __fastcall xmlGetChild(HXML hXml, LPCSTR key) { - LPTSTR wszKey = mir_a2t( key ); - HXML result = xi.getNthChild( hXml, wszKey, 0 ); - mir_free( wszKey ); + LPTSTR wszKey = mir_a2t(key); + HXML result = xi.getNthChild(hXml, wszKey, 0); + mir_free(wszKey); return result; } -HXML __fastcall xmlGetChildByTag( HXML hXml, LPCTSTR key, LPCTSTR attrName, LPCTSTR attrValue ) +HXML __fastcall xmlGetChildByTag(HXML hXml, LPCTSTR key, LPCTSTR attrName, LPCTSTR attrValue) { - return xi.getChildByAttrValue( hXml, key, attrName, attrValue ); + return xi.getChildByAttrValue(hXml, key, attrName, attrValue); } -HXML __fastcall xmlGetChildByTag( HXML hXml, LPCSTR key, LPCSTR attrName, LPCTSTR attrValue ) +HXML __fastcall xmlGetChildByTag(HXML hXml, LPCSTR key, LPCSTR attrName, LPCTSTR attrValue) { - LPTSTR wszKey = mir_a2t( key ), wszName = mir_a2t( attrName ); - HXML result = xi.getChildByAttrValue( hXml, wszKey, wszName, attrValue ); - mir_free( wszKey ), mir_free( wszName ); + LPTSTR wszKey = mir_a2t(key), wszName = mir_a2t(attrName); + HXML result = xi.getChildByAttrValue(hXml, wszKey, wszName, attrValue); + mir_free(wszKey), mir_free(wszName); return result; } -int __fastcall xmlGetChildCount( HXML hXml ) +int __fastcall xmlGetChildCount(HXML hXml) { - return xi.getChildCount( hXml ); + return xi.getChildCount(hXml); } -HXML __fastcall xmlGetNthChild( HXML hXml, LPCTSTR tag, int nth ) +HXML __fastcall xmlGetNthChild(HXML hXml, LPCTSTR tag, int nth) { int i, num; - if ( !hXml || tag == NULL || _tcslen( tag ) <= 0 || nth < 1 ) + if ( !hXml || tag == NULL || _tcslen(tag) <= 0 || nth < 1) return NULL; num = 1; - for ( i=0; ; i++ ) { - HXML n = xi.getChild( hXml, i ); - if ( !n ) + for (i=0; ; i++) { + HXML n = xi.getChild(hXml, i); + if ( !n) break; - if ( !lstrcmp( tag, xmlGetName( n ))) { - if ( num == nth ) + if ( !lstrcmp(tag, xmlGetName(n))) { + if (num == nth) return n; num++; @@ -262,21 +262,21 @@ HXML __fastcall xmlGetNthChild( HXML hXml, LPCTSTR tag, int nth ) return NULL; } -LPCTSTR __fastcall xmlGetName( HXML xml ) +LPCTSTR __fastcall xmlGetName(HXML xml) { - return xi.getName( xml ); + return xi.getName(xml); } -LPCTSTR __fastcall xmlGetText( HXML xml ) +LPCTSTR __fastcall xmlGetText(HXML xml) { - return xi.getText( xml ); + return xi.getText(xml); } ///////////////////////////////////////////////////////////////////////////////////////// void XPath::ProcessPath(LookupInfo &info, bool bCreate) { - if (!info.nodeName) return; + if ( !info.nodeName) return; TCHAR *nodeName = (TCHAR *)alloca(sizeof(TCHAR) * (info.nodeName.length+1)); lstrcpyn(nodeName, info.nodeName.p, info.nodeName.length+1); @@ -318,7 +318,7 @@ XPath::PathType XPath::LookupImpl(bool bCreate) case S_START: { ProcessPath(info, bCreate); - if (!m_hXml) + if ( !m_hXml) { state = S_FINAL_ERROR; break; @@ -501,7 +501,7 @@ XPath::PathType XPath::LookupImpl(bool bCreate) } } - if (!*p && (state < S_FINAL)) + if ( !*p && (state < S_FINAL)) { state = S_FINAL_ERROR; } -- cgit v1.2.3