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

Reuse existing signal

Browse Source
This commit is contained in:
Uwe L. Korn
2014-07-17 12:15:31 +01:00
parent eb2b7b3f53
commit 51ea6f99c5
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libtomahawk/playlist/PlayableModel.cpp
View File

@@ -1006,7 +1006,7 @@ PlayableModel::appendQueries( const QList< Tomahawk::query_ptr >& queries )
void void
PlayableModel::appendTracks( const QList< Tomahawk::track_ptr >& tracks, const QList< Tomahawk::PlaybackLog >& logs ) PlayableModel::appendTracks( const QList< Tomahawk::track_ptr >& tracks, const QList< Tomahawk::PlaybackLog >& logs )
{ {
emit appendingTracks(); emit loadingStarted();
QList< Tomahawk::query_ptr > queries; QList< Tomahawk::query_ptr > queries;
foreach ( const track_ptr& track, tracks ) foreach ( const track_ptr& track, tracks )
{ {
@@ -1020,7 +1020,7 @@ PlayableModel::appendTracks( const QList< Tomahawk::track_ptr >& tracks, const Q
void void
PlayableModel::appendTracks( const Tomahawk::collection_ptr& collection ) PlayableModel::appendTracks( const Tomahawk::collection_ptr& collection )
{ {
emit appendingTracks(); emit loadingStarted();
insertTracks( collection, rowCount( QModelIndex() ) ); insertTracks( collection, rowCount( QModelIndex() ) );
} }

1
src/libtomahawk/playlist/PlayableModel.h
View File

@@ -132,7 +132,6 @@ public:
void finishLoading(); void finishLoading();
signals: signals:
void appendingTracks();
void repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode mode ); void repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode mode );
void shuffleModeChanged( bool enabled ); void shuffleModeChanged( bool enabled );

4
src/libtomahawk/playlist/TrackView.cpp
View File

@@ -205,8 +205,6 @@ void
TrackView::setPlayableModel( PlayableModel* model ) TrackView::setPlayableModel( PlayableModel* model )
{ {
if ( m_model ) { if ( m_model ) {
disconnect( m_model, SIGNAL( appendingTracks() ),
m_loadingSpinner, SLOT( fadeIn() ) );
disconnect( m_model, SIGNAL( loadingStarted() ), disconnect( m_model, SIGNAL( loadingStarted() ),
m_loadingSpinner, SLOT( fadeIn() ) ); m_loadingSpinner, SLOT( fadeIn() ) );
disconnect( m_model, SIGNAL( loadingFinished() ), disconnect( m_model, SIGNAL( loadingFinished() ),
@@ -238,8 +236,6 @@ TrackView::setPlayableModel( PlayableModel* model )
setHorizontalScrollBarPolicy( Qt::ScrollBarAsNeeded ); setHorizontalScrollBarPolicy( Qt::ScrollBarAsNeeded );
} }
connect( m_model, SIGNAL( appendingTracks() ),
m_loadingSpinner, SLOT( fadeIn() ) );
connect( m_model, SIGNAL( loadingStarted() ), connect( m_model, SIGNAL( loadingStarted() ),
m_loadingSpinner, SLOT( fadeIn() ) ); m_loadingSpinner, SLOT( fadeIn() ) );
connect( m_model, SIGNAL( loadingFinished() ), connect( m_model, SIGNAL( loadingFinished() ),