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:
@@ -17,7 +17,7 @@
|
|||||||
#include "DynamicView.h"
|
#include "DynamicView.h"
|
||||||
|
|
||||||
#include "widgets/overlaywidget.h"
|
#include "widgets/overlaywidget.h"
|
||||||
#include "trackmodel.h"
|
#include "playlistmodel.h"
|
||||||
|
|
||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
using namespace Tomahawk;
|
using namespace Tomahawk;
|
||||||
@@ -35,7 +35,7 @@ DynamicView::~DynamicView()
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
DynamicView::setModel( TrackModel* model)
|
DynamicView::setModel( PlaylistModel* model)
|
||||||
{
|
{
|
||||||
PlaylistView::setModel( model );
|
PlaylistView::setModel( model );
|
||||||
|
|
||||||
|
@@ -21,6 +21,7 @@
|
|||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
#include <QPropertyAnimation>
|
#include <QPropertyAnimation>
|
||||||
|
|
||||||
|
class PlaylistModel;
|
||||||
class TrackModel;
|
class TrackModel;
|
||||||
namespace Tomahawk
|
namespace Tomahawk
|
||||||
{
|
{
|
||||||
@@ -32,7 +33,7 @@ public:
|
|||||||
explicit DynamicView( QWidget* parent = 0 );
|
explicit DynamicView( QWidget* parent = 0 );
|
||||||
virtual ~DynamicView();
|
virtual ~DynamicView();
|
||||||
|
|
||||||
virtual void setModel( TrackModel* model );
|
virtual void setModel( PlaylistModel* model );
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void showMessageTimeout( const QString& title, const QString& body );
|
void showMessageTimeout( const QString& title, const QString& body );
|
||||||
|
Reference in New Issue
Block a user