Merge branch 'decltest' of github.com:tomahawk-player/tomahawk into decltest

src/libtomahawk/playlist/PlayableModel.cpp

@@ -259,15 +259,22 @@ PlayableModel::data( const QModelIndex& index, int role ) const
     {
         return QVariant();
     }
-
+    else if ( role == Qt::TextAlignmentRole )
-    if ( role == Qt::TextAlignmentRole )
     {
         return QVariant( columnAlignment( index.column() ) );
     }
 
+    int column = index.column();
+    if ( role >= Qt::UserRole )
+    {
+        // Map user-role to column
+        column = role - Qt::UserRole;
+        role = Qt::DisplayRole;
+    }
+
     if ( !entry->query().isNull() )
     {
-        return queryData( entry->query()->displayQuery(), index.column(), role );
+        return queryData( entry->query()->displayQuery(), column, role );
     }
     else if ( !entry->artist().isNull() )
     {

src/libtomahawk/playlist/PlayableModel.h

@@ -38,7 +38,8 @@ class DLLEXPORT PlayableModel : public QAbstractItemModel
 Q_OBJECT
 
 public:
-    enum Columns {
+    enum Columns
+    {
         Artist = 0,
         Track = 1,
         Composer = 2,
@@ -54,6 +55,24 @@ public:
         Name = 12
     };
 
+    enum PlayableRoles
+    {
+        ArtistRole = Qt::UserRole,
+        TrackRole,
+        ComposerRole,
+        AlbumRole,
+        AlbumPosRole,
+        DurationRole,
+        BitrateRole,
+        AgeRole,
+        YearRole,
+        FilesizeRole,
+        OriginRole,
+        ScoreRole,
+        NameRole
+    };
+
+
     explicit PlayableModel( QObject* parent = 0, bool loading = true );
     virtual ~PlayableModel();
 

src/libtomahawk/playlist/dynamic/widgets/DynamicQmlWidget.cpp

@@ -31,7 +31,6 @@ DynamicQmlWidget::DynamicQmlWidget( const dynplaylist_ptr& playlist, QWidget* pa
     m_model->startOnDemand();
 
     setSource( QUrl( "qrc" RESPATH "qml/StationScene.qml" ) );
-    // TODO: fill m_model with the station stuff
 }