diff --git a/src/libtomahawk/network/servent.cpp b/src/libtomahawk/network/servent.cpp
index 8b27affac..0ed05161d 100644
--- a/src/libtomahawk/network/servent.cpp
+++ b/src/libtomahawk/network/servent.cpp
@@ -310,7 +310,7 @@ Servent::readyRead()
 
     ControlConnection* cc = 0;
     bool ok;
-    int pport = 0;
+//    int pport; //FIXME?
     QString key, conntype, nodeid, controlid;
     QVariantMap m = parser.parse( sock->_msg->payload(), &ok ).toMap();
     if( !ok )
@@ -320,7 +320,7 @@ Servent::readyRead()
     }
     conntype  = m.value( "conntype" ).toString();
     key       = m.value( "key" ).toString();
-    pport     = m.value( "port" ).toInt();
+//    pport     = m.value( "port" ).toInt();
     nodeid    = m.value( "nodeid" ).toString();
     controlid = m.value( "controlid" ).toString();
 
diff --git a/src/libtomahawk/playlist.cpp b/src/libtomahawk/playlist.cpp
index bb3ff7a6a..df3792064 100644
--- a/src/libtomahawk/playlist.cpp
+++ b/src/libtomahawk/playlist.cpp
@@ -137,8 +137,8 @@ Playlist::Playlist( const source_ptr& author,
     , m_lastmodified( 0 )
     , m_createdOn( 0 ) // will be set by db command
     , m_shared( shared )
-    , m_busy( false )
     , m_initEntries( entries )
+    , m_busy( false )
 {
     qDebug() << Q_FUNC_INFO << "2";
     init();
diff --git a/src/libtomahawk/playlist/artistview.cpp b/src/libtomahawk/playlist/artistview.cpp
index a3d5ce592..faf31731f 100644
--- a/src/libtomahawk/playlist/artistview.cpp
+++ b/src/libtomahawk/playlist/artistview.cpp
@@ -101,7 +101,16 @@ ArtistView::setProxyModel( TreeProxyModel* model )
 
 
 void
-ArtistView::setModel( TreeModel* model )
+ArtistView::setModel( QAbstractItemModel* model )
+{
+    Q_UNUSED( model );
+    qDebug() << "Explicitly use setPlaylistModel instead";
+    Q_ASSERT( false );
+}
+
+
+void
+ArtistView::setTreeModel( TreeModel* model )
 {
     m_model = model;
 
diff --git a/src/libtomahawk/playlist/artistview.h b/src/libtomahawk/playlist/artistview.h
index 119237246..a32b430a6 100644
--- a/src/libtomahawk/playlist/artistview.h
+++ b/src/libtomahawk/playlist/artistview.h
@@ -45,7 +45,8 @@ public:
     TreeProxyModel* proxyModel() const { return m_proxyModel; }
 //    PlaylistItemDelegate* delegate() { return m_delegate; }
 
-    void setModel( TreeModel* model );
+    void setModel( QAbstractItemModel* model );
+    void setTreeModel( TreeModel* model );
 
     virtual QWidget* widget() { return this; }
     virtual Tomahawk::PlaylistInterface* playlistInterface() const { return proxyModel(); }
diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp
index b33dbe272..f34b09692 100644
--- a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp
+++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp
@@ -564,6 +564,7 @@ Tomahawk::EchonestControl::artistTextEdited( const QString& text )
     // if the user is editing an artist field, try to help him out and suggest from echonest
     QLineEdit* l = qobject_cast<QLineEdit*>( m_input.data() );
     Q_ASSERT( l );
+    Q_UNUSED( l );
 //     l->setCompleter( new QCompleter( this ) ); // clear
 
     foreach( QNetworkReply* r, m_suggestWorkers ) {
diff --git a/src/libtomahawk/sip/SipModel.cpp b/src/libtomahawk/sip/SipModel.cpp
index 69c3a8972..96f82747d 100644
--- a/src/libtomahawk/sip/SipModel.cpp
+++ b/src/libtomahawk/sip/SipModel.cpp
@@ -187,6 +187,7 @@ SipModel::flags( const QModelIndex& index ) const
 void
 SipModel::pluginAdded( SipPlugin* p )
 {
+    Q_UNUSED( p );
     // we assume sip plugins are added at the end of the list.
     Q_ASSERT( SipHandler::instance()->allPlugins().last() == p );
     int size = SipHandler::instance()->allPlugins().count() - 1;
diff --git a/src/libtomahawk/viewmanager.cpp b/src/libtomahawk/viewmanager.cpp
index fa2ed2318..d08089da8 100644
--- a/src/libtomahawk/viewmanager.cpp
+++ b/src/libtomahawk/viewmanager.cpp
@@ -104,7 +104,7 @@ ViewManager::ViewManager( QObject* parent )
 
     m_superCollectionView = new ArtistView();
     m_superCollectionModel = new TreeModel( m_superCollectionView );
-    m_superCollectionView->setModel( m_superCollectionModel );
+    m_superCollectionView->setTreeModel( m_superCollectionModel );
     m_superCollectionView->setFrameShape( QFrame::NoFrame );
     m_superCollectionView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
     m_superCollectionView->setShowModes( false );
@@ -308,7 +308,7 @@ ViewManager::show( const Tomahawk::collection_ptr& collection )
         {
             view = new ArtistView();
             TreeModel* model = new TreeModel();
-            view->setModel( model );
+            view->setTreeModel( model );
             view->setFrameShape( QFrame::NoFrame );
             view->setAttribute( Qt::WA_MacShowFocusRect, 0 );
 
diff --git a/src/resolversmodel.cpp b/src/resolversmodel.cpp
index 3c9e8df15..d3431dbec 100644
--- a/src/resolversmodel.cpp
+++ b/src/resolversmodel.cpp
@@ -103,12 +103,14 @@ ResolversModel::setData( const QModelIndex& index, const QVariant& value, int ro
 int
 ResolversModel::rowCount( const QModelIndex& parent ) const
 {
+    Q_UNUSED( parent );
     return m_allResolvers.size();
 }
 
 int
 ResolversModel::columnCount(const QModelIndex& parent) const
 {
+    Q_UNUSED( parent );
     return 1;
 }
 
diff --git a/src/scrobbler.cpp b/src/scrobbler.cpp
index bcaee8e0f..82bf2855b 100644
--- a/src/scrobbler.cpp
+++ b/src/scrobbler.cpp
@@ -40,7 +40,7 @@ Scrobbler::Scrobbler( QObject* parent )
     connect( Tomahawk::InfoSystem::InfoSystem::instance(),
         SIGNAL( info( QString, Tomahawk::InfoSystem::InfoType, QVariant, QVariant, Tomahawk::InfoSystem::InfoCustomData ) ),
         SLOT( infoSystemInfo( QString, Tomahawk::InfoSystem::InfoType, QVariant, QVariant, Tomahawk::InfoSystem::InfoCustomData ) ) );
-    
+
     connect( AudioEngine::instance(), SIGNAL( started( const Tomahawk::result_ptr& ) ),
              SLOT( trackStarted( const Tomahawk::result_ptr& ) ), Qt::QueuedConnection );
 
@@ -137,6 +137,7 @@ Scrobbler::scrobble()
 void
 Scrobbler::infoSystemInfo( QString caller, Tomahawk::InfoSystem::InfoType type, QVariant input, QVariant output, Tomahawk::InfoSystem::InfoCustomData customData )
 {
+    Q_UNUSED( type );
     Q_UNUSED( input );
     Q_UNUSED( output );
     Q_UNUSED( customData );
diff --git a/src/sip/jabber/avatarmanager.cpp b/src/sip/jabber/avatarmanager.cpp
index b1abde919..9396c51df 100644
--- a/src/sip/jabber/avatarmanager.cpp
+++ b/src/sip/jabber/avatarmanager.cpp
@@ -151,7 +151,7 @@ QString AvatarManager::avatarHash(const QString &jid) const
     return m_JidsAvatarHashes.key(jid);
 }
 
-QDir AvatarManager::avatarDir(const QString &avatarHash) const
+QDir AvatarManager::avatarDir(const QString&) const
 {
     return m_cacheDir;
 }
@@ -167,7 +167,7 @@ bool AvatarManager::isCached(const QString &avatarHash) const
     return m_cachedAvatars.contains( avatarHash );
 }
 
-void AvatarManager::onNewAvatar(const QString& jid)
+void AvatarManager::onNewAvatar(const QString&)
 {
 //    qDebug() << Q_FUNC_INFO <<  "Found new Avatar..." << jid;
 }
diff --git a/src/sip/jabber/jabber.cpp b/src/sip/jabber/jabber.cpp
index ae2b41e98..77d5b04ff 100644
--- a/src/sip/jabber/jabber.cpp
+++ b/src/sip/jabber/jabber.cpp
@@ -216,6 +216,7 @@ JabberPlugin::icon() const
 bool
 JabberPlugin::connectPlugin( bool startup )
 {
+    Q_UNUSED( startup );
     qDebug() << Q_FUNC_INFO;
 
     if(m_client->isConnected())
diff --git a/src/sip/zeroconf/zeroconf.cpp b/src/sip/zeroconf/zeroconf.cpp
index 008556329..11f3bcec0 100644
--- a/src/sip/zeroconf/zeroconf.cpp
+++ b/src/sip/zeroconf/zeroconf.cpp
@@ -71,6 +71,8 @@ ZeroconfFactory::icon() const
 bool
 ZeroconfPlugin::connectPlugin( bool startup )
 {
+    Q_UNUSED( startup );
+
     delete m_zeroconf;
     m_zeroconf = new TomahawkZeroconf( Servent::instance()->port(), this );
     QObject::connect( m_zeroconf, SIGNAL( tomahawkHostFound( QString, int, QString, QString ) ),
diff --git a/src/sourcetree/items/genericpageitems.cpp b/src/sourcetree/items/genericpageitems.cpp
index 9a2787b93..50244f603 100644
--- a/src/sourcetree/items/genericpageitems.cpp
+++ b/src/sourcetree/items/genericpageitems.cpp
@@ -62,6 +62,7 @@ GenericPageItem::icon() const
 bool
 GenericPageItem::willAcceptDrag(const QMimeData* data) const
 {
+    Q_UNUSED( data );
     return false;
 }
 
diff --git a/src/sourcetree/items/playlistitems.cpp b/src/sourcetree/items/playlistitems.cpp
index b3461cf1f..d073b43a7 100644
--- a/src/sourcetree/items/playlistitems.cpp
+++ b/src/sourcetree/items/playlistitems.cpp
@@ -59,6 +59,8 @@ PlaylistItem::playlist() const
 void
 PlaylistItem::onPlaylistLoaded( Tomahawk::PlaylistRevision revision )
 {
+    Q_UNUSED( revision );
+
     m_loaded = true;
     emit updated();
 }
@@ -118,6 +120,7 @@ PlaylistItem::setLoaded( bool loaded )
 bool
 PlaylistItem::willAcceptDrag( const QMimeData* data ) const
 {
+    Q_UNUSED( data );
     return !m_playlist.isNull() && m_playlist->author()->isLocal();
 }
 
@@ -125,6 +128,8 @@ PlaylistItem::willAcceptDrag( const QMimeData* data ) const
 bool
 PlaylistItem::dropMimeData( const QMimeData* data, Qt::DropAction action )
 {
+    Q_UNUSED( action );
+
     QList< Tomahawk::query_ptr > queries;
 
     if ( data->hasFormat( "application/tomahawk.playlist.id" ) &&
@@ -190,9 +195,12 @@ PlaylistItem::icon() const
 
 
 bool
-PlaylistItem::setData(const QVariant& v, bool role)
+PlaylistItem::setData( const QVariant& v, bool role )
 {
-    if( m_playlist->author()->isLocal() ) {
+    Q_UNUSED( role );
+
+    if ( m_playlist->author()->isLocal() )
+    {
         m_playlist->rename( v.toString() );
 
         return true;
@@ -318,6 +326,7 @@ DynamicPlaylistItem::text() const
 bool
 DynamicPlaylistItem::willAcceptDrag( const QMimeData* data ) const
 {
+    Q_UNUSED( data );
     return false;
 }