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

Update PlaylistInterface slot signatures

Browse Source
This commit is contained in:
Jeff Mitchell
2011-06-16 18:08:57 -04:00
parent 64cd6e584f
commit 818636721a
5 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libtomahawk/playlist/topbar/topbar.cpp
View File

@@ -106,8 +106,8 @@ TopBar::TopBar( QWidget* parent )
connect( ViewManager::instance(), SIGNAL( filterAvailable( bool ) ), connect( ViewManager::instance(), SIGNAL( filterAvailable( bool ) ),
SLOT( setFilterVisible( bool ) ) ); SLOT( setFilterVisible( bool ) ) );
connect( ViewManager::instance(), SIGNAL( modeChanged( PlaylistInterface::ViewMode ) ), connect( ViewManager::instance(), SIGNAL( modeChanged( Tomahawk::PlaylistInterface::ViewMode ) ),
SLOT( onModeChanged( PlaylistInterface::ViewMode ) ) ); SLOT( onModeChanged( Tomahawk::PlaylistInterface::ViewMode ) ) );
} }
@@ -290,20 +290,20 @@ TopBar::setFilter( const QString& filter )
void void
TopBar::onModeChanged( PlaylistInterface::ViewMode mode ) TopBar::onModeChanged( Tomahawk::PlaylistInterface::ViewMode mode )
{ {
qDebug() << Q_FUNC_INFO << mode; qDebug() << Q_FUNC_INFO << mode;
switch ( mode ) switch ( mode )
{ {
case PlaylistInterface::Flat: case Tomahawk::PlaylistInterface::Flat:
onFlatMode(); onFlatMode();
break; break;
case PlaylistInterface::Tree: case Tomahawk::PlaylistInterface::Tree:
onArtistMode(); onArtistMode();
break; break;
case PlaylistInterface::Album: case Tomahawk::PlaylistInterface::Album:
onAlbumMode(); onAlbumMode();
break; break;

22
src/libtomahawk/viewmanager.cpp
View File

@@ -122,7 +122,7 @@ ViewManager::ViewManager( QObject* parent )
m_widget->layout()->setMargin( 0 ); m_widget->layout()->setMargin( 0 );
m_widget->layout()->setSpacing( 0 ); m_widget->layout()->setSpacing( 0 );
connect( AudioEngine::instance(), SIGNAL( playlistChanged( PlaylistInterface* ) ), this, SLOT( playlistInterfaceChanged( PlaylistInterface* ) ) ); connect( AudioEngine::instance(), SIGNAL( playlistChanged( Tomahawk::PlaylistInterface* ) ), this, SLOT( playlistInterfaceChanged( Tomahawk::PlaylistInterface* ) ) );
connect( &m_filterTimer, SIGNAL( timeout() ), SLOT( applyFilter() ) ); connect( &m_filterTimer, SIGNAL( timeout() ), SLOT( applyFilter() ) );
@@ -425,7 +425,7 @@ ViewManager::showSuperCollection()
} }
void void
ViewManager::playlistInterfaceChanged( PlaylistInterface* interface ) ViewManager::playlistInterfaceChanged( Tomahawk::PlaylistInterface* interface )
{ {
playlist_ptr pl = playlistForInterface( interface ); playlist_ptr pl = playlistForInterface( interface );
if ( !pl.isNull() ) if ( !pl.isNull() )
@@ -649,8 +649,8 @@ ViewManager::unlinkPlaylist()
disconnect( currentPlaylistInterface()->object(), SIGNAL( trackCountChanged( unsigned int ) ), disconnect( currentPlaylistInterface()->object(), SIGNAL( trackCountChanged( unsigned int ) ),
this, SIGNAL( numShownChanged( unsigned int ) ) ); this, SIGNAL( numShownChanged( unsigned int ) ) );
disconnect( currentPlaylistInterface()->object(), SIGNAL( repeatModeChanged( PlaylistInterface::RepeatMode ) ), disconnect( currentPlaylistInterface()->object(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ),
this, SIGNAL( repeatModeChanged( PlaylistInterface::RepeatMode ) ) ); this, SIGNAL( repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ) );
disconnect( currentPlaylistInterface()->object(), SIGNAL( shuffleModeChanged( bool ) ), disconnect( currentPlaylistInterface()->object(), SIGNAL( shuffleModeChanged( bool ) ),
this, SIGNAL( shuffleModeChanged( bool ) ) ); this, SIGNAL( shuffleModeChanged( bool ) ) );
@@ -687,8 +687,8 @@ ViewManager::updateView()
connect( currentPlaylistInterface()->object(), SIGNAL( trackCountChanged( unsigned int ) ), connect( currentPlaylistInterface()->object(), SIGNAL( trackCountChanged( unsigned int ) ),
SIGNAL( numShownChanged( unsigned int ) ) ); SIGNAL( numShownChanged( unsigned int ) ) );
connect( currentPlaylistInterface()->object(), SIGNAL( repeatModeChanged( PlaylistInterface::RepeatMode ) ), connect( currentPlaylistInterface()->object(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ),
SIGNAL( repeatModeChanged( PlaylistInterface::RepeatMode ) ) ); SIGNAL( repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ) );
connect( currentPlaylistInterface()->object(), SIGNAL( shuffleModeChanged( bool ) ), connect( currentPlaylistInterface()->object(), SIGNAL( shuffleModeChanged( bool ) ),
SIGNAL( shuffleModeChanged( bool ) ) ); SIGNAL( shuffleModeChanged( bool ) ) );
@@ -788,7 +788,7 @@ ViewManager::onWidgetDestroyed( QWidget* widget )
void void
ViewManager::setRepeatMode( PlaylistInterface::RepeatMode mode ) ViewManager::setRepeatMode( Tomahawk::PlaylistInterface::RepeatMode mode )
{ {
if ( currentPlaylistInterface() ) if ( currentPlaylistInterface() )
currentPlaylistInterface()->setRepeatMode( mode ); currentPlaylistInterface()->setRepeatMode( mode );
@@ -842,7 +842,7 @@ ViewManager::pageForPlaylist(const playlist_ptr& pl) const
ViewPage* ViewPage*
ViewManager::pageForInterface( PlaylistInterface* interface ) const ViewManager::pageForInterface( Tomahawk::PlaylistInterface* interface ) const
{ {
for ( int i = 0; i < m_pageHistory.count(); i++ ) for ( int i = 0; i < m_pageHistory.count(); i++ )
{ {
@@ -899,7 +899,7 @@ ViewManager::setHistoryPosition( int position )
Tomahawk::playlist_ptr Tomahawk::playlist_ptr
ViewManager::playlistForInterface( PlaylistInterface* interface ) const ViewManager::playlistForInterface( Tomahawk::PlaylistInterface* interface ) const
{ {
foreach ( PlaylistView* view, m_playlistViews.values() ) foreach ( PlaylistView* view, m_playlistViews.values() )
{ {
@@ -914,7 +914,7 @@ ViewManager::playlistForInterface( PlaylistInterface* interface ) const
Tomahawk::dynplaylist_ptr Tomahawk::dynplaylist_ptr
ViewManager::dynamicPlaylistForInterface( PlaylistInterface* interface ) const ViewManager::dynamicPlaylistForInterface( Tomahawk::PlaylistInterface* interface ) const
{ {
foreach ( DynamicWidget* view, m_dynamicWidgets.values() ) foreach ( DynamicWidget* view, m_dynamicWidgets.values() )
{ {
@@ -929,7 +929,7 @@ ViewManager::dynamicPlaylistForInterface( PlaylistInterface* interface ) const
Tomahawk::collection_ptr Tomahawk::collection_ptr
ViewManager::collectionForInterface( PlaylistInterface* interface ) const ViewManager::collectionForInterface( Tomahawk::PlaylistInterface* interface ) const
{ {
foreach ( CollectionView* view, m_collectionViews.values() ) foreach ( CollectionView* view, m_collectionViews.values() )
{ {

6
src/libtomahawk/widgets/welcomeplaylistmodel.cpp
View File

@@ -27,14 +27,14 @@ using namespace Tomahawk;
WelcomePlaylistModel::WelcomePlaylistModel( QObject* parent ) WelcomePlaylistModel::WelcomePlaylistModel( QObject* parent )
: QAbstractListModel( parent ) : QAbstractListModel( parent )
, m_waitingForSome( true )
, m_maxPlaylists( 0 ) , m_maxPlaylists( 0 )
, m_waitingForSome( true )
{ {
loadFromSettings(); loadFromSettings();
connect( SourceList::instance(), SIGNAL( sourceAdded( Tomahawk::source_ptr ) ), this, SLOT( onSourceAdded( Tomahawk::source_ptr ) ), Qt::QueuedConnection ); connect( SourceList::instance(), SIGNAL( sourceAdded( Tomahawk::source_ptr ) ), this, SLOT( onSourceAdded( Tomahawk::source_ptr ) ), Qt::QueuedConnection );
connect( TomahawkSettings::instance(), SIGNAL( recentlyPlayedPlaylistAdded( Tomahawk::playlist_ptr ) ), this, SLOT( plAdded( Tomahawk::playlist_ptr ) ) ); connect( TomahawkSettings::instance(), SIGNAL( recentlyPlayedPlaylistAdded( Tomahawk::playlist_ptr ) ), this, SLOT( plAdded( Tomahawk::playlist_ptr ) ) );
connect( AudioEngine::instance(),SIGNAL( playlistChanged( PlaylistInterface* ) ), this, SLOT( playlistChanged( PlaylistInterface* ) ), Qt::QueuedConnection ); connect( AudioEngine::instance(),SIGNAL( playlistChanged( Tomahawk::PlaylistInterface* ) ), this, SLOT( playlistChanged( Tomahawk::PlaylistInterface* ) ), Qt::QueuedConnection );
emit emptinessChanged( m_recplaylists.isEmpty() ); emit emptinessChanged( m_recplaylists.isEmpty() );
} }
@@ -157,7 +157,7 @@ WelcomePlaylistModel::plAdded( const playlist_ptr& pl )
} }
void void
WelcomePlaylistModel::playlistChanged( PlaylistInterface* pli ) WelcomePlaylistModel::playlistChanged( Tomahawk::PlaylistInterface* pli )
{ {
// ARG // ARG
if( Playlist* pl = dynamic_cast< Playlist* >( pli ) ) { if( Playlist* pl = dynamic_cast< Playlist* >( pli ) ) {

2
src/libtomahawk/widgets/welcomewidget.cpp
View File

@@ -64,7 +64,7 @@ WelcomeWidget::WelcomeWidget( QWidget* parent )
connect( SourceList::instance(), SIGNAL( sourceAdded( Tomahawk::source_ptr ) ), SLOT( onSourceAdded( Tomahawk::source_ptr ) ) ); connect( SourceList::instance(), SIGNAL( sourceAdded( Tomahawk::source_ptr ) ), SLOT( onSourceAdded( Tomahawk::source_ptr ) ) );
connect( ui->playlistWidget, SIGNAL( activated( QModelIndex ) ), SLOT( onPlaylistActivated( QModelIndex ) ) ); connect( ui->playlistWidget, SIGNAL( activated( QModelIndex ) ), SLOT( onPlaylistActivated( QModelIndex ) ) );
connect( AudioEngine::instance() ,SIGNAL( playlistChanged( PlaylistInterface* ) ), this, SLOT( updatePlaylists() ), Qt::QueuedConnection ); connect( AudioEngine::instance() ,SIGNAL( playlistChanged( Tomahawk::PlaylistInterface* ) ), this, SLOT( updatePlaylists() ), Qt::QueuedConnection );
} }

4
src/tomahawkwindow.cpp
View File

@@ -277,8 +277,8 @@ void
TomahawkWindow::setupSignals() TomahawkWindow::setupSignals()
{ {
// <From PlaylistManager> // <From PlaylistManager>
connect( ViewManager::instance(), SIGNAL( repeatModeChanged( PlaylistInterface::RepeatMode ) ), connect( ViewManager::instance(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ),
m_audioControls, SLOT( onRepeatModeChanged( PlaylistInterface::RepeatMode ) ) ); m_audioControls, SLOT( onRepeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ) );
connect( ViewManager::instance(), SIGNAL( shuffleModeChanged( bool ) ), connect( ViewManager::instance(), SIGNAL( shuffleModeChanged( bool ) ),
m_audioControls, SLOT( onShuffleModeChanged( bool ) ) ); m_audioControls, SLOT( onShuffleModeChanged( bool ) ) );