diff --git a/CMakeModules/AddTomahawkPlugin.cmake b/CMakeModules/AddTomahawkPlugin.cmake index a30310b44..f4cd96fa1 100644 --- a/CMakeModules/AddTomahawkPlugin.cmake +++ b/CMakeModules/AddTomahawkPlugin.cmake @@ -63,7 +63,7 @@ macro(add_tomahawk_plugin) list(APPEND PLUGIN_SOURCES ${PLUGIN_UI_SOURCES}) endif() - if(EXISTS "resources.qrc") + if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/resources.qrc") qt4_add_resources(PLUGIN_RC_SOURCES "resources.qrc") list(APPEND PLUGIN_SOURCES ${PLUGIN_RC_SOURCES}) unset(PLUGIN_RC_SOURCES) diff --git a/src/SocialWidget.cpp b/src/SocialWidget.cpp index a49992ac6..80f708939 100644 --- a/src/SocialWidget.cpp +++ b/src/SocialWidget.cpp @@ -193,6 +193,9 @@ SocialWidget::paintEvent( QPaintEvent* event ) void SocialWidget::onShortLinkReady( const QUrl& longUrl, const QUrl& shortUrl, const QVariant& callbackObj ) { + Q_UNUSED( longUrl ); + Q_UNUSED( callbackObj ); + if ( m_query->album().isEmpty() ) ui->textEdit->setText( tr( "Listening to \"%1\" by %2 and loving it! %3" ).arg( m_query->track() ).arg( m_query->artist() ).arg( shortUrl.toString() ) ); else diff --git a/src/accounts/spotify/SpotifyAccount.cpp b/src/accounts/spotify/SpotifyAccount.cpp index abe8055be..cfbb34bc6 100644 --- a/src/accounts/spotify/SpotifyAccount.cpp +++ b/src/accounts/spotify/SpotifyAccount.cpp @@ -874,7 +874,7 @@ SpotifyAccount::unregisterUpdater( const QString& plid ) void SpotifyAccount::fetchFullPlaylist( SpotifyPlaylistInfo* playlist ) { - + Q_UNUSED( playlist ); } diff --git a/src/accounts/spotify/SpotifyAccountConfig.cpp b/src/accounts/spotify/SpotifyAccountConfig.cpp index b3fa5f629..5e5676f24 100644 --- a/src/accounts/spotify/SpotifyAccountConfig.cpp +++ b/src/accounts/spotify/SpotifyAccountConfig.cpp @@ -51,6 +51,8 @@ SpotifyAccountConfig::SpotifyAccountConfig( SpotifyAccount *account ) void SpotifyAccountConfig::showEvent( QShowEvent *event ) { + Q_UNUSED( event ); + loadFromConfig(); m_loggedInManually = false; } diff --git a/src/libtomahawk/AtticaManager.h b/src/libtomahawk/AtticaManager.h index fecb2d27f..7a0a87ac0 100644 --- a/src/libtomahawk/AtticaManager.h +++ b/src/libtomahawk/AtticaManager.h @@ -58,7 +58,10 @@ public: bool pixmapDirty; Resolver( const QString& v, const QString& path, int userR, ResolverState s, bool resolver ) - : version( v ), scriptPath( path ), userRating( userR ), state( s ), pixmap( 0 ), binary( false ), pixmapDirty( false ) {} + : version( v ), scriptPath( path ), userRating( userR ), state( s ), pixmap( 0 ), binary( false ), pixmapDirty( false ) + { + Q_UNUSED( resolver ); + } Resolver() : userRating( -1 ), state( Uninstalled ), pixmap( 0 ), binary( false ), pixmapDirty( false ) {} }; diff --git a/src/libtomahawk/Playlist.cpp b/src/libtomahawk/Playlist.cpp index 88b6868f1..8b3d8942e 100644 --- a/src/libtomahawk/Playlist.cpp +++ b/src/libtomahawk/Playlist.cpp @@ -469,6 +469,9 @@ Playlist::setNewRevision( const QString& rev, bool is_newest_rev, const QMap< QString, Tomahawk::plentry_ptr >& addedmap ) { + Q_UNUSED( oldorderedguids ); + Q_UNUSED( is_newest_rev ); + // build up correctly ordered new list of plentry_ptrs from // existing ones, and the ones that have been added QMap entriesmap; diff --git a/src/libtomahawk/accounts/AccountManager.cpp b/src/libtomahawk/accounts/AccountManager.cpp index 39d04509b..22ab46d78 100644 --- a/src/libtomahawk/accounts/AccountManager.cpp +++ b/src/libtomahawk/accounts/AccountManager.cpp @@ -405,6 +405,8 @@ AccountManager::hookupAccount( Account* account ) const void AccountManager::hookupAndEnable( Account* account, bool startup ) { + Q_UNUSED( startup ); + tDebug( LOGVERBOSE ) << Q_FUNC_INFO; SipPlugin* p = account->sipPlugin(); if ( p ) diff --git a/src/libtomahawk/accounts/AccountModel.cpp b/src/libtomahawk/accounts/AccountModel.cpp index b5783e54a..2d7434a79 100644 --- a/src/libtomahawk/accounts/AccountModel.cpp +++ b/src/libtomahawk/accounts/AccountModel.cpp @@ -93,8 +93,8 @@ AccountModel::loadData() if ( acct ) { m_accounts << new AccountModelNode( acct ); - const int removed = allAccounts.removeAll( acct ); #if ACCOUNTMODEL_DEBUG + const int removed = allAccounts.removeAll( acct ); qDebug() << "Removed custom account from misc accounts list, found:" << removed; qDebug() << "All accounts after remove:"; foreach ( Account* acct, allAccounts ) diff --git a/src/libtomahawk/infobar/InfoBar.cpp b/src/libtomahawk/infobar/InfoBar.cpp index 1d379609f..0aaca0c59 100644 --- a/src/libtomahawk/infobar/InfoBar.cpp +++ b/src/libtomahawk/infobar/InfoBar.cpp @@ -324,6 +324,8 @@ InfoBar::createTile( int w ) void InfoBar::paintEvent( QPaintEvent* e ) { + Q_UNUSED( e ); + if ( m_bgTile.isNull() || width() > m_bgTile.width() ) createTile( width() ); diff --git a/src/libtomahawk/jobview/AclJobItem.cpp b/src/libtomahawk/jobview/AclJobItem.cpp index 3e67e4ff8..3d086c99e 100644 --- a/src/libtomahawk/jobview/AclJobItem.cpp +++ b/src/libtomahawk/jobview/AclJobItem.cpp @@ -65,6 +65,7 @@ AclJobDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, co const QString text = QString( tr( "Allow %1 to\nconnect and stream from you?" ) ).arg( item->username() ); const int w = fm.width( text ); + Q_UNUSED( w ); // looks obsolete const QRect rRect( opt.rect.left() + PADDING, ROW_HEIGHT + PADDING, opt.rect.width() - 2*PADDING, opt.rect.height() - 2*PADDING ); painter->drawText( rRect, Qt::AlignCenter, text ); diff --git a/src/libtomahawk/playlist/AlbumView.cpp b/src/libtomahawk/playlist/AlbumView.cpp index 740b8ead1..8565c5d43 100644 --- a/src/libtomahawk/playlist/AlbumView.cpp +++ b/src/libtomahawk/playlist/AlbumView.cpp @@ -206,6 +206,7 @@ AlbumView::resizeEvent( QResizeEvent* event ) int rectWidth = contentsRect().width() - scrollbar - 3; int itemWidth = 160; QSize itemSize = m_proxyModel->data( QModelIndex(), Qt::SizeHintRole ).toSize(); + Q_UNUSED( itemSize ); // looks obsolete int itemsPerRow = qMax( 1, qFloor( rectWidth / itemWidth ) ); // int rightSpacing = rectWidth - ( itemsPerRow * ( itemSize.width() + 16 ) ); diff --git a/src/libtomahawk/playlist/TreeModel.cpp b/src/libtomahawk/playlist/TreeModel.cpp index 1eea1e44f..420183fad 100644 --- a/src/libtomahawk/playlist/TreeModel.cpp +++ b/src/libtomahawk/playlist/TreeModel.cpp @@ -669,6 +669,8 @@ TreeModel::addAlbums( const QModelIndex& parent, const QList, Tomahawk::ModelMode, Tomahawk::collection_ptr ) ), diff --git a/src/libtomahawk/utils/BinaryInstallerHelper.cpp b/src/libtomahawk/utils/BinaryInstallerHelper.cpp index 972840a0b..e13cb9321 100644 --- a/src/libtomahawk/utils/BinaryInstallerHelper.cpp +++ b/src/libtomahawk/utils/BinaryInstallerHelper.cpp @@ -23,9 +23,9 @@ BinaryInstallerHelper::BinaryInstallerHelper( const QString& resolverId, bool createAccount, AtticaManager* manager ) : QObject( manager ) - , m_manager( QWeakPointer< AtticaManager >( manager ) ) , m_resolverId( resolverId ) , m_createAccount( createAccount ) + , m_manager( QWeakPointer< AtticaManager >( manager ) ) { Q_ASSERT( !m_resolverId.isEmpty() ); Q_ASSERT( !m_manager.isNull() ); diff --git a/src/libtomahawk/utils/TomahawkUtils.cpp b/src/libtomahawk/utils/TomahawkUtils.cpp index 0e06ebdb8..07471f42e 100644 --- a/src/libtomahawk/utils/TomahawkUtils.cpp +++ b/src/libtomahawk/utils/TomahawkUtils.cpp @@ -848,6 +848,11 @@ unzipFileInFolder( const QString &zipFileName, const QDir &folder ) void extractBinaryResolver( const QString& zipFilename, QObject* receiver ) { +#ifndef Q_OS_MAC + Q_UNUSED( zipFilename ); + Q_UNUSED( receiver ); +#endif + #if !defined(Q_OS_MAC) && !defined (Q_OS_WIN) Q_ASSERT( false ); qWarning() << "NO SUPPORT YET FOR LINUX BINARY RESOLVERS!"; diff --git a/src/libtomahawk/utils/TomahawkUtilsGui.cpp b/src/libtomahawk/utils/TomahawkUtilsGui.cpp index 1672f44d6..f0b894ce1 100644 --- a/src/libtomahawk/utils/TomahawkUtilsGui.cpp +++ b/src/libtomahawk/utils/TomahawkUtilsGui.cpp @@ -394,6 +394,8 @@ defaultPixmap( ImageType type, ImageMode mode, const QSize& size ) void prepareStyleOption( QStyleOptionViewItemV4* option, const QModelIndex& index, TrackModelItem* item ) { + Q_UNUSED( index ); + if ( item->isPlaying() ) { option->palette.setColor( QPalette::Highlight, option->palette.color( QPalette::Mid ) ); diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp index 1d2612a26..aab6d209d 100644 --- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp @@ -155,13 +155,15 @@ AlbumInfoWidget::load( const album_ptr& album ) void AlbumInfoWidget::loadAlbums( bool autoRefetch ) { + Q_UNUSED( autoRefetch ); + m_albumsModel->clear(); connect( m_album->artist().data(), SIGNAL( albumsAdded( QList, Tomahawk::ModelMode ) ), SLOT( gotAlbums( QList ) ) ); gotAlbums( m_album->artist()->albums( Mixed ) ); - + /* tDebug() << "Auto refetching"; m_buttonAlbums->setChecked( false ); onAlbumsModeToggle();*/ diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp index 9ead62220..09d17d3e9 100644 --- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp @@ -193,6 +193,8 @@ ArtistInfoWidget::load( const artist_ptr& artist ) void ArtistInfoWidget::onAlbumsFound( const QList& albums, ModelMode mode ) { + Q_UNUSED( mode ); + m_albumsModel->addAlbums( albums ); } diff --git a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp index 325fd75a6..89faf53bd 100644 --- a/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp +++ b/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp @@ -201,7 +201,7 @@ TrackInfoWidget::onStatsLoaded() void TrackInfoWidget::onSimilarArtistsLoaded() { - Artist* artist = qobject_cast( sender() ); +// Artist* artist = qobject_cast( sender() ); // m_albumsModel->addArtists( artist->similarArtists() ); } diff --git a/thirdparty/liblastfm2/src/types/Track.cpp b/thirdparty/liblastfm2/src/types/Track.cpp index e8cfc9fa3..10cc41230 100644 --- a/thirdparty/liblastfm2/src/types/Track.cpp +++ b/thirdparty/liblastfm2/src/types/Track.cpp @@ -78,9 +78,9 @@ lastfm::TrackData::TrackData() rating( 0 ), fpid( -1 ), loved( false ), - null( false ), scrobbleStatus( Track::Null ), - scrobbleError( Track::None ) + scrobbleError( Track::None ), + null( false ) {} lastfm::Track::Track()