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

Move m_name into ConnectionPrivate

Browse Source
This commit is contained in:
Uwe L. Korn
2013-06-15 20:36:13 +02:00
parent 88742ba1d5
commit c7dfe80c82
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/libtomahawk/network/Connection.cpp
View File

@@ -206,13 +206,17 @@ Connection::markAsFailed()
void void
Connection::setName( const QString& n ) Connection::setName( const QString& n )
{ {
m_name = n; Q_D( Connection );
d->name = n;
} }
QString QString
Connection::name() const Connection::name() const
{ {
return m_name; Q_D( const Connection );
return d->name;
} }
void void
@@ -273,15 +277,16 @@ Connection::peerIpAddress() const
void void
Connection::start( QTcpSocket* sock ) Connection::start( QTcpSocket* sock )
{ {
Q_D( Connection );
Q_ASSERT( m_sock.isNull() ); Q_ASSERT( m_sock.isNull() );
Q_ASSERT( sock ); Q_ASSERT( sock );
Q_ASSERT( sock->isValid() ); Q_ASSERT( sock->isValid() );
m_sock = sock; m_sock = sock;
if ( m_name.isEmpty() ) if ( d->name.isEmpty() )
{ {
m_name = QString( "peer[%1]" ).arg( m_sock->peerAddress().toString() ); d->name = QString( "peer[%1]" ).arg( m_sock->peerAddress().toString() );
} }
QTimer::singleShot( 0, this, SLOT( checkACL() ) ); QTimer::singleShot( 0, this, SLOT( checkACL() ) );

1
src/libtomahawk/network/Connection.h
View File

@@ -127,7 +127,6 @@ protected:
Servent* m_servent; Servent* m_servent;
bool m_outbound, m_ready, m_onceonly; bool m_outbound, m_ready, m_onceonly;
msg_ptr m_firstmsg; msg_ptr m_firstmsg;
QString m_name;
private: private:
Q_DECLARE_PRIVATE( Connection ) Q_DECLARE_PRIVATE( Connection )

1
src/libtomahawk/network/Connection_p.h
View File

@@ -59,6 +59,7 @@ private:
qint64 tx_bytes_requested; qint64 tx_bytes_requested;
qint64 rx_bytes; qint64 rx_bytes;
QString id; QString id;
QString name;
QString nodeid; QString nodeid;
QTimer* statstimer; QTimer* statstimer;