From 42c0199f534723e785f59648ba0bb8c3713dd439 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 20 Jun 2013 19:38:00 +0200 Subject: [PATCH] * Fixed incompatible signal/slot types. --- src/libtomahawk/Source.cpp | 2 +- src/libtomahawk/Source.h | 2 +- src/libtomahawk/network/DBSyncConnectionState.h | 1 + src/libtomahawk/network/DbSyncConnection.cpp | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libtomahawk/Source.cpp b/src/libtomahawk/Source.cpp index afb5e2428..09c22f757 100644 --- a/src/libtomahawk/Source.cpp +++ b/src/libtomahawk/Source.cpp @@ -508,7 +508,7 @@ Source::scanningFinished( bool updateGUI ) void -Source::onStateChanged( DBSyncConnectionState newstate, DBSyncConnectionState oldstate, const QString& info ) +Source::onStateChanged( Tomahawk::DBSyncConnectionState newstate, Tomahawk::DBSyncConnectionState oldstate, const QString& info ) { Q_D( Source ); diff --git a/src/libtomahawk/Source.h b/src/libtomahawk/Source.h index 5871dd85e..a1b289a56 100644 --- a/src/libtomahawk/Source.h +++ b/src/libtomahawk/Source.h @@ -144,7 +144,7 @@ private slots: void setOffline(); void setOnline(); - void onStateChanged( DBSyncConnectionState newstate, DBSyncConnectionState oldstate, const QString& info ); + void onStateChanged( Tomahawk::DBSyncConnectionState newstate, Tomahawk::DBSyncConnectionState oldstate, const QString& info ); void onPlaybackStarted( const Tomahawk::track_ptr& track, unsigned int duration ); void onPlaybackFinished( const Tomahawk::track_ptr& track, const Tomahawk::PlaybackLog& log ); diff --git a/src/libtomahawk/network/DBSyncConnectionState.h b/src/libtomahawk/network/DBSyncConnectionState.h index c862c09bf..17b571b7d 100644 --- a/src/libtomahawk/network/DBSyncConnectionState.h +++ b/src/libtomahawk/network/DBSyncConnectionState.h @@ -37,5 +37,6 @@ enum DBSyncConnectionState } +Q_DECLARE_METATYPE( Tomahawk::DBSyncConnectionState ) #endif // DBSYNCCONNECTIONSTATE_H diff --git a/src/libtomahawk/network/DbSyncConnection.cpp b/src/libtomahawk/network/DbSyncConnection.cpp index 9771fc6f9..d36e47fe9 100644 --- a/src/libtomahawk/network/DbSyncConnection.cpp +++ b/src/libtomahawk/network/DbSyncConnection.cpp @@ -56,7 +56,7 @@ DBSyncConnection::DBSyncConnection( Servent* s, const source_ptr& src ) // Be aware of namespaces in these signals/slots! connect( this, SIGNAL( stateChanged( Tomahawk::DBSyncConnectionState, Tomahawk::DBSyncConnectionState, QString ) ), - m_source.data(), SLOT( onStateChanged( DBSyncConnectionState, DBSyncConnectionState, QString ) ) ); + m_source.data(), SLOT( onStateChanged( Tomahawk::DBSyncConnectionState, Tomahawk::DBSyncConnectionState, QString ) ) ); connect( m_source.data(), SIGNAL( commandsFinished() ), this, SLOT( lastOpApplied() ) );