* Style cleanup for AvatarManager.

src/accounts/xmpp/sip/AvatarManager.cpp

@@ -33,11 +33,10 @@
 #include "utils/Logger.h"
 
 
-AvatarManager::AvatarManager(Jreen::Client *client) :
+AvatarManager::AvatarManager( Jreen::Client* client )
-    m_cacheDir(TomahawkUtils::appDataDir().absolutePath().append("/jreen/"))
+    : m_cacheDir( TomahawkUtils::appDataDir().absolutePath().append( "/jreen/" ) )
 {
     m_client = client;
-
     m_cachedAvatars = m_cacheDir.entryList();
 
     connect( m_client, SIGNAL( serverFeaturesReceived( QSet<QString> ) ), SLOT( onNewConnection() ) );
@@ -47,27 +46,32 @@ AvatarManager::AvatarManager(Jreen::Client *client) :
     connect( this, SIGNAL( newAvatar( QString ) ), SLOT( onNewAvatar( QString ) ) );
 }
 
+
 AvatarManager::~AvatarManager()
 {
 }
 
-void AvatarManager::onNewConnection()
+
+void
+AvatarManager::onNewConnection()
 {
     fetchVCard( m_client->jid().bare() );
 }
 
 
-void AvatarManager::fetchVCard(const QString &jid)
+void
+AvatarManager::fetchVCard( const QString& jid )
 {
-//    qDebug() << Q_FUNC_INFO;
-
     Jreen::IQ iq( Jreen::IQ::Get, jid );
     iq.addExtension( new Jreen::VCard() );
     Jreen::IQReply *reply = m_client->send( iq );
+
     connect( reply, SIGNAL( received( Jreen::IQ ) ), SLOT( onNewIq( Jreen::IQ ) ) );
 }
 
-void AvatarManager::onNewPresence(const Jreen::Presence& presence)
+
+void
+AvatarManager::onNewPresence( const Jreen::Presence& presence )
 {
     Jreen::VCardUpdate::Ptr update = presence.payload<Jreen::VCardUpdate>();
     if ( update )
@@ -89,27 +93,27 @@ void AvatarManager::onNewPresence(const Jreen::Presence& presence)
     }
     else
     {
-//        qDebug() << Q_FUNC_INFO << presence.from().full() << "got no statusupdateextension";
-
         //TODO: do we want this? might fetch avatars for broken clients
         fetchVCard( presence.from().bare() );
     }
 }
 
-void AvatarManager::onNewIq(const Jreen::IQ& iq)
+
+void
+AvatarManager::onNewIq( const Jreen::IQ& iq )
 {
     Jreen::VCard::Ptr vcard = iq.payload<Jreen::VCard>();
     if ( vcard )
     {
         iq.accept();
-
 //        qDebug() << Q_FUNC_INFO << "Got vcard from " << iq.from().full();
 
         QString id = iq.from().full();
         QString avatarHash;
 
         const Jreen::VCard::Photo &photo = vcard->photo();
-        if (!photo.data().isEmpty()) {
+        if ( !photo.data().isEmpty() )
+        {
 //            qDebug() << "vcard: got photo data" << id;
 
             avatarHash = QCryptographicHash::hash( photo.data(), QCryptographicHash::Sha1 ).toHex();
@@ -117,9 +121,9 @@ void AvatarManager::onNewIq(const Jreen::IQ& iq)
             if ( !m_cacheDir.exists() )
                 m_cacheDir.mkpath( avatarDir( avatarHash ).absolutePath() );
 
-
             QFile file( avatarPath( avatarHash ) );
-            if (file.open(QIODevice::WriteOnly)) {
+            if ( file.open( QIODevice::WriteOnly ) )
+            {
                 file.write( photo.data() );
                 file.close();
             }
@@ -130,22 +134,14 @@ void AvatarManager::onNewIq(const Jreen::IQ& iq)
             Q_ASSERT( !this->avatar( iq.from().bare() ).isNull() );
             emit newAvatar( iq.from().bare() );
         }
-        else
-        {
-//            qDebug() << "vcard: got no photo data" << id;
-        }
 
         // got own presence
         if ( m_client->jid().bare() == id )
         {
-//            qDebug() << Q_FUNC_INFO << "got own vcard";
-
             Jreen::Presence presence = m_client->presence();
             Jreen::VCardUpdate::Ptr update = presence.payload<Jreen::VCardUpdate>();
             if ( update->photoHash() != avatarHash )
             {
-                qDebug() << Q_FUNC_INFO << "Updating own presence...";
-
                 update->setPhotoHash( avatarHash );
                 m_client->send( presence );
             }
@@ -153,7 +149,9 @@ void AvatarManager::onNewIq(const Jreen::IQ& iq)
     }
 }
 
-QPixmap AvatarManager::avatar(const QString &jid) const
+
+QPixmap
+AvatarManager::avatar( const QString& jid ) const
 {
     if ( isCached( avatarHash( jid ) ) )
     {
@@ -165,29 +163,39 @@ QPixmap AvatarManager::avatar(const QString &jid) const
     }
 }
 
-QString AvatarManager::avatarHash(const QString &jid) const
+
+QString
+AvatarManager::avatarHash( const QString& jid ) const
 {
     //qDebug() << Q_FUNC_INFO << jid << m_JidsAvatarHashes.key( jid );
     return m_JidsAvatarHashes.key( jid );
 }
 
-QDir AvatarManager::avatarDir(const QString&) const
+
+QDir
+AvatarManager::avatarDir( const QString& /* avatarHash */ ) const
 {
     return m_cacheDir;
 }
 
-QString AvatarManager::avatarPath(const QString &avatarHash) const
+
+QString
+AvatarManager::avatarPath( const QString& avatarHash ) const
 {
     Q_ASSERT( !avatarHash.contains( "@" ) );
     return avatarDir( avatarHash ).absoluteFilePath( avatarHash );
 }
 
-bool AvatarManager::isCached(const QString &avatarHash) const
+
+bool
+AvatarManager::isCached( const QString& avatarHash ) const
 {
     return m_cachedAvatars.contains( avatarHash );
 }
 
-void AvatarManager::onNewAvatar(const QString&)
+
+void
+AvatarManager::onNewAvatar( const QString& /* jid */ )
 {
 //    qDebug() << Q_FUNC_INFO <<  "Found new Avatar..." << jid;
 }