merge branch with head

1 files changed, 6 insertions, 1 deletions

diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h
index fc305cd..29f3e8d 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.h
+++ b/noncore/multimedia/opieplayer2/playlistwidget.h
@@ -49,2 +49,4 @@ class QAction;
 class QLabel;
+class MediaPlayerState;
+class MediaPlayer;
 
@@ -67,3 +69,4 @@ public:
 
-    PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 );
+    static QString appName() { return QString::fromLatin1("opieplayer2"); }
+    PlayListWidget( QWidget* parent=0, const char* name=0, WFlags = 0 );
     ~PlayListWidget();
@@ -134,2 +137,4 @@ private:
     QListView *currentFileListView;
+
+    MediaPlayer *m_mp;
 };