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

Fixed compiling with clang.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2015-03-11 06:09:28 +01:00
parent 9f1311553d
commit 52fb1ae0d1
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/libtomahawk/DownloadManager.cpp
View File

@@ -88,7 +88,7 @@ DownloadManager::jobs( DownloadJob::TrackState state ) const
if ( job.isNull() ) if ( job.isNull() )
continue; continue;
if ( state == DownloadJob::TrackState::Any || job->state() == state ) if ( state == DownloadJob::Any || job->state() == state )
jobs << job; jobs << job;
} }
@@ -147,15 +147,15 @@ DownloadManager::containsJob( const downloadjob_ptr& job ) const
downloadjob_ptr downloadjob_ptr
DownloadManager::currentJob() const DownloadManager::currentJob() const
{ {
QList<downloadjob_ptr> j = jobs( DownloadJob::TrackState::Running ); QList<downloadjob_ptr> j = jobs( DownloadJob::Running );
if ( j.count() ) if ( j.count() )
return j.first(); return j.first();
j = jobs( DownloadJob::TrackState::Paused ); j = jobs( DownloadJob::Paused );
if ( j.count() ) if ( j.count() )
return j.first(); return j.first();
j = jobs( DownloadJob::TrackState::Waiting ); j = jobs( DownloadJob::Waiting );
if ( j.count() ) if ( j.count() )
return j.first(); return j.first();
@@ -171,18 +171,18 @@ DownloadManager::state() const
{ {
switch ( currentJob()->state() ) switch ( currentJob()->state() )
{ {
case DownloadJob::TrackState::Waiting: case DownloadJob::Waiting:
return DownloadManager::DownloadManagerState::Waiting; return DownloadManager::Waiting;
case DownloadJob::TrackState::Paused: case DownloadJob::Paused:
return DownloadManager::DownloadManagerState::Paused; return DownloadManager::Paused;
case DownloadJob::TrackState::Running: case DownloadJob::Running:
return DownloadManager::DownloadManagerState::Running; return DownloadManager::Running;
} }
} }
return DownloadManager::DownloadManagerState::Waiting; return DownloadManager::Waiting;
} }
@@ -192,7 +192,7 @@ DownloadManager::checkJobs()
if ( !m_globalState ) if ( !m_globalState )
return; return;
if ( state() == DownloadManager::DownloadManagerState::Waiting && !currentJob().isNull() ) if ( state() == DownloadManager::Waiting && !currentJob().isNull() )
{ {
downloadjob_ptr job = currentJob(); downloadjob_ptr job = currentJob();
/* connect( job.data(), SIGNAL( finished() ), SLOT( checkJobs() ) ); /* connect( job.data(), SIGNAL( finished() ), SLOT( checkJobs() ) );
@@ -210,7 +210,7 @@ DownloadManager::pause()
tLog() << Q_FUNC_INFO; tLog() << Q_FUNC_INFO;
m_globalState = false; m_globalState = false;
foreach ( const downloadjob_ptr& job, jobs( DownloadJob::TrackState::Running ) ) foreach ( const downloadjob_ptr& job, jobs( DownloadJob::Running ) )
{ {
job->pause(); job->pause();
} }
@@ -224,9 +224,9 @@ DownloadManager::resume()
m_globalState = true; m_globalState = true;
if ( jobs( DownloadJob::TrackState::Paused ).count() ) if ( jobs( DownloadJob::Paused ).count() )
{ {
foreach ( const downloadjob_ptr& job, jobs( DownloadJob::TrackState::Paused ) ) foreach ( const downloadjob_ptr& job, jobs( DownloadJob::Paused ) )
{ {
tLog() << "Resuming job:" << job->toString(); tLog() << "Resuming job:" << job->toString();
job->resume(); job->resume();

2
src/libtomahawk/DownloadManager.h
View File

@@ -38,7 +38,7 @@ public:
DownloadManagerState state() const; DownloadManagerState state() const;
QList<downloadjob_ptr> jobs( DownloadJob::TrackState state = DownloadJob::TrackState::Any ) const; QList<downloadjob_ptr> jobs( DownloadJob::TrackState state = DownloadJob::Any ) const;
bool containsJob( const downloadjob_ptr& job ) const; bool containsJob( const downloadjob_ptr& job ) const;
downloadjob_ptr currentJob() const; downloadjob_ptr currentJob() const;

2
src/libtomahawk/playlist/PlaylistItemDelegate.cpp
View File

@@ -309,7 +309,7 @@ PlaylistItemDelegate::paintDetailed( QPainter* painter, const QStyleOptionViewIt
} }
else else
{ {
if ( item->result()->downloadJob()->state() == DownloadJob::TrackState::Finished ) if ( item->result()->downloadJob()->state() == DownloadJob::Finished )
{ {
painter->setPen( opt.palette.text().color() ); painter->setPen( opt.palette.text().color() );
const QString text = painter->fontMetrics().elidedText( tr( "Finished" ), Qt::ElideRight, opt.rect.width() - 3 ); const QString text = painter->fontMetrics().elidedText( tr( "Finished" ), Qt::ElideRight, opt.rect.width() - 3 );