From 1cbab26204f32b7fb05de285ec66029937aa6d87 Mon Sep 17 00:00:00 2001
From: Leo Franchi <lfranchi@kde.org>
Date: Mon, 24 Jan 2011 19:34:42 -0500
Subject: [PATCH] fix merge

---
 src/libtomahawk/playlist/dynamic/DynamicView.cpp | 4 ++--
 src/libtomahawk/playlist/dynamic/DynamicView.h   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/libtomahawk/playlist/dynamic/DynamicView.cpp b/src/libtomahawk/playlist/dynamic/DynamicView.cpp
index 50f0a9a89..0ea76f952 100644
--- a/src/libtomahawk/playlist/dynamic/DynamicView.cpp
+++ b/src/libtomahawk/playlist/dynamic/DynamicView.cpp
@@ -17,7 +17,7 @@
 #include "DynamicView.h"
 
 #include "widgets/overlaywidget.h"
-#include "trackmodel.h"
+#include "playlistmodel.h"
 
 #include <QPainter>
 using namespace Tomahawk;
@@ -35,7 +35,7 @@ DynamicView::~DynamicView()
 }
 
 void 
-DynamicView::setModel( TrackModel* model)
+DynamicView::setModel( PlaylistModel* model)
 {
     PlaylistView::setModel( model );
     
diff --git a/src/libtomahawk/playlist/dynamic/DynamicView.h b/src/libtomahawk/playlist/dynamic/DynamicView.h
index f27ff1104..fbda18e34 100644
--- a/src/libtomahawk/playlist/dynamic/DynamicView.h
+++ b/src/libtomahawk/playlist/dynamic/DynamicView.h
@@ -21,6 +21,7 @@
 #include <QTimer>
 #include <QPropertyAnimation>
 
+class PlaylistModel;
 class TrackModel;
 namespace Tomahawk
 {
@@ -32,7 +33,7 @@ public:
     explicit DynamicView( QWidget* parent = 0 );
     virtual ~DynamicView();
     
-    virtual void setModel( TrackModel* model );
+    virtual void setModel( PlaylistModel* model );
     
 public slots:
     void showMessageTimeout( const QString& title, const QString& body );