mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-02 04:10:20 +02:00
Code Issues Releases Wiki Activity

Some more style changes

Browse Source
This commit is contained in:
Uwe L. Korn
2013-05-14 11:25:27 +02:00
parent 152609e68d
commit d7eea2cc8e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libtomahawk/network/Servent.cpp
View File

@@ -420,7 +420,7 @@ Servent::registerPeer( const Tomahawk::peerinfo_ptr& peerInfo )
sipInfos.append( info ); sipInfos.append( info );
} }
if ( sipInfos.length() == 0 ) if ( sipInfos.isEmpty() )
{ {
// We are not visible via any IP, send a dummy SipInfo // We are not visible via any IP, send a dummy SipInfo
SipInfo info = SipInfo(); SipInfo info = SipInfo();
@@ -847,9 +847,9 @@ Servent::connectToPeer( const peerinfo_ptr& peerInfo )
void void
Servent::connectToPeer(const peerinfo_ptr& peerInfo, const QList<SipInfo>& sipInfoList, Connection* conn ) Servent::connectToPeer(const peerinfo_ptr& peerInfo, const QList<SipInfo>& sipInfos, Connection* conn )
{ {
if ( sipInfoList.isEmpty() ) if ( sipInfos.isEmpty() )
{ {
tLog( LOGVERBOSE ) << Q_FUNC_INFO << "No more possible SIP endpoints for " << conn->name() << " skipping."; tLog( LOGVERBOSE ) << Q_FUNC_INFO << "No more possible SIP endpoints for " << conn->name() << " skipping.";
// If a peerinfo was supplied and has a ControlConnection which should be destroyed, than use this // If a peerinfo was supplied and has a ControlConnection which should be destroyed, than use this
@@ -860,7 +860,7 @@ Servent::connectToPeer(const peerinfo_ptr& peerInfo, const QList<SipInfo>& sipIn
delete conn; delete conn;
return; return;
} }
QList<SipInfo> sipInfo = QList<SipInfo>(sipInfoList); QList<SipInfo> sipInfo = QList<SipInfo>(sipInfos);
// Use first available SIP endpoint and remove it from the list // Use first available SIP endpoint and remove it from the list
SipInfo info = sipInfo.takeFirst(); SipInfo info = sipInfo.takeFirst();
if ( !info.isVisible() ) if ( !info.isVisible() )

2
src/libtomahawk/network/Servent.h
View File

@@ -90,7 +90,7 @@ public slots:
public: public:
void connectToPeer( const Tomahawk::peerinfo_ptr& ha ); void connectToPeer( const Tomahawk::peerinfo_ptr& ha );
void connectToPeer(const Tomahawk::peerinfo_ptr &peerInfo, const QList<SipInfo>& sipInfoList, Connection* conn ); void connectToPeer(const Tomahawk::peerinfo_ptr &peerInfo, const QList<SipInfo>& sipInfos, Connection* conn );
void reverseOfferRequest( ControlConnection* orig_conn, const QString &theirdbid, const QString& key, const QString& theirkey ); void reverseOfferRequest( ControlConnection* orig_conn, const QString &theirdbid, const QString& key, const QString& theirkey );
bool visibleExternally() const { return (!m_externalHostname.isNull()) || (m_externalAddresses.length() > 0); } bool visibleExternally() const { return (!m_externalHostname.isNull()) || (m_externalAddresses.length() > 0); }