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

fix a bunch of warnings

Browse Source
This commit is contained in:
Leo Franchi
2011-06-19 00:39:53 -04:00
parent 0efe65d738
commit 8939af7407
11 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/audiocontrols.cpp
View File

@@ -49,7 +49,7 @@ AudioControls::AudioControls( QWidget* parent )
font.setPixelSize( 12 ); font.setPixelSize( 12 );
#ifdef Q_WS_MAC #ifdef Q_WS_MAC
font.setPointSize( font.pointSize() - 2 ); font.setPixelSize( font.pixelSize() - 2 );
#endif #endif
ui->artistTrackLabel->setFont( font ); ui->artistTrackLabel->setFont( font );

3
src/libtomahawk/infosystem/infoplugins/adiumplugin.h
View File

@@ -48,10 +48,9 @@ public slots:
private slots: private slots:
void clearStatus(); void clearStatus();
private:
void settingsChanged(); void settingsChanged();
private:
void audioStarted( const QVariant &input ); void audioStarted( const QVariant &input );
void audioFinished( const QVariant &input ); void audioFinished( const QVariant &input );
void audioStopped(); void audioStopped();

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

@@ -53,8 +53,8 @@ AlbumProxyModel::setSourceAlbumModel( AlbumModel* sourceModel )
{ {
m_model = sourceModel; m_model = sourceModel;
connect( m_model, SIGNAL( trackCountChanged( unsigned int ) ), if ( m_model && m_model->metaObject()->indexOfSignal( "trackCountChanged(uint)" ) > -1 )
SIGNAL( sourceTrackCountChanged( unsigned int ) ) ); connect( m_model, SIGNAL( trackCountChanged( unsigned int ) ), SIGNAL( sourceTrackCountChanged( unsigned int ) ) );
QSortFilterProxyModel::setSourceModel( sourceModel ); QSortFilterProxyModel::setSourceModel( sourceModel );
} }

3
src/libtomahawk/playlist/dynamic/widgets/LoadingSpinner.cpp
View File

@@ -65,6 +65,9 @@ void
LoadingSpinner::fadeOut() LoadingSpinner::fadeOut()
{ {
m_showHide->setDirection( QTimeLine::Backward ); m_showHide->setDirection( QTimeLine::Backward );
if( m_showHide->state() == QTimeLine::Running )
m_showHide->stop();
m_showHide->start(); m_showHide->start();
} }

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

@@ -57,8 +57,8 @@ TrackProxyModel::setSourceTrackModel( TrackModel* sourceModel )
{ {
m_model = sourceModel; m_model = sourceModel;
connect( m_model, SIGNAL( trackCountChanged( unsigned int ) ), if ( m_model && m_model->metaObject()->indexOfSignal( "trackCountChanged(uint)" ) > -1 )
SIGNAL( sourceTrackCountChanged( unsigned int ) ) ); connect( m_model, SIGNAL( trackCountChanged( unsigned int ) ), SIGNAL( sourceTrackCountChanged( unsigned int ) ) );
QSortFilterProxyModel::setSourceModel( m_model ); QSortFilterProxyModel::setSourceModel( m_model );
} }

5
src/libtomahawk/playlist/trackview.cpp
View File

@@ -133,7 +133,10 @@ TrackView::setTrackModel( TrackModel* model )
m_proxyModel->setSourceTrackModel( m_model ); m_proxyModel->setSourceTrackModel( m_model );
} }
connect( m_model, SIGNAL( itemSizeChanged( QModelIndex ) ), SLOT( onItemResized( QModelIndex ) ) );
if ( m_model && m_model->metaObject()->indexOfSignal( "itemSizeChanged(QModelIndex)" ) > -1 )
connect( m_model, SIGNAL( itemSizeChanged( QModelIndex ) ), SLOT( onItemResized( QModelIndex ) ) );
connect( m_model, SIGNAL( loadingStarted() ), m_loadingSpinner, SLOT( fadeIn() ) ); connect( m_model, SIGNAL( loadingStarted() ), m_loadingSpinner, SLOT( fadeIn() ) );
connect( m_model, SIGNAL( loadingFinished() ), m_loadingSpinner, SLOT( fadeOut() ) ); connect( m_model, SIGNAL( loadingFinished() ), m_loadingSpinner, SLOT( fadeOut() ) );

5
src/libtomahawk/playlist/treeproxymodel.cpp
View File

