diff --git a/src/libtomahawk/Artist.cpp b/src/libtomahawk/Artist.cpp index c70aeb593..c36e64ea2 100644 --- a/src/libtomahawk/Artist.cpp +++ b/src/libtomahawk/Artist.cpp @@ -82,8 +82,8 @@ Artist::Artist( unsigned int id, const QString& name ) : QObject() , m_id( id ) , m_name( name ) - , m_infoLoaded( false ) - , m_infoLoading( false ) + , m_coverLoaded( false ) + , m_coverLoading( false ) , m_simArtistsLoaded( false ) , m_infoJobs( 0 ) #ifndef ENABLE_HEADLESS @@ -295,7 +295,7 @@ Artist::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVari if ( ba.length() ) { m_coverBuffer = ba; - m_infoLoaded = true; + m_coverLoaded = true; emit coverChanged(); } } @@ -348,7 +348,7 @@ Artist::infoSystemFinished( QString target ) QPixmap Artist::cover( const QSize& size, bool forceLoad ) const { - if ( !m_infoLoaded && !m_infoLoading ) + if ( !m_coverLoaded && !m_coverLoading ) { if ( !forceLoad ) return QPixmap(); @@ -374,7 +374,7 @@ Artist::cover( const QSize& size, bool forceLoad ) const m_infoJobs++; Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData ); - m_infoLoading = true; + m_coverLoading = true; } if ( !m_cover && !m_coverBuffer.isEmpty() ) diff --git a/src/libtomahawk/Artist.h b/src/libtomahawk/Artist.h index a19f5931b..cf267df1e 100644 --- a/src/libtomahawk/Artist.h +++ b/src/libtomahawk/Artist.h @@ -49,8 +49,6 @@ public: QString name() const { return m_name; } QString sortname() const { return m_sortname; } - bool infoLoaded() const { return m_infoLoaded; } - QList<Tomahawk::album_ptr> albums( ModelMode mode = Mixed, const Tomahawk::collection_ptr& collection = Tomahawk::collection_ptr() ) const; QList<Tomahawk::artist_ptr> similarArtists() const; @@ -65,6 +63,7 @@ public: #ifndef ENABLE_HEADLESS QPixmap cover( const QSize& size, bool forceLoad = true ) const; #endif + bool coverLoaded() const { return m_coverLoaded; } Tomahawk::playlistinterface_ptr playlistInterface(); @@ -94,8 +93,8 @@ private: QString m_name; QString m_sortname; - bool m_infoLoaded; - mutable bool m_infoLoading; + bool m_coverLoaded; + mutable bool m_coverLoading; QHash<Tomahawk::ModelMode, bool> m_albumsLoaded; bool m_simArtistsLoaded;