summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp7
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidgetgui.cpp1
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidgetgui.h1
3 files changed, 1 insertions, 8 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 55b66ab..6355bec 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -169,9 +169,6 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
169 169
170 170
171PlayListWidget::~PlayListWidget() { 171PlayListWidget::~PlayListWidget() {
172 if ( d->current ) {
173 delete d->current;
174 }
175 delete d; 172 delete d;
176} 173}
177 174
@@ -428,10 +425,8 @@ const DocLnk *PlayListWidget::current() const { // this is fugly
428 assert( currentTab() == CurrentPlayList ); 425 assert( currentTab() == CurrentPlayList );
429 426
430// qDebug("playlist"); 427// qDebug("playlist");
431 if ( mediaPlayerState->isUsingPlaylist() ) { 428 if ( mediaPlayerState->isUsingPlaylist() )
432 return d->selectedFiles->current(); 429 return d->selectedFiles->current();
433 } else if ( d->setDocumentUsed && d->current )
434 return d->current;
435 430
436 assert( false ); 431 assert( false );
437} 432}
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
index a217c94..db7c979 100644
--- a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
@@ -66,7 +66,6 @@ PlayListWidgetGui::PlayListWidgetGui( QWidget* parent, const char* name, WFlags
66 66
67 d = new PlayListWidgetPrivate; 67 d = new PlayListWidgetPrivate;
68 d->setDocumentUsed = FALSE; 68 d->setDocumentUsed = FALSE;
69 d->current = NULL;
70 69
71 setBackgroundMode( PaletteButton ); 70 setBackgroundMode( PaletteButton );
72 setToolBarsMovable( FALSE ); 71 setToolBarsMovable( FALSE );
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.h b/noncore/multimedia/opieplayer2/playlistwidgetgui.h
index 6c35771..4eefb93 100644
--- a/noncore/multimedia/opieplayer2/playlistwidgetgui.h
+++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.h
@@ -64,7 +64,6 @@ public:
64 QFrame *playListFrame; 64 QFrame *playListFrame;
65 PlayListSelection *selectedFiles; 65 PlayListSelection *selectedFiles;
66 bool setDocumentUsed; 66 bool setDocumentUsed;
67 DocLnk *current;
68}; 67};
69 68
70 69