From a4f65cbcc22094af713c06dcd7cd4ae0680bb7c7 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Mon, 26 Dec 2011 12:29:56 -0500 Subject: [PATCH] Fix some compilation errors from the merge --- src/libtomahawk/artist.h | 2 +- src/libtomahawk/widgets/whatshotwidget.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/artist.h b/src/libtomahawk/artist.h index 0e8b15b56..f49865c1b 100644 --- a/src/libtomahawk/artist.h +++ b/src/libtomahawk/artist.h @@ -29,7 +29,7 @@ namespace Tomahawk { -class DLLEXPORT Artist : public QObject, public Tomahwk::PlaylistInterface +class DLLEXPORT Artist : public QObject, public Tomahawk::PlaylistInterface { Q_OBJECT diff --git a/src/libtomahawk/widgets/whatshotwidget.cpp b/src/libtomahawk/widgets/whatshotwidget.cpp index 6eccfc402..4666f972b 100644 --- a/src/libtomahawk/widgets/whatshotwidget.cpp +++ b/src/libtomahawk/widgets/whatshotwidget.cpp @@ -111,7 +111,7 @@ WhatsHotWidget::WhatsHotWidget( QWidget* parent ) WhatsHotWidget::~WhatsHotWidget() { m_workerThread->exit(0); - delete m_playlistInterface; + m_playlistInterface.clear(); delete ui; }