mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-03-13 20:39:57 +01:00
fix merge
This commit is contained in:
parent
2f1303e12e
commit
1cbab26204
@ -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 );
|
||||
|
||||
|
@ -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 );
|
||||
|
Loading…
x
Reference in New Issue
Block a user