File fix-broken-connects.patch of Package amarok5
diff --git a/src/playlist/navigators/DynamicTrackNavigator.cpp b/src/playlist/navigators/DynamicTrackNavigator.cpp
index e1173373a5..5f5576bff5 100644
--- a/src/playlist/navigators/DynamicTrackNavigator.cpp
+++ b/src/playlist/navigators/DynamicTrackNavigator.cpp
@@ -31,13 +31,11 @@
Playlist::DynamicTrackNavigator::DynamicTrackNavigator()
: m_playlist( 0 )
{
- connect( qobject_cast<Playlist::Model*>(m_model->qaim()), &Playlist::Model::activeTrackChanged,
- this, &DynamicTrackNavigator::trackChanged );
- connect( m_model->qaim(), &QAbstractItemModel::modelReset,
- this, &DynamicTrackNavigator::repopulate );
+ connect( m_model->qaim(), SIGNAL(activeTrackChanged(quint64)), SLOT(trackChanged()) );
+ connect( m_model->qaim(), SIGNAL(modelReset()), SLOT(repopulate()) );
- connect( Dynamic::DynamicModel::instance(), &Dynamic::DynamicModel::activeChanged,
- this, &DynamicTrackNavigator::activePlaylistChanged );
+ connect( Dynamic::DynamicModel::instance(), SIGNAL(activeChanged(int)),
+ SLOT(activePlaylistChanged()) );
activePlaylistChanged();
}
@@ -84,8 +82,8 @@ Playlist::DynamicTrackNavigator::activePlaylistChanged()
if( m_playlist )
{
- disconnect( m_playlist, &Dynamic::DynamicPlaylist::tracksReady,
- this, &DynamicTrackNavigator::receiveTracks );
+ disconnect( m_playlist, SIGNAL(tracksReady(Meta::TrackList)),
+ this, SLOT(receiveTracks(Meta::TrackList)) );
m_playlist->requestAbort();
}
@@ -99,8 +97,8 @@ Playlist::DynamicTrackNavigator::activePlaylistChanged()
}
else
{
- connect( m_playlist, &Dynamic::DynamicPlaylist::tracksReady,
- this, &DynamicTrackNavigator::receiveTracks );
+ connect( m_playlist, SIGNAL(tracksReady(Meta::TrackList)),
+ this, SLOT(receiveTracks(Meta::TrackList)) );
}
}
diff --git a/src/playlist/proxymodels/ProxyBase.cpp b/src/playlist/proxymodels/ProxyBase.cpp
index 64c374c236..8bcd9f9506 100644
--- a/src/playlist/proxymodels/ProxyBase.cpp
+++ b/src/playlist/proxymodels/ProxyBase.cpp
@@ -34,10 +34,8 @@ ProxyBase::ProxyBase( AbstractModel *belowModel, QObject *parent )
// Proxy the Playlist::AbstractModel signals.
// If you need to do something special in a subclass, disconnect() this signal and
// do your own connect() call.
- connect( qobject_cast<Playlist::Model*>( sourceModel() ), &Playlist::Model::activeTrackChanged,
- this, &ProxyBase::activeTrackChanged );
- connect( qobject_cast<Playlist::Model*>( sourceModel() ), &Playlist::Model::queueChanged,
- this, &ProxyBase::queueChanged );
+ connect( sourceModel(), SIGNAL(activeTrackChanged(quint64)), this, SIGNAL(activeTrackChanged(quint64)) );
+ connect( sourceModel(), SIGNAL(queueChanged()), this, SIGNAL(queueChanged()) );
}
ProxyBase::~ProxyBase()