From da0d585d53472d3b4986c1a66dc1e23436f67603 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 8 Apr 2015 03:05:33 +0200 Subject: [PATCH] Style fixes. --- src/libtomahawk/audio/Qnr_IoDeviceStream.cpp | 13 ++--- src/libtomahawk/audio/Qnr_IoDeviceStream.h | 2 +- .../resolvers/JSResolverHelper.cpp | 57 +++++++++++-------- .../resolvers/ScriptInfoPlugin.cpp | 1 - src/libtomahawk/utils/ShortLinkHelper.cpp | 1 + 5 files changed, 42 insertions(+), 32 deletions(-) diff --git a/src/libtomahawk/audio/Qnr_IoDeviceStream.cpp b/src/libtomahawk/audio/Qnr_IoDeviceStream.cpp index 8d8eea8bb..8d30447c2 100644 --- a/src/libtomahawk/audio/Qnr_IoDeviceStream.cpp +++ b/src/libtomahawk/audio/Qnr_IoDeviceStream.cpp @@ -38,8 +38,9 @@ QNR_IODeviceStream::QNR_IODeviceStream( const QSharedPointer& rep { m_type = MediaStream::Stream; - if ( !m_networkReply->isOpen() ) { - m_networkReply->open(QIODevice::ReadOnly); + if ( !m_networkReply->isOpen() ) + { + m_networkReply->open( QIODevice::ReadOnly ); } Q_ASSERT( m_networkReply->isOpen() ); @@ -82,7 +83,7 @@ QNR_IODeviceStream::seekStream( qint64 offset ) qint64 -QNR_IODeviceStream::needData ( void** buffer ) +QNR_IODeviceStream::needData( void** buffer ) { QMutexLocker locker( &m_mutex ); QByteArray data = m_data.mid( m_pos, BLOCK_SIZE ); @@ -93,18 +94,16 @@ QNR_IODeviceStream::needData ( void** buffer ) endOfData(); return 0; } - + *buffer = new char[data.size()]; memcpy(*buffer, data.data(), data.size()); return data.size(); } + void QNR_IODeviceStream::readyRead() { QMutexLocker locker( &m_mutex ); m_data += m_networkReply->readAll(); } - - -// vim: sw=4 sts=4 et tw=100 diff --git a/src/libtomahawk/audio/Qnr_IoDeviceStream.h b/src/libtomahawk/audio/Qnr_IoDeviceStream.h index 9181810ed..383d8dcb3 100644 --- a/src/libtomahawk/audio/Qnr_IoDeviceStream.h +++ b/src/libtomahawk/audio/Qnr_IoDeviceStream.h @@ -47,7 +47,7 @@ public: ~QNR_IODeviceStream(); virtual void seekStream( qint64 offset ); - virtual qint64 needData ( void** buffer ); + virtual qint64 needData( void** buffer ); private slots: void readyRead(); diff --git a/src/libtomahawk/resolvers/JSResolverHelper.cpp b/src/libtomahawk/resolvers/JSResolverHelper.cpp index 2949c4a8e..46126dc6a 100644 --- a/src/libtomahawk/resolvers/JSResolverHelper.cpp +++ b/src/libtomahawk/resolvers/JSResolverHelper.cpp @@ -1,6 +1,6 @@ /* === This file is part of Tomahawk Player - === * - * Copyright 2010-2011, Christian Muehlhaeuser + * Copyright 2010-2015, Christian Muehlhaeuser * Copyright 2010-2011, Leo Franchi * Copyright 2013, Teo Mrnjavac * Copyright 2013, Uwe L. Korn @@ -693,7 +693,7 @@ JSResolverHelper::reportStreamUrl( const QString& qid, const QString& streamUrl } -void JSResolverHelper::nativeAssert(bool assertion, const QString& message) +void JSResolverHelper::nativeAssert( bool assertion, const QString& message ) { if ( !assertion ) { @@ -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 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 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,19 +916,25 @@ 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 ) ); } - NewClosure( reply , SIGNAL( finished() ), this, SLOT( nativeAsyncRequestDone( int, NetworkReply* ) ), requestId, reply ); + NewClosure( reply, SIGNAL( finished() ), this, SLOT( nativeAsyncRequestDone( int, NetworkReply* ) ), requestId, reply ); } @@ -1017,7 +1024,7 @@ JSResolverHelper::createFuzzyIndex( const QVariantList& list ) } else { - m_resolver->d_func()->fuzzyIndex.reset( new FuzzyIndex( m_resolver, accountId() + ".lucene" , true ) ); + m_resolver->d_func()->fuzzyIndex.reset( new FuzzyIndex( m_resolver, accountId() + ".lucene", true ) ); } addToFuzzyIndex( list ); @@ -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. @@ -1056,7 +1064,7 @@ JSResolverHelper::addToFuzzyIndex( const QVariantList& list ) bool -cmpTuple ( const QVariant& x, const QVariant& y ) +cmpTuple( const QVariant& x, const QVariant& y ) { return x.toList().at( 1 ).toFloat() < y.toList().at( 1 ).toFloat(); } @@ -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,13 +1150,14 @@ JSResolverHelper::returnStreamUrl( const QString& streamUrl, const QMapget( req ) ); - NewClosure( reply , SIGNAL( finalUrlReached() ), this, SLOT( gotStreamUrl( IODeviceCallback, NetworkReply* )), callback, reply ); + NewClosure( reply, SIGNAL( finalUrlReached() ), this, SLOT( gotStreamUrl( IODeviceCallback, NetworkReply* )), callback, reply ); } } diff --git a/src/libtomahawk/resolvers/ScriptInfoPlugin.cpp b/src/libtomahawk/resolvers/ScriptInfoPlugin.cpp index bd90bc7d4..d7e857450 100644 --- a/src/libtomahawk/resolvers/ScriptInfoPlugin.cpp +++ b/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() ); diff --git a/src/libtomahawk/utils/ShortLinkHelper.cpp b/src/libtomahawk/utils/ShortLinkHelper.cpp index 19e72b479..5372f311e 100644 --- a/src/libtomahawk/utils/ShortLinkHelper.cpp +++ b/src/libtomahawk/utils/ShortLinkHelper.cpp @@ -154,6 +154,7 @@ ShortLinkHelper::shortLinkRequestFinished( const playlist_ptr& playlist ) d->reply->deleteLater(); } + void ShortLinkHelper::shortenLinkRequestFinished() {