From d641f06e6d1aa1ae04484fd9ab88f2c74578a91b Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Sat, 25 Feb 2012 20:54:54 -0500 Subject: [PATCH] cleanups --- src/libtomahawk/jobview/ErrorStatusMessage.cpp | 4 ++-- src/libtomahawk/jobview/ErrorStatusMessage.h | 3 ++- src/libtomahawk/utils/xspfloader.cpp | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/libtomahawk/jobview/ErrorStatusMessage.cpp b/src/libtomahawk/jobview/ErrorStatusMessage.cpp index d3fd6a685..38f1082a1 100644 --- a/src/libtomahawk/jobview/ErrorStatusMessage.cpp +++ b/src/libtomahawk/jobview/ErrorStatusMessage.cpp @@ -24,8 +24,8 @@ QPixmap* ErrorStatusMessage::s_pixmap = 0; -ErrorStatusMessage::ErrorStatusMessage( const QString& message, int timeoutSecs ) : - JobStatusItem() +ErrorStatusMessage::ErrorStatusMessage( const QString& message, int timeoutSecs ) + : JobStatusItem() , m_message( message ) { m_timer = new QTimer( this ); diff --git a/src/libtomahawk/jobview/ErrorStatusMessage.h b/src/libtomahawk/jobview/ErrorStatusMessage.h index 6831835a9..8eb23a93f 100644 --- a/src/libtomahawk/jobview/ErrorStatusMessage.h +++ b/src/libtomahawk/jobview/ErrorStatusMessage.h @@ -20,11 +20,12 @@ #define ERRORSTATUSMESSAGE_H #include "JobStatusItem.h" +#include "dllmacro.h" class QTimer; class QPixmap; -class ErrorStatusMessage : public JobStatusItem +class DLLEXPORT ErrorStatusMessage : public JobStatusItem { Q_OBJECT public: diff --git a/src/libtomahawk/utils/xspfloader.cpp b/src/libtomahawk/utils/xspfloader.cpp index f2164fb73..29fdbfe67 100644 --- a/src/libtomahawk/utils/xspfloader.cpp +++ b/src/libtomahawk/utils/xspfloader.cpp @@ -25,9 +25,12 @@ #include "utils/tomahawkutils.h" #include "utils/logger.h" + +#ifndef ENABLE_HEADLESS #include "jobview/JobStatusView.h" #include "jobview/JobStatusModel.h" #include "jobview/ErrorStatusMessage.h" +#endif #include "sourcelist.h" #include "playlist.h" @@ -117,7 +120,9 @@ void XSPFLoader::reportError() { emit error( FetchError ); +#ifndef ENABLE_HEADLESS JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( errorToString( FetchError) ) ); +#endif deleteLater(); }