Style fixes.

src/libtomahawk/audio/Qnr_IoDeviceStream.cpp

@@ -38,7 +38,8 @@ QNR_IODeviceStream::QNR_IODeviceStream( const QSharedPointer<QNetworkReply>& rep
 {
     m_type = MediaStream::Stream;
 
-    if ( !m_networkReply->isOpen() ) {
+    if ( !m_networkReply->isOpen() )
+    {
         m_networkReply->open( QIODevice::ReadOnly );
     }
 
@@ -99,12 +100,10 @@ QNR_IODeviceStream::needData ( void** buffer )
     return data.size();
 }
 
+
 void
 QNR_IODeviceStream::readyRead()
 {
     QMutexLocker locker( &m_mutex );
     m_data += m_networkReply->readAll();
 }
-
-
-// vim: sw=4 sts=4 et tw=100

src/libtomahawk/resolvers/JSResolverHelper.cpp

@@ -1,6 +1,6 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
  *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2015, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
  *   Copyright 2013,      Teo Mrnjavac <teo@kde.org>
  *   Copyright 2013,      Uwe L. Korn <uwelk@xhochy.com>
@@ -703,7 +703,6 @@ void JSResolverHelper::nativeAssert(bool assertion, const QString& message)
 }
 
 
-
 void
 JSResolverHelper::customIODeviceFactory( const Tomahawk::result_ptr&, const QString& url,
                                                std::function< void( const QString&, QSharedPointer< QIODevice >& ) > callback )
@@ -732,8 +731,7 @@ JSResolverHelper::customIODeviceFactory( const Tomahawk::result_ptr&, const QStr
 
 
 void
-JSResolverHelper::reportStreamUrl( const QString& qid,
-                                         const QString& streamUrl, const QVariantMap& headers )
+JSResolverHelper::reportStreamUrl( const QString& qid, const QString& streamUrl, const QVariantMap& headers )
 {
     if ( !m_streamCallbacks.contains( qid ) )
         return;
@@ -741,9 +739,11 @@ JSResolverHelper::reportStreamUrl( const QString& qid,
     std::function< void( const QString&, QSharedPointer< QIODevice >& ) > callback = m_streamCallbacks.take( qid );
 
     QMap<QString, QString> parsedHeaders;
-    foreach ( const QString& key,  headers.keys()) {
+    foreach ( const QString& key, headers.keys() )
+    {
         Q_ASSERT_X( headers[key].canConvert( QVariant::String ), Q_FUNC_INFO, "Expected a Map of string for additional headers" );
-        if ( headers[key].canConvert( QVariant::String ) ) {
+        if ( headers[key].canConvert( QVariant::String ) )
+        {
             parsedHeaders.insert( key, headers[key].toString() );
         }
     }
@@ -771,14 +771,14 @@ JSResolverHelper::nativeRetrieveMetadata( int metadataId, const QString& url,
         if ( options.contains( "headers" ) && options["headers"].canConvert( QVariant::Map ) )
         {
             const QVariantMap variantHeaders = options["headers"].toMap();
-            foreach ( const QString& key, variantHeaders.keys() ) {
+            foreach ( const QString& key, variantHeaders.keys() )
+            {
                 headers.insert( key, variantHeaders[key].toString() );
             }
         }
 
         // TODO: Add heuristic if size is not defined
-        CloudStream stream( url, sizehint, headers,
-                            Tomahawk::Utils::nam() );
+        CloudStream stream( url, sizehint, headers, Tomahawk::Utils::nam() );
         stream.Precache();
         QScopedPointer<TagLib::File> tag;
         if ( mime_type == "audio/mpeg" )
@@ -897,7 +897,8 @@ JSResolverHelper::nativeAsyncRequest( const int requestId, const QString& url,
                                       const QVariantMap& options )
 {
     QNetworkRequest req( url );
-    foreach ( const QString& key , headers.keys() ) {
+    foreach ( const QString& key, headers.keys() )
+    {
         req.setRawHeader( key.toLatin1(), headers[key].toString().toLatin1() );
     }
 
@@ -915,15 +916,21 @@ JSResolverHelper::nativeAsyncRequest( const int requestId, const QString& url,
     }
 
     NetworkReply* reply = NULL;
-    if ( options.contains( "method") && options["method"].toString().toUpper() == "POST" ) {
+    if ( options.contains( "method") && options["method"].toString().toUpper() == "POST" )
+    {
         QByteArray data;
-        if ( options.contains( "data" ) ) {
+        if ( options.contains( "data" ) )
+        {
             data = options["data"].toString().toLatin1();
         }
         reply = new NetworkReply( Tomahawk::Utils::nam()->post( req, data ) );
-    } else if ( options.contains( "method") && options["method"].toString().toUpper() == "HEAD" ) {
+    }
+    else if ( options.contains( "method") && options["method"].toString().toUpper() == "HEAD" )
+    {
         reply = new NetworkReply( Tomahawk::Utils::nam()->head( req ) );
-    } else {
+    }
+    else
+    {
         reply = new NetworkReply( Tomahawk::Utils::nam()->get( req ) );
     }
 
@@ -1038,7 +1045,8 @@ JSResolverHelper::addToFuzzyIndex( const QVariantList& list )
     foreach ( const QVariant& variant, list )
     {
         // Convert each entry to IndexData
-        if ( variant.canConvert( QVariant::Map ) ) {
+        if ( variant.canConvert( QVariant::Map ) )
+        {
             QVariantMap map = variant.toMap();
 
             // Convert each entry and do multiple checks that we have valid data.
@@ -1071,7 +1079,8 @@ JSResolverHelper::searchInFuzzyIndex( const query_ptr& query )
 
         // Convert map to sorted QVariantList
         QVariantList list;
-        foreach ( int id, map.keys() ) {
+        foreach ( int id, map.keys() )
+        {
             QVariantList innerList;
             innerList.append( QVariant( id ) );
             innerList.append( QVariant( map[id] ) );
@@ -1098,7 +1107,8 @@ JSResolverHelper::resolveFromFuzzyIndex( const QString& artist, const QString& a
 {
     // Important: Do not autoresolve!
     query_ptr query = Query::get( artist, track, album, QString(), false );
-    if ( query.isNull() ) {
+    if ( query.isNull() )
+    {
         tLog() << Q_FUNC_INFO << "Could not create a query for" << artist << "-" << track;
         return QVariantList();
     }
@@ -1140,7 +1150,8 @@ JSResolverHelper::returnStreamUrl( const QString& streamUrl, const QMap<QString,
     {
         QUrl url = QUrl::fromEncoded( streamUrl.toUtf8() );
         QNetworkRequest req( url );
-        foreach ( const QString& key , headers.keys() ) {
+        foreach ( const QString& key, headers.keys() )
+        {
             req.setRawHeader( key.toLatin1(), headers[key].toLatin1() );
         }
         tDebug() << "Creating a QNetowrkReply with url:" << req.url().toString();

src/libtomahawk/resolvers/ScriptInfoPlugin.cpp

@@ -70,7 +70,6 @@ ScriptInfoPlugin::getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
 {
     Q_D( ScriptInfoPlugin );
 
-
     QVariantMap arguments;
     arguments[ "type" ] = requestData.type;
     arguments[ "data" ] = convertInfoStringHashToQVariantMap( requestData.input.value<Tomahawk::InfoSystem::InfoStringHash>() );

src/libtomahawk/utils/ShortLinkHelper.cpp

@@ -154,6 +154,7 @@ ShortLinkHelper::shortLinkRequestFinished( const playlist_ptr& playlist )
     d->reply->deleteLater();
 }
 
+
 void
 ShortLinkHelper::shortenLinkRequestFinished()
 {