mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-12 09:04:33 +02:00
Code Issues Releases Wiki Activity

Remove obsolete mention of boost

Browse Source
This commit is contained in:
Uwe L. Korn
2014-08-18 16:55:38 +01:00
parent 6cffce4d32
commit 0a315afa9b
7 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libtomahawk/UrlHandler.cpp
View File

@@ -103,7 +103,7 @@ localFileIODeviceFactory( const Tomahawk::result_ptr&, const QString& url,
if ( io ) if ( io )
io->open( QIODevice::ReadOnly ); io->open( QIODevice::ReadOnly );
//boost::functions cannot accept temporaries as parameters // std::functions cannot accept temporaries as parameters
QSharedPointer< QIODevice > sp = QSharedPointer<QIODevice>( io ); QSharedPointer< QIODevice > sp = QSharedPointer<QIODevice>( io );
callback( url, sp ); callback( url, sp );
} }

1
src/libtomahawk/network/ConnectionManager.cpp
View File

@@ -33,7 +33,6 @@
#include "Servent.h" #include "Servent.h"
#include "Source.h" #include "Source.h"
#include <boost/bind.hpp>
#include <qtconcurrentrun.h> #include <qtconcurrentrun.h>
/* Management of ConnectionManagers */ /* Management of ConnectionManagers */

2
src/libtomahawk/network/Servent.cpp
View File

@@ -1261,7 +1261,7 @@ Servent::remoteIODeviceFactory( const Tomahawk::result_ptr& result, const QStrin
StreamConnection* sc = new StreamConnection( this, cc, fileId, result ); StreamConnection* sc = new StreamConnection( this, cc, fileId, result );
createParallelConnection( cc, sc, QString( "FILE_REQUEST_KEY:%1" ).arg( fileId ) ); createParallelConnection( cc, sc, QString( "FILE_REQUEST_KEY:%1" ).arg( fileId ) );
//boost::functions cannot accept temporaries as parameters // std::functions cannot accept temporaries as parameters
sp = sc->iodevice(); sp = sc->iodevice();
callback( result->url(), sp ); callback( result->url(), sp );
} }

2
src/libtomahawk/network/Servent_p.h
View File

@@ -27,8 +27,6 @@
#include <QMutex> #include <QMutex>
#include <QStringList> #include <QStringList>
#include <boost/function.hpp>
class ServentPrivate : public QObject class ServentPrivate : public QObject
{ {
Q_OBJECT Q_OBJECT

2
src/libtomahawk/resolvers/ExternalResolver.h
View File

@@ -31,8 +31,6 @@
#include "ScriptCommand_LookupUrl.h" #include "ScriptCommand_LookupUrl.h"
#include "Typedefs.h" #include "Typedefs.h"
#include <boost/function.hpp>
#include <QObject> #include <QObject>
class QWidget; class QWidget;

2
src/libtomahawk/resolvers/JSResolver.cpp
View File

@@ -53,8 +53,6 @@
#include <QTime> #include <QTime>
#include <QWebFrame> #include <QWebFrame>
#include <boost/bind.hpp>
JSResolver::JSResolver( const QString& accountId, const QString& scriptPath, const QStringList& additionalScriptPaths ) JSResolver::JSResolver( const QString& accountId, const QString& scriptPath, const QStringList& additionalScriptPaths )
: Tomahawk::ExternalResolverGui( scriptPath ) : Tomahawk::ExternalResolverGui( scriptPath )
, d_ptr( new JSResolverPrivate( this, accountId, scriptPath, additionalScriptPaths ) ) , d_ptr( new JSResolverPrivate( this, accountId, scriptPath, additionalScriptPaths ) )

2
src/libtomahawk/resolvers/JSResolverHelper.cpp
View File

@@ -900,7 +900,7 @@ Q_DECLARE_METATYPE( IODeviceCallback )
void void
JSResolverHelper::gotStreamUrl( function< void( const QString&, QSharedPointer< QIODevice >& ) > callback, NetworkReply* reply ) JSResolverHelper::gotStreamUrl( function< void( const QString&, QSharedPointer< QIODevice >& ) > callback, NetworkReply* reply )
{ {
//boost::functions cannot accept temporaries as parameters // std::functions cannot accept temporaries as parameters
QSharedPointer< QIODevice > sp = QSharedPointer< QIODevice >( reply->reply(), &QObject::deleteLater ); QSharedPointer< QIODevice > sp = QSharedPointer< QIODevice >( reply->reply(), &QObject::deleteLater );
QString url = reply->reply()->url().toString(); QString url = reply->reply()->url().toString();
reply->disconnectFromReply(); reply->disconnectFromReply();