mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

Less ENABLE_HEADLESS

Browse Source
This commit is contained in:
Uwe L. Korn
2014-07-08 19:00:57 +01:00
parent 1a56bd7555
commit 07e47713e9
2 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libtomahawk/Artist.cpp
View File

@@ -52,9 +52,7 @@ Artist::~Artist()
tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Deleting artist:" << m_name; tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Deleting artist:" << m_name;
m_ownRef.clear(); m_ownRef.clear();
#ifndef ENABLE_HEADLESS
delete m_cover; delete m_cover;
#endif
} }
@@ -137,9 +135,7 @@ Artist::Artist( unsigned int id, const QString& name )
, m_infoJobs( 0 ) , m_infoJobs( 0 )
, m_chartPosition( 0 ) , m_chartPosition( 0 )
, m_chartCount( 0 ) , m_chartCount( 0 )
#ifndef ENABLE_HEADLESS
, m_cover( 0 ) , m_cover( 0 )
#endif
{ {
tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Creating artist:" << id << name; tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Creating artist:" << id << name;
m_sortname = DatabaseImpl::sortname( name, true ); m_sortname = DatabaseImpl::sortname( name, true );
@@ -158,9 +154,7 @@ Artist::Artist( const QString& name )
, m_infoJobs( 0 ) , m_infoJobs( 0 )
, m_chartPosition( 0 ) , m_chartPosition( 0 )
, m_chartCount( 0 ) , m_chartCount( 0 )
#ifndef ENABLE_HEADLESS
, m_cover( 0 ) , m_cover( 0 )
#endif
{ {
tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Creating artist:" << name; tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Creating artist:" << name;
m_sortname = DatabaseImpl::sortname( name, true ); m_sortname = DatabaseImpl::sortname( name, true );
@@ -590,7 +584,6 @@ Artist::infoSystemFinished( QString target )
} }
#ifndef ENABLE_HEADLESS
QPixmap QPixmap
Artist::cover( const QSize& size, bool forceLoad ) const Artist::cover( const QSize& size, bool forceLoad ) const
{ {
@@ -650,7 +643,6 @@ Artist::cover( const QSize& size, bool forceLoad ) const
else else
return QPixmap(); return QPixmap();
} }
#endif
Tomahawk::playlistinterface_ptr Tomahawk::playlistinterface_ptr

10
src/libtomahawk/Artist.h
View File

@@ -20,12 +20,8 @@
#ifndef TOMAHAWKARTIST_H #ifndef TOMAHAWKARTIST_H
#define TOMAHAWKARTIST_H #define TOMAHAWKARTIST_H
#include <QtCore/QObject>
#ifndef ENABLE_HEADLESS
#include <QtGui/QPixmap>
#endif
#include <QFuture> #include <QFuture>
#include <QPixmap>
#include "TrackData.h" #include "TrackData.h"
#include "Typedefs.h" #include "Typedefs.h"
@@ -69,9 +65,7 @@ public:
QString biography() const; QString biography() const;
#ifndef ENABLE_HEADLESS
QPixmap cover( const QSize& size, bool forceLoad = true ) const; QPixmap cover( const QSize& size, bool forceLoad = true ) const;
#endif
bool coverLoaded() const { return m_coverLoaded; } bool coverLoaded() const { return m_coverLoaded; }
Tomahawk::playlistinterface_ptr playlistInterface(); Tomahawk::playlistinterface_ptr playlistInterface();
@@ -134,9 +128,7 @@ private:
unsigned int m_chartCount; unsigned int m_chartCount;
mutable QByteArray m_coverBuffer; mutable QByteArray m_coverBuffer;
#ifndef ENABLE_HEADLESS
mutable QPixmap* m_cover; mutable QPixmap* m_cover;
#endif
QHash< Tomahawk::ModelMode, QHash< Tomahawk::collection_ptr, Tomahawk::playlistinterface_ptr > > m_playlistInterface; QHash< Tomahawk::ModelMode, QHash< Tomahawk::collection_ptr, Tomahawk::playlistinterface_ptr > > m_playlistInterface;