From e70b6cf0fd6d09806e2fa2f76997ea2489e0c360 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 21 Aug 2014 19:04:24 +0200 Subject: [PATCH] * Style fixes to ConnectionManager. --- src/libtomahawk/network/ConnectionManager.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/libtomahawk/network/ConnectionManager.cpp b/src/libtomahawk/network/ConnectionManager.cpp index 2ecbf8de5..20267edb5 100644 --- a/src/libtomahawk/network/ConnectionManager.cpp +++ b/src/libtomahawk/network/ConnectionManager.cpp @@ -42,6 +42,7 @@ static QMutex nodeMapMutex; static Tomahawk::Utils::WeakObjectHash< ConnectionManager > connectionManagers; static QHash< QString, QSharedPointer< ConnectionManager > > activeConnectionManagers; + QSharedPointer ConnectionManager::getManagerForNodeId( const QString &nodeid ) { @@ -57,6 +58,7 @@ ConnectionManager::getManagerForNodeId( const QString &nodeid ) return manager; } + void ConnectionManager::setActive( bool active, const QString& nodeid, const QSharedPointer& manager ) { @@ -71,6 +73,7 @@ ConnectionManager::setActive( bool active, const QString& nodeid, const QSharedP } } + /* ConnectionManager Implementation */ ConnectionManager::ConnectionManager( const QString &nodeid ) @@ -79,11 +82,13 @@ ConnectionManager::ConnectionManager( const QString &nodeid ) // TODO sth? } + ConnectionManager::~ConnectionManager() { delete d_ptr; } + void ConnectionManager::handleSipInfo( const Tomahawk::peerinfo_ptr &peerInfo ) { @@ -91,12 +96,14 @@ ConnectionManager::handleSipInfo( const Tomahawk::peerinfo_ptr &peerInfo ) QtConcurrent::run( &ConnectionManager::handleSipInfoPrivateS, peerInfo, weakRef().toStrongRef() ); } + QWeakPointer ConnectionManager::weakRef() const { return d_func()->ownRef; } + void ConnectionManager::setWeakRef( QWeakPointer weakRef ) { @@ -302,7 +309,9 @@ ConnectionManager::connectToPeer( const Tomahawk::peerinfo_ptr &peerInfo, bool l tryConnect(); } -void ConnectionManager::tryConnect() + +void +ConnectionManager::tryConnect() { // ATTENTION: mutex should be already locked by the calling function. Q_ASSERT( !d_func()->controlConnection.isNull() ); @@ -365,6 +374,7 @@ void ConnectionManager::tryConnect() sock->moveToThread( Servent::instance()->thread() ); } + void ConnectionManager::socketError( QAbstractSocket::SocketError error ) { @@ -379,12 +389,14 @@ ConnectionManager::socketError( QAbstractSocket::SocketError error ) tryConnect(); } + void ConnectionManager::handleSipInfoPrivateS( const Tomahawk::peerinfo_ptr &peerInfo, const QSharedPointer &connectionManager ) { connectionManager->handleSipInfoPrivate( peerInfo ); } + void ConnectionManager::activate() { @@ -392,6 +404,7 @@ ConnectionManager::activate() setActive( true, d_func()->nodeid, weakRef().toStrongRef() ); } + void ConnectionManager::deactivate() { @@ -419,6 +432,7 @@ ConnectionManager::socketConnected() connect( d->controlConnection.data(), SIGNAL( authTimeout() ), SLOT( authFailed() ) ); } + void ConnectionManager::handoverSocket( QTcpSocketExtra* sock ) {