merge branch with head

1 files changed, 5 insertions, 5 deletions

diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
index 293bf45..fec91ea 100644
--- a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
@@ -46,8 +46,8 @@
 
 #include "mediaplayerstate.h"
 
-PlayListWidgetGui::PlayListWidgetGui( MediaPlayerState &_mediaPlayerState, QWidget* parent, const char* name )
-    : QMainWindow( parent, name ), mediaPlayerState( _mediaPlayerState ) {
+PlayListWidgetGui::PlayListWidgetGui(QWidget* parent, const char* name )
+    : QMainWindow( parent, name )  {
 
     d = new PlayListWidgetPrivate;
     d->setDocumentUsed = FALSE;
@@ -186,9 +186,9 @@ void PlayListWidgetGui::setView( char view )  {
 void PlayListWidgetGui::setActiveWindow()  {
     //  qDebug("SETTING active window");
     // When we get raised we need to ensure that it switches views
-    MediaPlayerState::DisplayType origDisplayType = mediaPlayerState.displayType();
-    mediaPlayerState.setDisplayType( MediaPlayerState::MediaSelection ); // invalidate
-    mediaPlayerState.setDisplayType( origDisplayType ); // now switch back
+    MediaPlayerState::DisplayType origDisplayType = mediaPlayerState->displayType();
+    mediaPlayerState->setDisplayType( MediaPlayerState::MediaSelection ); // invalidate
+    mediaPlayerState->setDisplayType( origDisplayType ); // now switch back
 }