From 958452207e41867091f6ce1f9bb9a881d5ac1631 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 26 Oct 2014 19:57:19 +0100 Subject: [PATCH] Use Q_D instead of d_func() --- src/libtomahawk/network/Servent.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/libtomahawk/network/Servent.cpp b/src/libtomahawk/network/Servent.cpp index b33f2ce55..0c194208e 100644 --- a/src/libtomahawk/network/Servent.cpp +++ b/src/libtomahawk/network/Servent.cpp @@ -959,18 +959,19 @@ Servent::socketError( QAbstractSocket::SocketError e ) void Servent::checkACLResult( const QString& nodeid, const QString& username, Tomahawk::ACLStatus::Type peerStatus ) { + Q_D( Servent ); - if ( !d_func()->queuedForACLResult.contains( username ) ) + if ( !d->queuedForACLResult.contains( username ) ) { return; } - if ( !d_func()->queuedForACLResult.value( username ).contains( nodeid ) ) + if ( !d->queuedForACLResult.value( username ).contains( nodeid ) ) { return; } tDebug( LOGVERBOSE ) << Q_FUNC_INFO << QString( "ACL status for user %1 is" ).arg( username ) << peerStatus; - QSet peerInfos = d_func()->queuedForACLResult.value( username ).value( nodeid ); + QSet peerInfos = d->queuedForACLResult.value( username ).value( nodeid ); if ( peerStatus == Tomahawk::ACLStatus::Stream ) { foreach ( Tomahawk::peerinfo_ptr peerInfo, peerInfos ) @@ -980,7 +981,7 @@ Servent::checkACLResult( const QString& nodeid, const QString& username, Tomahaw } // We have a result, so remove from queue - d_func()->queuedForACLResult[username].remove( nodeid ); + d->queuedForACLResult[username].remove( nodeid ); }