1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-18 20:04:00 +02:00

fix merge

This commit is contained in:
Leo Franchi
2011-01-24 19:34:42 -05:00
parent 2f1303e12e
commit 1cbab26204
2 changed files with 4 additions and 3 deletions

View File

@@ -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 );

View File

@@ -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 );