mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-05 13:47:26 +02:00
Code Issues Releases Wiki Activity

Remove usage of QSharedPointer around SipInfo

Browse Source
This commit is contained in:
Uwe L. Korn
2013-05-29 00:26:17 +02:00
parent 1ad80185a5
commit 13775e9366
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/accounts/xmpp/sip/TomahawkXmppMessageFactory.cpp
View File

@@ -137,7 +137,7 @@ void TomahawkXmppMessageFactory::serialize(Payload *extension, QXmlStreamWriter
// Get a copy of the list, so that we can modify it here. // Get a copy of the list, so that we can modify it here.
QList<SipInfo> sipInfos = QList<SipInfo>( sipMessage->sipInfos() ); QList<SipInfo> sipInfos = QList<SipInfo>( sipMessage->sipInfos() );
QSharedPointer<SipInfo> lastInfo = QSharedPointer<SipInfo>(); SipInfo lastInfo;
foreach ( SipInfo info, sipInfos ) foreach ( SipInfo info, sipInfos )
{ {
if ( info.isVisible() ) if ( info.isVisible() )
@@ -146,7 +146,7 @@ void TomahawkXmppMessageFactory::serialize(Payload *extension, QXmlStreamWriter
if ( ( Servent::isValidExternalIP( ha ) && ha.protocol() == QAbstractSocket::IPv4Protocol ) || ( ha.protocol() == QAbstractSocket::UnknownNetworkLayerProtocol ) || ( ha.isNull() && !info.host().isEmpty() ) ) if ( ( Servent::isValidExternalIP( ha ) && ha.protocol() == QAbstractSocket::IPv4Protocol ) || ( ha.protocol() == QAbstractSocket::UnknownNetworkLayerProtocol ) || ( ha.isNull() && !info.host().isEmpty() ) )
{ {
// For comapability reasons, this shall be put as the last candidate (this is the IP/host that would have been sent in previous versions) // For comapability reasons, this shall be put as the last candidate (this is the IP/host that would have been sent in previous versions)
lastInfo = QSharedPointer<SipInfo>( new SipInfo( info ) ); lastInfo = info;
sipInfos.removeOne( info ); sipInfos.removeOne( info );
break; break;
} }
@@ -163,11 +163,11 @@ void TomahawkXmppMessageFactory::serialize(Payload *extension, QXmlStreamWriter
serializeSipInfo( info, writer ); serializeSipInfo( info, writer );
} }
if ( !lastInfo.isNull() ) if ( lastInfo.isValid() )
{ {
Q_ASSERT( lastInfo->isVisible() ); Q_ASSERT( lastInfo.isVisible() );
tLog( LOGVERBOSE ) << Q_FUNC_INFO << "Using " << lastInfo->host() << ":" << lastInfo->port() << " as the host which all older clients will only detect"; tLog( LOGVERBOSE ) << Q_FUNC_INFO << "Using " << lastInfo.host() << ":" << lastInfo.port() << " as the host which all older clients will only detect";
serializeSipInfo( *lastInfo, writer ); serializeSipInfo( lastInfo, writer );
} }
// </transport> // </transport>