@@ -46,8 +46,9 @@ TreeProxyModel::setSourceModel( TreeModel* sourceModel )
{ {
m_model = sourceModel; m_model = sourceModel;
connect( m_model, SIGNAL( trackCountChanged( unsigned int ) ), if ( m_model && m_model->metaObject()->indexOfSignal( "trackCountChanged(uint)" ) > -1 )
SIGNAL( sourceTrackCountChanged( unsigned int ) ) ); connect( m_model, SIGNAL( trackCountChanged( unsigned int ) ), SIGNAL( sourceTrackCountChanged( unsigned int ) ) );
QSortFilterProxyModel::setSourceModel( sourceModel ); QSortFilterProxyModel::setSourceModel( sourceModel );
} }

2
src/libtomahawk/viewmanager.cpp
View File

@@ -198,8 +198,6 @@ ViewManager::show( const Tomahawk::dynplaylist_ptr& playlist )
{ {
m_dynamicWidgets[ playlist ] = new Tomahawk::DynamicWidget( playlist, m_stack ); m_dynamicWidgets[ playlist ] = new Tomahawk::DynamicWidget( playlist, m_stack );
connect( playlist.data(), SIGNAL( deleted( Tomahawk::dynplaylist_ptr ) ), this, SLOT( onDynamicDeleted( Tomahawk::dynplaylist_ptr ) ) );
playlist->resolve(); playlist->resolve();
} }

3
src/sip/jabber/jabber.cpp
View File

@@ -232,7 +232,8 @@ JabberPlugin::connectPlugin( bool startup )
//FIXME: we're badly workarounding some missing reconnection api here, to be fixed soon //FIXME: we're badly workarounding some missing reconnection api here, to be fixed soon
QTimer::singleShot( 1000, m_client, SLOT( connectToServer() ) ); QTimer::singleShot( 1000, m_client, SLOT( connectToServer() ) );
connect(m_client->connection(), SIGNAL(error(SocketError)), SLOT(onError(SocketError))); if ( m_client->connection() )
connect(m_client->connection(), SIGNAL(error(SocketError)), SLOT(onError(SocketError)));
m_state = Connecting; m_state = Connecting;
emit stateChanged( m_state ); emit stateChanged( m_state );

7
src/sourcetree/sourcesproxymodel.cpp
View File

@@ -35,8 +35,11 @@ SourcesProxyModel::SourcesProxyModel( SourcesModel* model, QObject* parent )
setSourceModel( model ); setSourceModel( model );
connect( model, SIGNAL( askForExpand( QModelIndex ) ), this, SLOT( askedToExpand( QModelIndex ) ) );
connect( model, SIGNAL( selectRequest( QModelIndex ) ), this, SLOT( selectRequested( QModelIndex ) ) ); if ( model && model->metaObject()->indexOfSignal( "trackCountChanged(QModelIndex)" ) > -1 )
connect( model, SIGNAL( askForExpand( QModelIndex ) ), this, SLOT( askedToExpand( QModelIndex ) ) );
if ( model && model->metaObject()->indexOfSignal( "selectRequest(QModelIndex)" ) > -1 )
connect( model, SIGNAL( selectRequest( QModelIndex ) ), this, SLOT( selectRequested( QModelIndex ) ) );
} }

1
src/sourcetree/sourcetreeview.cpp
View File

@@ -106,7 +106,6 @@ SourceTreeView::SourceTreeView( QWidget* parent )
header()->setStretchLastSection( false ); header()->setStretchLastSection( false );
header()->setResizeMode( 0, QHeaderView::Stretch ); header()->setResizeMode( 0, QHeaderView::Stretch );
connect( m_model, SIGNAL( clicked( QModelIndex ) ), SIGNAL( clicked( QModelIndex ) ) );
connect( this, SIGNAL( clicked( QModelIndex ) ), SLOT( onItemActivated( QModelIndex ) ) ); connect( this, SIGNAL( clicked( QModelIndex ) ), SLOT( onItemActivated( QModelIndex ) ) );
connect( this, SIGNAL( expanded( QModelIndex ) ), this, SLOT( onItemExpanded( QModelIndex ) ) ); connect( this, SIGNAL( expanded( QModelIndex ) ), this, SLOT( onItemExpanded( QModelIndex ) ) );
// connect( selectionModel(), SIGNAL( selectionChanged( QItemSelection, QItemSelection ) ), SLOT( onSelectionChanged() ) ); // connect( selectionModel(), SIGNAL( selectionChanged( QItemSelection, QItemSelection ) ), SLOT( onSelectionChanged() ) );